From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 23 Jun 2010 14:46:32 +0000 (-0700)
Subject: .32 patch
X-Git-Tag: v2.6.31.14~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a158934665e906b677bc8e302625ff8cb2852eab;p=thirdparty%2Fkernel%2Fstable-queue.git

.32 patch
---

diff --git a/queue-2.6.32/mm-hugetlb-fix-clear_huge_page.patch b/queue-2.6.32/mm-hugetlb-fix-clear_huge_page.patch
new file mode 100644
index 00000000000..ad0e5d79b26
--- /dev/null
+++ b/queue-2.6.32/mm-hugetlb-fix-clear_huge_page.patch
@@ -0,0 +1,35 @@
+From 74dbdd239bb1348ad86d28b18574d9c1f28b62ca Mon Sep 17 00:00:00 2001
+From: Andrea Arcangeli <aarcange@redhat.com>
+Date: Fri, 8 Jan 2010 14:43:05 -0800
+Subject: mm: hugetlb: fix clear_huge_page()
+
+From: Andrea Arcangeli <aarcange@redhat.com>
+
+commit 74dbdd239bb1348ad86d28b18574d9c1f28b62ca upstream.
+
+sz is in bytes, MAX_ORDER_NR_PAGES is in pages.
+
+Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
+Acked-by: David Gibson <dwg@au1.ibm.com>
+Cc: Mel Gorman <mel@csn.ul.ie>
+Cc: David Rientjes <rientjes@google.com>
+Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ mm/hugetlb.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mm/hugetlb.c
++++ b/mm/hugetlb.c
+@@ -401,7 +401,7 @@ static void clear_huge_page(struct page
+ {
+ 	int i;
+ 
+-	if (unlikely(sz > MAX_ORDER_NR_PAGES)) {
++	if (unlikely(sz/PAGE_SIZE > MAX_ORDER_NR_PAGES)) {
+ 		clear_gigantic_page(page, addr, sz);
+ 		return;
+ 	}
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index d9e7b445422..7fcfb473eed 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -47,3 +47,4 @@ pci-quirk-disable-msi-on-via-k8t890-systems.patch
 pci-quirks-disable-msi-on-amd-rs4xx-internal-gfx-bridges.patch
 pci-disable-msi-for-mcp55-on-p5n32-e-sli.patch
 virtio_net-make-delayed-refill-more-reliable.patch
+mm-hugetlb-fix-clear_huge_page.patch