git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/parisc/kernel/vmlinux.lds.S
b/arch/parisc/kernel/vmlinux.lds.S
index
e011bc8
..
e5fac3e
100644
(file)
--- a/
arch/parisc/kernel/vmlinux.lds.S
+++ b/
arch/parisc/kernel/vmlinux.lds.S
@@
-29,7
+29,7
@@
#include <asm/page.h>
/* ld script to make hppa Linux kernel */
#include <asm/page.h>
/* ld script to make hppa Linux kernel */
-#ifndef CONFIG_
PARISC64
+#ifndef CONFIG_
64BIT
OUTPUT_FORMAT("elf32-hppa-linux")
OUTPUT_ARCH(hppa)
#else
OUTPUT_FORMAT("elf32-hppa-linux")
OUTPUT_ARCH(hppa)
#else
@@
-38,7
+38,7
@@
OUTPUT_ARCH(hppa:hppa2.0w)
#endif
ENTRY(_stext)
#endif
ENTRY(_stext)
-#ifndef CONFIG_
PARISC64
+#ifndef CONFIG_
64BIT
jiffies = jiffies_64 + 4;
#else
jiffies = jiffies_64;
jiffies = jiffies_64 + 4;
#else
jiffies = jiffies_64;
@@
-84,6
+84,9
@@
SECTIONS
.data : { /* Data */
*(.data)
.data : { /* Data */
*(.data)
+ *(.data.vm0.pmd)
+ *(.data.vm0.pgd)
+ *(.data.vm0.pte)
CONSTRUCTORS
}
CONSTRUCTORS
}
@@
-112,7
+115,7
@@
SECTIONS
. = ALIGN(16384);
init_istack : { *(init_istack) }
. = ALIGN(16384);
init_istack : { *(init_istack) }
-#ifdef CONFIG_
PARISC64
+#ifdef CONFIG_
64BIT
. = ALIGN(16); /* Linkage tables */
.opd : { *(.opd) } PROVIDE (__gp = .);
.plt : { *(.plt) }
. = ALIGN(16); /* Linkage tables */
.opd : { *(.opd) } PROVIDE (__gp = .);
.plt : { *(.plt) }
@@
-180,7
+183,7
@@
SECTIONS
/* Sections to be discarded */
/DISCARD/ : {
*(.exitcall.exit)
/* Sections to be discarded */
/DISCARD/ : {
*(.exitcall.exit)
-#ifdef CONFIG_
PARISC64
+#ifdef CONFIG_
64BIT
/* temporary hack until binutils is fixed to not emit these
for static binaries */
*(.interp)
/* temporary hack until binutils is fixed to not emit these
for static binaries */
*(.interp)