Date: Wed, 4 May 2011 20:29:40 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r221459 - in projects/largeSMP/sys: amd64/amd64 amd64/include i386/i386 i386/include i386/xen Message-ID: <201105042029.p44KTe2j066216@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105042029.p44KTe2j066216>