Add sparc64 Kconfig HUGETLB_PAGE_SIZE_64KB fix, from Bunk

diff --git a/queue/series b/queue/series
index 60dda58d38b44b27748794fea81a6497c428c5ea..f266937995272ab99af574a3ba38924c43d2af81 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -14,3 +14,4 @@ sparc64-fix-sys_fstat64-entry-in-64-bit-syscall-table.patch
 fix-DoS-in-netlink_rcv_skb.patch
 moxa-serial-add-proper-capability-check.patch
 fix-sys-class-net-if-wireless-without-dev-get_wireless_stats.patch
+sparc64-fix-HUGETLB_PAGE_SIZE_64K-dependencies.patch

diff --git a/queue/sparc64-fix-HUGETLB_PAGE_SIZE_64K-dependencies.patch b/queue/sparc64-fix-HUGETLB_PAGE_SIZE_64K-dependencies.patch
new file mode 100644 (file)
index 0000000..544683d
--- /dev/null
+++ b/queue/sparc64-fix-HUGETLB_PAGE_SIZE_64K-dependencies.patch
@@ -0,0 +1,29 @@
+From stable-bounces@linux.kernel.org  Thu Jan 12 14:59:31 2006
+Date: Thu, 12 Jan 2006 23:55:10 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: stable@kernel.org
+Message-ID: <20060112225510.GA29663@stusta.de>
+Cc: davem@davemloft.net
+Subject: [PATCH] arch/sparc64/Kconfig: fix HUGETLB_PAGE_SIZE_64K dependencies
+
+This patch fixes a typo in the dependencies of HUGETLB_PAGE_SIZE_64K.
+
+This bug was reported by Jean-Luc Leger <reiga@dspnet.fr.eu.org>.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ arch/sparc64/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.y.orig/arch/sparc64/Kconfig
++++ linux-2.6.15.y/arch/sparc64/Kconfig
+@@ -179,7 +179,7 @@ config HUGETLB_PAGE_SIZE_512K
+       bool "512K"
+ 
+ config HUGETLB_PAGE_SIZE_64K
+-      depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K
++      depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
+       bool "64K"
+ 
+ endchoice