Merge branch 'linus' into x86/urgent

Merge reason: pull in latest, to be able to revert a patch there.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

19 files changed, 225 insertions, 55 deletions

diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 704dd396257b..77df726180ba 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -438,7 +438,7 @@ static int diag204_probe(void)
                 }
                 if (diag204((unsigned long)SUBC_STIB6 |
                             (unsigned long)INFO_EXT, pages, buf) >= 0) {
-                        diag204_store_sc = SUBC_STIB7;
+                        diag204_store_sc = SUBC_STIB6;
                         diag204_info_type = INFO_EXT;
                         goto out;
                 }
diff --git a/arch/s390/include/asm/delay.h b/arch/s390/include/asm/delay.h
index a356c958e260..8a096b83f51f 100644
--- a/arch/s390/include/asm/delay.h
+++ b/arch/s390/include/asm/delay.h
@@ -14,10 +14,11 @@
 #ifndef _S390_DELAY_H
 #define _S390_DELAY_H
 
-extern void __udelay(unsigned long usecs);
-extern void udelay_simple(unsigned long usecs);
+extern void __udelay(unsigned long long usecs);
+extern void udelay_simple(unsigned long long usecs);
 extern void __delay(unsigned long loops);
 
-#define udelay(n) __udelay(n)
+#define udelay(n) __udelay((unsigned long long) (n))
+#define mdelay(n) __udelay((unsigned long long) (n) * 1000)
 
 #endif /* defined(_S390_DELAY_H) */
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 74d0bbb7d955..e885442c1dfe 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -92,6 +92,18 @@
 /* Keep this the last entry.  */
 #define R_390_NUM       61
 
+/* Bits present in AT_HWCAP. */
+#define HWCAP_S390_ESAN3        1
+#define HWCAP_S390_ZARCH        2
+#define HWCAP_S390_STFLE        4
+#define HWCAP_S390_MSA          8
+#define HWCAP_S390_LDISP        16
+#define HWCAP_S390_EIMM         32
+#define HWCAP_S390_DFP          64
+#define HWCAP_S390_HPAGE        128
+#define HWCAP_S390_ETF3EH       256
+#define HWCAP_S390_HIGH_GPRS    512
+
 /*
  * These are used to set parameters in the core dumps.
  */
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 539263fc9ab9..95dcf183a28d 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -311,6 +311,10 @@ typedef struct
         __u32           orig_gpr2;
 } s390_compat_regs;
 
+typedef struct
+{
+        __u32           gprs_high[NUM_GPRS];
+} s390_compat_regs_high;
 
 #ifdef __KERNEL__
 
diff --git a/arch/s390/include/asm/ucontext.h b/arch/s390/include/asm/ucontext.h
index d69bec0b03f5..cfb874e66c9a 100644
--- a/arch/s390/include/asm/ucontext.h
+++ b/arch/s390/include/asm/ucontext.h
@@ -9,6 +9,21 @@
 #ifndef _ASM_S390_UCONTEXT_H
 #define _ASM_S390_UCONTEXT_H
 
+#define UC_EXTENDED     0x00000001
+
+#ifndef __s390x__
+
+struct ucontext_extended {
+        unsigned long     uc_flags;
+        struct ucontext  *uc_link;
+        stack_t           uc_stack;
+        _sigregs          uc_mcontext;
+        unsigned long     uc_sigmask[2];
+        unsigned long     uc_gprs_high[16];
+};
+
+#endif
+
 struct ucontext {
         unsigned long     uc_flags;
         struct ucontext  *uc_link;
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index b537cb0e9b55..eee999853a7c 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -39,6 +39,7 @@ typedef struct
         struct sigcontext32 sc;
         _sigregs32 sregs;
         int signo;
+        __u32 gprs_high[NUM_GPRS];
         __u8 retcode[S390_SYSCALL_SIZE];
 } sigframe32;
 
