git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull ec into release branch
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/sh/kernel/vmlinux.lds.S
b/arch/sh/kernel/vmlinux.lds.S
index
77b4026
..
78a6c09
100644
(file)
--- a/
arch/sh/kernel/vmlinux.lds.S
+++ b/
arch/sh/kernel/vmlinux.lds.S
@@
-3,6
+3,7
@@
* Written by Niibe Yutaka
*/
#include <asm/thread_info.h>
* Written by Niibe Yutaka
*/
#include <asm/thread_info.h>
+#include <asm/cache.h>
#include <asm-generic/vmlinux.lds.h>
#ifdef CONFIG_CPU_LITTLE_ENDIAN
#include <asm-generic/vmlinux.lds.h>
#ifdef CONFIG_CPU_LITTLE_ENDIAN
@@
-51,9
+52,9
@@
SECTIONS
}
. = ALIGN(PAGE_SIZE);
}
. = ALIGN(PAGE_SIZE);
- .data.page_aligned : { *(.data.
idt
) }
+ .data.page_aligned : { *(.data.
page_aligned
) }
- . = ALIGN(
32
);
+ . = ALIGN(
L1_CACHE_BYTES
);
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
__per_cpu_end = .;
__per_cpu_start = .;
.data.percpu : { *(.data.percpu) }
__per_cpu_end = .;
@@
-83,9
+84,13
@@
SECTIONS
.con_initcall.init : { *(.con_initcall.init) }
__con_initcall_end = .;
SECURITY_INIT
.con_initcall.init : { *(.con_initcall.init) }
__con_initcall_end = .;
SECURITY_INIT
+
+#ifdef CONFIG_BLK_DEV_INITRD
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
+#endif
+
__machvec_start = .;
.init.machvec : { *(.init.machvec) }
__machvec_end = .;
__machvec_start = .;
.init.machvec : { *(.init.machvec) }
__machvec_end = .;