diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-27 21:17:32 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-27 21:17:32 -0400 |
| commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
| tree | b774e849efa85255b2fbc0a24698c75196038e96 /arch/powerpc/Kconfig | |
| parent | 13906db670a128864714c30c244b866dce119494 (diff) | |
| parent | d220980b701d838560a70de691b53be007e99e78 (diff) | |
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 | |||
| 999 | must live at a different physical address than the primary | 999 | must live at a different physical address than the primary |
| 1000 | kernel. | 1000 | kernel. |
| 1001 | 1001 | ||
| 1002 | # This value must have zeroes in the bottom 60 bits otherwise lots will break | ||
| 1002 | config PAGE_OFFSET | 1003 | config PAGE_OFFSET |
| 1003 | hex | 1004 | hex |
| 1004 | default "0xc000000000000000" | 1005 | default "0xc000000000000000" |