diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /usr | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
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 b9efed5e35cc..c14322d1c0cf 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S | |||
| @@ -22,16 +22,17 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/stringify.h> | 24 | #include <linux/stringify.h> |
| 25 | #include <asm-generic/vmlinux.lds.h> | ||
| 25 | 26 | ||
| 26 | .section .init.ramfs,"a" | 27 | .section .init.ramfs,"a" |
| 27 | __irf_start: | 28 | __irf_start: |
| 28 | .incbin __stringify(INITRAMFS_IMAGE) | 29 | .incbin __stringify(INITRAMFS_IMAGE) |
| 29 | __irf_end: | 30 | __irf_end: |
| 30 | .section .init.ramfs.info,"a" | 31 | .section .init.ramfs.info,"a" |
| 31 | .globl __initramfs_size | 32 | .globl VMLINUX_SYMBOL(__initramfs_size) |
| 32 | __initramfs_size: | 33 | VMLINUX_SYMBOL(__initramfs_size): |
| 33 | #ifdef CONFIG_32BIT | 34 | #ifdef CONFIG_64BIT |
| 34 | .long __irf_end - __irf_start | ||
| 35 | #else | ||
| 36 | .quad __irf_end - __irf_start | 35 | .quad __irf_end - __irf_start |
| 36 | #else | ||
| 37 | .long __irf_end - __irf_start | ||
| 37 | #endif | 38 | #endif |