diff options
| author | Ingo Molnar | 2013-08-12 17:54:05 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-08-12 17:54:05 +0200 |
| commit | 0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch) | |
| tree | 753837a9fb9e3f65bc7450994159683a47f086a6 /include/linux/mm.h | |
| parent | Merge tag 'ras_for_3.12' into x86/ras (diff) | |
| parent | mce: acpi/apei: Soft-offline a page on firmware GHES notification (diff) | |
| download | kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.gz kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.xz kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.zip | |
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 { MF_COUNT_INCREASED = 1 << 0, MF_ACTION_REQUIRED = 1 << 1, MF_MUST_KILL = 1 << 2, + MF_SOFT_OFFLINE = 1 << 3, }; extern int memory_failure(unsigned long pfn, int trapno, int flags); extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); |