Index: evbppc/evbppc/evbppc_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/evbppc/evbppc_machdep.c,v
retrieving revision 1.9
diff -p -r1.9 evbppc_machdep.c
*** evbppc/evbppc/evbppc_machdep.c	7 Nov 2009 07:27:43 -0000	1.9
--- evbppc/evbppc/evbppc_machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: evbppc_machd
*** 80,85 ****
--- 80,91 ----
  #include <machine/bus.h>
  #include <machine/pmap.h>
  
+ /*
+  * ibm4xx/booke kernels need to set module_machine to this for modules to work.
+  */
+ char module_machine_ibm4xx[] = "powerpc-ibm4xx";
+ char module_machine_booke[] = "powerpc-booke";
+ 
  int fake_mapiodev = 1;
  
  /*
Index: evbppc/explora/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/machdep.c,v
retrieving revision 1.32
diff -p -r1.32 machdep.c
*** evbppc/explora/machdep.c	14 Jan 2011 02:06:25 -0000	1.32
--- evbppc/explora/machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
*** 46,51 ****
--- 46,52 ----
  #include <sys/reboot.h>
  #include <sys/ksyms.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** cpu_startup(void)
*** 344,349 ****
--- 345,355 ----
  	prop_object_release(pn);
  
  	intr_init();
+ 	
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  int
Index: evbppc/include/cpu.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/include/cpu.h,v
retrieving revision 1.4
diff -p -r1.4 cpu.h
*** evbppc/include/cpu.h	11 Dec 2005 12:17:12 -0000	1.4
--- evbppc/include/cpu.h	17 Apr 2011 11:40:45 -0000
*************** extern int fake_mapiodev;
*** 57,60 ****
--- 57,63 ----
  #include <powerpc/cpu.h>
  #endif
  
+ extern char module_machine_booke[];
+ extern char module_machine_ibm4xx[];
+ 
  #endif	/* _MACHINE_CPU_H_ */
Index: evbppc/mpc85xx/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/mpc85xx/machdep.c,v
retrieving revision 1.5
diff -p -r1.5 machdep.c
*** evbppc/mpc85xx/machdep.c	17 Feb 2011 13:57:12 -0000	1.5
--- evbppc/mpc85xx/machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetSBD$");
*** 60,65 ****
--- 60,66 ----
  #include <sys/bus.h>
  #include <sys/extent.h>
  #include <sys/malloc.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(vaddr_t startkernel, vaddr_t end
*** 836,841 ****
--- 837,847 ----
  #endif
  
  		printf(" initppc done!\n");
+ 
+ 	/*
+ 	 * Look for the Book-E modules in the right place.
+ 	 */
+ 	module_machine = module_machine_booke;
  }
  
  #ifdef MPC8548
Index: evbppc/obs405/obs200_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs200_machdep.c,v
retrieving revision 1.14
diff -p -r1.14 obs200_machdep.c
*** evbppc/obs405/obs200_machdep.c	4 Apr 2011 20:37:50 -0000	1.14
--- evbppc/obs405/obs200_machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: obs200_machd
*** 82,87 ****
--- 82,88 ----
  #include <sys/reboot.h>
  #include <sys/systm.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(u_int startkernel, u_int endkern
*** 194,199 ****
--- 195,205 ----
  	if (boothowto & RB_KDB)
  		ipkdb_connect(0);
  #endif
+ 
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  void
Index: evbppc/obs405/obs266_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs266_machdep.c,v
retrieving revision 1.15
diff -p -r1.15 obs266_machdep.c
*** evbppc/obs405/obs266_machdep.c	4 Apr 2011 20:37:50 -0000	1.15
--- evbppc/obs405/obs266_machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: obs266_machd
*** 82,87 ****
--- 82,88 ----
  #include <sys/reboot.h>
  #include <sys/systm.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(u_int startkernel, u_int endkern
*** 185,190 ****
--- 186,196 ----
  	if (boothowto & RB_KDB)
  		ipkdb_connect(0);
  #endif
+ 
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  void
Index: evbppc/obs405/obs600_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs600_machdep.c,v
retrieving revision 1.3
diff -p -r1.3 obs600_machdep.c
*** evbppc/obs405/obs600_machdep.c	25 Feb 2011 10:18:09 -0000	1.3
--- evbppc/obs405/obs600_machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: obs600_machd
*** 84,89 ****
--- 84,90 ----
  #include <sys/reboot.h>
  #include <sys/systm.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(u_int startkernel, u_int endkern
*** 197,202 ****
--- 198,208 ----
  	if (boothowto & RB_KDB)
  		ipkdb_connect(0);
  #endif
+ 
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  void
Index: evbppc/virtex/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/machdep.c,v
retrieving revision 1.15
diff -p -r1.15 machdep.c
*** evbppc/virtex/machdep.c	17 Jan 2011 07:32:54 -0000	1.15
--- evbppc/virtex/machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
*** 59,64 ****
--- 59,65 ----
  #include <sys/boot_flag.h>
  #include <sys/ksyms.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(u_int startkernel, u_int endkern
*** 265,270 ****
--- 266,276 ----
  	 */
  	kgdb_connect(1);
  #endif /* KGDB */
+ 
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  /*
Index: evbppc/walnut/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/machdep.c,v
retrieving revision 1.48
diff -p -r1.48 machdep.c
*** evbppc/walnut/machdep.c	4 Apr 2011 20:37:50 -0000	1.48
--- evbppc/walnut/machdep.c	17 Apr 2011 11:40:45 -0000
*************** __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
*** 90,95 ****
--- 90,96 ----
  #include <sys/boot_flag.h>
  #include <sys/ksyms.h>
  #include <sys/device.h>
+ #include <sys/module.h>
  
  #include <uvm/uvm_extern.h>
  
*************** initppc(u_int startkernel, u_int endkern
*** 336,341 ****
--- 337,347 ----
  	if (boothowto & RB_KDB)
  		ipkdb_connect(0);
  #endif
+ 
+ 	/*
+ 	 * Look for the ibm4xx modules in the right place.
+ 	 */
+ 	module_machine = module_machine_ibm4xx;
  }
  
  static void