aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-arm926.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-01 15:43:57 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-01 15:43:57 -0400
commit3f8efdbe73a5bc96e006b2379a8c8d1d8ef52a9d (patch)
tree9171fa7f40177ef34cdcf44b83c9e57687a47ec5 /arch/arm/mm/proc-arm926.S
parenta069c896d0d6c028581089da7a9a9037a63c2803 (diff)
parent22b1908610dd7ff68471cd4fbd383dbdfe5e0ecd (diff)
Merge nommu branch
Diffstat (limited to 'arch/arm/mm/proc-arm926.S')
-rw-r--r--arch/arm/mm/proc-arm926.S15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 496a2335d69e..189820e25184 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -404,11 +404,11 @@ __arm926_setup:
404 mcr p15, 7, r0, c15, c0, 0 404 mcr p15, 7, r0, c15, c0, 0
405#endif 405#endif
406 406
407 adr r5, arm926_crval
408 ldmia r5, {r5, r6}
407 mrc p15, 0, r0, c1, c0 @ get control register v4 409 mrc p15, 0, r0, c1, c0 @ get control register v4
408 ldr r5, arm926_cr1_clear
409 bic r0, r0, r5 410 bic r0, r0, r5
410 ldr r5, arm926_cr1_set 411 orr r0, r0, r6
411 orr r0, r0, r5
412#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN 412#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
413 orr r0, r0, #0x4000 @ .1.. .... .... .... 413 orr r0, r0, #0x4000 @ .1.. .... .... ....
414#endif 414#endif
@@ -421,12 +421,9 @@ __arm926_setup:
421 * .011 0001 ..11 0101 421 * .011 0001 ..11 0101
422 * 422 *
423 */ 423 */
424 .type arm926_cr1_clear, #object 424 .type arm926_crval, #object
425 .type arm926_cr1_set, #object 425arm926_crval:
426arm926_cr1_clear: 426 crval clear=0x00007f3f, mmuset=0x00003135, ucset=0x00001134
427 .word 0x7f3f
428arm926_cr1_set:
429 .word 0x3135
430 427
431 __INITDATA 428 __INITDATA
432 429