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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sh
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/sh/kernel/vmlinux.lds.S
b/arch/sh/kernel/vmlinux.lds.S
index
95fdd91
..
f34bdcc
100644
(file)
--- a/
arch/sh/kernel/vmlinux.lds.S
+++ b/
arch/sh/kernel/vmlinux.lds.S
@@
-2,6
+2,7
@@
* ld script to make SuperH Linux kernel
* Written by Niibe Yutaka
*/
* ld script to make SuperH Linux kernel
* Written by Niibe Yutaka
*/
+#include <asm/thread_info.h>
#include <asm-generic/vmlinux.lds.h>
#ifdef CONFIG_CPU_LITTLE_ENDIAN
#include <asm-generic/vmlinux.lds.h>
#ifdef CONFIG_CPU_LITTLE_ENDIAN
@@
-13,7
+14,7
@@
OUTPUT_ARCH(sh)
ENTRY(_start)
SECTIONS
{
ENTRY(_start)
SECTIONS
{
- . =
0x80000000
+ CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
+ . =
CONFIG_PAGE_OFFSET
+ CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
_text = .; /* Text and read-only data */
text = .; /* Text and read-only data */
.empty_zero_page : {
_text = .; /* Text and read-only data */
text = .; /* Text and read-only data */
.empty_zero_page : {
@@
-40,17
+41,17
@@
SECTIONS
*(.data)
/* Align the initial ramdisk image (INITRD) on page boundaries. */
*(.data)
/* Align the initial ramdisk image (INITRD) on page boundaries. */
- . = ALIGN(
4096
);
+ . = ALIGN(
PAGE_SIZE
);
__rd_start = .;
*(.initrd)
__rd_start = .;
*(.initrd)
- . = ALIGN(
4096
);
+ . = ALIGN(
PAGE_SIZE
);
__rd_end = .;
CONSTRUCTORS
}
__rd_end = .;
CONSTRUCTORS
}
- . = ALIGN(
4096
);
- .data.page_aligned : { *(.data.
idt
) }
+ . = ALIGN(
PAGE_SIZE
);
+ .data.page_aligned : { *(.data.
page_aligned
) }
. = ALIGN(32);
__per_cpu_start = .;
. = ALIGN(32);
__per_cpu_start = .;
@@
-60,12
+61,10
@@
SECTIONS
_edata = .; /* End of data section */
_edata = .; /* End of data section */
- . = ALIGN(
8192);
/* init_task */
+ . = ALIGN(
THREAD_SIZE);
/* init_task */
.data.init_task : { *(.data.init_task) }
.data.init_task : { *(.data.init_task) }
- /* stack */
- .stack : { stack = .; _stack = .; }
- . = ALIGN(
4096);
/* Init code and data */
+ . = ALIGN(
PAGE_SIZE);
/* Init code and data */
__init_begin = .;
_sinittext = .;
.init.text : { *(.init.text) }
__init_begin = .;
_sinittext = .;
.init.text : { *(.init.text) }
@@
-77,13
+76,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 = .;
@@
-96,7
+89,7
@@
SECTIONS
__machvec_start = .;
.init.machvec : { *(.init.machvec) }
__machvec_end = .;
__machvec_start = .;
.init.machvec : { *(.init.machvec) }
__machvec_end = .;
- . = ALIGN(
4096
);
+ . = ALIGN(
PAGE_SIZE
);
__init_end = .;
. = ALIGN(4);
__init_end = .;
. = ALIGN(4);