diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-06-29 01:27:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-06-29 01:27:43 +0000 |
| commit | 660665028c302fc8c8bfe8c06bb5913b6da5ed95 (patch) | |
| tree | eee91f9144f70050ede5f4f3628cb9d9400f52a2 /sys/arch | |
| parent | 15d563180af9ffe1ff6ef0a2016e469bb253a279 (diff) | |
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.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc/sparc/cpu.c | 6 |
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); } |