PERFORCE change 153397 for review

Nathan Whitehorn nwhitehorn at FreeBSD.org
Sun Nov 23 09:41:24 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=153397

Change 153397 by nwhitehorn at nwhitehorn_trantor on 2008/11/23 17:41:02

	Hose kobj_machdep_init(). The changes required to support pluggable
	Open Firmware on sparc64 make it redundant.
	
	sun4v is not changed since I apparently forgot to call it there.

Affected files ...

.. //depot/projects/ppc-g5/sys/kern/subr_kobj.c#3 edit
.. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#7 edit
.. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#4 edit
.. //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#7 edit
.. //depot/projects/ppc-g5/sys/sys/kobj.h#2 edit

Differences ...

==== //depot/projects/ppc-g5/sys/kern/subr_kobj.c#3 (text+ko) ====

@@ -78,12 +78,6 @@
 
 SYSINIT(kobj, SI_SUB_LOCK, SI_ORDER_ANY, kobj_init_mutex, NULL);
 
-void
-kobj_machdep_init(void)
-{
-	kobj_init_mutex(NULL);
-}
-
 /*
  * This method structure is used to initialise new caches. Since the
  * desc pointer is NULL, it is guaranteed never to match any read

==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#7 (text+ko) ====

@@ -301,11 +301,10 @@
 	__asm __volatile("mtsprg 0, %0" :: "r"(pc));
 
 	/*
-	 * Init mutexes and KOBJ
+	 * Init mutexes, which we use heavily in PMAP
 	 */
 
 	mutex_init();
-	kobj_machdep_init();
 
 	/*
 	 * Install the OF client interface

==== //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#4 (text+ko) ====

@@ -430,7 +430,6 @@
 	if (boothowto & RB_KDB)
 		kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger");
 #endif
-	kobj_machdep_init();
 
 	/* Initialise virtual memory. */
 	pmap_mmu_install(MMU_TYPE_BOOKE, 0);

==== //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#7 (text+ko) ====

@@ -476,7 +476,6 @@
 	 * Finish pmap initialization now that we're ready for mutexes.
 	 */
 	PMAP_LOCK_INIT(kernel_pmap);
-	kobj_machdep_init();
 
 	OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1);
 

==== //depot/projects/ppc-g5/sys/sys/kobj.h#2 (text+ko) ====

@@ -246,9 +246,4 @@
  */
 int kobj_error_method(void);
 
-/*
- * Machine-dependent initialisation call for boot-time kobj clients
- */
-void kobj_machdep_init(void);
-
 #endif /* !_SYS_KOBJ_H_ */


More information about the p4-projects mailing list