Patchwork hardirq.h removal broke sparc64 build...

login
register
mail settings
Submitter Andrew Morton
Date Jan. 7, 2009, 10:58 p.m.
Message ID <20090107145822.625960f2.akpm@linux-foundation.org>
Download mbox | patch
Permalink /patch/17238/
State Accepted
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Jan. 7, 2009, 10:58 p.m.
On Wed, 07 Jan 2009 14:43:10 -0800 (PST)
David Miller <davem@davemloft.net> wrote:

> 
> [ Andrew, read carefully, I think some part of a patch you
>   merged might have been lost while reshuffling or whatever. ]
> 
> This change:
> 
> commit ba84be2338d3a2b6020d39279335bb06fcd332e1
> Author: Russell King <rmk+kernel@arm.linux.org.uk>
> Date:   Tue Jan 6 14:41:07 2009 -0800
> 
>     remove linux/hardirq.h from asm-generic/local.h
> 
> broke the build on sparc64:

urgh, sorry.

> drivers/base/topology.c: In function ___show_physical_package_id___:
> drivers/base/topology.c:103: error: implicit declaration of function ___cpu_data___
> drivers/base/topology.c:103: error: request for member ___proc_id___ in something not a structure or union
> drivers/base/topology.c: In function ___show_core_id___:
> drivers/base/topology.c:106: error: request for member ___core_id___ in something not a structure or union
> 
> Even though there is a footnote there from Alexey saying that
> sparc64 was fixed up :-)
> 
>     [adobriyan@gmail.com: fix sparc64]

OK, that patch was misdescribed.  It in fact added the <asm/hardirq.h>
includes to arch/avr32/kernel/traps.c and arch/sh/kernel/traps_32.c.

The "sparc fix" was Sam's patch:


which did get included. 


> I've spent most of last night and this morning trying to figure out
> a way to fix this, it is very non-trivial.
> 
> Adding a simple asm/cpudata.h include into asm/topology_64.h for the
> SMP case does not work.
> 
> asm/cpudata.h brings in percpu.h which wants SLAB which wants to use
> GFP_* values and thus includes gfp.h
> 
> And thus because of the include loop:
> 
> 	linux/gfp.h --> linux/mmzone.h --> linux/topology.h -->
> 	asm/topology.h --> asm/cpudata.h --> linux/percpu.h -->
> 	linux/slab.h
> 
> we can't include asm/cpudata.h into asm/topology.h otherwise
> we get:
> 
> include/linux/slub_def.h: In function ___kmalloc_large___:
> include/linux/slub_def.h:209: error: implicit declaration of function _____get_free_pages___
> include/linux/slub_def.h:209: error: _____GFP_COMP___ undeclared (first use in this function)
> include/linux/slub_def.h:209: error: (Each undeclared identifier is reported only once
> include/linux/slub_def.h:209: error: for each function it appears in.)
> include/linux/slub_def.h:209: warning: cast to pointer from integer of different size
> 
> for the drivers/base/topology.o build failure case above.

yes, there were some nasty problems liek that.  In several cases we wimped
out and added the necessary includes to the .c file.  Will that (sad hack)
work here?

--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 7, 2009, 11:07 p.m.
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 7 Jan 2009 14:58:22 -0800

> On Wed, 07 Jan 2009 14:43:10 -0800 (PST)
> David Miller <davem@davemloft.net> wrote:
> 
> > for the drivers/base/topology.o build failure case above.
> 
> yes, there were some nasty problems liek that.  In several cases we wimped
> out and added the necessary includes to the .c file.  Will that (sad hack)
> work here?

I'll try that but if other gremlins pop up I'll simply
add a linux/hardirq.h include to arch/sparc/include/asm/local.h
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/arch/sparc/kernel/mdesc.c~remove-linux-hardirqh-from-asm-generic-localh-sparc-fix
+++ a/arch/sparc/kernel/mdesc.c
@@ -11,6 +11,7 @@ 
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
 
+#include <asm/cpudata.h>
 #include <asm/hypervisor.h>
 #include <asm/mdesc.h>
 #include <asm/prom.h>
--- a/arch/sparc/kernel/sysfs.c~remove-linux-hardirqh-from-asm-generic-localh-sparc-fix
+++ a/arch/sparc/kernel/sysfs.c
@@ -8,6 +8,7 @@ 
 #include <linux/percpu.h>
 #include <linux/init.h>
 
+#include <asm/cpudata.h>
 #include <asm/hypervisor.h>
 #include <asm/spitfire.h>