Re: 2.6.9-rc1-mm1 ppc build broken

[Andrew Morton]

jhf@xxxxxxxxxxxxxx (Joseph Fannin) wrote:
>
>  > The #include <asm/io.h> comes from bk-ia64.patch time
>  > interpolation logic patch from Cristoph Lameter.
>  > 
>  > I've checked that at least for the embedded port I'm
>  > working on the linux/mm.h is *not* a must on ppc
>  > asm/io.h so we can get rid of it (commented out).
>  > Maybe this is also true for the rest of ppc platforms.
>  > 
>  > Now 2.6.9-rc1-mm1 builds fine.
> 
>      This is still broken in -mm3.  This fix works for my powermac too,
>  except that arch/ppc/syslib/open_pic.c misses errno.h when it does not
>  get it through mm.h.  I can't speak for other platforms, but I'll
>  include the patch.

OK, now I have an ordering problem.  If I understand you correctly, this
patch fixes a ppc problem which was introduced by a patch from the bk-ia64
tree, yes?

If so, my options are to ask Tony to add this patch to the bk-ia64 tree so
they all go in at the same time, or to merge this patch into Linus's tree
prior to the ia64 patch.  To do the latter, I'd need confirmation that your
patch is safe against current -linus.  Can you please confirm this?

--- 25/arch/ppc/syslib/open_pic.c~ppc-build-fix	2004-09-05 14:50:54.250084104 -0700
+++ 25-akpm/arch/ppc/syslib/open_pic.c	2004-09-05 14:50:54.266081672 -0700
@@ -16,6 +16,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
+#include <linux/errno.h>
 #include <asm/ptrace.h>
 #include <asm/signal.h>
 #include <asm/io.h>
diff -puN include/asm-ppc/io.h~ppc-build-fix include/asm-ppc/io.h
--- 25/include/asm-ppc/io.h~ppc-build-fix	2004-09-05 14:50:54.262082280 -0700
+++ 25-akpm/include/asm-ppc/io.h	2004-09-05 14:50:54.276080152 -0700
@@ -4,7 +4,6 @@
 
 #include <linux/config.h>
 #include <linux/types.h>
-#include <linux/mm.h>
 
 #include <asm/page.h>
 #include <asm/byteorder.h>
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/