summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/powerpc/aim/locore.S10
-rw-r--r--sys/powerpc/powerpc/locore.S10
2 files changed, 8 insertions, 12 deletions
diff --git a/sys/powerpc/aim/locore.S b/sys/powerpc/aim/locore.S
index 734d40911e05..2300d19b3144 100644
--- a/sys/powerpc/aim/locore.S
+++ b/sys/powerpc/aim/locore.S
@@ -69,10 +69,9 @@
#include <machine/psl.h>
#include <machine/asm.h>
-/*
- * Some instructions gas doesn't understand (yet?)
- */
-#define bdneq bdnzf 2,
+/* Locate the per-CPU data structure */
+#define GET_CPUINFO(r) \
+ mfsprg0 r
/*
* Globals
@@ -90,7 +89,6 @@ GLOBAL(powersave)
.long 0
#define INTSTK 8192 /* 8K interrupt stack */
-#define SPILLSTK 4096 /* 4K spill stack */
/*
* Dummy interrupt table to keep sysctl happy until
@@ -103,7 +101,7 @@ GLOBAL(eintrnames)
GLOBAL(intrcnt)
.long 0
GLOBAL(eintrcnt)
-
+
/*
* File-scope for locore.S
*/
diff --git a/sys/powerpc/powerpc/locore.S b/sys/powerpc/powerpc/locore.S
index 734d40911e05..2300d19b3144 100644
--- a/sys/powerpc/powerpc/locore.S
+++ b/sys/powerpc/powerpc/locore.S
@@ -69,10 +69,9 @@
#include <machine/psl.h>
#include <machine/asm.h>
-/*
- * Some instructions gas doesn't understand (yet?)
- */
-#define bdneq bdnzf 2,
+/* Locate the per-CPU data structure */
+#define GET_CPUINFO(r) \
+ mfsprg0 r
/*
* Globals
@@ -90,7 +89,6 @@ GLOBAL(powersave)
.long 0
#define INTSTK 8192 /* 8K interrupt stack */
-#define SPILLSTK 4096 /* 4K spill stack */
/*
* Dummy interrupt table to keep sysctl happy until
@@ -103,7 +101,7 @@ GLOBAL(eintrnames)
GLOBAL(intrcnt)
.long 0
GLOBAL(eintrcnt)
-
+
/*
* File-scope for locore.S
*/