diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-08 11:18:37 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-08 11:18:37 -0500 |
| commit | 0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4 (patch) | |
| tree | bda182d9407e32354620e9188258c86cad2e3813 /arch/arm/mm/proc-xsc3.S | |
| parent | 22325525d8bb1478daddefec1b762e7882bcd515 (diff) | |
| parent | d13fecd0293d55a4bcb8a31078216504192d8ce0 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mm/proc-xsc3.S')
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 96456f548798..8e4f6dca8997 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -407,6 +407,13 @@ __xsc3_setup: | |||
| 407 | 407 | ||
| 408 | adr r5, xsc3_crval | 408 | adr r5, xsc3_crval |
| 409 | ldmia r5, {r5, r6} | 409 | ldmia r5, {r5, r6} |
| 410 | |||
| 411 | #ifdef CONFIG_CACHE_XSC3L2 | ||
| 412 | mrc p15, 1, r0, c0, c0, 1 @ get L2 present information | ||
| 413 | ands r0, r0, #0xf8 | ||
| 414 | orrne r6, r6, #(1 << 26) @ enable L2 if present | ||
| 415 | #endif | ||
| 416 | |||
| 410 | mrc p15, 0, r0, c1, c0, 0 @ get control register | 417 | mrc p15, 0, r0, c1, c0, 0 @ get control register |
| 411 | bic r0, r0, r5 @ ..V. ..R. .... ..A. | 418 | bic r0, r0, r5 @ ..V. ..R. .... ..A. |
| 412 | orr r0, r0, r6 @ ..VI Z..S .... .C.M (mmu) | 419 | orr r0, r0, r6 @ ..VI Z..S .... .C.M (mmu) |