diff options
| author | Robin Getz <robin.getz@analog.com> | 2007-11-15 08:10:48 +0100 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@analog.com> | 2007-11-15 08:10:48 +0100 |
| commit | 6a3f0b460cea79f08683cef1862d686a887efd8c (patch) | |
| tree | 4133b0e4e2af811cd96a4ee722f8453e07082266 /arch/blackfin/kernel/cplbinit.c | |
| parent | Blackfin arch: fix AD7877 bus_num and add support for WM8731 SPI control inte... (diff) | |
| download | linux-6a3f0b460cea79f08683cef1862d686a887efd8c.tar.xz linux-6a3f0b460cea79f08683cef1862d686a887efd8c.zip | |
Blackfin arch: fix bug cplbmgr.S does not exit properly on error condition
https://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=1685
Ensure that cache/protection is turned back on when we get a
fault, and ensure that the initial population of the CPLB tables are
correct - that kernel is locked in CPLB tables
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/kernel/cplbinit.c')
| -rw-r--r-- | arch/blackfin/kernel/cplbinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/cplbinit.c b/arch/blackfin/kernel/cplbinit.c index f2db6a5e2b5b..7392ac2d2c29 100644 --- a/arch/blackfin/kernel/cplbinit.c +++ b/arch/blackfin/kernel/cplbinit.c @@ -163,8 +163,8 @@ static struct cplb_desc cplb_data[] = { static u16 __init lock_kernel_check(u32 start, u32 end) { - if ((start <= (u32) _stext && end >= (u32) _end) - || (start >= (u32) _stext && end <= (u32) _end)) + if ((end <= (u32) _end && end >= (u32)_stext) || + (start <= (u32) _end && start >= (u32)_stext)) return IN_KERNEL; return 0; } |