diff mbox

fix omap compile with randconfig

Message ID 20140113010025.GA14431@amd.pavel.ucw.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Pavel Machek Jan. 13, 2014, 1 a.m. UTC
This fixes:

arch/arm/mach-omap2/built-in.o: In function `omap_reserve':
/data/l/linux-n900/arch/arm/mach-omap2/common.c:36: undefined
  reference to `omap_fb_reserve_memblock'

Signed-off-by: Pavel Machek <pavel@ucw.cz>

Comments

Olof Johansson Jan. 13, 2014, 6:02 p.m. UTC | #1
On Sun, Jan 12, 2014 at 5:00 PM, Pavel Machek <pavel@ucw.cz> wrote:
>
> This fixes:
>
> arch/arm/mach-omap2/built-in.o: In function `omap_reserve':
> /data/l/linux-n900/arch/arm/mach-omap2/common.c:36: undefined
>   reference to `omap_fb_reserve_memblock'
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
> index 9beecde..857907f 100644
> --- a/arch/arm/mach-omap2/common.c
> +++ b/arch/arm/mach-omap2/common.c
> @@ -33,5 +33,7 @@ void __init omap_reserve(void)
>         omap_dsp_reserve_sdram_memblock();
>         omap_secure_ram_reserve_memblock();
>         omap_barrier_reserve_memblock();
> +#ifdef CONFIG_OMAP2_VRFB
>         omap_fb_reserve_memblock();
> +#endif
>  }

What is this patch against? omap_fb_reserve_memblock() doesn't exist
in v3.13-rc8, nor in -next.

Adding an ifdef here is likely the wrong thing anyway, there should be
a stub provided for !CONFIG_OMAP2_VRFB in the header file instead.


-Olof
Pavel Machek Jan. 13, 2014, 10:49 p.m. UTC | #2
On Mon 2014-01-13 10:02:58, Olof Johansson wrote:
> On Sun, Jan 12, 2014 at 5:00 PM, Pavel Machek <pavel@ucw.cz> wrote:
> >
> > This fixes:
> >
> > arch/arm/mach-omap2/built-in.o: In function `omap_reserve':
> > /data/l/linux-n900/arch/arm/mach-omap2/common.c:36: undefined
> >   reference to `omap_fb_reserve_memblock'
> >
> > Signed-off-by: Pavel Machek <pavel@ucw.cz>
> >
> > diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
> > index 9beecde..857907f 100644
> > --- a/arch/arm/mach-omap2/common.c
> > +++ b/arch/arm/mach-omap2/common.c
> > @@ -33,5 +33,7 @@ void __init omap_reserve(void)
> >         omap_dsp_reserve_sdram_memblock();
> >         omap_secure_ram_reserve_memblock();
> >         omap_barrier_reserve_memblock();
> > +#ifdef CONFIG_OMAP2_VRFB
> >         omap_fb_reserve_memblock();
> > +#endif
> >  }
> 
> What is this patch against? omap_fb_reserve_memblock() doesn't exist
> in v3.13-rc8, nor in -next.

It is actually against -n900 tree, sorry about that. But this means
that this regression likely will not hit -next :-).

> Adding an ifdef here is likely the wrong thing anyway, there should be
> a stub provided for !CONFIG_OMAP2_VRFB in the header file instead.

Agreed.

I found few more compile problems, but those are neither easy nor I
expect them to happen commonly. In particular BIG_ENDIAN=y breaks
flexcan, MMU=n break some core code, and CONFIG_ARM_KPROBES_TEST=y
just does not work with my compiler here. Probably not worth trying to
reproduce on vanilla tree?

Thanks,
									Pavel
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 9beecde..857907f 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -33,5 +33,7 @@  void __init omap_reserve(void)
 	omap_dsp_reserve_sdram_memblock();
 	omap_secure_ram_reserve_memblock();
 	omap_barrier_reserve_memblock();
+#ifdef CONFIG_OMAP2_VRFB
 	omap_fb_reserve_memblock();
+#endif
 }