Blackfin arch: remove pointless define IN_KERNEL
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h
index 6bfc257..2aeec87 100644
--- a/arch/blackfin/include/asm/cplbinit.h
+++ b/arch/blackfin/include/asm/cplbinit.h
@@ -46,8 +46,6 @@
#define I_CPLB 0x4
#define D_CPLB 0x8
-#define IN_KERNEL 1
-
#define ASYNC_MEMORY_CPLB_COVERAGE ((ASYNC_BANK0_SIZE + ASYNC_BANK1_SIZE + \
ASYNC_BANK2_SIZE + ASYNC_BANK3_SIZE) / SIZE_4M)
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
index 8966c70..c17c988 100644
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
@@ -160,13 +160,13 @@
},
};
-static u16 __init lock_kernel_check(u32 start, u32 end)
+static bool __init lock_kernel_check(u32 start, u32 end)
{
if (start >= (u32)_end || end <= (u32)_stext)
- return 0;
+ return false;
/* This cplb block overlapped with kernel area. */
- return IN_KERNEL;
+ return true;
}
static unsigned short __init
@@ -198,7 +198,7 @@
table->tab[table->pos++] = start;
- if (lock_kernel_check(start, start + block_size) == IN_KERNEL)
+ if (lock_kernel_check(start, start + block_size))
table->tab[table->pos++] =
cplb_data | CPLB_LOCK | CPLB_DIRTY;
else