diff options
| author | Ingo Molnar | 2009-01-21 10:39:51 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-01-21 10:39:51 +0100 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | x86: uv cleanup, build fix (diff) | |
| parent | x86: optimise x86's do_page_fault (C entry point for the page fault path) (diff) | |
| download | kernel-qcow2-linux-198030782cedf25391e67e7c88b04f87a5eb6563.tar.gz kernel-qcow2-linux-198030782cedf25391e67e7c88b04f87a5eb6563.tar.xz kernel-qcow2-linux-198030782cedf25391e67e7c88b04f87a5eb6563.zip | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 04e8ecea9b40..295ccc5e86b1 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -87,7 +87,9 @@ SECTIONS /* The dummy segment contents for the bug workaround mentioned above near PHDRS. */ .dummy : AT(ADDR(.dummy) - LOAD_OFFSET) { - LONG(0xf177) + LONG(0) + LONG(0) + LONG(0) } :kernel :dummy /* |