From: Andrew Morton Date: Thu, 7 Feb 2013 01:26:45 +0000 (+1100) Subject: mm-memory-failurec-fix-wrong-num_poisoned_pages-in-handling-memory-error-on-thp-fix X-Git-Tag: next-20130218~1^2~396 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9024ec170c334f7261ec106c7e067cc4a9040bfb;p=karo-tx-linux.git mm-memory-failurec-fix-wrong-num_poisoned_pages-in-handling-memory-error-on-thp-fix tweak comment Cc: Naoya Horiguchi Signed-off-by: Andrew Morton --- diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9b1e5e7078a1..1a56d63adf9c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1040,11 +1040,11 @@ int memory_failure(unsigned long pfn, int trapno, int flags) } /* - * Currently errors on hugetlbfs pages are contained in hugepage - * unit, so nr_pages should be 1 << compound_order. OTOH when - * errors are on transparent hugepages, they are supposed to be - * split and error containment is done in normal page unit. - * So nr_pages should be one in this case. + * Currently errors on hugetlbfs pages are measured in hugepage units, + * so nr_pages should be 1 << compound_order. OTOH when errors are on + * transparent hugepages, they are supposed to be split and error + * measurement is done in normal page units. So nr_pages should be one + * in this case. */ if (PageHuge(p)) nr_pages = 1 << compound_order(hpage);