diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-10-16 11:25:34 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-10-16 11:25:34 -0400 |
commit | a92946bc6abad6494ac95ea1a8b7c224b15fa1f7 (patch) | |
tree | f6e37479464d013a41e9a1d43b1cfefbcbc00263 /arch/blackfin | |
parent | 9bebeff98ea960b13c4de95782c54f8e5e8b70fc (diff) |
Blackfin arch: use the new bfin_addr_dcachable() function
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c index 5094677fd09e..baa52e261f0d 100644 --- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c +++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
22 | 22 | ||
23 | #include <asm/blackfin.h> | 23 | #include <asm/blackfin.h> |
24 | #include <asm/cacheflush.h> | ||
24 | #include <asm/cplbinit.h> | 25 | #include <asm/cplbinit.h> |
25 | #include <asm/mmu_context.h> | 26 | #include <asm/mmu_context.h> |
26 | 27 | ||
@@ -144,9 +145,7 @@ static noinline int dcplb_miss(void) | |||
144 | 145 | ||
145 | d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB; | 146 | d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB; |
146 | #ifdef CONFIG_BFIN_DCACHE | 147 | #ifdef CONFIG_BFIN_DCACHE |
147 | if (addr < _ramend - DMA_UNCACHED_REGION || | 148 | if (bfin_addr_dcachable(addr)) { |
148 | (reserved_mem_dcache_on && addr >= _ramend && | ||
149 | addr < physical_mem_end)) { | ||
150 | d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND; | 149 | d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND; |
151 | #ifdef CONFIG_BFIN_WT | 150 | #ifdef CONFIG_BFIN_WT |
152 | d_data |= CPLB_L1_AOW | CPLB_WT; | 151 | d_data |= CPLB_L1_AOW | CPLB_WT; |