Messages in this thread Patch in this message | | | Date | Tue, 30 Nov 2010 16:36:59 +0100 | From | Michal Marek <> | Subject | Re: [PATCH] initramfs: Fix build break on symbol-prefixed archs |
| |
On Mon, Nov 29, 2010 at 06:29:37PM -0500, Mike Frysinger wrote: > On Mon, Nov 29, 2010 at 17:38, Andrew Morton wrote: > > On Wed, 24 Nov 2010 03:40:51 -0500 Mike Frysinger wrote: > >> On Sat, Nov 13, 2010 at 18:17, Mike Frysinger wrote: > >> > On Thu, Oct 28, 2010 at 17:19, Michal Marek wrote: > >> >> On 28.10.2010 22:35, Sam Ravnborg wrote: > >> >>> On Thu, Oct 28, 2010 at 12:46:31AM +0200, Michal Marek wrote: > >> >>>> On 27.10.2010 20:23, Mike Frysinger wrote: > >> >>>>> can we get this change dropped from linux-next until someone gets a > >> >>>>> chance to fix it ? > >> >>>> > >> >>>> Sorry I missed this thread. So your last patch > >> >>>> (http://lkml.org/lkml/2010/10/19/488) did fix the Blackfin build > >> >>>> failure? Can you submit it with a proper Signed-off-by and changelog? > >> >>> > >> >>> Did you see the patch I posted in: http://lkml.org/lkml/2010/10/19/534 > >> >>> > >> >>> The one that fix up the cppflags usage. > >> >>> > >> >>> I think this will solve the issue with blackfin nicely - and > >> >>> make use of cppflags more as expected. > >> >> > >> >> As Mike noted - your patch does not strip the double quotes. And Mike's > >> >> patch is really minimal, it just adds the SYMBOL_PREFIX definition to > >> >> _a_flags. I'll look at your patch after this merge window. > >> > > >> > why am i seeing __initramfs_size failures in mainline now ? > >> > >> ping ... it looks like no one merged the VMLINUX_SYMBOL() changes in > >> usr/initramfs_data.S proposed by Hendrik
Argh, yes. I only merged your patch to use -DSYMBOL_PREFIX when preprocessing .S files ("initramfs: Fix build break on symbol-prefixed archs") as d63f6d1, but did not realize that the main part of Hendrik's patch is missing :-/.
> > > > Well I found and forward-ported the below, from October.
I deleted the Makefile change, which is now obsoleted by d63f6d1, the result would look like below. Mike, does mainline with this patch build on Blackfin now?
Michal
From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Subject: [PATCH] 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>
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index 792a750..c14322d 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -22,14 +22,15 @@ */ #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: +.globl VMLINUX_SYMBOL(__initramfs_size) +VMLINUX_SYMBOL(__initramfs_size): #ifdef CONFIG_64BIT .quad __irf_end - __irf_start #else
| |