OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a8fca0
)
[PATCH] ARM: explicitly disable BTB on ixp2350
author
Deepak Saxena
<dsaxena@plexity.net>
Tue, 30 May 2006 21:36:49 +0000
(14:36 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 31 May 2006 03:33:20 +0000
(20:33 -0700)
We don't enable the BTB on the ixp2350 as that can cause weird
crashes (erratum #42.) However, some bootloaders enable the BTB,
which means that we have to disable the BTB explicitly.
Found thanks to Tom Rini.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/arm/mm/proc-xsc3.S
patch
|
blob
|
history
diff --git
a/arch/arm/mm/proc-xsc3.S
b/arch/arm/mm/proc-xsc3.S
index
80873b3
..
8d32e21
100644
(file)
--- a/
arch/arm/mm/proc-xsc3.S
+++ b/
arch/arm/mm/proc-xsc3.S
@@
-427,12
+427,13
@@
__xsc3_setup:
#endif
mcr p15, 0, r0, c1, c0, 1 @ set auxiliary control reg
mrc p15, 0, r0, c1, c0, 0 @ get control register
- bic r0, r0, #0x0200 @ .... ..R. .... ....
bic r0, r0, #0x0002 @ .... .... .... ..A.
orr r0, r0, #0x0005 @ .... .... .... .C.M
#if BTB_ENABLE
+ bic r0, r0, #0x0200 @ .... ..R. .... ....
orr r0, r0, #0x3900 @ ..VI Z..S .... ....
#else
+ bic r0, r0, #0x0a00 @ .... Z.R. .... ....
orr r0, r0, #0x3100 @ ..VI ...S .... ....
#endif
#if L2_CACHE_ENABLE