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

Pull s390 update from Martin Schwidefsky:
 "This is the first batch of s390 patches for the 3.10 merge window.

  Included are some performance enhancements: storage key
  initialization, zero page cache synonyms, system call micro
  optimization and the speedup patches for dasdfmt.  Sebastian managed
  to get rid of the special casing for the console device in the cio
  layer.  And the usual bunch of bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (59 commits)
  s390/pci: use pci_scan_root_bus
  s390/scm_blk: fix memleak in init function
  s390/scm_blk: allow more cluster size values
  s390/cio: fix irq statistics
  s390/memory hotplug: prevent offline of active memory increments
  s390: remove small stack config option
  s390: system call path micro optimization
  s390: lowcore stack pointer offsets
  s390/uapi: change struct statfs[64] member types to unsigned values
  s390/pci: return correct dma address for offset > PAGE_SIZE
  s390/ptrace: remove empty ifdefs
  s390/compat: remove ptrace compat definitions from uapi header file
  s390/compat: fix compile error for !COMPAT
  s390/compat: fix compat_sys_statfs() memory corruption
  s390/zcore: Fix HSA copy length for last block
  s390/mm,gmap: segment mapping race
  s390/mm,gmap: implement gmap_translate()
  s390/pci: remove disable_device implementation
  s390/pci: disable per default
  s390/pci: return error after failed pci ops
  ...

16 files changed, 170 insertions, 362 deletions

diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 15422933c60b..4d8604e311f3 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -61,8 +61,6 @@ extern const char _sb_findmap[];
 
 #ifndef CONFIG_64BIT
 
-#define __BITOPS_ALIGN          3
-#define __BITOPS_WORDSIZE       32
 #define __BITOPS_OR             "or"
 #define __BITOPS_AND            "nr"
 #define __BITOPS_XOR            "xr"
@@ -81,8 +79,6 @@ extern const char _sb_findmap[];
 
 #else /* CONFIG_64BIT */
 
-#define __BITOPS_ALIGN          7
-#define __BITOPS_WORDSIZE       64
 #define __BITOPS_OR             "ogr"
 #define __BITOPS_AND            "ngr"
 #define __BITOPS_XOR            "xgr"
@@ -101,8 +97,7 @@ extern const char _sb_findmap[];
 
 #endif /* CONFIG_64BIT */
 
-#define __BITOPS_WORDS(bits) (((bits)+__BITOPS_WORDSIZE-1)/__BITOPS_WORDSIZE)
-#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
+#define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
 
 #ifdef CONFIG_SMP
 /*
@@ -114,9 +109,9 @@ static inline void set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make OR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
 }
@@ -130,9 +125,9 @@ static inline void clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make AND mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
+        mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
 }
@@ -146,9 +141,9 @@ static inline void change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make XOR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
 }
@@ -163,12 +158,12 @@ test_and_set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make OR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
-        __BITOPS_BARRIER();
+        barrier();
         return (old & mask) != 0;
 }
 
@@ -182,12 +177,12 @@ test_and_clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make AND/test mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
+        mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
-        __BITOPS_BARRIER();
+        barrier();
         return (old ^ new) != 0;
 }
 
@@ -201,12 +196,12 @@ test_and_change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make XOR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
-        __BITOPS_BARRIER();
+        barrier();
         return (old & mask) != 0;
 }
 #endif /* CONFIG_SMP */
@@ -218,7 +213,7 @@ static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
@@ -229,7 +224,7 @@ __constant_set_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr |= 1 << (nr & 7);
 }
 
@@ -246,7 +241,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc" );
@@ -257,7 +252,7 @@ __constant_clear_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr &= ~(1 << (nr & 7));
 }
 
@@ -273,7 +268,7 @@ static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
@@ -284,7 +279,7 @@ __constant_change_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr ^= 1 << (nr & 7);
 }
 
@@ -302,7 +297,7 @@ test_and_set_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
@@ -321,7 +316,7 @@ test_and_clear_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
@@ -340,7 +335,7 @@ test_and_change_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
@@ -376,7 +371,7 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(volatile unsigned char *) addr;
         return (ch >> (nr & 7)) & 1;
 }
@@ -384,7 +379,7 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
 static inline int 
 __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) {
     return (((volatile char *) addr)
-            [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7))) != 0;
+            [(nr^(BITS_PER_LONG-8))>>3] & (1<<(nr&7))) != 0;
 }
 
 #define test_bit(nr,addr) \
