From owner-svn-src-head@FreeBSD.ORG Sat Nov 1 22:36:42 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E8AEAB7; Sat, 1 Nov 2014 22:36:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00D96E89; Sat, 1 Nov 2014 22:36:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1MafJr089794; Sat, 1 Nov 2014 22:36:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1Mafe2089791; Sat, 1 Nov 2014 22:36:41 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201411012236.sA1Mafe2089791@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 1 Nov 2014 22:36:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273953 - in head/sys: dev/hwpmc kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Nov 2014 22:36:42 -0000 Author: mjg Date: Sat Nov 1 22:36:40 2014 New Revision: 273953 URL: https://svnweb.freebsd.org/changeset/base/273953 Log: Fix up module unload for syscall_module_handler consumers. After r273707 it was registering syscalls as static. This fixes hwpmc module unload. Reported by: markj Modified: head/sys/dev/hwpmc/hwpmc_mod.c head/sys/kern/kern_syscalls.c head/sys/sys/sysent.h Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Sat Nov 1 22:00:46 2014 (r273952) +++ head/sys/dev/hwpmc/hwpmc_mod.c Sat Nov 1 22:36:40 2014 (r273953) @@ -320,7 +320,8 @@ static struct syscall_module_data pmc_sy NULL, &pmc_syscall_num, &pmc_sysent, - { 0, NULL } + { 0, NULL }, + SY_THR_STATIC_KLD, }; static moduledata_t pmc_mod = { Modified: head/sys/kern/kern_syscalls.c ============================================================================== --- head/sys/kern/kern_syscalls.c Sat Nov 1 22:00:46 2014 (r273952) +++ head/sys/kern/kern_syscalls.c Sat Nov 1 22:36:40 2014 (r273953) @@ -160,7 +160,7 @@ syscall_module_handler(struct module *mo switch (what) { case MOD_LOAD: error = syscall_register(data->offset, data->new_sysent, - &data->old_sysent, SY_THR_STATIC_KLD); + &data->old_sysent, data->flags); if (error) { /* Leave a mark so we know to safely unload below. */ data->offset = NULL; Modified: head/sys/sys/sysent.h ============================================================================== --- head/sys/sys/sysent.h Sat Nov 1 22:00:46 2014 (r273952) +++ head/sys/sys/sysent.h Sat Nov 1 22:36:40 2014 (r273953) @@ -175,6 +175,7 @@ struct syscall_module_data { int *offset; /* offset into sysent */ struct sysent *new_sysent; /* new sysent */ struct sysent old_sysent; /* old sysent */ + int flags; /* flags for syscall_register */ }; #define MAKE_SYSENT(syscallname) \