@@ -48,6 +49,7 @@ typedef struct
         __u8 retcode[S390_SYSCALL_SIZE];
         compat_siginfo_t info;
         struct ucontext32 uc;
+        __u32 gprs_high[NUM_GPRS];
 } rt_sigframe32;
 
 int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
@@ -344,6 +346,30 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs)
         return 0;
 }
 
+static int save_sigregs_gprs_high(struct pt_regs *regs, __u32 __user *uregs)
+{
+        __u32 gprs_high[NUM_GPRS];
+        int i;
+
+        for (i = 0; i < NUM_GPRS; i++)
+                gprs_high[i] = regs->gprs[i] >> 32;
+
+        return __copy_to_user(uregs, &gprs_high, sizeof(gprs_high));
+}
+
+static int restore_sigregs_gprs_high(struct pt_regs *regs, __u32 __user *uregs)
+{
+        __u32 gprs_high[NUM_GPRS];
+        int err, i;
+
+        err = __copy_from_user(&gprs_high, uregs, sizeof(gprs_high));
+        if (err)
+                return err;
+        for (i = 0; i < NUM_GPRS; i++)
+                *(__u32 *)&regs->gprs[i] = gprs_high[i];
+        return 0;
+}
+
 asmlinkage long sys32_sigreturn(void)
 {
         struct pt_regs *regs = task_pt_regs(current);
@@ -363,6 +389,8 @@ asmlinkage long sys32_sigreturn(void)
 
         if (restore_sigregs32(regs, &frame->sregs))
                 goto badframe;
+        if (restore_sigregs_gprs_high(regs, frame->gprs_high))
+                goto badframe;
 
         return regs->gprs[2];
 
@@ -394,6 +422,8 @@ asmlinkage long sys32_rt_sigreturn(void)
 
         if (restore_sigregs32(regs, &frame->uc.uc_mcontext))
                 goto badframe;
+        if (restore_sigregs_gprs_high(regs, frame->gprs_high))
+                goto badframe;
 
         err = __get_user(ss_sp, &frame->uc.uc_stack.ss_sp);
         st.ss_sp = compat_ptr(ss_sp);
@@ -474,6 +504,8 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
 
         if (save_sigregs32(regs, &frame->sregs))
                 goto give_sigsegv;
+        if (save_sigregs_gprs_high(regs, frame->gprs_high))
+                goto give_sigsegv;
         if (__put_user((unsigned long) &frame->sregs, &frame->sc.sregs))
                 goto give_sigsegv;
 
@@ -529,13 +561,14 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
                 goto give_sigsegv;
 
         /* Create the ucontext.  */
-        err |= __put_user(0, &frame->uc.uc_flags);
+        err |= __put_user(UC_EXTENDED, &frame->uc.uc_flags);
         err |= __put_user(0, &frame->uc.uc_link);
         err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
         err |= __put_user(sas_ss_flags(regs->gprs[15]),
                           &frame->uc.uc_stack.ss_flags);
         err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
         err |= save_sigregs32(regs, &frame->uc.uc_mcontext);
+        err |= save_sigregs_gprs_high(regs, frame->gprs_high);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
                 goto give_sigsegv;
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 682fb69dba21..cbd9901dc0f8 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -409,7 +409,7 @@ sys32_munmap_wrapper:
         .globl  sys32_truncate_wrapper
 sys32_truncate_wrapper:
         llgtr   %r2,%r2                 # const char *
-        llgfr   %r3,%r3                 # unsigned long
+        lgfr    %r3,%r3                 # long
         jg      sys_truncate            # branch to system call
 
         .globl  sys32_ftruncate_wrapper
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 57bdcb1e3cdf..f5fe34dd821b 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -185,9 +185,6 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent)
 {
         struct ftrace_graph_ent trace;
 
-        /* Nmi's are currently unsupported. */
-        if (unlikely(in_nmi()))
-                goto out;
         if (unlikely(atomic_read(&current->tracing_graph_pause)))
                 goto out;
         if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index ab2e3ed28abc..639380a0c45c 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -55,6 +55,8 @@ void *module_alloc(unsigned long size)
 /* Free memory returned from module_alloc */
 void module_free(struct module *mod, void *module_region)
 {
+        vfree(mod->arch.syminfo);
+        mod->arch.syminfo = NULL;
         vfree(module_region);
 }
 
@@ -402,6 +404,7 @@ int module_finalize(const Elf_Ehdr *hdr,
                     struct module *me)
 {
         vfree(me->arch.syminfo);
+        me->arch.syminfo = NULL;
         return module_bug_finalize(hdr, sechdrs, me);
 }
 
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 802c8ab247f3..0729f36c2fe3 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -31,9 +31,9 @@ void __cpuinit print_cpu_info(void)
 
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
-        static const char *hwcap_str[9] = {
+        static const char *hwcap_str[10] = {
                 "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",
-                "edat", "etf3eh"
+                "edat", "etf3eh", "highgprs"
         };
         struct _lowcore *lc;
         unsigned long n = (unsigned long) v - 1;
@@ -48,7 +48,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                            num_online_cpus(), loops_per_jiffy/(500000/HZ),
                            (loops_per_jiffy/(5000/HZ))%100);
                 seq_puts(m, "features\t: ");
-                for (i = 0; i < 9; i++)
+                for (i = 0; i < 10; i++)
                         if (hwcap_str[i] && (elf_hwcap & (1UL << i)))
                                 seq_printf(m, "%s ", hwcap_str[i]);
                 seq_puts(m, "\n");
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index a8738676b26c..653c6a178740 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -57,6 +57,7 @@
 enum s390_regset {
         REGSET_GENERAL,
         REGSET_FP,
+        REGSET_GENERAL_EXTENDED,
 };
 
 static void
@@ -879,6 +880,67 @@ static int s390_compat_regs_set(struct task_struct *target,
         return rc;
 }
 
+static int s390_compat_regs_high_get(struct task_struct *target,
+                                     const struct user_regset *regset,
+                                     unsigned int pos, unsigned int count,
+                                     void *kbuf, void __user *ubuf)
+{
+        compat_ulong_t *gprs_high;
+
+        gprs_high = (compat_ulong_t *)
+                &task_pt_regs(target)->gprs[pos / sizeof(compat_ulong_t)];
+        if (kbuf) {
+                compat_ulong_t *k = kbuf;
+                while (count > 0) {
+                        *k++ = *gprs_high;
+                        gprs_high += 2;
+                        count -= sizeof(*k);
+                }
+        } else {
+                compat_ulong_t __user *u = ubuf;
+                while (count > 0) {
+                        if (__put_user(*gprs_high, u++))
+                                return -EFAULT;
+                        gprs_high += 2;
+                        count -= sizeof(*u);
+                }
+        }
+        return 0;
+}
+
+static int s390_compat_regs_high_set(struct task_struct *target,
+                                     const struct user_regset *regset,
+                                     unsigned int pos, unsigned int count,
+                                     const void *kbuf, const void __user *ubuf)
+{
+        compat_ulong_t *gprs_high;
+        int rc = 0;
+
+        gprs_high = (compat_ulong_t *)
+                &task_pt_regs(target)->gprs[pos / sizeof(compat_ulong_t)];
+        if (kbuf) {
+                const compat_ulong_t *k = kbuf;
+                while (count > 0) {
+                        *gprs_high = *k++;
+                        *gprs_high += 2;
+                        count -= sizeof(*k);
+                }
+        } else {
+                const compat_ulong_t  __user *u = ubuf;
+                while (count > 0 && !rc) {
+                        unsigned long word;
+                        rc = __get_user(word, u++);
+                        if (rc)
+                                break;
+                        *gprs_high = word;
+                        *gprs_high += 2;
+                        count -= sizeof(*u);
+                }
+        }
+
+        return rc;
+}
+
 static const struct user_regset s390_compat_regsets[] = {
         [REGSET_GENERAL] = {
                 .core_note_type = NT_PRSTATUS,
@@ -896,6 +958,14 @@ static const struct user_regset s390_compat_regsets[] = {
                 .get = s390_fpregs_get,
                 .set = s390_fpregs_set,
         },
+        [REGSET_GENERAL_EXTENDED] = {
+                .core_note_type = NT_PRXSTATUS,
+                .n = sizeof(s390_compat_regs_high) / sizeof(compat_long_t),
+                .size = sizeof(compat_long_t),
+                .align = sizeof(compat_long_t),
+                .get = s390_compat_regs_high_get,
+                .set = s390_compat_regs_high_set,
+        },
 };
 
 static const struct user_regset_view user_s390_compat_view = {
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9ed13a1ed376..061479ff029f 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -729,7 +729,7 @@ static void __init setup_hwcaps(void)
 
         if ((facility_list & (1UL << (31 - 22)))
             && (facility_list & (1UL << (31 - 30))))
-                elf_hwcap |= 1UL << 8;
+                elf_hwcap |= HWCAP_S390_ETF3EH;
 
         /*
          * Check for additional facilities with store-facility-list-extended.
@@ -748,11 +748,20 @@ static void __init setup_hwcaps(void)
             __stfle(&facility_list_extended, 1) > 0) {
                 if ((facility_list_extended & (1ULL << (63 - 42)))
                     && (facility_list_extended & (1ULL << (63 - 44))))
-                        elf_hwcap |= 1UL << 6;
+                        elf_hwcap |= HWCAP_S390_DFP;
         }
 
+        /*
+         * Huge page support HWCAP_S390_HPAGE is bit 7.
+         */
         if (MACHINE_HAS_HPAGE)
-                elf_hwcap |= 1UL << 7;
+                elf_hwcap |= HWCAP_S390_HPAGE;
+
+        /*
+         * 64-bit register support for 31-bit processes
+         * HWCAP_S390_HIGH_GPRS is bit 9.
+         */
+        elf_hwcap |= HWCAP_S390_HIGH_GPRS;
 
         switch (S390_lowcore.cpu_id.machine) {
         case 0x9672:
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index fe927d0bc20b..7c8653e27db6 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -43,7 +43,7 @@ swsusp_arch_suspend:
         lghi    %r1,0x1000
 
         /* Save CPU address */
-        stap    __LC_CPU_ADDRESS(%r1)
+        stap    __LC_CPU_ADDRESS(%r0)
 
         /* Store registers */
         mvc     0x318(4,%r1),__SF_EMPTY(%r15)   /* move prefix to lowcore */
@@ -69,8 +69,21 @@ swsusp_arch_suspend:
         stmg    %r0,%r15,0x280(%r1)             /* store general registers */
 
         stpt    0x328(%r1)                      /* store timer */
+        stck    __SF_EMPTY(%r15)                /* store clock */
         stckc   0x330(%r1)                      /* store clock comparator */
 
+        /* Update cputime accounting before going to sleep */
+        lg      %r0,__LC_LAST_UPDATE_TIMER
+        slg     %r0,0x328(%r1)
+        alg     %r0,__LC_SYSTEM_TIMER
+        stg     %r0,__LC_SYSTEM_TIMER
+        mvc     __LC_LAST_UPDATE_TIMER(8),0x328(%r1)
+        lg      %r0,__LC_LAST_UPDATE_CLOCK
+        slg     %r0,__SF_EMPTY(%r15)
+        alg     %r0,__LC_STEAL_TIMER
+        stg     %r0,__LC_STEAL_TIMER
+        mvc     __LC_LAST_UPDATE_CLOCK(8),__SF_EMPTY(%r15)
+
         /* Activate DAT */
         stosm   __SF_EMPTY(%r15),0x04
 
@@ -159,8 +172,7 @@ pgm_check_entry:
         larl    %r1,.Lresume_cpu                /* Resume CPU address: r2 */
         stap    0(%r1)
         llgh    %r2,0(%r1)
-        lghi    %r3,0x1000
-        llgh    %r1,__LC_CPU_ADDRESS(%r3)       /* Suspend CPU address: r1 */
+        llgh    %r1,__LC_CPU_ADDRESS(%r0)       /* Suspend CPU address: r1 */
         cgr     %r1,%r2
         je      restore_registers               /* r1 = r2 -> nothing to do */
         larl    %r4,.Lrestart_suspend_psw       /* Set new restart PSW */
@@ -200,8 +212,11 @@ restart_suspend:
 
 restore_registers:
         /* Restore registers */
-        lghi    %r13,0x1000             /* %r1 = pointer to save arae */
+        lghi    %r13,0x1000             /* %r1 = pointer to save area */
 
+        /* Ignore time spent in suspended state. */
+        llgf    %r1,0x318(%r13)
+        stck    __LC_LAST_UPDATE_CLOCK(%r1)
         spt     0x328(%r13)             /* reprogram timer */
         //sckc  0x330(%r13)             /* set clock comparator */
 
@@ -229,9 +244,6 @@ restore_registers:
         /* Load old stack */
         lg      %r15,0x2f8(%r13)
 
-        /* Pointer to save area */
-        lghi    %r13,0x1000
-
         /* Restore prefix register */
         spx     0x318(%r13)
 
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 45a3e9a7ae21..adfb32aa6d59 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -247,6 +247,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         }
 
         /*
+         * Put vDSO base into mm struct. We need to do this before calling
+         * install_special_mapping or the perf counter mmap tracking code
+         * will fail to recognise it as a vDSO (since arch_vma_name fails).
+         */
+        current->mm->context.vdso_base = vdso_base;
+
+        /*
          * our vma flags don't have VM_WRITE so by default, the process
          * isn't allowed to write those pages.
          * gdb can break that with ptrace interface, and thus trigger COW
@@ -267,14 +274,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                                      VM_ALWAYSDUMP,
                                      vdso_pagelist);
         if (rc)
-                goto out_up;
-
-        /* Put vDSO base into mm struct */
-        current->mm->context.vdso_base = vdso_base;
-
-        up_write(&mm->mmap_sem);
-        return 0;
-
+                current->mm->context.vdso_base = 0;
 out_up:
         up_write(&mm->mmap_sem);
         return rc;
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index bc15ef93e656..a68ac10213b2 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -51,6 +51,7 @@ SECTIONS
 
         . = ALIGN(PAGE_SIZE);
         _eshared = .;           /* End of shareable data */
+        _sdata = .;             /* Start of data section */
 
         EXCEPTION_TABLE(16) :data
 
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 97c1eca83cc2..752b362bf651 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -25,13 +25,13 @@ void __delay(unsigned long loops)
         asm volatile("0: brct %0,0b" : : "d" ((loops/2) + 1));
 }
 
-static void __udelay_disabled(unsigned long usecs)
+static void __udelay_disabled(unsigned long long usecs)
 {
         unsigned long mask, cr0, cr0_saved;
         u64 clock_saved;
 
         clock_saved = local_tick_disable();
-        set_clock_comparator(get_clock() + ((u64) usecs << 12));
+        set_clock_comparator(get_clock() + (usecs << 12));
         __ctl_store(cr0_saved, 0, 0);
         cr0 = (cr0_saved & 0xffff00e0) | 0x00000800;
         __ctl_load(cr0 , 0, 0);
@@ -46,20 +46,25 @@ static void __udelay_disabled(unsigned long usecs)
         set_clock_comparator(S390_lowcore.clock_comparator);
 }
 
-static void __udelay_enabled(unsigned long usecs)
+static void __udelay_enabled(unsigned long long usecs)
 {
         unsigned long mask;
-        u64 end, time;
+        u64 clock_saved;
+        u64 end;
 
         mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_EXT | PSW_MASK_IO;
-        end = get_clock() + ((u64) usecs << 12);
+        end = get_clock() + (usecs << 12);
         do {
-                time = end < S390_lowcore.clock_comparator ?
-                        end : S390_lowcore.clock_comparator;
-                set_clock_comparator(time);
+                clock_saved = 0;
+                if (end < S390_lowcore.clock_comparator) {
+                        clock_saved = local_tick_disable();
+                        set_clock_comparator(end);
+                }
                 trace_hardirqs_on();
                 __load_psw_mask(mask);
                 local_irq_disable();
+                if (clock_saved)
+                        local_tick_enable(clock_saved);
         } while (get_clock() < end);
         set_clock_comparator(S390_lowcore.clock_comparator);
 }
@@ -67,7 +72,7 @@ static void __udelay_enabled(unsigned long usecs)
 /*
  * Waits for 'usecs' microseconds using the TOD clock comparator.
  */
-void __udelay(unsigned long usecs)
+void __udelay(unsigned long long usecs)
 {
         unsigned long flags;
 
@@ -101,11 +106,11 @@ EXPORT_SYMBOL(__udelay);
  * Simple udelay variant. To be used on startup and reboot
  * when the interrupt handler isn't working.
  */
-void udelay_simple(unsigned long usecs)
+void udelay_simple(unsigned long long usecs)
 {
         u64 end;
 
-        end = get_clock() + ((u64) usecs << 12);
+        end = get_clock() + (usecs << 12);
         while (get_clock() < end)
                 cpu_relax();
 }
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c
index 3f15aaf54855..58da3f461214 100644
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
@@ -36,7 +36,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x)
         tmp1 = -4096UL;
         asm volatile(
                 "0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n"
-                "   jz    7f\n"
+                "9: jz    7f\n"
                 "1:"ALR"  %0,%3\n"
                 "  "SLR"  %1,%3\n"
                 "  "SLR"  %2,%3\n"
@@ -47,7 +47,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x)
                 "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
                 "   jnh   4f\n"
                 "3: .insn ss,0xc80000000000,0(%4,%2),0(%1),0\n"
-                "  "SLR"  %0,%4\n"
+                "10:"SLR"  %0,%4\n"
                 "  "ALR"  %2,%4\n"
                 "4:"LHI"  %4,-1\n"
                 "  "ALR"  %4,%0\n"      /* copy remaining size, subtract 1 */
@@ -61,7 +61,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x)
                 "   j     8f\n"
                 "7:"SLR"  %0,%0\n"
                 "8: \n"
-                EX_TABLE(0b,2b) EX_TABLE(3b,4b)
+                EX_TABLE(0b,2b) EX_TABLE(3b,4b) EX_TABLE(9b,2b) EX_TABLE(10b,4b)
                 : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
                 : "d" (reg0) : "cc", "memory");
         return size;
