From: Hugh Dickins <hugh@veritas.com>
Date: Mon, 6 Apr 2009 11:01:15 +0000 (+0000)
Subject: powerpc: Allow 256kB pages with SHMEM
X-Git-Tag: v2.6.30-rc3~89^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=adf213c43898f2324cfc35c315556bc21cb65b31;p=karo-tx-linux.git

powerpc: Allow 256kB pages with SHMEM

Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed,
let powerpc 256kB pages coexist with CONFIG_SHMEM again.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5b50e1ac6179..4c7804551362 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -462,7 +462,7 @@ config PPC_64K_PAGES
 
 config PPC_256K_PAGES
 	bool "256k page size" if 44x
-	depends on !STDBINUTILS && (!SHMEM || BROKEN)
+	depends on !STDBINUTILS
 	help
 	  Make the page size 256k.