5 files changed, 25 insertions, 16 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 6e08f425bb44..5c0800adb4dd 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -218,7 +218,7 @@ inline int check_gpio(unsigned gpio)
         if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
             || gpio == GPIO_PH14 || gpio == GPIO_PH15
             || gpio == GPIO_PJ14 || gpio == GPIO_PJ15
-            || gpio > MAX_BLACKFIN_GPIOS)
+            || gpio >= MAX_BLACKFIN_GPIOS)
                 return -EINVAL;
         return 0;
 }
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
index 512f8c92ead5..2debc900e246 100644
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/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
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 77800dd83e57..0c3ea118b657 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -351,10 +351,15 @@ int _access_ok(unsigned long addr, unsigned long size)
                 return 1;
 #endif
 #if L1_DATA_B_LENGTH != 0
-        if (addr >= L1_DATA_B_START
+        if (addr >= L1_DATA_B_START + (_ebss_b_l1 - _sdata_b_l1)
             && addr + size <= L1_DATA_B_START + L1_DATA_B_LENGTH)
                 return 1;
 #endif
+#if L2_LENGTH != 0
+        if (addr >= L2_START + (_ebss_l2 - _stext_l2)
+            && addr + size <= L2_START + L2_LENGTH)
+                return 1;
+#endif
         return 0;
 }
 EXPORT_SYMBOL(_access_ok);
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 7f35d1046cd8..71a9a8c53cea 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -119,23 +119,23 @@ void __init bfin_relocate_l1_mem(void)
         /* Copy _stext_l1 to _etext_l1 to L1 instruction SRAM */
         dma_memcpy(_stext_l1, _l1_lma_start, l1_code_length);
 
-        l1_data_a_length = _ebss_l1 - _sdata_l1;
+        l1_data_a_length = _sbss_l1 - _sdata_l1;
         if (l1_data_a_length > L1_DATA_A_LENGTH)
                 panic("L1 Data SRAM Bank A Overflow\n");
 
-        /* Copy _sdata_l1 to _ebss_l1 to L1 data bank A SRAM */
+        /* Copy _sdata_l1 to _sbss_l1 to L1 data bank A SRAM */
         dma_memcpy(_sdata_l1, _l1_lma_start + l1_code_length, l1_data_a_length);
 
-        l1_data_b_length = _ebss_b_l1 - _sdata_b_l1;
+        l1_data_b_length = _sbss_b_l1 - _sdata_b_l1;
         if (l1_data_b_length > L1_DATA_B_LENGTH)
                 panic("L1 Data SRAM Bank B Overflow\n");
 
-        /* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */
+        /* Copy _sdata_b_l1 to _sbss_b_l1 to L1 data bank B SRAM */
         dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length +
                         l1_data_a_length, l1_data_b_length);
 
         if (L2_LENGTH != 0) {
-                l2_length = _ebss_l2 - _stext_l2;
+                l2_length = _sbss_l2 - _stext_l2;
                 if (l2_length > L2_LENGTH)
                         panic("L2 SRAM Overflow\n");
 
@@ -827,7 +827,7 @@ void __init setup_arch(char **cmdline_p)
                                 printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
                                        bfin_compiled_revid(), bfin_revid());
                 }
-                if (bfin_revid() <= CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX)
+                if (bfin_revid() < CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX)
                         printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",
                                CPU, bfin_revid());
         }
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 1aa2c788e228..bef025b07443 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -59,7 +59,7 @@
 #endif
 
 
-#ifdef CONFIG_VERBOSE_DEBUG
+#ifdef CONFIG_DEBUG_VERBOSE
 #define verbose_printk(fmt, arg...) \
         printk(fmt, ##arg)
 #else
@@ -147,9 +147,12 @@ static void decode_address(char *buf, unsigned long address)
                                 char *name = p->comm;
                                 struct file *file = vma->vm_file;
 
-                                if (file)
-                                        name = d_path(&file->f_path, _tmpbuf,
+                                if (file) {
+                                        char *d_name = d_path(&file->f_path, _tmpbuf,
                                                       sizeof(_tmpbuf));
+                                        if (!IS_ERR(d_name))
+                                                name = d_name;
+                                }
 
                                 /* FLAT does not have its text aligned to the start of
                                  * the map while FDPIC ELF does ...
@@ -571,7 +574,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
 #endif
                         panic("Kernel exception");
                 } else {
-#ifdef CONFIG_VERBOSE_DEBUG
+#ifdef CONFIG_DEBUG_VERBOSE
                         unsigned long *stack;
                         /* Dump the user space stack */
                         stack = (unsigned long *)rdusp();