From owner-svn-src-projects@FreeBSD.ORG Wed May 4 20:29:41 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 162D4106566C; Wed, 4 May 2011 20:29:41 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC9348FC1B; Wed, 4 May 2011 20:29:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p44KTeMq066222; Wed, 4 May 2011 20:29:40 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44KTe2j066216; Wed, 4 May 2011 20:29:40 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201105042029.p44KTe2j066216@svn.freebsd.org> From: Attilio Rao Date: Wed, 4 May 2011 20:29:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221459 - in projects/largeSMP/sys: amd64/amd64 amd64/include i386/i386 i386/include i386/xen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2011 20:29:41 -0000 Author: attilio Date: Wed May 4 20:29:40 2011 New Revision: 221459 URL: http://svn.freebsd.org/changeset/base/221459 Log: Revert md_assert_preempt() introduction. Discussed with: jeff, jhb Modified: projects/largeSMP/sys/amd64/amd64/mp_machdep.c projects/largeSMP/sys/amd64/include/smp.h projects/largeSMP/sys/i386/i386/mp_machdep.c projects/largeSMP/sys/i386/include/smp.h projects/largeSMP/sys/i386/xen/mp_machdep.c Modified: projects/largeSMP/sys/amd64/amd64/mp_machdep.c ============================================================================== --- projects/largeSMP/sys/amd64/amd64/mp_machdep.c Wed May 4 20:28:45 2011 (r221458) +++ projects/largeSMP/sys/amd64/amd64/mp_machdep.c Wed May 4 20:29:40 2011 (r221459) @@ -1428,22 +1428,6 @@ cpususpend_handler(void) intr_restore(rf); } -void -md_assert_nopreempt(void) -{ -#ifdef INVARIANTS - struct thread *td; - register_t rflags; - - td = curthread; - rflags = read_rflags(); - - if ((rflags & PSL_I) != 0 && td->td_critnest <= 0) - panic("Preemption still allowed, thread %s\n", - (td->td_pinned <= 0) ? "not pinned" : "pinned"); -#endif -} - /* * This is called once the rest of the system is up and running and we're * ready to let the AP's out of the pen. Modified: projects/largeSMP/sys/amd64/include/smp.h ============================================================================== --- projects/largeSMP/sys/amd64/include/smp.h Wed May 4 20:28:45 2011 (r221458) +++ projects/largeSMP/sys/amd64/include/smp.h Wed May 4 20:29:40 2011 (r221459) @@ -64,7 +64,6 @@ void ipi_bitmap_handler(struct trapfram void ipi_cpu(int cpu, u_int ipi); int ipi_nmi_handler(void); void ipi_selected(cpumask_t cpus, u_int ipi); -void md_assert_nopreempt(void); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); void smp_cache_flush(void); Modified: projects/largeSMP/sys/i386/i386/mp_machdep.c ============================================================================== --- projects/largeSMP/sys/i386/i386/mp_machdep.c Wed May 4 20:28:45 2011 (r221458) +++ projects/largeSMP/sys/i386/i386/mp_machdep.c Wed May 4 20:29:40 2011 (r221459) @@ -1486,22 +1486,6 @@ cpustop_handler(void) } } -void -md_assert_nopreempt(void) -{ -#ifdef INVARIANTS - struct thread *td; - register_t rflags; - - td = curthread; - rflags = read_rflags(); - - if ((rflags & PSL_I) != 0 && td->td_critnest <= 0) - panic("Preemption still allowed, thread %s\n", - (td->td_pinned <= 0) ? "not pinned" : "pinned"); -#endif -} - /* * This is called once the rest of the system is up and running and we're * ready to let the AP's out of the pen. Modified: projects/largeSMP/sys/i386/include/smp.h ============================================================================== --- projects/largeSMP/sys/i386/include/smp.h Wed May 4 20:28:45 2011 (r221458) +++ projects/largeSMP/sys/i386/include/smp.h Wed May 4 20:29:40 2011 (r221459) @@ -65,7 +65,6 @@ void ipi_bitmap_handler(struct trapfram void ipi_cpu(int cpu, u_int ipi); int ipi_nmi_handler(void); void ipi_selected(cpumask_t cpus, u_int ipi); -void md_assert_nopreempt(void); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); void smp_cache_flush(void); Modified: projects/largeSMP/sys/i386/xen/mp_machdep.c ============================================================================== --- projects/largeSMP/sys/i386/xen/mp_machdep.c Wed May 4 20:28:45 2011 (r221458) +++ projects/largeSMP/sys/i386/xen/mp_machdep.c Wed May 4 20:29:40 2011 (r221459) @@ -1216,22 +1216,6 @@ cpustop_handler(void) } } -void -md_assert_nopreempt(void) -{ -#ifdef INVARIANTS - struct thread *td; - register_t rflags; - - td = curthread; - rflags = read_rflags(); - - if ((rflags & PSL_I) != 0 && td->td_critnest <= 0) - panic("Preemption still allowed, thread %s\n", - (td->td_pinned <= 0) ? "not pinned" : "pinned"); -#endif -} - /* * This is called once the rest of the system is up and running and we're * ready to let the AP's out of the pen.