diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 17:54:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 17:54:05 +0200 |
| commit | 0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch) | |
| tree | 753837a9fb9e3f65bc7450994159683a47f086a6 /mm | |
| 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 'mm')
| -rw-r--r-- | mm/memory-failure.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 2c13aa7a016..55d7c8026ab 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1286,7 +1286,10 @@ static void memory_failure_work_func(struct work_struct *work) spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); if (!gotten) break; - memory_failure(entry.pfn, entry.trapno, entry.flags); + if (entry.flags & MF_SOFT_OFFLINE) + soft_offline_page(pfn_to_page(entry.pfn), entry.flags); + else + memory_failure(entry.pfn, entry.trapno, entry.flags); } } |