@@ -693,18 +688,18 @@ static inline int find_next_bit_left(const unsigned long *addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 set = __flo_word(0, *p & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit_left(p, size);
@@ -736,22 +731,22 @@ static inline int find_next_zero_bit (const unsigned long * addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * __ffz_word returns __BITOPS_WORDSIZE
+                 * __ffz_word returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffz_word(bit, *p >> bit);
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_zero_bit(p, size);
@@ -773,22 +768,22 @@ static inline int find_next_bit (const unsigned long * addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * __ffs_word returns __BITOPS_WORDSIZE
+                 * __ffs_word returns BITS_PER_LONG
                  * if no one bit is present in the word.
                  */
                 set = __ffs_word(0, *p & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit(p, size);
@@ -843,22 +838,22 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
+                 * s390 version of ffz returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffz_word(bit, __load_ulong_le(p, 0) >> bit);
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_zero_bit_le(p, size);
@@ -885,22 +880,22 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
+                 * s390 version of ffz returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffs_word(0, __load_ulong_le(p, 0) & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit_le(p, size);
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index e6061617a50b..f201af8be580 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -220,7 +220,8 @@ extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *);
 #define to_ccwdrv(n) container_of(n, struct ccw_driver, driver)
 
 extern struct ccw_device *ccw_device_probe_console(void);
-extern int ccw_device_force_console(void);
+extern void ccw_device_wait_idle(struct ccw_device *);
+extern int ccw_device_force_console(struct ccw_device *);
 
 int ccw_device_siosl(struct ccw_device *);
 
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index ad2b924167d7..ffb898961c8d 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -296,8 +296,6 @@ static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
         return 0;
 }
 
-extern void wait_cons_dev(void);
-
 extern void css_schedule_reprobe(void);
 
 extern void reipl_ccw_dev(struct ccw_dev_id *id);
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index f8c6df6cd1f0..c1e7c646727c 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -70,6 +70,22 @@ typedef u32		compat_ulong_t;
 typedef u64             compat_u64;
 typedef u32             compat_uptr_t;
 
+typedef struct {
+        u32 mask;
+        u32 addr;
+} __aligned(8) psw_compat_t;
+
+typedef struct {
+        psw_compat_t psw;
+        u32 gprs[NUM_GPRS];
+        u32 acrs[NUM_ACRS];
+        u32 orig_gpr2;
+} s390_compat_regs;
+
+typedef struct {
+        u32 gprs_high[NUM_GPRS];
+} s390_compat_regs_high;
+
 struct compat_timespec {
         compat_time_t   tv_sec;
         s32             tv_nsec;
@@ -124,18 +140,33 @@ struct compat_flock64 {
 };
 
 struct compat_statfs {
-        s32             f_type;
-        s32             f_bsize;
-        s32             f_blocks;
-        s32             f_bfree;
-        s32             f_bavail;
-        s32             f_files;
-        s32             f_ffree;
+        u32             f_type;
+        u32             f_bsize;
+        u32             f_blocks;
+        u32             f_bfree;
+        u32             f_bavail;
+        u32             f_files;
+        u32             f_ffree;
+        compat_fsid_t   f_fsid;
+        u32             f_namelen;
+        u32             f_frsize;
+        u32             f_flags;
+        u32             f_spare[4];
+};
+
+struct compat_statfs64 {
+        u32             f_type;
+        u32             f_bsize;
+        u64             f_blocks;
+        u64             f_bfree;
+        u64             f_bavail;
+        u64             f_files;
+        u64             f_ffree;
         compat_fsid_t   f_fsid;
-        s32             f_namelen;
-        s32             f_frsize;
-        s32             f_flags;
-        s32             f_spare[5];
+        u32             f_namelen;
+        u32             f_frsize;
+        u32             f_flags;
+        u32             f_spare[4];
 };
 
 #define COMPAT_RLIM_OLD_INFINITY        0x7fffffff
@@ -248,8 +279,6 @@ static inline int is_compat_task(void)
         return is_32bit_task();
 }
 
-#endif
-
 static inline void __user *arch_compat_alloc_user_space(long len)
 {
         unsigned long stack;
@@ -260,6 +289,8 @@ static inline void __user *arch_compat_alloc_user_space(long len)
         return (void __user *) (stack - len);
 }
 
+#endif
+
 struct compat_ipc64_perm {
         compat_key_t key;
         __compat_uid32_t uid;
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 1bfdf24b85a2..78f4f8711d58 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -119,6 +119,8 @@
  */
 
 #include <asm/ptrace.h>
+#include <asm/compat.h>
+#include <asm/syscall.h>
 #include <asm/user.h>
 
 typedef s390_fp_regs elf_fpregset_t;
@@ -180,18 +182,31 @@ extern unsigned long elf_hwcap;
 extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
-#ifdef CONFIG_64BIT
+#ifndef CONFIG_COMPAT
+#define SET_PERSONALITY(ex) \
+do {                                                            \
+        set_personality(PER_LINUX |                             \
+                (current->personality & (~PER_MASK)));          \
+        current_thread_info()->sys_call_table =                 \
+                (unsigned long) &sys_call_table;                \
+} while (0)
+#else /* CONFIG_COMPAT */
 #define SET_PERSONALITY(ex)                                     \
 do {                                                            \
         if (personality(current->personality) != PER_LINUX32)   \
                 set_personality(PER_LINUX |                     \
                         (current->personality & ~PER_MASK));    \
-        if ((ex).e_ident[EI_CLASS] == ELFCLASS32)               \
+        if ((ex).e_ident[EI_CLASS] == ELFCLASS32) {             \
                 set_thread_flag(TIF_31BIT);                     \
-        else                                                    \
+                current_thread_info()->sys_call_table =         \
+                        (unsigned long) &sys_call_table_emu;    \
+        } else {                                                \
                 clear_thread_flag(TIF_31BIT);                   \
+                current_thread_info()->sys_call_table =         \
+                        (unsigned long) &sys_call_table;        \
+        }                                                       \
 } while (0)
-#endif /* CONFIG_64BIT */
+#endif /* CONFIG_COMPAT */
 
 #define STACK_RND_MASK  0x7ffUL
 
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 05333b7f0469..6c1801235db9 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -140,6 +140,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
 struct zpci_dev *zpci_alloc_device(void);
 int zpci_create_device(struct zpci_dev *);
 int zpci_enable_device(struct zpci_dev *);
+int zpci_disable_device(struct zpci_dev *);
 void zpci_stop_device(struct zpci_dev *);
 void zpci_free_device(struct zpci_dev *);
 int zpci_scan_device(struct zpci_dev *);
diff --git a/arch/s390/include/asm/pci_debug.h b/arch/s390/include/asm/pci_debug.h
index 6bbec4265b6e..1ca5d1047c71 100644
--- a/arch/s390/include/asm/pci_debug.h
+++ b/arch/s390/include/asm/pci_debug.h
@@ -7,14 +7,11 @@ extern debug_info_t *pci_debug_msg_id;
 extern debug_info_t *pci_debug_err_id;
 
 #ifdef CONFIG_PCI_DEBUG
-#define zpci_dbg(fmt, args...)                                                  \
-        do {                                                                    \
-                if (pci_debug_msg_id->level >= 2)                               \
-                        debug_sprintf_event(pci_debug_msg_id, 2, fmt , ## args);\
-        } while (0)
+#define zpci_dbg(imp, fmt, args...)                             \
+        debug_sprintf_event(pci_debug_msg_id, imp, fmt, ##args)
 
 #else /* !CONFIG_PCI_DEBUG */
-#define zpci_dbg(fmt, args...) do { } while (0)
+#define zpci_dbg(imp, fmt, args...) do { } while (0)
 #endif
 
 #define zpci_err(text...)                                                       \
diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h
index 1486a98d5dad..e6a2bdd4d705 100644
--- a/arch/s390/include/asm/pci_insn.h
+++ b/arch/s390/include/asm/pci_insn.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_S390_PCI_INSN_H
 #define _ASM_S390_PCI_INSN_H
 
-#include <linux/delay.h>
-
-#define ZPCI_INSN_BUSY_DELAY    1       /* 1 microsecond */
-
 /* Load/Store status codes */
 #define ZPCI_PCI_ST_FUNC_NOT_ENABLED            4
 #define ZPCI_PCI_ST_FUNC_IN_ERR                 8
@@ -82,199 +78,12 @@ struct zpci_fib {
         u64 reserved7;
 } __packed;
 
-/* Modify PCI Function Controls */
-static inline u8 __mpcifc(u64 req, struct zpci_fib *fib, u8 *status)
-{
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rxy,0xe300000000d0,%[req],%[fib]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (req), [fib] "+Q" (*fib)
-                : : "cc");
-        *status = req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int mpcifc_instr(u64 req, struct zpci_fib *fib)
-{
-        u8 cc, status;
-
-        do {
-                cc = __mpcifc(req, fib, &status);
-                if (cc == 2)
-                        msleep(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d\n",
-                             __func__, cc, status);
-        return (cc) ? -EIO : 0;
-}
-
-/* Refresh PCI Translations */
-static inline u8 __rpcit(u64 fn, u64 addr, u64 range, u8 *status)
-{
-        register u64 __addr asm("2") = addr;
-        register u64 __range asm("3") = range;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d30000,%[fn],%[addr]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [fn] "+d" (fn)
-                : [addr] "d" (__addr), "d" (__range)
-                : "cc");
-        *status = fn >> 24 & 0xff;
-        return cc;
-}
-
-static inline int rpcit_instr(u64 fn, u64 addr, u64 range)
-{
-        u8 cc, status;
-
-        do {
-                cc = __rpcit(fn, addr, range, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  dma_addr: %Lx  size: %Lx\n",
-                            __func__, cc, status, addr, range);
-        return (cc) ? -EIO : 0;
-}
-
-/* Store PCI function controls */
-static inline u8 __stpcifc(u32 handle, u8 space, struct zpci_fib *fib, u8 *status)
-{
-        u64 fn = (u64) handle << 32 | space << 16;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rxy,0xe300000000d4,%[fn],%[fib]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [fn] "+d" (fn), [fib] "=m" (*fib)
-                : : "cc");
-        *status = fn >> 24 & 0xff;
-        return cc;
-}
-
-/* Set Interruption Controls */
-static inline void sic_instr(u16 ctl, char *unused, u8 isc)
-{
-        asm volatile (
-                "       .insn   rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
-                : : [ctl] "d" (ctl), [isc] "d" (isc << 27), [u] "Q" (*unused));
-}
-
-/* PCI Load */
-static inline u8 __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
-{
-        register u64 __req asm("2") = req;
-        register u64 __offset asm("3") = offset;
-        u64 __data;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d20000,%[data],%[req]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [data] "=d" (__data), [req] "+d" (__req)
-                :  "d" (__offset)
-                : "cc");
-        *status = __req >> 24 & 0xff;
-        *data = __data;
-        return cc;
-}
-
-static inline int pcilg_instr(u64 *data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcilg(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc) {
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                            __func__, cc, status, req, offset);
-                /* TODO: on IO errors set data to 0xff...
-                 * here or in users of pcilg (le conversion)?
-                 */
-        }
-        return (cc) ? -EIO : 0;
-}
-
-/* PCI Store */
-static inline u8 __pcistg(u64 data, u64 req, u64 offset, u8 *status)
-{
-        register u64 __req asm("2") = req;
-        register u64 __offset asm("3") = offset;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d00000,%[data],%[req]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (__req)
-                : "d" (__offset), [data] "d" (data)
-                : "cc");
-        *status = __req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int pcistg_instr(u64 data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcistg(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                        __func__, cc, status, req, offset);
-        return (cc) ? -EIO : 0;
-}
-
-/* PCI Store Block */
-static inline u8 __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
-{
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rsy,0xeb00000000d0,%[req],%[offset],%[data]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (req)
-                : [offset] "d" (offset), [data] "Q" (*data)
-                : "cc");
-        *status = req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int pcistb_instr(const u64 *data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcistb(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
 
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                            __func__, cc, status, req, offset);
-        return (cc) ? -EIO : 0;
-}
+int s390pci_mod_fc(u64 req, struct zpci_fib *fib);
+int s390pci_refresh_trans(u64 fn, u64 addr, u64 range);
+int s390pci_load(u64 *data, u64 req, u64 offset);
+int s390pci_store(u64 data, u64 req, u64 offset);
+int s390pci_store_block(const u64 *data, u64 req, u64 offset);
+void set_irq_ctrl(u16 ctl, char *unused, u8 isc);
 
 #endif
diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h
index 5fd81f31d6c7..83a9caa6ae53 100644
--- a/arch/s390/include/asm/pci_io.h
+++ b/arch/s390/include/asm/pci_io.h
@@ -36,7 +36,7 @@ static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\
         u64 data;                                                               \
         int rc;                                                                 \
                                                                                 \
-        rc = pcilg_instr(&data, req, ZPCI_OFFSET(addr));                        \
+        rc = s390pci_load(&data, req, ZPCI_OFFSET(addr));                       \
         if (rc)                                                                 \
                 data = -1ULL;                                                   \
         return (RETTYPE) data;                                                  \
@@ -50,7 +50,7 @@ static inline void zpci_write_##VALTYPE(VALTYPE val,				\
         u64 req = ZPCI_CREATE_REQ(entry->fh, entry->bar, LENGTH);               \
         u64 data = (VALTYPE) val;                                               \
                                                                                 \
-        pcistg_instr(data, req, ZPCI_OFFSET(addr));                             \
+        s390pci_store(data, req, ZPCI_OFFSET(addr));                            \
 }
 
 zpci_read(8, u64)
@@ -83,15 +83,18 @@ static inline int zpci_write_single(u64 req, const u64 *data, u64 offset, u8 len
                 val = 0;                /* let FW report error */
                 break;
         }
-        return pcistg_instr(val, req, offset);
+        return s390pci_store(val, req, offset);
 }
 
 static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
 {
         u64 data;
-        u8 cc;
+        int cc;
+
+        cc = s390pci_load(&data, req, offset);
+        if (cc)
+                goto out;
 
-        cc = pcilg_instr(&data,  req, offset);
         switch (len) {
         case 1:
                 *((u8 *) dst) = (u8) data;
@@ -106,12 +109,13 @@ static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
                 *((u64 *) dst) = (u64) data;
                 break;
         }
+out:
         return cc;
 }
 
 static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)
 {
-        return pcistb_instr(data, req, offset);
+        return s390pci_store_block(data, req, offset);
 }
 
 static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 3cb47cf02530..4a64c0e5428f 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -764,6 +764,8 @@ void gmap_disable(struct gmap *gmap);
 int gmap_map_segment(struct gmap *gmap, unsigned long from,
                      unsigned long to, unsigned long length);
 int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len);
+unsigned long __gmap_translate(unsigned long address, struct gmap *);
+unsigned long gmap_translate(unsigned long address, struct gmap *);
 unsigned long __gmap_fault(unsigned long address, struct gmap *);
 unsigned long gmap_fault(unsigned long address, struct gmap *);
 void gmap_discard(unsigned long from, unsigned long to, struct gmap *);
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 94e749c90230..6b499870662f 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -161,7 +161,8 @@ extern unsigned long thread_saved_pc(struct task_struct *t);
 
 extern void show_code(struct pt_regs *regs);
 extern void print_fn_code(unsigned char *code, unsigned long len);
-extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]);
+extern int insn_to_mnemonic(unsigned char *instruction, char *buf,
+                            unsigned int len);
 
 unsigned long get_wchan(struct task_struct *p);
 #define task_pt_regs(tsk) ((struct pt_regs *) \
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 3ee5da3bc10c..559512a455da 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -9,9 +9,7 @@
 #include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-#ifndef __s390x__
