Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Barry Song and committed by
Bob Liu
4936afc6 edd8a97e

+2
+2
arch/blackfin/kernel/cplb-mpu/cplbmgr.c
··· 120 120 d_data = L2_DMEMORY; 121 121 } else if (addr >= physical_mem_end) { 122 122 if (addr >= ASYNC_BANK0_BASE && addr < ASYNC_BANK3_BASE + ASYNC_BANK3_SIZE) { 123 + #if defined(CONFIG_ROMFS_ON_MTD) && defined(CONFIG_MTD_ROM) 123 124 mask = current_rwx_mask[cpu]; 124 125 if (mask) { 125 126 int page = (addr - (ASYNC_BANK0_BASE - _ramend)) >> PAGE_SHIFT; ··· 130 129 if (mask[idx] & bit) 131 130 d_data |= CPLB_USER_RD; 132 131 } 132 + #endif 133 133 } else if (addr >= BOOT_ROM_START && addr < BOOT_ROM_START + BOOT_ROM_LENGTH 134 134 && (status & (FAULT_RW | FAULT_USERSUPV)) == FAULT_USERSUPV) { 135 135 addr &= ~(1 * 1024 * 1024 - 1);