diff options
| author | Benjamin Herrenschmidt | 2013-08-28 03:17:32 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2013-08-28 03:17:32 +0200 |
| commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
| tree | b774e849efa85255b2fbc0a24698c75196038e96 /arch/powerpc/Kconfig | |
| parent | powerpc/powernv: Return secondary CPUs to firmware on kexec (diff) | |
| parent | powerpc/hvsi: Increase handshake timeout from 200ms to 400ms. (diff) | |
| download | kernel-qcow2-linux-10420921675582903ab256dc3094206ac0280f68.tar.gz kernel-qcow2-linux-10420921675582903ab256dc3094206ac0280f68.tar.xz kernel-qcow2-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/Kconfig | 1 |
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" |