diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-26 11:40:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-26 11:40:13 +0100 |
| commit | 4e9f44ba29f20484615a461244bfd3a419391490 (patch) | |
| tree | 490dd38bb8d14765327cee0be2f9731254e9c402 /include/linux/mm.h | |
| parent | 87f71ae2dd7471c1b4c94100be1f218e91dc64c3 (diff) | |
| parent | 5f7b88d51e89771f64c15903b96b5933dd0bc6d8 (diff) | |
Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Implement MCE recovery for the data load error path and assorted cleanups.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |