aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorAttilio Rao <attilio@FreeBSD.org>2011-05-04 20:29:40 +0000
committerAttilio Rao <attilio@FreeBSD.org>2011-05-04 20:29:40 +0000
commit8c0ef2464efbebb0a7d29051d56a975209b9240b (patch)
tree49d6dfdbb991d7ac4b424972593bb475925314ae /sys/i386
parent7505ef3a411ed3f714d5c6bf3228f0d7cd83d97f (diff)
downloadsrc-8c0ef2464efbebb0a7d29051d56a975209b9240b.tar.gz
src-8c0ef2464efbebb0a7d29051d56a975209b9240b.zip
Revert md_assert_preempt() introduction.
Discussed with: jeff, jhb
Notes
Notes: svn path=/projects/largeSMP/; revision=221459
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/mp_machdep.c16
-rw-r--r--sys/i386/include/smp.h1
-rw-r--r--sys/i386/xen/mp_machdep.c16
3 files changed, 0 insertions, 33 deletions
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index f36bf1d5c0de..a07b06c53f75 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -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.
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index 2e2ede4f66f1..b512e00b4228 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -65,7 +65,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);
diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c
index 2cd07627cb10..670d110af49c 100644
--- a/sys/i386/xen/mp_machdep.c
+++ b/sys/i386/xen/mp_machdep.c
@@ -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.