summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 11:17:32 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-28 11:17:32 +1000
commit10420921675582903ab256dc3094206ac0280f68 (patch)
treeb774e849efa85255b2fbc0a24698c75196038e96 /arch/powerpc/Kconfig
parent13906db670a128864714c30c244b866dce119494 (diff)
parentd220980b701d838560a70de691b53be007e99e78 (diff)
downloadblackbird-op-linux-10420921675582903ab256dc3094206ac0280f68.tar.gz
blackbird-op-linux-10420921675582903ab256dc3094206ac0280f68.zip
Merge branch 'merge' into next
Merge recent fixes to lparcfg so subsequent patches can move the whole file to arch/powerpc/platforms/pseries
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 174c6a12269a..04f1e94c3437 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -999,6 +999,7 @@ config RELOCATABLE
must live at a different physical address than the primary
kernel.
+# This value must have zeroes in the bottom 60 bits otherwise lots will break
config PAGE_OFFSET
hex
default "0xc000000000000000"
OpenPOWER on IntegriCloud