From owner-p4-projects@FreeBSD.ORG Tue Aug 1 08:55:00 2006 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 0BC4916A4E1; Tue, 1 Aug 2006 08:55:00 +0000 (UTC) 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 DC04C16A4DD for ; Tue, 1 Aug 2006 08:54:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F91943D45 for ; Tue, 1 Aug 2006 08:54:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k718sxgo056735 for ; Tue, 1 Aug 2006 08:54:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k718sxXH056722 for perforce@freebsd.org; Tue, 1 Aug 2006 08:54:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 1 Aug 2006 08:54:59 GMT Message-Id: <200608010854.k718sxXH056722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 102905 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: Tue, 01 Aug 2006 08:55:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=102905 Change 102905 by rdivacky@rdivacky_witten on 2006/08/01 08:54:21 Install/deinstall ntpl-related stuff in module loading/unloading only in a case of previous success. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#12 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#12 (text+ko) ==== @@ -916,20 +916,20 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); + SLIST_INIT(&emuldata_head); + rw_init(&emul_lock, "emuldata lock"); + LIST_INIT(&futex_list); + mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, + NULL, 1000); + linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, + NULL, 1000); + linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else printf("cannot insert Linux ELF brand handler\n"); - SLIST_INIT(&emuldata_head); - rw_init(&emul_lock, "emuldata lock"); - LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); - linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, - NULL, 1000); - linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, - NULL, 1000); - linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, - NULL, 1000); break; case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; @@ -947,17 +947,17 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); + rw_destroy(&emul_lock); + mtx_destroy(&futex_mtx); + EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); + EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); + EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); + printf("Emuldata slist empty: %i\n", SLIST_EMPTY(&emuldata_head)); + printf("Futex slist empty: %i\n", LIST_EMPTY(&futex_list)); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else printf("Could not deinstall ELF interpreter entry\n"); - rw_destroy(&emul_lock); - mtx_destroy(&futex_mtx); - EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); - EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); - EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); - printf("Emuldata slist empty: %i\n", SLIST_EMPTY(&emuldata_head)); - printf("Futex slist empty: %i\n", LIST_EMPTY(&futex_list)); break; default: return EOPNOTSUPP;