diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 11:54:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 11:54:05 -0400 |
commit | 0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch) | |
tree | 753837a9fb9e3f65bc7450994159683a47f086a6 /include/linux/mm.h | |
parent | bf6c216282a260d3ce727c23fc15f28a76beff0b (diff) | |
parent | cf870c70a194443f8fc654ddc9d6cfd02c58003b (diff) |
Merge branch 'x86/mce' into x86/ras
Pursue a single RAS/MCE topic branch on x86.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index f0224608d15e..d2d59b4149d0 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1798,6 +1798,7 @@ enum mf_flags { | |||
1798 | MF_COUNT_INCREASED = 1 << 0, | 1798 | MF_COUNT_INCREASED = 1 << 0, |
1799 | MF_ACTION_REQUIRED = 1 << 1, | 1799 | MF_ACTION_REQUIRED = 1 << 1, |
1800 | MF_MUST_KILL = 1 << 2, | 1800 | MF_MUST_KILL = 1 << 2, |
1801 | MF_SOFT_OFFLINE = 1 << 3, | ||
1801 | }; | 1802 | }; |
1802 | extern int memory_failure(unsigned long pfn, int trapno, int flags); | 1803 | extern int memory_failure(unsigned long pfn, int trapno, int flags); |
1803 | extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); | 1804 | extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); |