From e61b8194558e4343b0874458b6e89bfacf8c3766 Mon Sep 17 00:00:00 2001 From: Graf Yang Date: Mon, 27 Oct 2008 18:12:53 +0800 Subject: [PATCH] --- yaml --- r: 119133 b: refs/heads/master c: 6776cf4476833df0f1e96bd9dba18c1ea4f582d5 h: refs/heads/master i: 119131: 438a83410f1fa9d7b752d34f1587818b37ddede0 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fd43ff5add27..f34264751a47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a0bfff44e4aa4ee1721b3daa004d2039576c70d +refs/heads/master: 6776cf4476833df0f1e96bd9dba18c1ea4f582d5 diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 512f8c92ead5..2debc900e246 100644 --- a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c @@ -188,10 +188,11 @@ static struct cplb_desc cplb_data[] = { static u16 __init lock_kernel_check(u32 start, u32 end) { - if ((end <= (u32) _end && end >= (u32)_stext) || - (start <= (u32) _end && start >= (u32)_stext)) - return IN_KERNEL; - return 0; + if (start >= (u32)_end || end <= (u32)_stext) + return 0; + + /* This cplb block overlapped with kernel area. */ + return IN_KERNEL; } static unsigned short __init