aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-12-15 13:48:12 -0500
committerTony Luck <tony.luck@intel.com>2012-01-03 15:06:32 -0500
commitcd42f4a3b2b1c4cbd997363dc57821953d73fd87 (patch)
treec7db057922def7f742fbcd283324051bdd92b053 /include/linux/mm.h
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
HWPOISON: Clean up memory_failure() vs. __memory_failure()
There is only one caller of memory_failure(), all other users call __memory_failure() and pass in the flags argument explicitly. The lone user of memory_failure() will soon need to pass flags too. Add flags argument to the callsite in mce.c. Delete the old memory_failure() function, and then rename __memory_failure() without the leading "__". Provide clearer message when action optional memory errors are ignored. Acked-by: Borislav Petkov <bp@amd64.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4baadd18f4ad..bcc523474724 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1607,8 +1607,7 @@ void vmemmap_populate_print_last(void);
1607enum mf_flags { 1607enum mf_flags {
1608 MF_COUNT_INCREASED = 1 << 0, 1608 MF_COUNT_INCREASED = 1 << 0,
1609}; 1609};
1610extern void memory_failure(unsigned long pfn, int trapno); 1610extern int memory_failure(unsigned long pfn, int trapno, int flags);
1611extern int __memory_failure(unsigned long pfn, int trapno, int flags);
1612extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); 1611extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);
1613extern int unpoison_memory(unsigned long pfn); 1612extern int unpoison_memory(unsigned long pfn);
1614extern int sysctl_memory_failure_early_kill; 1613extern int sysctl_memory_failure_early_kill;