summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-05-04 20:29:40 +0000
committerattilio <attilio@FreeBSD.org>2011-05-04 20:29:40 +0000
commitf756d5bed6346f4902b1da276e52098882a7a66b (patch)
tree49d6dfdbb991d7ac4b424972593bb475925314ae /sys/amd64
parent0987be4d6b2d0935772f9e136a600dabcdb316ab (diff)
downloadFreeBSD-src-f756d5bed6346f4902b1da276e52098882a7a66b.zip
FreeBSD-src-f756d5bed6346f4902b1da276e52098882a7a66b.tar.gz
Revert md_assert_preempt() introduction.
Discussed with: jeff, jhb
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/mp_machdep.c16
-rw-r--r--sys/amd64/include/smp.h1
2 files changed, 0 insertions, 17 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 70ba466..8e8dc67 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -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.
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index bafb349..ec107f9 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -64,7 +64,6 @@ void ipi_bitmap_handler(struct trapframe frame);
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);
OpenPOWER on IntegriCloud