diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 18:57:02 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 18:57:02 +0100 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /usr | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| download | op-kernel-dev-4b7bd364700d9ac8372eff48832062b936d0793b.zip op-kernel-dev-4b7bd364700d9ac8372eff48832062b936d0793b.tar.gz | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/initramfs_data.S | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index b9efed5..c14322d 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -22,16 +22,17 @@ */ #include <linux/stringify.h> +#include <asm-generic/vmlinux.lds.h> .section .init.ramfs,"a" __irf_start: .incbin __stringify(INITRAMFS_IMAGE) __irf_end: .section .init.ramfs.info,"a" -.globl __initramfs_size -__initramfs_size: -#ifdef CONFIG_32BIT - .long __irf_end - __irf_start -#else +.globl VMLINUX_SYMBOL(__initramfs_size) +VMLINUX_SYMBOL(__initramfs_size): +#ifdef CONFIG_64BIT .quad __irf_end - __irf_start +#else + .long __irf_end - __irf_start #endif |
