summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2008-06-29 01:27:42 +0000
committermiod <miod@openbsd.org>2008-06-29 01:27:42 +0000
commitf16574a886faab07470a468fc7d8d72e4a5aa442 (patch)
treef1a7007e3b7147c39d21c0ad74e9a414aadf8e24
parentnew belkin rum with california designed plastic (diff)
downloadwireguard-openbsd-f16574a886faab07470a468fc7d8d72e4a5aa442.tar.xz
wireguard-openbsd-f16574a886faab07470a468fc7d8d72e4a5aa442.zip
Revert 1.8, and reenable branch prediction on swift cpus. Ten years of trap.c
and locore.s changes have fixed the condition incorrectly blamed on branch prediction, and these processors run fine with it enabled.
-rw-r--r--sys/arch/sparc/sparc/cpu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c
index 0788428450f..617a4235711 100644
--- a/sys/arch/sparc/sparc/cpu.c
+++ b/sys/arch/sparc/sparc/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.43 2007/05/10 18:06:01 art Exp $ */
+/* $OpenBSD: cpu.c,v 1.44 2008/06/29 01:27:42 miod Exp $ */
/* $NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */
/*
@@ -941,8 +941,8 @@ swift_hotfix(sc)
{
int pcr = lda(SRMMU_PCR, ASI_SRMMU);
- /* Turn off branch prediction */
- pcr &= ~SWIFT_PCR_BF;
+ /* Turn on branch prediction */
+ pcr |= SWIFT_PCR_BF;
sta(SRMMU_PCR, ASI_SRMMU, pcr);
}