X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Flinux%2Fmm.h;h=3dc8f6b687217962e973ee99e6b8ea7b3140d034;hb=4e9f44ba29f20484615a461244bfd3a419391490;hp=17b27cd269c404e117416e468ca9853dd94d141b;hpb=bcede2f64a3b5cb50c0bdec1553ab480fd75d659;p=firefly-linux-kernel-4.4.55.git

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 17b27cd269c4..3dc8f6b68721 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1598,9 +1598,9 @@ void vmemmap_populate_print_last(void);
 
 enum mf_flags {
 	MF_COUNT_INCREASED = 1 << 0,
+	MF_ACTION_REQUIRED = 1 << 1,
 };
-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;