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 6bfc257881612656bebf161f41321375e9f006a1..2aeec87d24e10dda3eb331ac2d83622c7ffe31b7 100644 (file)
--- 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 8966c706b71a840ddca33a830dbb97c1334055c5..c17c988fb7199e8efc5b97688a1a5fbac1c604ab 100644 (file)
--- 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