diff --git a/[refs] b/[refs] index 97875d996771..96e8f243f4e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383163826012d70da070bedd432a74bb8d915315 +refs/heads/master: 05a717fbc893c777165b00821b9dcde968a95bcc diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c index b0d6084de359..afef5c740aa4 100644 --- a/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c @@ -163,7 +163,7 @@ static struct cplb_desc cplb_data[] = { static bool __init lock_kernel_check(u32 start, u32 end) { - if (start >= (u32)_end || end <= (u32)_stext) + if (start >= (u32)__init_begin || end <= (u32)_stext) return false; /* This cplb block overlapped with kernel area. */