diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-10-31 12:27:17 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 12:36:21 +0100 |
| commit | 5663a1232bd557b4b2141ad345dd56785fa51c2a (patch) | |
| tree | e52cb28aff24dee85b43330553e38eca66766e60 /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/pow... (diff) | |
| download | linux-5663a1232bd557b4b2141ad345dd56785fa51c2a.tar.xz linux-5663a1232bd557b4b2141ad345dd56785fa51c2a.zip | |
Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"
This reverts commit 91a00302959545a9ae423e99732b1e46eb19e877, plus
commit 0dcd440120ef12879ff34fc78d7e4abf171c79e4 ("powerpc: Revert CHRP
boot wrapper to real-base = 12MB on 32-bit") which depended on it.
Commit 91a00302 was causing NVRAM corruption on some pSeries machines,
for as-yet unknown reasons, so this reverts it until the cause is
identified.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 384dca5a9c1d..2412c056baa4 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -205,9 +205,6 @@ SECTIONS } #endif - /* Fake ELF header containing RPA note; for addnote */ - .fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) } - /* freed after init ends here */ . = ALIGN(PAGE_SIZE); __init_end = .; |