Merge commit 'v2.6.28-rc6' into x86/urgent

1 files changed, 7 insertions, 4 deletions

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();