From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758112Ab0IHBaQ (ORCPT ); Tue, 7 Sep 2010 21:30:16 -0400 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:63591 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757909Ab0IHBaN (ORCPT ); Tue, 7 Sep 2010 21:30:13 -0400 From: Naoya Horiguchi To: Andi Kleen Cc: Andrew Morton , Christoph Lameter , Mel Gorman , Wu Fengguang , "Jun'ichi Nomura" , linux-mm , LKML Subject: [PATCH 09/10] HWPOISON, hugetlb: fix unpoison for hugepage Date: Wed, 8 Sep 2010 10:19:40 +0900 Message-Id: <1283908781-13810-10-git-send-email-n-horiguchi@ah.jp.nec.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1283908781-13810-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1283908781-13810-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently unpoisoning hugepages doesn't work correctly because clearing PG_HWPoison is done outside if (TestClearPageHWPoison). This patch fixes it. Signed-off-by: Naoya Horiguchi Signed-off-by: Jun'ichi Nomura --- mm/memory-failure.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git v2.6.36-rc2/mm/memory-failure.c v2.6.36-rc2/mm/memory-failure.c index 1d0392d..483a59f 100644 --- v2.6.36-rc2/mm/memory-failure.c +++ v2.6.36-rc2/mm/memory-failure.c @@ -1202,9 +1202,9 @@ int unpoison_memory(unsigned long pfn) pr_debug("MCE: Software-unpoisoned page %#lx\n", pfn); atomic_long_sub(nr_pages, &mce_bad_pages); freeit = 1; + if (PageHuge(page)) + clear_page_hwpoison_huge_page(page); } - if (PageHuge(p)) - clear_page_hwpoison_huge_page(page); unlock_page(page); put_page(page); -- 1.7.2.2