From 1b9dc138dbb76a585cce99e7881ef5f692b03177 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 27 Sep 2010 23:39:30 +0200 Subject: [PATCH] --- yaml --- r: 217339 b: refs/heads/master c: a08c80ebb621a6dc277c91e029acb725f2f20254 h: refs/heads/master i: 217337: 3a24428e7c7937177bcc93b4066d92685dde6499 217335: c5ca7dc9382648253581fb2254429b3edca94cc9 v: v3 --- [refs] | 2 +- trunk/mm/memory-failure.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 545d42626dfa..aa141efd56b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9033ae16407f46ae06f559f9374281f6e9d89efc +refs/heads/master: a08c80ebb621a6dc277c91e029acb725f2f20254 diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c index 88653c93e4ce..2044fe8920c2 100644 --- a/trunk/mm/memory-failure.c +++ b/trunk/mm/memory-failure.c @@ -840,8 +840,6 @@ static int page_action(struct page_state *ps, struct page *p, return (result == RECOVERED || result == DELAYED) ? 0 : -EBUSY; } -#define N_UNMAP_TRIES 5 - /* * Do all that is necessary to remove user space mappings. Unmap * the pages and send SIGBUS to the processes if the data was dirty. @@ -853,7 +851,6 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn, struct address_space *mapping; LIST_HEAD(tokill); int ret; - int i; int kill = 1; struct page *hpage = compound_head(p); @@ -907,17 +904,7 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn, if (kill) collect_procs(hpage, &tokill); - /* - * try_to_unmap can fail temporarily due to races. - * Try a few times (RED-PEN better strategy?) - */ - for (i = 0; i < N_UNMAP_TRIES; i++) { - ret = try_to_unmap(hpage, ttu); - if (ret == SWAP_SUCCESS) - break; - pr_debug("MCE %#lx: try_to_unmap retry needed %d\n", pfn, ret); - } - + ret = try_to_unmap(hpage, ttu); if (ret != SWAP_SUCCESS) printk(KERN_ERR "MCE %#lx: failed to unmap page (mapcount=%d)\n", pfn, page_mapcount(hpage));