summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2011-09-18 13:46:23 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2011-09-18 13:46:23 +0000
commit936c955f7bfdeab6264cf13fdb3f37e2dd10814f (patch)
tree7ae47bace0683b090d50f112327f42c73896512b /sys
parent8961eca456609145265df76bf5209ebd47670001 (diff)
Disable space-ID hashing like we do on hppa.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hppa64/hppa64/locore.S10
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/hppa64/hppa64/locore.S b/sys/arch/hppa64/hppa64/locore.S
index a584e56e0a6..9cae3aeaa25 100644
--- a/sys/arch/hppa64/hppa64/locore.S
+++ b/sys/arch/hppa64/hppa64/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.37 2011/08/17 20:49:07 kettenis Exp $ */
+/* $OpenBSD: locore.S,v 1.38 2011/09/18 13:46:22 kettenis Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -59,6 +59,9 @@
.text
+#define MFCPU(r,x) .word 0x140008a0 | ((r) << 21) | ((x))
+#define MTCPU(x,r) .word 0x14001840 | ((r) << 21) | ((x) << 16)
+
/*
* $start(pdc, boothowto, bootdev, esym)
*/
@@ -90,6 +93,11 @@ $start
mtctl %r1, %eirr
mtctl %r0, %cr10 /* ccr */
+ /* disable space-ID hashing */
+ MFCPU(2,28)
+ depdi 0, 54, 1, %r28
+ MTCPU(28,2)
+
ldil L%cpu0_info, %r1
ldo R%cpu0_info(%r1), %r1
mtctl %r1, %cr24