-#else /* __s390x__ */
-#endif /* __s390x__ */
+
 extern long psw_kernel_bits;
 extern long psw_user_bits;
 
@@ -77,8 +75,6 @@ struct per_struct_kernel {
 #define PER_CONTROL_SUSPENSION          0x00400000UL
 #define PER_CONTROL_ALTERATION          0x00200000UL
 
-#ifdef __s390x__
-#endif /* __s390x__ */
 /*
  * These are defined as per linux/ptrace.h, which see.
  */
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index fe7b99759e12..cd29d2f4e4f3 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -23,6 +23,7 @@
  * type here is what we want [need] for both 32 bit and 64 bit systems.
  */
 extern const unsigned int sys_call_table[];
+extern const unsigned int sys_call_table_emu[];
 
 static inline long syscall_get_nr(struct task_struct *task,
                                   struct pt_regs *regs)
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index 9e2cfe0349c3..eb5f64d26d06 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -14,13 +14,8 @@
 #define THREAD_ORDER 1
 #define ASYNC_ORDER  1
 #else /* CONFIG_64BIT */
-#ifndef __SMALL_STACK
 #define THREAD_ORDER 2
 #define ASYNC_ORDER  2
-#else
-#define THREAD_ORDER 1
-#define ASYNC_ORDER  1
-#endif
 #endif /* CONFIG_64BIT */
 
 #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
@@ -41,6 +36,7 @@ struct thread_info {
         struct task_struct      *task;          /* main task structure */
         struct exec_domain      *exec_domain;   /* execution domain */
         unsigned long           flags;          /* low level flags */
+        unsigned long           sys_call_table; /* System call table address */
         unsigned int            cpu;            /* current CPU */
         int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
         struct restart_block    restart_block;
diff --git a/arch/s390/include/uapi/asm/ptrace.h b/arch/s390/include/uapi/asm/ptrace.h
index a5ca214b34fd..3aa9f1ec5b29 100644
--- a/arch/s390/include/uapi/asm/ptrace.h
+++ b/arch/s390/include/uapi/asm/ptrace.h
@@ -215,12 +215,6 @@ typedef struct
         unsigned long addr;
 } __attribute__ ((aligned(8))) psw_t;
 
-typedef struct
-{
-        __u32   mask;
-        __u32   addr;
-} __attribute__ ((aligned(8))) psw_compat_t;
-
 #ifndef __s390x__
 
 #define PSW_MASK_PER            0x40000000UL
@@ -295,20 +289,6 @@ typedef struct
         unsigned long orig_gpr2;
 } s390_regs;
 
