diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/arm/mm/proc-v6.S | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 194737d60a22..70f75d2e3ead 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -32,8 +32,10 @@ | |||
| 32 | 32 | ||
| 33 | #ifndef CONFIG_SMP | 33 | #ifndef CONFIG_SMP |
| 34 | #define TTB_FLAGS TTB_RGN_WBWA | 34 | #define TTB_FLAGS TTB_RGN_WBWA |
| 35 | #define PMD_FLAGS PMD_SECT_WB | ||
| 35 | #else | 36 | #else |
| 36 | #define TTB_FLAGS TTB_RGN_WBWA|TTB_S | 37 | #define TTB_FLAGS TTB_RGN_WBWA|TTB_S |
| 38 | #define PMD_FLAGS PMD_SECT_WBWA|PMD_SECT_S | ||
| 37 | #endif | 39 | #endif |
| 38 | 40 | ||
| 39 | ENTRY(cpu_v6_proc_init) | 41 | ENTRY(cpu_v6_proc_init) |
| @@ -222,10 +224,9 @@ __v6_proc_info: | |||
| 222 | .long 0x0007b000 | 224 | .long 0x0007b000 |
| 223 | .long 0x0007f000 | 225 | .long 0x0007f000 |
| 224 | .long PMD_TYPE_SECT | \ | 226 | .long PMD_TYPE_SECT | \ |
| 225 | PMD_SECT_BUFFERABLE | \ | ||
| 226 | PMD_SECT_CACHEABLE | \ | ||
| 227 | PMD_SECT_AP_WRITE | \ | 227 | PMD_SECT_AP_WRITE | \ |
| 228 | PMD_SECT_AP_READ | 228 | PMD_SECT_AP_READ | \ |
| 229 | PMD_FLAGS | ||
| 229 | .long PMD_TYPE_SECT | \ | 230 | .long PMD_TYPE_SECT | \ |
| 230 | PMD_SECT_XN | \ | 231 | PMD_SECT_XN | \ |
| 231 | PMD_SECT_AP_WRITE | \ | 232 | PMD_SECT_AP_WRITE | \ |