projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
parisc
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/parisc/kernel/vmlinux.lds.S
b/arch/parisc/kernel/vmlinux.lds.S
index 9989495a51dd64e8c026c88c20fec99fc9dc2ae0..2a8253358c6ccc6686a9a255d171c6fa3f59e229 100644
(file)
--- a/
arch/parisc/kernel/vmlinux.lds.S
+++ b/
arch/parisc/kernel/vmlinux.lds.S
@@
-68,6
+68,8
@@
SECTIONS
RODATA
RODATA
+ BUG_TABLE
+
/* writeable */
. = ALIGN(ASM_PAGE_SIZE); /* Make sure this is page aligned so
that we can properly leave these
/* writeable */
. = ALIGN(ASM_PAGE_SIZE); /* Make sure this is page aligned so
that we can properly leave these
@@
-153,13
+155,7
@@
SECTIONS
__setup_end = .;
__initcall_start = .;
.initcall.init : {
__setup_end = .;
__initcall_start = .;
.initcall.init : {
- *(.initcall1.init)
- *(.initcall2.init)
- *(.initcall3.init)
- *(.initcall4.init)
- *(.initcall5.init)
- *(.initcall6.init)
- *(.initcall7.init)
+ INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
}
__initcall_end = .;
__con_initcall_start = .;
@@
-179,10
+175,12
@@
SECTIONS
from .altinstructions and .eh_frame */
.exit.text : { *(.exit.text) }
.exit.data : { *(.exit.data) }
from .altinstructions and .eh_frame */
.exit.text : { *(.exit.text) }
.exit.data : { *(.exit.data) }
+#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(ASM_PAGE_SIZE);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
. = ALIGN(ASM_PAGE_SIZE);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
+#endif
. = ALIGN(32);
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
. = ALIGN(32);
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
@@
-204,6
+202,7
@@
SECTIONS
*(.dynstr)
*(.dynamic)
*(.hash)
*(.dynstr)
*(.dynamic)
*(.hash)
+ *(.gnu.hash)
#endif
}
#endif
}