-typedef struct
-{
-        psw_compat_t    psw;
-        __u32           gprs[NUM_GPRS];
-        __u32           acrs[NUM_ACRS];
-        __u32           orig_gpr2;
-} s390_compat_regs;
-
-typedef struct
-{
-        __u32           gprs_high[NUM_GPRS];
-} s390_compat_regs_high;
-
-
 /*
  * Now for the user space program event recording (trace) definitions.
  * The following structures are used only for the ptrace interface, don't
diff --git a/arch/s390/include/uapi/asm/statfs.h b/arch/s390/include/uapi/asm/statfs.h
index 5acca0a34c20..a61d538756f2 100644
--- a/arch/s390/include/uapi/asm/statfs.h
+++ b/arch/s390/include/uapi/asm/statfs.h
@@ -7,9 +7,6 @@
 #ifndef _S390_STATFS_H
 #define _S390_STATFS_H
 
-#ifndef __s390x__
-#include <asm-generic/statfs.h>
-#else
 /*
  * We can't use <asm-generic/statfs.h> because in 64-bit mode
  * we mix ints of different sizes in our struct statfs.
@@ -21,49 +18,33 @@ typedef __kernel_fsid_t	fsid_t;
 #endif
 
 struct statfs {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
+        unsigned int    f_type;
+        unsigned int    f_bsize;
+        unsigned long   f_blocks;
+        unsigned long   f_bfree;
+        unsigned long   f_bavail;
+        unsigned long   f_files;
+        unsigned long   f_ffree;
         __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_flags;
-        int  f_spare[4];
+        unsigned int    f_namelen;
+        unsigned int    f_frsize;
+        unsigned int    f_flags;
+        unsigned int    f_spare[4];
 };
 
 struct statfs64 {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
+        unsigned int    f_type;
+        unsigned int    f_bsize;
+        unsigned long   f_blocks;
+        unsigned long   f_bfree;
+        unsigned long   f_bavail;
+        unsigned long   f_files;
+        unsigned long   f_ffree;
         __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_flags;
-        int  f_spare[4];
+        unsigned int    f_namelen;
+        unsigned int    f_frsize;
+        unsigned int    f_flags;
+        unsigned int    f_spare[4];
 };
 
-struct compat_statfs64 {
-        __u32 f_type;
-        __u32 f_bsize;
-        __u64 f_blocks;
-        __u64 f_bfree;
-        __u64 f_bavail;
-        __u64 f_files;
-        __u64 f_ffree;
-        __kernel_fsid_t f_fsid;
-        __u32 f_namelen;
-        __u32 f_frsize;
-        __u32 f_flags;
-        __u32 f_spare[4];
-};
-
-#endif /* __s390x__ */
 #endif