summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-11 20:37:48 (GMT)
committerIngo Molnar <mingo@kernel.org>2012-07-11 20:37:48 (GMT)
commitbb65a764de59b76323e0b72abbd9fc31401a53fa (patch)
tree38646e0b3fd8143737270aa1ea5dadf7d9762a65 /include
parent92254d31444aad272155f7963e65910c402703dd (diff)
parent6751ed65dc6642af64f7b8a440a75563c8aab7ae (diff)
downloadlinux-fsl-qoriq-bb65a764de59b76323e0b72abbd9fc31401a53fa.tar.xz
Merge branch 'mce-ripvfix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Merge memory fault handling fix from Tony Luck. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index b36d08c..f9f279c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1591,6 +1591,7 @@ void vmemmap_populate_print_last(void);
enum mf_flags {
MF_COUNT_INCREASED = 1 << 0,
MF_ACTION_REQUIRED = 1 << 1,
+ MF_MUST_KILL = 1 << 2,
};
extern int memory_failure(unsigned long pfn, int trapno, int flags);
extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);