diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 22:37:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 22:37:48 +0200 |
| commit | bb65a764de59b76323e0b72abbd9fc31401a53fa (patch) | |
| tree | 38646e0b3fd8143737270aa1ea5dadf7d9762a65 /include | |
| parent | 92254d31444aad272155f7963e65910c402703dd (diff) | |
| parent | 6751ed65dc6642af64f7b8a440a75563c8aab7ae (diff) | |
| download | linux-stable-bb65a764de59b76323e0b72abbd9fc31401a53fa.tar.gz linux-stable-bb65a764de59b76323e0b72abbd9fc31401a53fa.tar.bz2 linux-stable-bb65a764de59b76323e0b72abbd9fc31401a53fa.zip | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index b36d08ce5c57..f9f279cf5b1b 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); |