hardirq.h removal broke sparc64 build...

From: David Miller
Date: Wed Jan 07 2009 - 17:43:26 EST



[ 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@xxxxxxxxxxxxxxxx>
Date: Tue Jan 6 14:41:07 2009 -0800

remove linux/hardirq.h from asm-generic/local.h

broke the build on sparc64:

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@xxxxxxxxx: fix sparc64]

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.

Actually, looking at the patch, where is the part from Alexey
that does the "fix sparc64"? I see nothing in the patch that
would even appear to possibly be for that. The diffstat is:

arch/avr32/kernel/traps.c | 1 +
arch/sh/kernel/traps_32.c | 1 +
drivers/acpi/processor_idle.c | 1 +
include/asm-generic/local.h | 1 -
4 files changed, 3 insertions(+), 1 deletion(-)

Was Alexey's fix removed or lost? :-/
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸ ¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðà nÆàþY&—