projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
ppc
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/ppc/kernel/vmlinux.lds.S
b/arch/ppc/kernel/vmlinux.lds.S
index
6192126
..
a062556
100644
(file)
--- a/
arch/ppc/kernel/vmlinux.lds.S
+++ b/
arch/ppc/kernel/vmlinux.lds.S
@@
-135,10
+135,12
@@
SECTIONS
.data.percpu : { *(.data.percpu) }
__per_cpu_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(4096);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
+#endif
. = ALIGN(4096);
__init_end = .;