diff options
author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2010-11-29 17:38:50 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:21 -0500 |
commit | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (patch) | |
tree | d655aec03674ada60e6a1b82ed28219db11260b1 /usr | |
parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) |
initramfs: Really fix build break on symbol-prefixed archs
Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
of symbol-prefixed architectures, for example, blackfin.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>,
Cc: Michal Marek <mmarek@suse.cz>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[mmarek: leave out Makefile change, since d63f6d1 already takes care of the
SYMBOL_PREFIX define]
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'usr')
-rw-r--r-- | usr/initramfs_data.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index 792a750d9441..c14322d1c0cf 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S | |||
@@ -22,14 +22,15 @@ | |||
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_64BIT | 34 | #ifdef CONFIG_64BIT |
34 | .quad __irf_end - __irf_start | 35 | .quad __irf_end - __irf_start |
35 | #else | 36 | #else |