X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Flinux%2Fmm.h;h=bcc5234747246b0be01128d7081e06e50dcff070;hb=cd42f4a3b2b1c4cbd997363dc57821953d73fd87;hp=3dc3a8c2c4858a1d3400aa2d5fd029d36a1177c6;hpb=fba9569924e06da076cb2ad12474bbd82d69f54d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 3dc3a8c..bcc5234 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -10,6 +10,7 @@
 #include <linux/mmzone.h>
 #include <linux/rbtree.h>
 #include <linux/prio_tree.h>
+#include <linux/atomic.h>
 #include <linux/debug_locks.h>
 #include <linux/mm_types.h>
 #include <linux/range.h>
@@ -1606,8 +1607,7 @@ void vmemmap_populate_print_last(void);
 enum mf_flags {
 	MF_COUNT_INCREASED = 1 << 0,
 };
-extern void memory_failure(unsigned long pfn, int trapno);
-extern int __memory_failure(unsigned long pfn, int trapno, int flags);
+extern int memory_failure(unsigned long pfn, int trapno, int flags);
 extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);
 extern int unpoison_memory(unsigned long pfn);
 extern int sysctl_memory_failure_early_kill;