Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:
 "Among the traditional bug fixes and cleanups are some improvements:

   - A tool to generated the facility lists, generating the bit fields
     by hand has been a source of bugs in the past

   - The spinlock loop is reordered to avoid bursts of hypervisor calls

   - Add support for the open-for-business interface to the service
     element

   - The get_cpu call is added to the vdso

   - A set of tracepoints is defined for the common I/O layer

   - The deprecated sclp_cpi module is removed

   - Update default configuration"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (56 commits)
  s390/sclp: fix possible control register corruption
  s390: fix normalization bug in exception table sorting
  s390/configs: update default configurations
  s390/vdso: optimize getcpu system call
  s390: drop smp_mb in vdso_init
  s390: rename struct _lowcore to struct lowcore
  s390/mem_detect: use unsigned longs
  s390/ptrace: get rid of long longs in psw_bits
  s390/sysinfo: add missing SYSIB 1.2.2 multithreading fields
  s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK
  s390/Kconfig: remove pointless 64 bit dependencies
  s390/dasd: fix failfast for disconnected devices
  s390/con3270: testing return kzalloc retval
  s390/hmcdrv: constify hmcdrv_ftp_ops structs
  s390/cio: add NULL test
  s390/cio: Change I/O instructions from inline to normal functions
  s390/cio: Introduce common I/O layer tracepoints
  s390/cio: Consolidate inline assemblies and related data definitions
  s390/cio: Fix incorrect xsch opcode specification
  s390/cio: Remove unused inline assemblies
  ...

6 files changed, 12 insertions, 14 deletions

diff --git a/arch/s390/mm/extable.c b/arch/s390/mm/extable.c
index 4d1ee88864e8..18c8b819b0aa 100644
--- a/arch/s390/mm/extable.c
+++ b/arch/s390/mm/extable.c
@@ -52,12 +52,16 @@ void sort_extable(struct exception_table_entry *start,
         int i;
 
         /* Normalize entries to being relative to the start of the section */
-        for (p = start, i = 0; p < finish; p++, i += 8)
+        for (p = start, i = 0; p < finish; p++, i += 8) {
                 p->insn += i;
+                p->fixup += i + 4;
+        }
         sort(start, finish - start, sizeof(*start), cmp_ex, NULL);
         /* Denormalize all entries */
-        for (p = start, i = 0; p < finish; p++, i += 8)
+        for (p = start, i = 0; p < finish; p++, i += 8) {
                 p->insn -= i;
+                p->fixup -= i + 4;
+        }
 }
 
 #ifdef CONFIG_MODULES
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 18fccc303db7..a1bf4ad8925d 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -94,7 +94,7 @@ static DEFINE_MUTEX(dcss_lock);
 static LIST_HEAD(dcss_list);
 static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",
                                         "EW/EN-MIXED" };
-static int loadshr_scode, loadnsr_scode, findseg_scode;
+static int loadshr_scode, loadnsr_scode;
 static int segext_scode, purgeseg_scode;
 static int scode_set;
 
@@ -130,7 +130,6 @@ dcss_set_subcodes(void)
                 loadshr_scode = DCSS_LOADSHRX;
                 loadnsr_scode = DCSS_LOADNSRX;
                 purgeseg_scode = DCSS_PURGESEG;
-                findseg_scode = DCSS_FINDSEGX;
                 segext_scode = DCSS_SEGEXTX;
                 return 0;
         }
@@ -138,7 +137,6 @@ dcss_set_subcodes(void)
         loadshr_scode = DCSS_LOADNOLY;
         loadnsr_scode = DCSS_LOADNSR;
         purgeseg_scode = DCSS_PURGESEG;
-        findseg_scode = DCSS_FINDSEG;
         segext_scode = DCSS_SEGEXT;
         return 0;
 }
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index ec1a30d0d11a..1b903f6ad54a 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -254,7 +254,6 @@ static noinline void do_sigsegv(struct pt_regs *regs, int si_code)
 static noinline void do_no_context(struct pt_regs *regs)
 {
         const struct exception_table_entry *fixup;
-        unsigned long address;
 
         /* Are we prepared to handle this kernel fault?  */
         fixup = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN);
@@ -267,7 +266,6 @@ static noinline void do_no_context(struct pt_regs *regs)
          * Oops. The kernel tried to access some bad page. We'll have to
          * terminate things with extreme prejudice.
          */
-        address = regs->int_parm_long & __FAIL_ADDR_MASK;
         if (!user_space_fault(regs))
                 printk(KERN_ALERT "Unable to handle kernel pointer dereference"
                        " in virtual kernel address space\n");
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c
index 12bbf0e8478f..21c74a71e2ab 100644
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
@@ -233,6 +233,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
         struct mm_struct *mm = current->mm;
         int nr, ret;
 
+        might_sleep();
         start &= PAGE_MASK;
         nr = __get_user_pages_fast(start, nr_pages, write, pages);
         if (nr == nr_pages)
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index 8a993a53fcd6..fec59c067d0d 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -163,11 +163,11 @@ static int is_swapped(unsigned long addr)
         unsigned long lc;
         int cpu;
 
-        if (addr < sizeof(struct _lowcore))
+        if (addr < sizeof(struct lowcore))
                 return 1;
         for_each_online_cpu(cpu) {
                 lc = (unsigned long) lowcore_ptr[cpu];
-                if (addr > lc + sizeof(struct _lowcore) - 1 || addr < lc)
+                if (addr > lc + sizeof(struct lowcore) - 1 || addr < lc)
                         continue;
                 return 1;
         }
diff --git a/arch/s390/mm/mem_detect.c b/arch/s390/mm/mem_detect.c
index e00f0d5d296d..d612cc3eec6a 100644
--- a/arch/s390/mm/mem_detect.c
+++ b/arch/s390/mm/mem_detect.c
@@ -14,8 +14,6 @@
 #include <asm/sclp.h>
 #include <asm/setup.h>
 
-#define ADDR2G (1ULL << 31)
-
 #define CHUNK_READ_WRITE 0
 #define CHUNK_READ_ONLY  1
 
@@ -27,15 +25,14 @@ static inline void memblock_physmem_add(phys_addr_t start, phys_addr_t size)
 
 void __init detect_memory_memblock(void)
 {
-        unsigned long long memsize, rnmax, rzm;
-        unsigned long addr, size;
+        unsigned long memsize, rnmax, rzm, addr, size;
         int type;
 
         rzm = sclp.rzm;
         rnmax = sclp.rnmax;
         memsize = rzm * rnmax;
         if (!rzm)
-                rzm = 1ULL << 17;
+                rzm = 1UL << 17;
         max_physmem_end = memsize;
         addr = 0;
         /* keep memblock lists close to the kernel */