diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-28 05:55:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-28 05:55:45 -0400 |
| commit | 3f8793e30269cb9ba5975f02faa7ddf75853bde9 (patch) | |
| tree | 2c2cad30e50aa6aceca264d7c2b3badc66e68e20 | |
| parent | 9e9430213f85ebdaf40026ec790295420efd0f91 (diff) | |
| parent | 6bee00dbbcb1e9feb0510e9a7104b4af00adc574 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 04dc8b65401b..8f6cf56c11c0 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -349,7 +349,7 @@ ENTRY(cpu_xsc3_switch_mm) | |||
| 349 | cpu_xsc3_mt_table: | 349 | cpu_xsc3_mt_table: |
| 350 | .long 0x00 @ L_PTE_MT_UNCACHED | 350 | .long 0x00 @ L_PTE_MT_UNCACHED |
| 351 | .long PTE_EXT_TEX(1) @ L_PTE_MT_BUFFERABLE | 351 | .long PTE_EXT_TEX(1) @ L_PTE_MT_BUFFERABLE |
| 352 | .long PTE_CACHEABLE @ L_PTE_MT_WRITETHROUGH | 352 | .long PTE_EXT_TEX(5) | PTE_CACHEABLE @ L_PTE_MT_WRITETHROUGH |
| 353 | .long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEBACK | 353 | .long PTE_CACHEABLE | PTE_BUFFERABLE @ L_PTE_MT_WRITEBACK |
| 354 | .long PTE_EXT_TEX(1) | PTE_BUFFERABLE @ L_PTE_MT_DEV_SHARED | 354 | .long PTE_EXT_TEX(1) | PTE_BUFFERABLE @ L_PTE_MT_DEV_SHARED |
| 355 | .long 0x00 @ unused | 355 | .long 0x00 @ unused |