aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2013-09-11 17:22:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 18:58:11 -0400
commitb194b8cdb83daafd2405fb902193b8e904107614 (patch)
tree8d1279e5f7fc667c8359264baef014478c801375 /mm
parent86e057734bd1c460c48ae69f8fcc3ed90eb40d59 (diff)
mm/hwpoison: add '#' to madvise_hwpoison
Add '#' to madvise_hwpoison. Before patch: [ 95.892866] Injecting memory failure for page 19d0 at b7786000 [ 95.893151] MCE 0x19d0: non LRU page recovery: Ignored After patch: [ 95.892866] Injecting memory failure for page 0x19d0 at 0xb7786000 [ 95.893151] MCE 0x19d0: non LRU page recovery: Ignored Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/madvise.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index 936799f042cc..9b1c7be182d7 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -353,14 +353,14 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
353 if (ret != 1) 353 if (ret != 1)
354 return ret; 354 return ret;
355 if (bhv == MADV_SOFT_OFFLINE) { 355 if (bhv == MADV_SOFT_OFFLINE) {
356 printk(KERN_INFO "Soft offlining page %lx at %lx\n", 356 pr_info("Soft offlining page %#lx at %#lx\n",
357 page_to_pfn(p), start); 357 page_to_pfn(p), start);
358 ret = soft_offline_page(p, MF_COUNT_INCREASED); 358 ret = soft_offline_page(p, MF_COUNT_INCREASED);
359 if (ret) 359 if (ret)
360 break; 360 break;
361 continue; 361 continue;
362 } 362 }
363 printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n", 363 pr_info("Injecting memory failure for page %#lx at %#lx\n",
364 page_to_pfn(p), start); 364 page_to_pfn(p), start);
365 /* Ignore return value for now */ 365 /* Ignore return value for now */
366 memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED); 366 memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);