2 files changed, 4 insertions, 6 deletions

diff --git a/arch/blackfin/include/asm/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h
index 6bfc25788161..2aeec87d24e1 100644
--- a/arch/blackfin/include/asm/cplbinit.h
+++ b/arch/blackfin/include/asm/cplbinit.h
@@ -46,8 +46,6 @@ extern void bfin_dcache_init(struct cplb_entry *icplb_tbl);
 #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 8966c706b71a..c17c988fb719 100644
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
@@ -160,13 +160,13 @@ static struct cplb_desc cplb_data[] = {
         },
 };
 
-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 @@ fill_cplbtab(struct cplb_tab *table,
 
                 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