From owner-p4-projects@FreeBSD.ORG Wed Dec 14 16:04:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11ABD16A422; Wed, 14 Dec 2005 16:04:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C630416A41F for ; Wed, 14 Dec 2005 16:04:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B71E43D64 for ; Wed, 14 Dec 2005 16:04:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEG4Jcl068250 for ; Wed, 14 Dec 2005 16:04:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEG4J1q068247 for perforce@freebsd.org; Wed, 14 Dec 2005 16:04:19 GMT (envelope-from jhb@freebsd.org) Date: Wed, 14 Dec 2005 16:04:19 GMT Message-Id: <200512141604.jBEG4J1q068247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88178 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: Wed, 14 Dec 2005 16:04:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=88178 Change 88178 by jhb@jhb_slimer on 2005/12/14 16:03:32 Don't destroy the linux_osname mutex twice on unload. Affected files ... .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#22 edit .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#12 edit .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#12 edit .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#7 edit .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#47 edit Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#22 (text+ko) ==== @@ -263,7 +263,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#12 (text+ko) ==== @@ -1081,7 +1081,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/compat/linux/linux_mib.c#12 (text+ko) ==== @@ -156,13 +156,6 @@ } void -linux_mib_destroy(void) -{ - - mtx_destroy(&osname_lock); -} - -void linux_get_osname(struct thread *td, char *dst) { register struct prison *pr; ==== //depot/projects/smpng/sys/compat/linux/linux_mib.h#7 (text+ko) ==== @@ -31,8 +31,6 @@ #ifndef _LINUX_MIB_H_ #define _LINUX_MIB_H_ -void linux_mib_destroy(void); - void linux_get_osname(struct thread *td, char *dst); int linux_set_osname(struct thread *td, char *osname); ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#47 (text+ko) ==== @@ -923,7 +923,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break;