From owner-svn-src-stable@FreeBSD.ORG Tue Nov 9 14:53:49 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACC2A106566B; Tue, 9 Nov 2010 14:53:49 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 990788FC0C; Tue, 9 Nov 2010 14:53:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA9ErnEg022271; Tue, 9 Nov 2010 14:53:49 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA9Ernek022263; Tue, 9 Nov 2010 14:53:49 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201011091453.oA9Ernek022263@svn.freebsd.org> From: Alexander Motin Date: Tue, 9 Nov 2010 14:53:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215037 - in stable/8/sys: amd64/amd64 cddl/dev/cyclic/amd64 cddl/dev/cyclic/i386 i386/i386 modules/cyclic pc98/cbus sys x86/isa X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2010 14:53:49 -0000 Author: mav Date: Tue Nov 9 14:53:49 2010 New Revision: 215037 URL: http://svn.freebsd.org/changeset/base/215037 Log: MFC r206900,r206901,r206922,r206993 by rpaulo: Rename the cyclic global variable lapic_cyclic_clock_func to just cyclic_clock_func. Deleted: stable/8/sys/cddl/dev/cyclic/amd64/ Modified: stable/8/sys/amd64/amd64/local_apic.c stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c stable/8/sys/i386/i386/local_apic.c stable/8/sys/modules/cyclic/Makefile stable/8/sys/pc98/cbus/clock.c stable/8/sys/sys/dtrace_bsd.h stable/8/sys/x86/isa/clock.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/amd64/amd64/local_apic.c ============================================================================== --- stable/8/sys/amd64/amd64/local_apic.c Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/amd64/amd64/local_apic.c Tue Nov 9 14:53:49 2010 (r215037) @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #ifdef KDTRACE_HOOKS #include -cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU]; +cyclic_clock_func_t cyclic_clock_func[MAXCPU]; #endif /* Sanity checks on IDT vectors. */ @@ -788,8 +788,8 @@ lapic_handle_timer(struct trapframe *fra * timers. */ int cpu = PCPU_GET(cpuid); - if (lapic_cyclic_clock_func[cpu] != NULL) - (*lapic_cyclic_clock_func[cpu])(frame); + if (cyclic_clock_func[cpu] != NULL) + (*cyclic_clock_func[cpu])(frame); #endif /* Fire hardclock at hz. */ Modified: stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c ============================================================================== --- stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c Tue Nov 9 14:53:49 2010 (r215037) @@ -67,7 +67,7 @@ cyclic_machdep_uninit(void) for (i = 0; i <= mp_maxid; i++) /* Reset the cyclic clock callback hook. */ - lapic_cyclic_clock_func[i] = NULL; + cyclic_clock_func[i] = NULL; /* De-register the cyclic backend. */ cyclic_uninit(); @@ -105,13 +105,13 @@ cyclic_clock(struct trapframe *frame) static void enable(cyb_arg_t arg) { /* Register the cyclic clock callback function. */ - lapic_cyclic_clock_func[curcpu] = cyclic_clock; + cyclic_clock_func[curcpu] = cyclic_clock; } static void disable(cyb_arg_t arg) { /* Reset the cyclic clock callback function. */ - lapic_cyclic_clock_func[curcpu] = NULL; + cyclic_clock_func[curcpu] = NULL; } static void reprogram(cyb_arg_t arg, hrtime_t exp) Modified: stable/8/sys/i386/i386/local_apic.c ============================================================================== --- stable/8/sys/i386/i386/local_apic.c Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/i386/i386/local_apic.c Tue Nov 9 14:53:49 2010 (r215037) @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #ifdef KDTRACE_HOOKS #include -cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU]; +cyclic_clock_func_t cyclic_clock_func[MAXCPU]; #endif /* Sanity checks on IDT vectors. */ @@ -790,8 +790,8 @@ lapic_handle_timer(struct trapframe *fra * timers. */ int cpu = PCPU_GET(cpuid); - if (lapic_cyclic_clock_func[cpu] != NULL) - (*lapic_cyclic_clock_func[cpu])(frame); + if (cyclic_clock_func[cpu] != NULL) + (*cyclic_clock_func[cpu])(frame); #endif /* Fire hardclock at hz. */ Modified: stable/8/sys/modules/cyclic/Makefile ============================================================================== --- stable/8/sys/modules/cyclic/Makefile Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/modules/cyclic/Makefile Tue Nov 9 14:53:49 2010 (r215037) @@ -10,7 +10,7 @@ SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. \ - -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH} + -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -DDEBUG=1 Modified: stable/8/sys/pc98/cbus/clock.c ============================================================================== --- stable/8/sys/pc98/cbus/clock.c Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/pc98/cbus/clock.c Tue Nov 9 14:53:49 2010 (r215037) @@ -175,8 +175,8 @@ clkintr(struct trapframe *frame) * timers. */ int cpu = PCPU_GET(cpuid); - if (lapic_cyclic_clock_func[cpu] != NULL) - (*lapic_cyclic_clock_func[cpu])(frame); + if (cyclic_clock_func[cpu] != NULL) + (*cyclic_clock_func[cpu])(frame); #endif #ifdef SMP Modified: stable/8/sys/sys/dtrace_bsd.h ============================================================================== --- stable/8/sys/sys/dtrace_bsd.h Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/sys/dtrace_bsd.h Tue Nov 9 14:53:49 2010 (r215037) @@ -50,7 +50,7 @@ typedef void (*cyclic_clock_func_t)(stru * * Defining them here avoids a proliferation of header files. */ -extern cyclic_clock_func_t lapic_cyclic_clock_func[]; +extern cyclic_clock_func_t cyclic_clock_func[]; /* * The dtrace module handles traps that occur during a DTrace probe. Modified: stable/8/sys/x86/isa/clock.c ============================================================================== --- stable/8/sys/x86/isa/clock.c Tue Nov 9 13:39:17 2010 (r215036) +++ stable/8/sys/x86/isa/clock.c Tue Nov 9 14:53:49 2010 (r215037) @@ -186,8 +186,8 @@ clkintr(struct trapframe *frame) * timers. */ int cpu = PCPU_GET(cpuid); - if (lapic_cyclic_clock_func[cpu] != NULL) - (*lapic_cyclic_clock_func[cpu])(frame); + if (cyclic_clock_func[cpu] != NULL) + (*cyclic_clock_func[cpu])(frame); #endif if (using_atrtc_timer) {