summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Song <barry.song@analog.com>2010-02-21 03:01:20 +0000
committerBob Liu <lliubbo@gmail.com>2012-03-21 11:00:06 +0800
commit4936afc6510608ddabeb4f562cf1a291cc38faa1 (patch)
tree388dd4e558e2fbbd6a2b058aea7e863cdcb389d0
parentedd8a97e6e89ee2edc86e21db6253a73741f3c72 (diff)
downloadlinux-3.10-4936afc6510608ddabeb4f562cf1a291cc38faa1.tar.gz
linux-3.10-4936afc6510608ddabeb4f562cf1a291cc38faa1.tar.bz2
linux-3.10-4936afc6510608ddabeb4f562cf1a291cc38faa1.zip
blackfin: cplb-mpu: fix page mask table overflow
page mask table will overflow without xip related macros. Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
-rw-r--r--arch/blackfin/kernel/cplb-mpu/cplbmgr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 8de92299b3e..b56bd8514b7 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -120,6 +120,7 @@ MGR_ATTR static noinline int dcplb_miss(unsigned int cpu)
d_data = L2_DMEMORY;
} else if (addr >= physical_mem_end) {
if (addr >= ASYNC_BANK0_BASE && addr < ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE) {
+#if defined(CONFIG_ROMFS_ON_MTD) && defined(CONFIG_MTD_ROM)
mask = current_rwx_mask[cpu];
if (mask) {
int page = (addr - (ASYNC_BANK0_BASE - _ramend)) >> PAGE_SHIFT;
@@ -129,6 +130,7 @@ MGR_ATTR static noinline int dcplb_miss(unsigned int cpu)
if (mask[idx] & bit)
d_data |= CPLB_USER_RD;
}
+#endif
} else if (addr >= BOOT_ROM_START && addr < BOOT_ROM_START + BOOT_ROM_LENGTH
&& (status & (FAULT_RW | FAULT_USERSUPV)) == FAULT_USERSUPV) {
addr &= ~(1 * 1024 * 1024 - 1);