@@ -82,7 +82,7 @@ static size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x)
         tmp1 = -4096UL;
         asm volatile(
                 "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n"
-                "   jz    4f\n"
+                "6: jz    4f\n"
                 "1:"ALR"  %0,%3\n"
                 "  "SLR"  %1,%3\n"
                 "  "SLR"  %2,%3\n"
@@ -93,11 +93,11 @@ static size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x)
                 "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
                 "   jnh   5f\n"
                 "3: .insn ss,0xc80000000000,0(%4,%1),0(%2),0\n"
-                "  "SLR"  %0,%4\n"
+                "7:"SLR"  %0,%4\n"
                 "   j     5f\n"
                 "4:"SLR"  %0,%0\n"
                 "5: \n"
-                EX_TABLE(0b,2b) EX_TABLE(3b,5b)
+                EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b)
                 : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
                 : "d" (reg0) : "cc", "memory");
         return size;
diff --git a/arch/s390/lib/uaccess_std.c b/arch/s390/lib/uaccess_std.c
index d2ffbadb51a7..07deaeee14c8 100644
--- a/arch/s390/lib/uaccess_std.c
+++ b/arch/s390/lib/uaccess_std.c
@@ -36,12 +36,12 @@ size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
         tmp1 = -256UL;
         asm volatile(
                 "0: mvcp  0(%0,%2),0(%1),%3\n"
-                "   jz    8f\n"
+                "10:jz    8f\n"
                 "1:"ALR"  %0,%3\n"
                 "   la    %1,256(%1)\n"
                 "   la    %2,256(%2)\n"
                 "2: mvcp  0(%0,%2),0(%1),%3\n"
-                "   jnz   1b\n"
+                "11:jnz   1b\n"
                 "   j     8f\n"
                 "3: la    %4,255(%1)\n" /* %4 = ptr + 255 */
                 "  "LHI"  %3,-4096\n"
@@ -50,7 +50,7 @@ size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
                 "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
                 "   jnh   5f\n"
                 "4: mvcp  0(%4,%2),0(%1),%3\n"
-                "  "SLR"  %0,%4\n"
+                "12:"SLR"  %0,%4\n"
                 "  "ALR"  %2,%4\n"
                 "5:"LHI"  %4,-1\n"
                 "  "ALR"  %4,%0\n"      /* copy remaining size, subtract 1 */
@@ -65,6 +65,7 @@ size_t copy_from_user_std(size_t size, const void __user *ptr, void *x)
                 "8:"SLR"  %0,%0\n"
                 "9: \n"
                 EX_TABLE(0b,3b) EX_TABLE(2b,3b) EX_TABLE(4b,5b)
+                EX_TABLE(10b,3b) EX_TABLE(11b,3b) EX_TABLE(12b,5b)
                 : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
                 : : "cc", "memory");
         return size;
