| Date | Wed, 19 Sep 2007 17:09:34 -0700 | From | Andrew Morton <> | Subject | Re: 2.6.23-rc6-mm1 |
| |
On Wed, 19 Sep 2007 19:58:28 -0400 jfannin@gmail.com (Joseph Fannin) wrote:
> On Tue, Sep 18, 2007 at 01:18:41AM -0700, Andrew Morton wrote: > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.23-rc6/2.6.23-rc6-mm1/ > > > > 2.6.23-rc6-mm1 > > [patch submitter cc'd] > > I had to reverse > convert-cpu_sibling_map-to-a-per_cpu-data-array-ppc64.patch (and the > fix on top of it) to get past this error on 32bit powerpc: > > make[1]: Entering directory `/usr/src/ctesiphon/linux-2.6.23-rc6-mm1' > CHK include/linux/version.h > CHK include/linux/utsrelease.h > CC arch/powerpc/kernel/asm-offsets.s > In file included from include/linux/smp.h:19, > from include/linux/sched.h:67, > from arch/powerpc/kernel/asm-offsets.c:17: > include/asm/smp.h:63: error: expected declaration specifiers or ___...___ before ___cpu_sibling_map___ > include/asm/smp.h:63: warning: data definition has no type or storage class > include/asm/smp.h:63: warning: type defaults to ___int___ in declaration of ___DECLARE_PER_CPU___ > make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 > > I dunno if this will build or work with these reverted (I'm still > looking at other build failures) but backing these out got the build > moving again.
This, methinks.
--- a/include/asm-powerpc/smp.h~convert-cpu_sibling_map-to-a-per_cpu-data-array-ppc64-fix-2 +++ a/include/asm-powerpc/smp.h @@ -25,8 +25,8 @@ #ifdef CONFIG_PPC64 #include <asm/paca.h> -#include <asm/percpu.h> #endif +#include <asm/percpu.h> extern int boot_cpuid;
(conditional includes are evil) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|