[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Problems compiling 2.4.19-rc1-benh



Egidio,
    At least last night, unless Ben has fixed it in the meanwhile,
there are two sets of changes you have to make to the tree for it
to compile. The error you saw needs the fix...

--- init/do_mounts.c.org        Wed Jun 26 05:48:37 2002
+++ init/do_mounts.c    Wed Jun 26 05:49:15 2002
@@ -378,7 +378,7 @@
        return sys_symlink(path + n + 5, name);
 }
 
-#if defined(CONFIG_BLOCK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
+#if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD)
 static void __init change_floppy(char *fmt, ...)
 {
        struct termios termios;

and you will also need to apply...

--- arch/ppc/mm/mmu_decl.h.org  Wed Jun 26 05:52:08 2002
+++ arch/ppc/mm/mmu_decl.h      Wed Jun 26 05:52:42 2002
@@ -22,6 +22,7 @@
  *  2 of the License, or (at your option) any later version.
  *
  */
+#include <asm/pgtable.h>
 
 extern void mapin_ram(void);
 extern void bat_mapin_ram(unsigned long bat2, unsigned long bat3);
--- arch/ppc/xmon/Makefile.org  Wed Jun 26 05:54:32 2002
+++ arch/ppc/xmon/Makefile      Wed Jun 26 05:54:49 2002
@@ -3,6 +3,7 @@
 # Makefile for xmon
 
 O_TARGET       := x.o
+CFLAGS_xmon.o  += -I$(TOPDIR)/arch/$(ARCH)/mm
 
 ifdef CONFIG_8xx
 obj-y          := start_8xx.o
--- arch/ppc/xmon/xmon.c.org    Wed Jun 26 05:55:59 2002
+++ arch/ppc/xmon/xmon.c        Wed Jun 26 05:59:21 2002
@@ -14,6 +14,8 @@
 #include <asm/string.h>
 #include <asm/prom.h>
 #include <asm/bitops.h>
+
+#include "mmu_decl.h"
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
 #endif
@@ -938,11 +940,10 @@
 static void
 dump_hash_table_seg(unsigned seg, unsigned start, unsigned end)
 {
-       extern void *Hash;
-       extern unsigned long Hash_size;
-       unsigned *htab = Hash;
-       unsigned hsize = Hash_size;
-       unsigned v, hmask, va, last_va;
+       unsigned *htab = (void *) Hash;
+       unsigned long hsize = Hash_size;
+       unsigned long hmask;
+       unsigned v, va, last_va;
        int found, last_found, i;
        unsigned *hg, w1, last_w2, last_va0;
 
@@ -997,11 +998,10 @@
 static void
 dump_hash_table_seg(unsigned seg, unsigned start, unsigned end)
 {
-       extern void *Hash;
-       extern unsigned long Hash_size;
-       unsigned *htab = Hash;
-       unsigned hsize = Hash_size;
-       unsigned v, hmask, va, last_va;
+       unsigned *htab = (void *) Hash;
+       unsigned long hsize = Hash_size;
+       unsigned long hmask;
+       unsigned v, va, last_va;
        int found, last_found, i;
        unsigned *hg, w1, last_w2, last_va0;
 

That should allow the benh kernel to compile.
                                         Jack


-- 
To UNSUBSCRIBE, email to debian-powerpc-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org



Reply to: