summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-11-18 17:48:22 +0800
committerBryan Wu <cooloney@kernel.org>2008-11-18 17:48:22 +0800
commit4c5b8a648ff0e6bda853cc4094cb7e962ebd8d1d (patch)
tree08bf18a2f723ab3178ce3277c437ce6a77a4f7ad /arch
parentff4c02e4be00dccfb4b7baa8e56300b6ab3e290a (diff)
Blackfin arch: remove pointless define IN_KERNEL
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/include/asm/cplbinit.h2
-rw-r--r--arch/blackfin/kernel/cplb-nompu/cplbinit.c8
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