aboutsummaryrefslogtreecommitdiff
path: root/sys/powerpc
diff options
context:
space:
mode:
authorJason A. Harmening <jah@FreeBSD.org>2017-02-04 06:24:49 +0000
committerJason A. Harmening <jah@FreeBSD.org>2017-02-04 06:24:49 +0000
commitad62ba6e96f00cff4b6da027168e1b7561549def (patch)
treea9d85760b78c1fa5c8b21d0dc70ff6faf1a55b61 /sys/powerpc
parentc0bde750ac2516a640c198e02d69c48357bcc810 (diff)
downloadsrc-ad62ba6e96f00cff4b6da027168e1b7561549def.tar.gz
src-ad62ba6e96f00cff4b6da027168e1b7561549def.zip
Revert r313037
The switch to get_pcpu() in MI code seems to cause hangs on MIPS. Back out until we can get a better idea of what's happening there. Reported by: kan, lidl
Notes
Notes: svn path=/head/; revision=313193
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/include/cpufunc.h2
-rw-r--r--sys/powerpc/include/pcpu.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h
index c70a94d31b6c..378274b67e36 100644
--- a/sys/powerpc/include/cpufunc.h
+++ b/sys/powerpc/include/cpufunc.h
@@ -201,7 +201,7 @@ intr_restore(register_t msr)
}
static __inline struct pcpu *
-get_pcpu(void)
+powerpc_get_pcpup(void)
{
struct pcpu *ret;
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index b6949cf7bdc5..79cdd3039fff 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -142,7 +142,7 @@ struct pvo_entry;
#ifdef _KERNEL
-#define pcpup (get_pcpu())
+#define pcpup ((struct pcpu *) powerpc_get_pcpup())
static __inline __pure2 struct thread *
__curthread(void)