Merge remote-tracking branch 'upstream' into next

 - bring back critical fixes (esp. aa67f6096c19bc)
 - provide an updated base for development

* upstream: (4334 commits)
  missed mnt_drop_write() in do_dentry_open()
  UBIFS: nuke pdflush from comments
  gfs2: nuke pdflush from comments
  drbd: nuke pdflush from comments
  nilfs2: nuke write_super from comments
  hfs: nuke write_super from comments
  vfs: nuke pdflush from comments
  jbd/jbd2: nuke write_super from comments
  btrfs: nuke pdflush from comments
  btrfs: nuke write_super from comments
  ext4: nuke pdflush from comments
  ext4: nuke write_super from comments
  ext3: nuke write_super from comments
  Documentation: fix the VM knobs descritpion WRT pdflush
  Documentation: get rid of write_super
  vfs: kill write_super and sync_supers
  ACPI processor: Fix tick_broadcast_mask online/offline regression
  ACPI: Only count valid srat memory structures
  ACPI: Untangle a return statement for better readability
  Linux 3.6-rc1
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index c02310b8db09..ffb622b16ab5 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1558,7 +1558,7 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
 
 void show_code(struct pt_regs *regs)
 {
-        char *mode = (regs->psw.mask & PSW_MASK_PSTATE) ? "User" : "Krnl";
+        char *mode = user_mode(regs) ? "User" : "Krnl";
         unsigned char code[64];
         char buffer[64], *ptr;
         mm_segment_t old_fs;
@@ -1567,7 +1567,7 @@ void show_code(struct pt_regs *regs)
 
         /* Get a snapshot of the 64 bytes surrounding the fault address. */
         old_fs = get_fs();
-        set_fs((regs->psw.mask & PSW_MASK_PSTATE) ? USER_DS : KERNEL_DS);
+        set_fs(user_mode(regs) ? USER_DS : KERNEL_DS);
         for (start = 32; start && regs->psw.addr >= 34 - start; start -= 2) {
                 addr = regs->psw.addr - 34 + start;
                 if (__copy_from_user(code + start - 2,