From owner-p4-projects@FreeBSD.ORG Sun Nov 23 17:41:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7DE1065672; Sun, 23 Nov 2008 17:41:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 011921065674 for ; Sun, 23 Nov 2008 17:41:24 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5F588FC18 for ; Sun, 23 Nov 2008 17:41:23 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANHfHba068779 for ; Sun, 23 Nov 2008 17:41:17 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANHfGFx068775 for perforce@freebsd.org; Sun, 23 Nov 2008 17:41:16 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 23 Nov 2008 17:41:16 GMT Message-Id: <200811231741.mANHfGFx068775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 153397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2008 17:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=153397 Change 153397 by nwhitehorn@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_ */