diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-04 00:17:32 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-04 00:17:32 -0500 |
commit | 292a6c58e9133b57d004d92a846fff326dd31e92 (patch) | |
tree | a267d1881a9a0bcb69938becd0c182874cd6c19c /arch/powerpc/kernel/vmlinux.lds.S | |
parent | 8ad200d7b7c8fac77cf705831e90e889360d7030 (diff) | |
parent | dc3a9efb5ee89493a42c3365d219e339e4720c2b (diff) |
Merge branch 'for-paulus' of git://kernel/home/michael/src/work/
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index d4dfcfbce272..9ceaa7a7bd00 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -1,11 +1,9 @@ | |||
1 | #include <linux/config.h> | 1 | #include <linux/config.h> |
2 | #ifdef CONFIG_PPC64 | ||
3 | #include <asm/page.h> | 2 | #include <asm/page.h> |
4 | #else | ||
5 | #define PAGE_SIZE 4096 | ||
6 | #endif | ||
7 | #include <asm-generic/vmlinux.lds.h> | 3 | #include <asm-generic/vmlinux.lds.h> |
8 | 4 | ||
5 | ENTRY(_stext) | ||
6 | |||
9 | #ifdef CONFIG_PPC64 | 7 | #ifdef CONFIG_PPC64 |
10 | OUTPUT_ARCH(powerpc:common64) | 8 | OUTPUT_ARCH(powerpc:common64) |
11 | jiffies = jiffies_64; | 9 | jiffies = jiffies_64; |
@@ -21,6 +19,7 @@ SECTIONS | |||
21 | *(.exit.data) | 19 | *(.exit.data) |
22 | } | 20 | } |
23 | 21 | ||
22 | . = KERNELBASE; | ||
24 | 23 | ||
25 | /* Read-only sections, merged into text segment: */ | 24 | /* Read-only sections, merged into text segment: */ |
26 | #ifdef CONFIG_PPC32 | 25 | #ifdef CONFIG_PPC32 |