@@ -85,12 +86,12 @@ size_t copy_to_user_std(size_t size, void __user *ptr, const void *x)
         tmp1 = -256UL;
         asm volatile(
                 "0: mvcs  0(%0,%1),0(%2),%3\n"
-                "   jz    5f\n"
+                "7: jz    5f\n"
                 "1:"ALR"  %0,%3\n"
                 "   la    %1,256(%1)\n"
                 "   la    %2,256(%2)\n"
                 "2: mvcs  0(%0,%1),0(%2),%3\n"
-                "   jnz   1b\n"
+                "8: jnz   1b\n"
                 "   j     5f\n"
                 "3: la    %4,255(%1)\n" /* %4 = ptr + 255 */
                 "  "LHI"  %3,-4096\n"
@@ -99,11 +100,12 @@ size_t copy_to_user_std(size_t size, void __user *ptr, const void *x)
                 "  "CLR"  %0,%4\n"      /* copy crosses next page boundary? */
                 "   jnh   6f\n"
                 "4: mvcs  0(%4,%1),0(%2),%3\n"
-                "  "SLR"  %0,%4\n"
+                "9:"SLR"  %0,%4\n"
                 "   j     6f\n"
                 "5:"SLR"  %0,%0\n"
                 "6: \n"
                 EX_TABLE(0b,3b) EX_TABLE(2b,3b) EX_TABLE(4b,6b)
+                EX_TABLE(7b,3b) EX_TABLE(8b,3b) EX_TABLE(9b,6b)
                 : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
                 : : "cc", "memory");
         return size;
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index c60bfb309ce6..2757c5616a07 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -279,7 +279,10 @@ int s390_enable_sie(void)
         /* lets check if we are allowed to replace the mm */
         task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-            tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+            !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+            tsk->mm != tsk->active_mm) {
                 task_unlock(tsk);
                 return -EINVAL;
         }
@@ -295,7 +298,10 @@ int s390_enable_sie(void)
         /* Now lets check again if something happened */
         task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-            tsk->mm != tsk->active_mm || !hlist_empty(&tsk->mm->ioctx_list)) {
+#ifdef CONFIG_AIO
+            !hlist_empty(&tsk->mm->ioctx_list) ||
+#endif
+            tsk->mm != tsk->active_mm) {
                 mmput(mm);
                 task_unlock(tsk);
                 return -EINVAL;