Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into for-3.16

Pull in driver-core-next to receive kernfs_notify() updates which will
be used by the planned "cgroup.populated" implementation.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
index e6af9406987c..acb412442e5e 100644
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
@@ -144,10 +144,10 @@ void show_registers(struct pt_regs *regs)
         char *mode;
 
         mode = user_mode(regs) ? "User" : "Krnl";
-        printk("%s PSW : %p %p (%pSR)\n",
-               mode, (void *) regs->psw.mask,
-               (void *) regs->psw.addr,
-               (void *) regs->psw.addr);
+        printk("%s PSW : %p %p", mode, (void *)regs->psw.mask, (void *)regs->psw.addr);
+        if (!user_mode(regs))
+                printk(" (%pSR)", (void *)regs->psw.addr);
+        printk("\n");
         printk("           R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "
                "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),
                mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),