From dafdcaf1ee4c6dcb33f9a3abf341264c4cbc8fc6 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Wed, 16 Dec 2009 12:19:57 +0100 Subject: [PATCH] --- yaml --- r: 177614 b: refs/heads/master c: a7560fc80f33cab33176ee78f146df22b28e3338 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/memory-failure.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4e79c38b2513..3d79eedb4a04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b9a29ecd75e310f75a9243e1c3538ad34598fcb +refs/heads/master: a7560fc80f33cab33176ee78f146df22b28e3338 diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c index 745f61082ce5..275f4e2df8ac 100644 --- a/trunk/mm/memory-failure.c +++ b/trunk/mm/memory-failure.c @@ -618,13 +618,11 @@ static struct page_state { static void action_result(unsigned long pfn, char *msg, int result) { - struct page *page = NULL; - if (pfn_valid(pfn)) - page = pfn_to_page(pfn); + struct page *page = pfn_to_page(pfn); printk(KERN_ERR "MCE %#lx: %s%s page recovery: %s\n", pfn, - page && PageDirty(page) ? "dirty " : "", + PageDirty(page) ? "dirty " : "", msg, action_name[result]); } @@ -750,8 +748,10 @@ int __memory_failure(unsigned long pfn, int trapno, int ref) panic("Memory failure from trap %d on page %lx", trapno, pfn); if (!pfn_valid(pfn)) { - action_result(pfn, "memory outside kernel control", IGNORED); - return -EIO; + printk(KERN_ERR + "MCE %#lx: memory outside kernel control\n", + pfn); + return -ENXIO; } p = pfn_to_page(pfn);