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 percpu-dtc into release branch
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
vmlinux.lds.S
diff --git
a/arch/cris/arch-v32/vmlinux.lds.S
b/arch/cris/arch-v32/vmlinux.lds.S
index
adb9460
..
e124fcd
100644
(file)
--- a/
arch/cris/arch-v32/vmlinux.lds.S
+++ b/
arch/cris/arch-v32/vmlinux.lds.S
@@
-8,7
+8,6
@@
* the kernel has booted.
*/
* the kernel has booted.
*/
-#include <linux/config.h>
#include <asm-generic/vmlinux.lds.h>
jiffies = jiffies_64;
#include <asm-generic/vmlinux.lds.h>
jiffies = jiffies_64;
@@
-96,6
+95,7
@@
SECTIONS
.data.percpu : { *(.data.percpu) }
__per_cpu_end = .;
.data.percpu : { *(.data.percpu) }
__per_cpu_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
.init.ramfs : {
__initramfs_start = .;
*(.init.ramfs)
.init.ramfs : {
__initramfs_start = .;
*(.init.ramfs)
@@
-108,6
+108,7
@@
SECTIONS
FILL (0);
. = ALIGN (8192);
}
FILL (0);
. = ALIGN (8192);
}
+#endif
__vmlinux_end = .; /* Last address of the physical file. */
__init_end = .;
__vmlinux_end = .; /* Last address of the physical file. */
__init_end = .;