Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] move include/asm-s390 to arch/s390/include/asm

135 files changed, 0 insertions, 15320 deletions

diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
deleted file mode 100644
index 63a23415fba6..000000000000
--- a/include/asm-s390/Kbuild
+++ /dev/null
@@ -1,15 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-header-y += dasd.h
-header-y += monwriter.h
-header-y += qeth.h
-header-y += tape390.h
-header-y += ucontext.h
-header-y += vtoc.h
-header-y += zcrypt.h
-header-y += chsc.h
-
-unifdef-y += cmb.h
-unifdef-y += debug.h
-unifdef-y += chpid.h
-unifdef-y += schid.h
diff --git a/include/asm-s390/airq.h b/include/asm-s390/airq.h
deleted file mode 100644
index 1ac80d6b0588..000000000000
--- a/include/asm-s390/airq.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  include/asm-s390/airq.h
- *
- *    Copyright IBM Corp. 2002,2007
- *    Author(s): Ingo Adlung <adlung@de.ibm.com>
- *               Cornelia Huck <cornelia.huck@de.ibm.com>
- *               Arnd Bergmann <arndb@de.ibm.com>
- *               Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
- */
-
-#ifndef _ASM_S390_AIRQ_H
-#define _ASM_S390_AIRQ_H
-
-typedef void (*adapter_int_handler_t)(void *, void *);
-
-void *s390_register_adapter_interrupt(adapter_int_handler_t, void *, u8);
-void s390_unregister_adapter_interrupt(void *, u8);
-
-#endif /* _ASM_S390_AIRQ_H */
diff --git a/include/asm-s390/appldata.h b/include/asm-s390/appldata.h
deleted file mode 100644
index 79283dac8281..000000000000
--- a/include/asm-s390/appldata.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * include/asm-s390/appldata.h
- *
- * Copyright (C) IBM Corp. 2006
- *
- * Author(s): Melissa Howland <melissah@us.ibm.com>
- */
-
-#ifndef _ASM_S390_APPLDATA_H
-#define _ASM_S390_APPLDATA_H
-
-#include <asm/io.h>
-
-#ifndef CONFIG_64BIT
-
-#define APPLDATA_START_INTERVAL_REC     0x00    /* Function codes for */
-#define APPLDATA_STOP_REC               0x01    /* DIAG 0xDC          */
-#define APPLDATA_GEN_EVENT_REC          0x02
-#define APPLDATA_START_CONFIG_REC       0x03
-
-/*
- * Parameter list for DIAGNOSE X'DC'
- */
-struct appldata_parameter_list {
-        u16 diag;               /* The DIAGNOSE code X'00DC'          */
-        u8  function;           /* The function code for the DIAGNOSE */
-        u8  parlist_length;     /* Length of the parameter list       */
-        u32 product_id_addr;    /* Address of the 16-byte product ID  */
-        u16 reserved;
-        u16 buffer_length;      /* Length of the application data buffer  */
-        u32 buffer_addr;        /* Address of the application data buffer */
-} __attribute__ ((packed));
-
-#else /* CONFIG_64BIT */
-
-#define APPLDATA_START_INTERVAL_REC     0x80
-#define APPLDATA_STOP_REC               0x81
-#define APPLDATA_GEN_EVENT_REC          0x82
-#define APPLDATA_START_CONFIG_REC       0x83
-
-/*
- * Parameter list for DIAGNOSE X'DC'
- */
-struct appldata_parameter_list {
-        u16 diag;
-        u8  function;
-        u8  parlist_length;
-        u32 unused01;
-        u16 reserved;
-        u16 buffer_length;
-        u32 unused02;
-        u64 product_id_addr;
-        u64 buffer_addr;
-} __attribute__ ((packed));
-
-#endif /* CONFIG_64BIT */
-
-struct appldata_product_id {
-        char prod_nr[7];        /* product number */
-        u16  prod_fn;           /* product function */
-        u8   record_nr;         /* record number */
-        u16  version_nr;        /* version */
-        u16  release_nr;        /* release */
-        u16  mod_lvl;           /* modification level */
-} __attribute__ ((packed));
-
-static inline int appldata_asm(struct appldata_product_id *id,
-                               unsigned short fn, void *buffer,
-                               unsigned short length)
-{
-        struct appldata_parameter_list parm_list;
-        int ry;
-
-        if (!MACHINE_IS_VM)
-                return -ENOSYS;
-        parm_list.diag = 0xdc;
-        parm_list.function = fn;
-        parm_list.parlist_length = sizeof(parm_list);
-        parm_list.buffer_length = length;
-        parm_list.product_id_addr = (unsigned long) id;
-        parm_list.buffer_addr = virt_to_phys(buffer);
-        asm volatile(
-                "       diag    %1,%0,0xdc"
-                : "=d" (ry)
-                : "d" (&parm_list), "m" (parm_list), "m" (*id)
-                : "cc");
-        return ry;
-}
-
-#endif /* _ASM_S390_APPLDATA_H */
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
deleted file mode 100644
index 2d184655bc5d..000000000000
--- a/include/asm-s390/atomic.h
+++ /dev/null
@@ -1,285 +0,0 @@
-#ifndef __ARCH_S390_ATOMIC__
-#define __ARCH_S390_ATOMIC__
-
-#include <linux/compiler.h>
-
-/*
- *  include/asm-s390/atomic.h
- *
- *  S390 version
- *    Copyright (C) 1999-2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *               Denis Joseph Barrow,
- *               Arnd Bergmann (arndb@de.ibm.com)
- *
- *  Derived from "include/asm-i386/bitops.h"
- *    Copyright (C) 1992, Linus Torvalds
- *
- */
-
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- * S390 uses 'Compare And Swap' for atomicity in SMP enviroment
- */
-
-typedef struct {
-        int counter;
-} __attribute__ ((aligned (4))) atomic_t;
-#define ATOMIC_INIT(i)  { (i) }
-
-#ifdef __KERNEL__
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-#define __CS_LOOP(ptr, op_val, op_string) ({                            \
-        typeof(ptr->counter) old_val, new_val;                          \
-        asm volatile(                                                   \
-                "       l       %0,%2\n"                                \
-                "0:     lr      %1,%0\n"                                \
-                op_string "     %1,%3\n"                                \
-                "       cs      %0,%1,%2\n"                             \
-                "       jl      0b"                                     \
-                : "=&d" (old_val), "=&d" (new_val),                     \
-                  "=Q" (((atomic_t *)(ptr))->counter)                   \
-                : "d" (op_val),  "Q" (((atomic_t *)(ptr))->counter)     \
-                : "cc", "memory");                                      \
-        new_val;                                                        \
-})
-
-#else /* __GNUC__ */
-
-#define __CS_LOOP(ptr, op_val, op_string) ({                            \
-        typeof(ptr->counter) old_val, new_val;                          \
-        asm volatile(                                                   \
-                "       l       %0,0(%3)\n"                             \
-                "0:     lr      %1,%0\n"                                \
-                op_string "     %1,%4\n"                                \
-                "       cs      %0,%1,0(%3)\n"                          \
-                "       jl      0b"                                     \
-                : "=&d" (old_val), "=&d" (new_val),                     \
-                  "=m" (((atomic_t *)(ptr))->counter)                   \
-                : "a" (ptr), "d" (op_val),                              \
-                  "m" (((atomic_t *)(ptr))->counter)                    \
-                : "cc", "memory");                                      \
-        new_val;                                                        \
-})
-
-#endif /* __GNUC__ */
-
-static inline int atomic_read(const atomic_t *v)
-{
-        barrier();
-        return v->counter;
-}
-
-static inline void atomic_set(atomic_t *v, int i)
-{
-        v->counter = i;
-        barrier();
-}
-
-static __inline__ int atomic_add_return(int i, atomic_t * v)
-{
-        return __CS_LOOP(v, i, "ar");
-}
-#define atomic_add(_i, _v)              atomic_add_return(_i, _v)
-#define atomic_add_negative(_i, _v)     (atomic_add_return(_i, _v) < 0)
-#define atomic_inc(_v)                  atomic_add_return(1, _v)
-#define atomic_inc_return(_v)           atomic_add_return(1, _v)
-#define atomic_inc_and_test(_v)         (atomic_add_return(1, _v) == 0)
-
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
-{
-        return __CS_LOOP(v, i, "sr");
-}
-#define atomic_sub(_i, _v)              atomic_sub_return(_i, _v)
-#define atomic_sub_and_test(_i, _v)     (atomic_sub_return(_i, _v) == 0)
-#define atomic_dec(_v)                  atomic_sub_return(1, _v)
-#define atomic_dec_return(_v)           atomic_sub_return(1, _v)
-#define atomic_dec_and_test(_v)         (atomic_sub_return(1, _v) == 0)
-
-static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t * v)
-{
-               __CS_LOOP(v, ~mask, "nr");
-}
-
-static __inline__ void atomic_set_mask(unsigned long mask, atomic_t * v)
-{
-               __CS_LOOP(v, mask, "or");
-}
-
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-
-static __inline__ int atomic_cmpxchg(atomic_t *v, int old, int new)
-{
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        asm volatile(
-                "       cs      %0,%2,%1"
-                : "+d" (old), "=Q" (v->counter)
-                : "d" (new), "Q" (v->counter)
-                : "cc", "memory");
-#else /* __GNUC__ */
-        asm volatile(
-                "       cs      %0,%3,0(%2)"
-                : "+d" (old), "=m" (v->counter)
-                : "a" (v), "d" (new), "m" (v->counter)
-                : "cc", "memory");
-#endif /* __GNUC__ */
-        return old;
-}
-
-static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
-{
-        int c, old;
-        c = atomic_read(v);
-        for (;;) {
-                if (unlikely(c == u))
-                        break;
-                old = atomic_cmpxchg(v, c, c + a);
-                if (likely(old == c))
-                        break;
-                c = old;
-        }
-        return c != u;
-}
-
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-
-#undef __CS_LOOP
-
-#ifdef __s390x__
-typedef struct {
-        long long counter;
-} __attribute__ ((aligned (8))) atomic64_t;
-#define ATOMIC64_INIT(i)  { (i) }
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-#define __CSG_LOOP(ptr, op_val, op_string) ({                           \
-        typeof(ptr->counter) old_val, new_val;                          \
-        asm volatile(                                                   \
-                "       lg      %0,%2\n"                                \
-                "0:     lgr     %1,%0\n"                                \
-                op_string "     %1,%3\n"                                \
-                "       csg     %0,%1,%2\n"                             \
-                "       jl      0b"                                     \
-                : "=&d" (old_val), "=&d" (new_val),                     \
-                  "=Q" (((atomic_t *)(ptr))->counter)                   \
-                : "d" (op_val), "Q" (((atomic_t *)(ptr))->counter)      \
-                : "cc", "memory" );                                     \
-        new_val;                                                        \
-})
-
-#else /* __GNUC__ */
-
-#define __CSG_LOOP(ptr, op_val, op_string) ({                           \
-        typeof(ptr->counter) old_val, new_val;                          \
-        asm volatile(                                                   \
-                "       lg      %0,0(%3)\n"                             \
-                "0:     lgr     %1,%0\n"                                \
-                op_string "     %1,%4\n"                                \
-                "       csg     %0,%1,0(%3)\n"                          \
-                "       jl      0b"                                     \
-                : "=&d" (old_val), "=&d" (new_val),                     \
-                  "=m" (((atomic_t *)(ptr))->counter)                   \
-                : "a" (ptr), "d" (op_val),                              \
-                  "m" (((atomic_t *)(ptr))->counter)                    \
-                : "cc", "memory" );                                     \
-        new_val;                                                        \
-})
-
-#endif /* __GNUC__ */
-
-static inline long long atomic64_read(const atomic64_t *v)
-{
-        barrier();
-        return v->counter;
-}
-
-static inline void atomic64_set(atomic64_t *v, long long i)
-{
-        v->counter = i;
-        barrier();
-}
-
-static __inline__ long long atomic64_add_return(long long i, atomic64_t * v)
-{
-        return __CSG_LOOP(v, i, "agr");
-}
-#define atomic64_add(_i, _v)            atomic64_add_return(_i, _v)
-#define atomic64_add_negative(_i, _v)   (atomic64_add_return(_i, _v) < 0)
-#define atomic64_inc(_v)                atomic64_add_return(1, _v)
-#define atomic64_inc_return(_v)         atomic64_add_return(1, _v)
-#define atomic64_inc_and_test(_v)       (atomic64_add_return(1, _v) == 0)
-
-static __inline__ long long atomic64_sub_return(long long i, atomic64_t * v)
-{
-        return __CSG_LOOP(v, i, "sgr");
-}
-#define atomic64_sub(_i, _v)            atomic64_sub_return(_i, _v)
-#define atomic64_sub_and_test(_i, _v)   (atomic64_sub_return(_i, _v) == 0)
-#define atomic64_dec(_v)                atomic64_sub_return(1, _v)
-#define atomic64_dec_return(_v)         atomic64_sub_return(1, _v)
-#define atomic64_dec_and_test(_v)       (atomic64_sub_return(1, _v) == 0)
-
-static __inline__ void atomic64_clear_mask(unsigned long mask, atomic64_t * v)
-{
-               __CSG_LOOP(v, ~mask, "ngr");
-}
-
-static __inline__ void atomic64_set_mask(unsigned long mask, atomic64_t * v)
-{
-               __CSG_LOOP(v, mask, "ogr");
-}
-
-#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
-
-static __inline__ long long atomic64_cmpxchg(atomic64_t *v,
-                                             long long old, long long new)
-{
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        asm volatile(
-                "       csg     %0,%2,%1"
-                : "+d" (old), "=Q" (v->counter)
-                : "d" (new), "Q" (v->counter)
-                : "cc", "memory");
-#else /* __GNUC__ */
-        asm volatile(
-                "       csg     %0,%3,0(%2)"
-                : "+d" (old), "=m" (v->counter)
-                : "a" (v), "d" (new), "m" (v->counter)
-                : "cc", "memory");
-#endif /* __GNUC__ */
-        return old;
-}
-
-static __inline__ int atomic64_add_unless(atomic64_t *v,
-                                          long long a, long long u)
-{
-        long long c, old;
-        c = atomic64_read(v);
-        for (;;) {
-                if (unlikely(c == u))
-                        break;
-                old = atomic64_cmpxchg(v, c, c + a);
-                if (likely(old == c))
-                        break;
-                c = old;
-        }
-        return c != u;
-}
-
-#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-
-#undef __CSG_LOOP
-#endif
-
-#define smp_mb__before_atomic_dec()     smp_mb()
-#define smp_mb__after_atomic_dec()      smp_mb()
-#define smp_mb__before_atomic_inc()     smp_mb()
-#define smp_mb__after_atomic_inc()      smp_mb()
-
-#include <asm-generic/atomic.h>
-#endif /* __KERNEL__ */
-#endif /* __ARCH_S390_ATOMIC__  */
diff --git a/include/asm-s390/auxvec.h b/include/asm-s390/auxvec.h
deleted file mode 100644
index 0d340720fd99..000000000000
--- a/include/asm-s390/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMS390_AUXVEC_H
-#define __ASMS390_AUXVEC_H
-
-#endif
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
deleted file mode 100644
index b4eb24ab5af9..000000000000
--- a/include/asm-s390/bitops.h
+++ /dev/null
@@ -1,884 +0,0 @@
-#ifndef _S390_BITOPS_H
-#define _S390_BITOPS_H
-
-/*
- *  include/asm-s390/bitops.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/bitops.h"
- *    Copyright (C) 1992, Linus Torvalds
- *
- */
-
-#ifdef __KERNEL__
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include <linux/compiler.h>
-
-/*
- * 32 bit bitops format:
- * bit 0 is the LSB of *addr; bit 31 is the MSB of *addr;
- * bit 32 is the LSB of *(addr+4). That combined with the
- * big endian byte order on S390 give the following bit
- * order in memory:
- *    1f 1e 1d 1c 1b 1a 19 18 17 16 15 14 13 12 11 10 \
- *    0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00
- * after that follows the next long with bit numbers
- *    3f 3e 3d 3c 3b 3a 39 38 37 36 35 34 33 32 31 30
- *    2f 2e 2d 2c 2b 2a 29 28 27 26 25 24 23 22 21 20
- * The reason for this bit ordering is the fact that
- * in the architecture independent code bits operations
- * of the form "flags |= (1 << bitnr)" are used INTERMIXED
- * with operation of the form "set_bit(bitnr, flags)".
- *
- * 64 bit bitops format:
- * bit 0 is the LSB of *addr; bit 63 is the MSB of *addr;
- * bit 64 is the LSB of *(addr+8). That combined with the
- * big endian byte order on S390 give the following bit
- * order in memory:
- *    3f 3e 3d 3c 3b 3a 39 38 37 36 35 34 33 32 31 30
- *    2f 2e 2d 2c 2b 2a 29 28 27 26 25 24 23 22 21 20
- *    1f 1e 1d 1c 1b 1a 19 18 17 16 15 14 13 12 11 10
- *    0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00
- * after that follows the next long with bit numbers
- *    7f 7e 7d 7c 7b 7a 79 78 77 76 75 74 73 72 71 70
- *    6f 6e 6d 6c 6b 6a 69 68 67 66 65 64 63 62 61 60
- *    5f 5e 5d 5c 5b 5a 59 58 57 56 55 54 53 52 51 50
- *    4f 4e 4d 4c 4b 4a 49 48 47 46 45 44 43 42 41 40
- * The reason for this bit ordering is the fact that
- * in the architecture independent code bits operations
- * of the form "flags |= (1 << bitnr)" are used INTERMIXED
- * with operation of the form "set_bit(bitnr, flags)".
- */
-
-/* bitmap tables from arch/S390/kernel/bitmap.S */
-extern const char _oi_bitmap[];
-extern const char _ni_bitmap[];
-extern const char _zb_findmap[];
-extern const char _sb_findmap[];
-
-#ifndef __s390x__
-
-#define __BITOPS_ALIGN          3
-#define __BITOPS_WORDSIZE       32
-#define __BITOPS_OR             "or"
-#define __BITOPS_AND            "nr"
-#define __BITOPS_XOR            "xr"
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-        asm volatile(                                           \
-                "       l       %0,%2\n"                        \
-                "0:     lr      %1,%0\n"                        \
-                __op_string "   %1,%3\n"                        \
-                "       cs      %0,%1,%2\n"                     \
-                "       jl      0b"                             \
-                : "=&d" (__old), "=&d" (__new),                 \
-                  "=Q" (*(unsigned long *) __addr)              \
-                : "d" (__val), "Q" (*(unsigned long *) __addr)  \
-                : "cc");
-
-#else /* __GNUC__ */
-
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-        asm volatile(                                           \
-                "       l       %0,0(%4)\n"                     \
-                "0:     lr      %1,%0\n"                        \
-                __op_string "   %1,%3\n"                        \
-                "       cs      %0,%1,0(%4)\n"                  \
-                "       jl      0b"                             \
-                : "=&d" (__old), "=&d" (__new),                 \
-                  "=m" (*(unsigned long *) __addr)              \
-                : "d" (__val), "a" (__addr),                    \
-                  "m" (*(unsigned long *) __addr) : "cc");
-
-#endif /* __GNUC__ */
-
-#else /* __s390x__ */
-
-#define __BITOPS_ALIGN          7
-#define __BITOPS_WORDSIZE       64
-#define __BITOPS_OR             "ogr"
-#define __BITOPS_AND            "ngr"
-#define __BITOPS_XOR            "xgr"
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-        asm volatile(                                           \
-                "       lg      %0,%2\n"                        \
-                "0:     lgr     %1,%0\n"                        \
-                __op_string "   %1,%3\n"                        \
-                "       csg     %0,%1,%2\n"                     \
-                "       jl      0b"                             \
-                : "=&d" (__old), "=&d" (__new),                 \
-                  "=Q" (*(unsigned long *) __addr)              \
-                : "d" (__val), "Q" (*(unsigned long *) __addr)  \
-                : "cc");
-
-#else /* __GNUC__ */
-
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-        asm volatile(                                           \
-                "       lg      %0,0(%4)\n"                     \
-                "0:     lgr     %1,%0\n"                        \
-                __op_string "   %1,%3\n"                        \
-                "       csg     %0,%1,0(%4)\n"                  \
-                "       jl      0b"                             \
-                : "=&d" (__old), "=&d" (__new),                 \
-                  "=m" (*(unsigned long *) __addr)              \
-                : "d" (__val), "a" (__addr),                    \
-                  "m" (*(unsigned long *) __addr) : "cc");
-
-
-#endif /* __GNUC__ */
-
-#endif /* __s390x__ */
-
-#define __BITOPS_WORDS(bits) (((bits)+__BITOPS_WORDSIZE-1)/__BITOPS_WORDSIZE)
-#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
-
-#ifdef CONFIG_SMP
-/*
- * SMP safe set_bit routine based on compare and swap (CS)
- */
-static inline void set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make OR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
-}
-
-/*
- * SMP safe clear_bit routine based on compare and swap (CS)
- */
-static inline void clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make AND mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
-}
-
-/*
- * SMP safe change_bit routine based on compare and swap (CS)
- */
-static inline void change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make XOR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
-}
-
-/*
- * SMP safe test_and_set_bit routine based on compare and swap (CS)
- */
-static inline int
-test_and_set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make OR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
-        __BITOPS_BARRIER();
-        return (old & mask) != 0;
-}
-
-/*
- * SMP safe test_and_clear_bit routine based on compare and swap (CS)
- */
-static inline int
-test_and_clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make AND/test mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
-        __BITOPS_BARRIER();
-        return (old ^ new) != 0;
-}
-
-/*
- * SMP safe test_and_change_bit routine based on compare and swap (CS) 
- */
-static inline int
-test_and_change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr, old, new, mask;
-
-        addr = (unsigned long) ptr;
-        /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
-        /* make XOR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
-        /* Do the atomic update. */
-        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
-        __BITOPS_BARRIER();
-        return (old & mask) != 0;
-}
-#endif /* CONFIG_SMP */
-
-/*
- * fast, non-SMP set_bit routine
- */
-static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr;
-
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile(
-                "       oc      0(1,%1),0(%2)"
-                : "=m" (*(char *) addr) : "a" (addr),
-                  "a" (_oi_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc" );
-}
-
-static inline void 
-__constant_set_bit(const unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr;
-
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        *(unsigned char *) addr |= 1 << (nr & 7);
-}
-
-#define set_bit_simple(nr,addr) \
-(__builtin_constant_p((nr)) ? \
- __constant_set_bit((nr),(addr)) : \
- __set_bit((nr),(addr)) )
-
-/*
- * fast, non-SMP clear_bit routine
- */
-static inline void 
-__clear_bit(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr;
-
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile(
-                "       nc      0(1,%1),0(%2)"
-                : "=m" (*(char *) addr) : "a" (addr),
-                  "a" (_ni_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc");
-}
-
-static inline void 
-__constant_clear_bit(const unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr;
-
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        *(unsigned char *) addr &= ~(1 << (nr & 7));
-}
-
-#define clear_bit_simple(nr,addr) \
-(__builtin_constant_p((nr)) ? \
- __constant_clear_bit((nr),(addr)) : \
- __clear_bit((nr),(addr)) )
-
-/* 
- * fast, non-SMP change_bit routine 
- */
-static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr)
-{
-        unsigned long addr;
-
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile(
-                "       xc      0(1,%1),0(%2)"
-                :  "=m" (*(char *) addr) : "a" (addr),
-                   "a" (_oi_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc" );
-}
-
-static inline void 
-__constant_change_bit(const unsigned long nr, volatile unsigned long *ptr) 
-{
-        unsigned long addr;
-
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        *(unsigned char *) addr ^= 1 << (nr & 7);
-}
-
-#define change_bit_simple(nr,addr) \
-(__builtin_constant_p((nr)) ? \
- __constant_change_bit((nr),(addr)) : \
- __change_bit((nr),(addr)) )
-
-/*
- * fast, non-SMP test_and_set_bit routine
- */
-static inline int
-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);
-        ch = *(unsigned char *) addr;
-        asm volatile(
-                "       oc      0(1,%1),0(%2)"
-                : "=m" (*(char *) addr)
-                : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
-                  "m" (*(char *) addr) : "cc", "memory");
-        return (ch >> (nr & 7)) & 1;
-}
-#define __test_and_set_bit(X,Y)         test_and_set_bit_simple(X,Y)
-
-/*
- * fast, non-SMP test_and_clear_bit routine
- */
-static inline int
-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);
-        ch = *(unsigned char *) addr;
-        asm volatile(
-                "       nc      0(1,%1),0(%2)"
-                : "=m" (*(char *) addr)
-                : "a" (addr), "a" (_ni_bitmap + (nr & 7)),
-                  "m" (*(char *) addr) : "cc", "memory");
-        return (ch >> (nr & 7)) & 1;
-}
-#define __test_and_clear_bit(X,Y)       test_and_clear_bit_simple(X,Y)
-
-/*
- * fast, non-SMP test_and_change_bit routine
- */
-static inline int
-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);
-        ch = *(unsigned char *) addr;
-        asm volatile(
-                "       xc      0(1,%1),0(%2)"
-                : "=m" (*(char *) addr)
-                : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
-                  "m" (*(char *) addr) : "cc", "memory");
-        return (ch >> (nr & 7)) & 1;
-}
-#define __test_and_change_bit(X,Y)      test_and_change_bit_simple(X,Y)
-
-#ifdef CONFIG_SMP
-#define set_bit             set_bit_cs
-#define clear_bit           clear_bit_cs
-#define change_bit          change_bit_cs
-#define test_and_set_bit    test_and_set_bit_cs
-#define test_and_clear_bit  test_and_clear_bit_cs
-#define test_and_change_bit test_and_change_bit_cs
-#else
-#define set_bit             set_bit_simple
-#define clear_bit           clear_bit_simple
-#define change_bit          change_bit_simple
-#define test_and_set_bit    test_and_set_bit_simple
-#define test_and_clear_bit  test_and_clear_bit_simple
-#define test_and_change_bit test_and_change_bit_simple
-#endif
-
-
-/*
- * This routine doesn't need to be atomic.
- */
-
-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);
-        ch = *(volatile unsigned char *) addr;
-        return (ch >> (nr & 7)) & 1;
-}
-
-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;
-}
-
-#define test_bit(nr,addr) \
-(__builtin_constant_p((nr)) ? \
- __constant_test_bit((nr),(addr)) : \
- __test_bit((nr),(addr)) )
-
-/*
- * Optimized find bit helper functions.
- */
-
-/**
- * __ffz_word_loop - find byte offset of first long != -1UL
- * @addr: pointer to array of unsigned long
- * @size: size of the array in bits
- */
-static inline unsigned long __ffz_word_loop(const unsigned long *addr,
-                                            unsigned long size)
-{
-        typedef struct { long _[__BITOPS_WORDS(size)]; } addrtype;
-        unsigned long bytes = 0;
-
-        asm volatile(
-#ifndef __s390x__
-                "       ahi     %1,-1\n"
-                "       sra     %1,5\n"
-                "       jz      1f\n"
-                "0:     c       %2,0(%0,%3)\n"
-                "       jne     1f\n"
-                "       la      %0,4(%0)\n"
-                "       brct    %1,0b\n"
-                "1:\n"
-#else
-                "       aghi    %1,-1\n"
-                "       srag    %1,%1,6\n"
-                "       jz      1f\n"
-                "0:     cg      %2,0(%0,%3)\n"
-                "       jne     1f\n"
-                "       la      %0,8(%0)\n"
-                "       brct    %1,0b\n"
-                "1:\n"
-#endif
-                : "+&a" (bytes), "+&d" (size)
-                : "d" (-1UL), "a" (addr), "m" (*(addrtype *) addr)
-                : "cc" );
-        return bytes;
-}
-
-/**
- * __ffs_word_loop - find byte offset of first long != 0UL
- * @addr: pointer to array of unsigned long
- * @size: size of the array in bits
- */
-static inline unsigned long __ffs_word_loop(const unsigned long *addr,
-                                            unsigned long size)
-{
-        typedef struct { long _[__BITOPS_WORDS(size)]; } addrtype;
-        unsigned long bytes = 0;
-
-        asm volatile(
-#ifndef __s390x__
-                "       ahi     %1,-1\n"
-                "       sra     %1,5\n"
-                "       jz      1f\n"
-                "0:     c       %2,0(%0,%3)\n"
-                "       jne     1f\n"
-                "       la      %0,4(%0)\n"
-                "       brct    %1,0b\n"
-                "1:\n"
-#else
-                "       aghi    %1,-1\n"
-                "       srag    %1,%1,6\n"
-                "       jz      1f\n"
-                "0:     cg      %2,0(%0,%3)\n"
-                "       jne     1f\n"
-                "       la      %0,8(%0)\n"
-                "       brct    %1,0b\n"
-                "1:\n"
-#endif
-                : "+&a" (bytes), "+&a" (size)
-                : "d" (0UL), "a" (addr), "m" (*(addrtype *) addr)
-                : "cc" );
-        return bytes;
-}
-
-/**
- * __ffz_word - add number of the first unset bit
- * @nr: base value the bit number is added to
- * @word: the word that is searched for unset bits
- */
-static inline unsigned long __ffz_word(unsigned long nr, unsigned long word)
-{
-#ifdef __s390x__
-        if (likely((word & 0xffffffff) == 0xffffffff)) {
-                word >>= 32;
-                nr += 32;
-        }
-#endif
-        if (likely((word & 0xffff) == 0xffff)) {
-                word >>= 16;
-                nr += 16;
-        }
-        if (likely((word & 0xff) == 0xff)) {
-                word >>= 8;
-                nr += 8;
-        }
-        return nr + _zb_findmap[(unsigned char) word];
-}
-
-/**
- * __ffs_word - add number of the first set bit
- * @nr: base value the bit number is added to
- * @word: the word that is searched for set bits
- */
-static inline unsigned long __ffs_word(unsigned long nr, unsigned long word)
-{
-#ifdef __s390x__
-        if (likely((word & 0xffffffff) == 0)) {
-                word >>= 32;
-                nr += 32;
-        }
-#endif
-        if (likely((word & 0xffff) == 0)) {
-                word >>= 16;
-                nr += 16;
-        }
-        if (likely((word & 0xff) == 0)) {
-                word >>= 8;
-                nr += 8;
-        }
-        return nr + _sb_findmap[(unsigned char) word];
-}
-
-
-/**
- * __load_ulong_be - load big endian unsigned long
- * @p: pointer to array of unsigned long
- * @offset: byte offset of source value in the array
- */
-static inline unsigned long __load_ulong_be(const unsigned long *p,
-                                            unsigned long offset)
-{
-        p = (unsigned long *)((unsigned long) p + offset);
-        return *p;
-}
-
-/**
- * __load_ulong_le - load little endian unsigned long
- * @p: pointer to array of unsigned long
- * @offset: byte offset of source value in the array
- */
-static inline unsigned long __load_ulong_le(const unsigned long *p,
-                                            unsigned long offset)
-{
-        unsigned long word;
-
-        p = (unsigned long *)((unsigned long) p + offset);
-#ifndef __s390x__
-        asm volatile(
-                "       ic      %0,0(%1)\n"
-                "       icm     %0,2,1(%1)\n"
-                "       icm     %0,4,2(%1)\n"
-                "       icm     %0,8,3(%1)"
-                : "=&d" (word) : "a" (p), "m" (*p) : "cc");
-#else
-        asm volatile(
-                "       lrvg    %0,%1"
-                : "=d" (word) : "m" (*p) );
-#endif
-        return word;
-}
-
-/*
- * The various find bit functions.
- */
-
-/*
- * ffz - find first zero in word.
- * @word: The word to search
- *
- * Undefined if no zero exists, so code should check against ~0UL first.
- */
-static inline unsigned long ffz(unsigned long word)
-{
-        return __ffz_word(0, word);
-}
-
-/**
- * __ffs - find first bit in word.
- * @word: The word to search
- *
- * Undefined if no bit exists, so code should check against 0 first.
- */
-static inline unsigned long __ffs (unsigned long word)
-{
-        return __ffs_word(0, word);
-}
-
-/**
- * ffs - find first bit set
- * @x: the word to search
- *
- * This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-static inline int ffs(int x)
-{
-        if (!x)
-                return 0;
-        return __ffs_word(1, x);
-}
-
-/**
- * find_first_zero_bit - find the first zero bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit-number of the first zero bit, not the number of the byte
- * containing a bit.
- */
-static inline unsigned long find_first_zero_bit(const unsigned long *addr,
-                                                unsigned long size)
-{
-        unsigned long bytes, bits;
-
-        if (!size)
-                return 0;
-        bytes = __ffz_word_loop(addr, size);
-        bits = __ffz_word(bytes*8, __load_ulong_be(addr, bytes));
-        return (bits < size) ? bits : size;
-}
-
-/**
- * find_first_bit - find the first set bit in a memory region
- * @addr: The address to start the search at
- * @size: The maximum size to search
- *
- * Returns the bit-number of the first set bit, not the number of the byte
- * containing a bit.
- */
-static inline unsigned long find_first_bit(const unsigned long * addr,
-                                           unsigned long size)
-{
-        unsigned long bytes, bits;
-
-        if (!size)
-                return 0;
-        bytes = __ffs_word_loop(addr, size);
-        bits = __ffs_word(bytes*8, __load_ulong_be(addr, bytes));
-        return (bits < size) ? bits : size;
-}
-
-/**
- * find_next_zero_bit - find the first zero bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The maximum size to search
- */
-static inline int find_next_zero_bit (const unsigned long * addr,
-                                      unsigned long size,
-                                      unsigned long offset)
-{
-        const unsigned long *p;
-        unsigned long bit, set;
-
-        if (offset >= size)
-                return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
-        offset -= bit;
-        size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
-        if (bit) {
-                /*
-                 * __ffz_word returns __BITOPS_WORDSIZE
-                 * if no zero bit is present in the word.
-                 */
-                set = __ffz_word(0, *p >> bit) + bit;
-                if (set >= size)
-                        return size + offset;
-                if (set < __BITOPS_WORDSIZE)
-                        return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
-                p++;
-        }
-        return offset + find_first_zero_bit(p, size);
-}
-
-/**
- * find_next_bit - find the first set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The maximum size to search
- */
-static inline int find_next_bit (const unsigned long * addr,
-                                 unsigned long size,
-                                 unsigned long offset)
-{
-        const unsigned long *p;
-        unsigned long bit, set;
-
-        if (offset >= size)
-                return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
-        offset -= bit;
-        size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
-        if (bit) {
-                /*
-                 * __ffs_word returns __BITOPS_WORDSIZE
-                 * 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)
-                        return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
-                p++;
-        }
-        return offset + find_first_bit(p, size);
-}
-
-/*
- * Every architecture must define this function. It's the fastest
- * way of searching a 140-bit bitmap where the first 100 bits are
- * unlikely to be set. It's guaranteed that at least one of the 140
- * bits is cleared.
- */
-static inline int sched_find_first_bit(unsigned long *b)
-{
-        return find_first_bit(b, 140);
-}
-
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/fls64.h>
-
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-
-/*
- * ATTENTION: intel byte ordering convention for ext2 and minix !!
- * bit 0 is the LSB of addr; bit 31 is the MSB of addr;
- * bit 32 is the LSB of (addr+4).
- * That combined with the little endian byte order of Intel gives the
- * following bit order in memory:
- *    07 06 05 04 03 02 01 00 15 14 13 12 11 10 09 08 \
- *    23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24
- */
-
-#define ext2_set_bit(nr, addr)       \
-        __test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
-#define ext2_set_bit_atomic(lock, nr, addr)       \
-        test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
-#define ext2_clear_bit(nr, addr)     \
-        __test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
-#define ext2_clear_bit_atomic(lock, nr, addr)     \
-        test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
-#define ext2_test_bit(nr, addr)      \
-        test_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
-
-static inline int ext2_find_first_zero_bit(void *vaddr, unsigned int size)
-{
-        unsigned long bytes, bits;
-
-        if (!size)
-                return 0;
-        bytes = __ffz_word_loop(vaddr, size);
-        bits = __ffz_word(bytes*8, __load_ulong_le(vaddr, bytes));
-        return (bits < size) ? bits : size;
-}
-
-static inline int ext2_find_next_zero_bit(void *vaddr, unsigned long size,
-                                          unsigned long offset)
-{
-        unsigned long *addr = vaddr, *p;
-        unsigned long bit, set;
-
-        if (offset >= size)
-                return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
-        offset -= bit;
-        size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
-        if (bit) {
-                /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
-                 * if no zero bit is present in the word.
-                 */
-                set = ffz(__load_ulong_le(p, 0) >> bit) + bit;
-                if (set >= size)
-                        return size + offset;
-                if (set < __BITOPS_WORDSIZE)
-                        return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
-                p++;
-        }
-        return offset + ext2_find_first_zero_bit(p, size);
-}
-
-static inline unsigned long ext2_find_first_bit(void *vaddr,
-                                                unsigned long size)
-{
-        unsigned long bytes, bits;
-
-        if (!size)
-                return 0;
-        bytes = __ffs_word_loop(vaddr, size);
-        bits = __ffs_word(bytes*8, __load_ulong_le(vaddr, bytes));
-        return (bits < size) ? bits : size;
-}
-
-static inline int ext2_find_next_bit(void *vaddr, unsigned long size,
-                                     unsigned long offset)
-{
-        unsigned long *addr = vaddr, *p;
-        unsigned long bit, set;
-
-        if (offset >= size)
-                return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
-        offset -= bit;
-        size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
-        if (bit) {
-                /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
-                 * if no zero bit is present in the word.
-                 */
-                set = ffs(__load_ulong_le(p, 0) >> bit) + bit;
-                if (set >= size)
-                        return size + offset;
-                if (set < __BITOPS_WORDSIZE)
-                        return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
-                p++;
-        }
-        return offset + ext2_find_first_bit(p, size);
-}
-
-#include <asm-generic/bitops/minix.h>
-
-#endif /* __KERNEL__ */
-
-#endif /* _S390_BITOPS_H */
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
deleted file mode 100644
index 384e3621e341..000000000000
--- a/include/asm-s390/bug.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _ASM_S390_BUG_H
-#define _ASM_S390_BUG_H
-
-#include <linux/kernel.h>
-
-#ifdef CONFIG_BUG
-
-#ifdef CONFIG_64BIT
-#define S390_LONG ".quad"
-#else
-#define S390_LONG ".long"
-#endif
-
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-
-#define __EMIT_BUG(x) do {                                      \
-        asm volatile(                                           \
-                "0:     j       0b+2\n"                         \
-                "1:\n"                                          \
-                ".section .rodata.str,\"aMS\",@progbits,1\n"    \
-                "2:     .asciz  \""__FILE__"\"\n"               \
-                ".previous\n"                                   \
-                ".section __bug_table,\"a\"\n"                  \
-                "3:\t"  S390_LONG "\t1b,2b\n"                   \
-                "       .short  %0,%1\n"                        \
-                "       .org    3b+%2\n"                        \
-                ".previous\n"                                   \
-                : : "i" (__LINE__),                             \
-                    "i" (x),                                    \
-                    "i" (sizeof(struct bug_entry)));            \
-} while (0)
-
-#else /* CONFIG_DEBUG_BUGVERBOSE */
-
-#define __EMIT_BUG(x) do {                              \
-        asm volatile(                                   \
-                "0:     j       0b+2\n"                 \
-                "1:\n"                                  \
-                ".section __bug_table,\"a\"\n"          \
-                "2:\t"  S390_LONG "\t1b\n"              \
-                "       .short  %0\n"                   \
-                "       .org    2b+%1\n"                \
-                ".previous\n"                           \
-                : : "i" (x),                            \
-                    "i" (sizeof(struct bug_entry)));    \
-} while (0)
-
-#endif /* CONFIG_DEBUG_BUGVERBOSE */
-
-#define BUG()   __EMIT_BUG(0)
-
-#define WARN_ON(x) ({                                   \
-        int __ret_warn_on = !!(x);                      \
-        if (__builtin_constant_p(__ret_warn_on)) {      \
-                if (__ret_warn_on)                      \
-                        __EMIT_BUG(BUGFLAG_WARNING);    \
-        } else {                                        \
-                if (unlikely(__ret_warn_on))            \
-                        __EMIT_BUG(BUGFLAG_WARNING);    \
-        }                                               \
-        unlikely(__ret_warn_on);                        \
-})
-
-#define HAVE_ARCH_BUG
-#define HAVE_ARCH_WARN_ON
-#endif /* CONFIG_BUG */
-
-#include <asm-generic/bug.h>
-
-#endif /* _ASM_S390_BUG_H */
diff --git a/include/asm-s390/bugs.h b/include/asm-s390/bugs.h
deleted file mode 100644
index 011f1e6a2a6c..000000000000
--- a/include/asm-s390/bugs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  include/asm-s390/bugs.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/bugs.h"
- *    Copyright (C) 1994  Linus Torvalds
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *      void check_bugs(void);
- */
-
-static inline void check_bugs(void)
-{
-  /* s390 has no bugs ... */
-}
diff --git a/include/asm-s390/byteorder.h b/include/asm-s390/byteorder.h
deleted file mode 100644
index 1fe2492baa8d..000000000000
--- a/include/asm-s390/byteorder.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#ifndef _S390_BYTEORDER_H
-#define _S390_BYTEORDER_H
-
-/*
- *  include/asm-s390/byteorder.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- */
-
-#include <asm/types.h>
-
-#ifdef __GNUC__
-
-#ifdef __s390x__
-static inline __u64 ___arch__swab64p(const __u64 *x)
-{
-        __u64 result;
-
-        asm volatile("lrvg %0,%1" : "=d" (result) : "m" (*x));
-        return result;
-}
-
-static inline __u64 ___arch__swab64(__u64 x)
-{
-        __u64 result;
-
-        asm volatile("lrvgr %0,%1" : "=d" (result) : "d" (x));
-        return result;
-}
-
-static inline void ___arch__swab64s(__u64 *x)
-{
-        *x = ___arch__swab64p(x);
-}
-#endif /* __s390x__ */
-
-static inline __u32 ___arch__swab32p(const __u32 *x)
-{
-        __u32 result;
-        
-        asm volatile(
-#ifndef __s390x__
-                "       icm     %0,8,3(%1)\n"
-                "       icm     %0,4,2(%1)\n"
-                "       icm     %0,2,1(%1)\n"
-                "       ic      %0,0(%1)"
-                : "=&d" (result) : "a" (x), "m" (*x) : "cc");
-#else /* __s390x__ */
-                "       lrv     %0,%1"
-                : "=d" (result) : "m" (*x));
-#endif /* __s390x__ */
-        return result;
-}
-
-static inline __u32 ___arch__swab32(__u32 x)
-{
-#ifndef __s390x__
-        return ___arch__swab32p(&x);
-#else /* __s390x__ */
-        __u32 result;
-        
-        asm volatile("lrvr  %0,%1" : "=d" (result) : "d" (x));
-        return result;
-#endif /* __s390x__ */
-}
-
-static __inline__ void ___arch__swab32s(__u32 *x)
-{
-        *x = ___arch__swab32p(x);
-}
-
-static __inline__ __u16 ___arch__swab16p(const __u16 *x)
-{
-        __u16 result;
-        
-        asm volatile(
-#ifndef __s390x__
-                "       icm     %0,2,1(%1)\n"
-                "       ic      %0,0(%1)\n"
-                : "=&d" (result) : "a" (x), "m" (*x) : "cc");
-#else /* __s390x__ */
-                "       lrvh    %0,%1"
-                : "=d" (result) : "m" (*x));
-#endif /* __s390x__ */
-        return result;
-}
-
-static __inline__ __u16 ___arch__swab16(__u16 x)
-{
-        return ___arch__swab16p(&x);
-}
-
-static __inline__ void ___arch__swab16s(__u16 *x)
-{
-        *x = ___arch__swab16p(x);
-}
-
-#ifdef __s390x__
-#define __arch__swab64(x) ___arch__swab64(x)
-#define __arch__swab64p(x) ___arch__swab64p(x)
-#define __arch__swab64s(x) ___arch__swab64s(x)
-#endif /* __s390x__ */
-#define __arch__swab32(x) ___arch__swab32(x)
-#define __arch__swab16(x) ___arch__swab16(x)
-#define __arch__swab32p(x) ___arch__swab32p(x)
-#define __arch__swab16p(x) ___arch__swab16p(x)
-#define __arch__swab32s(x) ___arch__swab32s(x)
-#define __arch__swab16s(x) ___arch__swab16s(x)
-
-#ifndef __s390x__
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-#else /* __s390x__ */
-#define __BYTEORDER_HAS_U64__
-#endif /* __s390x__ */
-
-#endif /* __GNUC__ */
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _S390_BYTEORDER_H */
diff --git a/include/asm-s390/cache.h b/include/asm-s390/cache.h
deleted file mode 100644
index 9b866816863c..000000000000
--- a/include/asm-s390/cache.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  include/asm-s390/cache.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *
- *  Derived from "include/asm-i386/cache.h"
- *    Copyright (C) 1992, Linus Torvalds
- */
-
-#ifndef __ARCH_S390_CACHE_H
-#define __ARCH_S390_CACHE_H
-
-#define L1_CACHE_BYTES     256
-#define L1_CACHE_SHIFT     8
-
-#define __read_mostly __attribute__((__section__(".data.read_mostly")))
-
-#endif
diff --git a/include/asm-s390/cacheflush.h b/include/asm-s390/cacheflush.h
deleted file mode 100644
index 49d5af916d01..000000000000
--- a/include/asm-s390/cacheflush.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _S390_CACHEFLUSH_H
-#define _S390_CACHEFLUSH_H
-
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-
-/* Caches aren't brain-dead on the s390. */
-#define flush_cache_all()                       do { } while (0)
-#define flush_cache_mm(mm)                      do { } while (0)
-#define flush_cache_dup_mm(mm)                  do { } while (0)
-#define flush_cache_range(vma, start, end)      do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
-#define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#define flush_icache_range(start, end)          do { } while (0)
-#define flush_icache_page(vma,pg)               do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
-#define flush_cache_vmap(start, end)            do { } while (0)
-#define flush_cache_vunmap(start, end)          do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-
-#ifdef CONFIG_DEBUG_PAGEALLOC
-void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-
-#endif /* _S390_CACHEFLUSH_H */
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h
deleted file mode 100644
index ba007d8df941..000000000000
--- a/include/asm-s390/ccwdev.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *  include/asm-s390/ccwdev.h
- *  include/asm-s390x/ccwdev.h
- *
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Arnd Bergmann <arndb@de.ibm.com>
- *
- *  Interface for CCW device drivers
- */
-#ifndef _S390_CCWDEV_H_
-#define _S390_CCWDEV_H_
-
-#include <linux/device.h>
-#include <linux/mod_devicetable.h>
-#include <asm/fcx.h>
-
-/* structs from asm/cio.h */
-struct irb;
-struct ccw1;
-struct ccw_dev_id;
-
-/* simplified initializers for struct ccw_device:
- * CCW_DEVICE and CCW_DEVICE_DEVTYPE initialize one
- * entry in your MODULE_DEVICE_TABLE and set the match_flag correctly */
-#define CCW_DEVICE(cu, cum)                                             \
-        .cu_type=(cu), .cu_model=(cum),                                 \
-        .match_flags=(CCW_DEVICE_ID_MATCH_CU_TYPE                       \
-                   | (cum ? CCW_DEVICE_ID_MATCH_CU_MODEL : 0))
-
-#define CCW_DEVICE_DEVTYPE(cu, cum, dev, devm)                          \
-        .cu_type=(cu), .cu_model=(cum), .dev_type=(dev), .dev_model=(devm),\
-        .match_flags=CCW_DEVICE_ID_MATCH_CU_TYPE                        \
-                   | ((cum) ? CCW_DEVICE_ID_MATCH_CU_MODEL : 0)         \
-                   | CCW_DEVICE_ID_MATCH_DEVICE_TYPE                    \
-                   | ((devm) ? CCW_DEVICE_ID_MATCH_DEVICE_MODEL : 0)
-
-/* scan through an array of device ids and return the first
- * entry that matches the device.
- *
- * the array must end with an entry containing zero match_flags
- */
-static inline const struct ccw_device_id *
-ccw_device_id_match(const struct ccw_device_id *array,
-                        const struct ccw_device_id *match)
-{
-        const struct ccw_device_id *id = array;
-
-        for (id = array; id->match_flags; id++) {
-                if ((id->match_flags & CCW_DEVICE_ID_MATCH_CU_TYPE)
-                    && (id->cu_type != match->cu_type))
-                        continue;
-
-                if ((id->match_flags & CCW_DEVICE_ID_MATCH_CU_MODEL)
-                    && (id->cu_model != match->cu_model))
-                        continue;
-
-                if ((id->match_flags & CCW_DEVICE_ID_MATCH_DEVICE_TYPE)
-                    && (id->dev_type != match->dev_type))
-                        continue;
-
-                if ((id->match_flags & CCW_DEVICE_ID_MATCH_DEVICE_MODEL)
-                    && (id->dev_model != match->dev_model))
-                        continue;
-
-                return id;
-        }
-
-        return NULL;
-}
-
-/**
- * struct ccw_device - channel attached device
- * @ccwlock: pointer to device lock
- * @id: id of this device
- * @drv: ccw driver for this device
- * @dev: embedded device structure
- * @online: online status of device
- * @handler: interrupt handler
- *
- * @handler is a member of the device rather than the driver since a driver
- * can have different interrupt handlers for different ccw devices
- * (multi-subchannel drivers).
- */
-struct ccw_device {
-        spinlock_t *ccwlock;
-/* private: */
-        struct ccw_device_private *private;     /* cio private information */
-/* public: */
-        struct ccw_device_id id;
-        struct ccw_driver *drv;
-        struct device dev;
-        int online;
-        void (*handler) (struct ccw_device *, unsigned long, struct irb *);
-};
-
-
-/**
- * struct ccw driver - device driver for channel attached devices
- * @owner: owning module
- * @ids: ids supported by this driver
- * @probe: function called on probe
- * @remove: function called on remove
- * @set_online: called when setting device online
- * @set_offline: called when setting device offline
- * @notify: notify driver of device state changes
- * @shutdown: called at device shutdown
- * @driver: embedded device driver structure
- * @name: device driver name
- */
-struct ccw_driver {
-        struct module *owner;
-        struct ccw_device_id *ids;
-        int (*probe) (struct ccw_device *);
-        void (*remove) (struct ccw_device *);
-        int (*set_online) (struct ccw_device *);
-        int (*set_offline) (struct ccw_device *);
-        int (*notify) (struct ccw_device *, int);
-        void (*shutdown) (struct ccw_device *);
-        struct device_driver driver;
-        char *name;
-};
-
-extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
-                                              const char *bus_id);
-
-/* devices drivers call these during module load and unload.
- * When a driver is registered, its probe method is called
- * when new devices for its type pop up */
-extern int  ccw_driver_register   (struct ccw_driver *driver);
-extern void ccw_driver_unregister (struct ccw_driver *driver);
-
-struct ccw1;
-
-extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long);
-extern int ccw_device_set_options(struct ccw_device *, unsigned long);
-extern void ccw_device_clear_options(struct ccw_device *, unsigned long);
-
-/* Allow for i/o completion notification after primary interrupt status. */
-#define CCWDEV_EARLY_NOTIFICATION       0x0001
-/* Report all interrupt conditions. */
-#define CCWDEV_REPORT_ALL               0x0002
-/* Try to perform path grouping. */
-#define CCWDEV_DO_PATHGROUP             0x0004
-/* Allow forced onlining of boxed devices. */
-#define CCWDEV_ALLOW_FORCE              0x0008
-
-extern int ccw_device_start(struct ccw_device *, struct ccw1 *,
-                            unsigned long, __u8, unsigned long);
-extern int ccw_device_start_timeout(struct ccw_device *, struct ccw1 *,
-                                    unsigned long, __u8, unsigned long, int);
-extern int ccw_device_start_key(struct ccw_device *, struct ccw1 *,
-                                unsigned long, __u8, __u8, unsigned long);
-extern int ccw_device_start_timeout_key(struct ccw_device *, struct ccw1 *,
-                                        unsigned long, __u8, __u8,
-                                        unsigned long, int);
-
-
-extern int ccw_device_resume(struct ccw_device *);
-extern int ccw_device_halt(struct ccw_device *, unsigned long);
-extern int ccw_device_clear(struct ccw_device *, unsigned long);
-int ccw_device_tm_start_key(struct ccw_device *cdev, struct tcw *tcw,
-                            unsigned long intparm, u8 lpm, u8 key);
-int ccw_device_tm_start_key(struct ccw_device *, struct tcw *,
-                            unsigned long, u8, u8);
-int ccw_device_tm_start_timeout_key(struct ccw_device *, struct tcw *,
-                            unsigned long, u8, u8, int);
-int ccw_device_tm_start(struct ccw_device *, struct tcw *,
-                            unsigned long, u8);
-int ccw_device_tm_start_timeout(struct ccw_device *, struct tcw *,
-                            unsigned long, u8, int);
-int ccw_device_tm_intrg(struct ccw_device *cdev);
-
-extern int ccw_device_set_online(struct ccw_device *cdev);
-extern int ccw_device_set_offline(struct ccw_device *cdev);
-
-
-extern struct ciw *ccw_device_get_ciw(struct ccw_device *, __u32 cmd);
-extern __u8 ccw_device_get_path_mask(struct ccw_device *);
-extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *);
-
-#define get_ccwdev_lock(x) (x)->ccwlock
-
-#define to_ccwdev(n) container_of(n, struct ccw_device, dev)
-#define to_ccwdrv(n) container_of(n, struct ccw_driver, driver)
-
-extern struct ccw_device *ccw_device_probe_console(void);
-
-// FIXME: these have to go
-extern int _ccw_device_get_subchannel_number(struct ccw_device *);
-
-extern void *ccw_device_get_chp_desc(struct ccw_device *, int);
-#endif /* _S390_CCWDEV_H_ */
diff --git a/include/asm-s390/ccwgroup.h b/include/asm-s390/ccwgroup.h
deleted file mode 100644
index a27f68985a79..000000000000
--- a/include/asm-s390/ccwgroup.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef S390_CCWGROUP_H
-#define S390_CCWGROUP_H
-
-struct ccw_device;
-struct ccw_driver;
-
-/**
- * struct ccwgroup_device - ccw group device
- * @creator_id: unique number of the driver
- * @state: online/offline state
- * @count: number of attached slave devices
- * @dev: embedded device structure
- * @cdev: variable number of slave devices, allocated as needed
- */
-struct ccwgroup_device {
-        unsigned long creator_id;
-        enum {
-                CCWGROUP_OFFLINE,
-                CCWGROUP_ONLINE,
-        } state;
-/* private: */
-        atomic_t onoff;
-        struct mutex reg_mutex;
-/* public: */
-        unsigned int count;
-        struct device   dev;
-        struct ccw_device *cdev[0];
-};
-
-/**
- * struct ccwgroup_driver - driver for ccw group devices
- * @owner: driver owner
- * @name: driver name
- * @max_slaves: maximum number of slave devices
- * @driver_id: unique id
- * @probe: function called on probe
- * @remove: function called on remove
- * @set_online: function called when device is set online
- * @set_offline: function called when device is set offline
- * @shutdown: function called when device is shut down
- * @driver: embedded driver structure
- */
-struct ccwgroup_driver {
-        struct module *owner;
-        char *name;
-        int max_slaves;
-        unsigned long driver_id;
-
-        int (*probe) (struct ccwgroup_device *);
-        void (*remove) (struct ccwgroup_device *);
-        int (*set_online) (struct ccwgroup_device *);
-        int (*set_offline) (struct ccwgroup_device *);
-        void (*shutdown)(struct ccwgroup_device *);
-
-        struct device_driver driver;
-};
-
-extern int  ccwgroup_driver_register   (struct ccwgroup_driver *cdriver);
-extern void ccwgroup_driver_unregister (struct ccwgroup_driver *cdriver);
-int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
-                                struct ccw_driver *cdrv, int num_devices,
-                                const char *buf);
-
-extern int ccwgroup_probe_ccwdev(struct ccw_device *cdev);
-extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev);
-
-#define to_ccwgroupdev(x) container_of((x), struct ccwgroup_device, dev)
-#define to_ccwgroupdrv(x) container_of((x), struct ccwgroup_driver, driver)
-#endif
diff --git a/include/asm-s390/checksum.h b/include/asm-s390/checksum.h
deleted file mode 100644
index d5a8e7c1477c..000000000000
--- a/include/asm-s390/checksum.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef _S390_CHECKSUM_H
-#define _S390_CHECKSUM_H
-
-/*
- *  include/asm-s390/checksum.h
- *    S390 fast network checksum routines
- *    see also arch/S390/lib/checksum.c
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Ulrich Hild        (first version)
- *               Martin Schwidefsky (heavily optimized CKSM version)
- *               D.J. Barrow        (third attempt) 
- */
-
-#include <asm/uaccess.h>
-
-/*
- * computes the checksum of a memory block at buff, length len,
- * and adds in "sum" (32-bit)
- *
- * returns a 32-bit number suitable for feeding into itself
- * or csum_tcpudp_magic
- *
- * this function must be called with even lengths, except
- * for the last fragment, which may be odd
- *
- * it's best to have buff aligned on a 32-bit boundary
- */
-static inline __wsum
-csum_partial(const void *buff, int len, __wsum sum)
-{
-        register unsigned long reg2 asm("2") = (unsigned long) buff;
-        register unsigned long reg3 asm("3") = (unsigned long) len;
-
-        asm volatile(
-                "0:     cksm    %0,%1\n"        /* do checksum on longs */
-                "       jo      0b\n"
-                : "+d" (sum), "+d" (reg2), "+d" (reg3) : : "cc", "memory");
-        return sum;
-}
-
-/*
- * the same as csum_partial_copy, but copies from user space.
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- *
- * Copy from userspace and compute checksum.  If we catch an exception
- * then zero the rest of the buffer.
- */
-static inline __wsum
-csum_partial_copy_from_user(const void __user *src, void *dst,
-                                          int len, __wsum sum,
-                                          int *err_ptr)
-{
-        int missing;
-
-        missing = copy_from_user(dst, src, len);
-        if (missing) {
-                memset(dst + len - missing, 0, missing);
-                *err_ptr = -EFAULT;
-        }
-                
-        return csum_partial(dst, len, sum);
-}
-
-
-static inline __wsum
-csum_partial_copy_nocheck (const void *src, void *dst, int len, __wsum sum)
-{
-        memcpy(dst,src,len);
-        return csum_partial(dst, len, sum);
-}
-
-/*
- *      Fold a partial checksum without adding pseudo headers
- */
-static inline __sum16 csum_fold(__wsum sum)
-{
-#ifndef __s390x__
-        register_pair rp;
-
-        asm volatile(
-                "       slr     %N1,%N1\n"      /* %0 = H L */
-                "       lr      %1,%0\n"        /* %0 = H L, %1 = H L 0 0 */
-                "       srdl    %1,16\n"        /* %0 = H L, %1 = 0 H L 0 */
-                "       alr     %1,%N1\n"       /* %0 = H L, %1 = L H L 0 */
-                "       alr     %0,%1\n"        /* %0 = H+L+C L+H */
-                "       srl     %0,16\n"        /* %0 = H+L+C */
-                : "+&d" (sum), "=d" (rp) : : "cc");
-#else /* __s390x__ */
-        asm volatile(
-                "       sr      3,3\n"          /* %0 = H*65536 + L */
-                "       lr      2,%0\n"         /* %0 = H L, 2/3 = H L / 0 0 */
-                "       srdl    2,16\n"         /* %0 = H L, 2/3 = 0 H / L 0 */
-                "       alr     2,3\n"          /* %0 = H L, 2/3 = L H / L 0 */
-                "       alr     %0,2\n"         /* %0 = H+L+C L+H */
-                "       srl     %0,16\n"        /* %0 = H+L+C */
-                : "+&d" (sum) : : "cc", "2", "3");
-#endif /* __s390x__ */
-        return (__force __sum16) ~sum;
-}
-
-/*
- *      This is a version of ip_compute_csum() optimized for IP headers,
- *      which always checksum on 4 octet boundaries.
- *
- */
-static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
-{
-        return csum_fold(csum_partial(iph, ihl*4, 0));
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 32-bit checksum
- */
-static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                   unsigned short len, unsigned short proto,
-                   __wsum sum)
-{
-        __u32 csum = (__force __u32)sum;
-
-        csum += (__force __u32)saddr;
-        if (csum < (__force __u32)saddr)
-                csum++;
-
-        csum += (__force __u32)daddr;
-        if (csum < (__force __u32)daddr)
-                csum++;
-
-        csum += len + proto;
-        if (csum < len + proto)
-                csum++;
-
-        return (__force __wsum)csum;
-}
-
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-
-static inline __sum16
-csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                  unsigned short len, unsigned short proto,
-                  __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
-}
-
-/*
- * this routine is used for miscellaneous IP-like checksums, mainly
- * in icmp.c
- */
-
-static inline __sum16 ip_compute_csum(const void *buff, int len)
-{
-        return csum_fold(csum_partial(buff, len, 0));
-}
-
-#endif /* _S390_CHECKSUM_H */
-
-
diff --git a/include/asm-s390/chpid.h b/include/asm-s390/chpid.h
deleted file mode 100644
index dfe3c7f3439a..000000000000
--- a/include/asm-s390/chpid.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  drivers/s390/cio/chpid.h
- *
- *    Copyright IBM Corp. 2007
- *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
- */
-
-#ifndef _ASM_S390_CHPID_H
-#define _ASM_S390_CHPID_H _ASM_S390_CHPID_H
-
-#include <linux/string.h>
-#include <asm/types.h>
-
-#define __MAX_CHPID 255
-
-struct chp_id {
-        u8 reserved1;
-        u8 cssid;
-        u8 reserved2;
-        u8 id;
-} __attribute__((packed));
-
-#ifdef __KERNEL__
-#include <asm/cio.h>
-
-static inline void chp_id_init(struct chp_id *chpid)
-{
-        memset(chpid, 0, sizeof(struct chp_id));
-}
-
-static inline int chp_id_is_equal(struct chp_id *a, struct chp_id *b)
-{
-        return (a->id == b->id) && (a->cssid == b->cssid);
-}
-
-static inline void chp_id_next(struct chp_id *chpid)
-{
-        if (chpid->id < __MAX_CHPID)
-                chpid->id++;
-        else {
-                chpid->id = 0;
-                chpid->cssid++;
-        }
-}
-
-static inline int chp_id_is_valid(struct chp_id *chpid)
-{
-        return (chpid->cssid <= __MAX_CSSID);
-}
-
-
-#define chp_id_for_each(c) \
-        for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c))
-#endif /* __KERNEL */
-
-#endif /* _ASM_S390_CHPID_H */
diff --git a/include/asm-s390/chsc.h b/include/asm-s390/chsc.h
deleted file mode 100644
index d38d0cf62d4b..000000000000
--- a/include/asm-s390/chsc.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * ioctl interface for /dev/chsc
- *
- * Copyright 2008 IBM Corp.
- * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
- */
-
-#ifndef _ASM_CHSC_H
-#define _ASM_CHSC_H
-
-#include <asm/chpid.h>
-#include <asm/schid.h>
-
-struct chsc_async_header {
-        __u16 length;
-        __u16 code;
-        __u32 cmd_dependend;
-        __u32 key : 4;
-        __u32 : 28;
-        struct subchannel_id sid;
-} __attribute__ ((packed));
-
-struct chsc_async_area {
-        struct chsc_async_header header;
-        __u8 data[PAGE_SIZE - 16 /* size of chsc_async_header */];
-} __attribute__ ((packed));
-
-
-struct chsc_response_struct {
-        __u16 length;
-        __u16 code;
-        __u32 parms;
-        __u8 data[PAGE_SIZE - 8];
-} __attribute__ ((packed));
-
-struct chsc_chp_cd {
-        struct chp_id chpid;
-        int m;
-        int fmt;
-        struct chsc_response_struct cpcb;
-};
-
-struct chsc_cu_cd {
-        __u16 cun;
-        __u8 cssid;
-        int m;
-        int fmt;
-        struct chsc_response_struct cucb;
-};
-
-struct chsc_sch_cud {
-        struct subchannel_id schid;
-        int fmt;
-        struct chsc_response_struct scub;
-};
-
-struct conf_id {
-        int m;
-        __u8 cssid;
-        __u8 ssid;
-};
-
-struct chsc_conf_info {
-        struct conf_id id;
-        int fmt;
-        struct chsc_response_struct scid;
-};
-
-struct ccl_parm_chpid {
-        int m;
-        struct chp_id chp;
-};
-
-struct ccl_parm_cssids {
-        __u8 f_cssid;
-        __u8 l_cssid;
-};
-
-struct chsc_comp_list {
-        struct {
-                enum {
-                        CCL_CU_ON_CHP = 1,
-                        CCL_CHP_TYPE_CAP = 2,
-                        CCL_CSS_IMG = 4,
-                        CCL_CSS_IMG_CONF_CHAR = 5,
-                        CCL_IOP_CHP = 6,
-                } ctype;
-                int fmt;
-                struct ccl_parm_chpid chpid;
-                struct ccl_parm_cssids cssids;
-        } req;
-        struct chsc_response_struct sccl;
-};
-
-struct chsc_dcal {
-        struct {
-                enum {
-                        DCAL_CSS_IID_PN = 4,
-                } atype;
-                __u32 list_parm[2];
-                int fmt;
-        } req;
-        struct chsc_response_struct sdcal;
-};
-
-struct chsc_cpd_info {
-        struct chp_id chpid;
-        int m;
-        int fmt;
-        int rfmt;
-        int c;
-        struct chsc_response_struct chpdb;
-};
-
-#define CHSC_IOCTL_MAGIC 'c'
-
-#define CHSC_START _IOWR(CHSC_IOCTL_MAGIC, 0x81, struct chsc_async_area)
-#define CHSC_INFO_CHANNEL_PATH _IOWR(CHSC_IOCTL_MAGIC, 0x82, \
-                                    struct chsc_chp_cd)
-#define CHSC_INFO_CU _IOWR(CHSC_IOCTL_MAGIC, 0x83, struct chsc_cu_cd)
-#define CHSC_INFO_SCH_CU _IOWR(CHSC_IOCTL_MAGIC, 0x84, struct chsc_sch_cud)
-#define CHSC_INFO_CI _IOWR(CHSC_IOCTL_MAGIC, 0x85, struct chsc_conf_info)
-#define CHSC_INFO_CCL _IOWR(CHSC_IOCTL_MAGIC, 0x86, struct chsc_comp_list)
-#define CHSC_INFO_CPD _IOWR(CHSC_IOCTL_MAGIC, 0x87, struct chsc_cpd_info)
-#define CHSC_INFO_DCAL _IOWR(CHSC_IOCTL_MAGIC, 0x88, struct chsc_dcal)
-
-#endif
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
deleted file mode 100644
index 6dccb071aec3..000000000000
--- a/include/asm-s390/cio.h
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- *  include/asm-s390/cio.h
- *  include/asm-s390x/cio.h
- *
- * Common interface for I/O on S/390
- */
-#ifndef _ASM_S390_CIO_H_
-#define _ASM_S390_CIO_H_
-
-#include <linux/spinlock.h>
-#include <asm/types.h>
-
-#ifdef __KERNEL__
-
-#define LPM_ANYPATH 0xff
-#define __MAX_CSSID 0
-
-/**
- * struct cmd_scsw - command-mode subchannel status word
- * @key: subchannel key
- * @sctl: suspend control
- * @eswf: esw format
- * @cc: deferred condition code
- * @fmt: format
- * @pfch: prefetch
- * @isic: initial-status interruption control
- * @alcc: address-limit checking control
- * @ssi: suppress-suspended interruption
- * @zcc: zero condition code
- * @ectl: extended control
- * @pno: path not operational
- * @res: reserved
- * @fctl: function control
- * @actl: activity control
- * @stctl: status control
- * @cpa: channel program address
- * @dstat: device status
- * @cstat: subchannel status
- * @count: residual count
- */
-struct cmd_scsw {
-        __u32 key  : 4;
-        __u32 sctl : 1;
-        __u32 eswf : 1;
-        __u32 cc   : 2;
-        __u32 fmt  : 1;
-        __u32 pfch : 1;
-        __u32 isic : 1;
-        __u32 alcc : 1;
-        __u32 ssi  : 1;
-        __u32 zcc  : 1;
-        __u32 ectl : 1;
-        __u32 pno  : 1;
-        __u32 res  : 1;
-        __u32 fctl : 3;
-        __u32 actl : 7;
-        __u32 stctl : 5;
-        __u32 cpa;
-        __u32 dstat : 8;
-        __u32 cstat : 8;
-        __u32 count : 16;
-} __attribute__ ((packed));
-
-/**
- * struct tm_scsw - transport-mode subchannel status word
- * @key: subchannel key
- * @eswf: esw format
- * @cc: deferred condition code
- * @fmt: format
- * @x: IRB-format control
- * @q: interrogate-complete
- * @ectl: extended control
- * @pno: path not operational
- * @fctl: function control
- * @actl: activity control
- * @stctl: status control
- * @tcw: TCW address
- * @dstat: device status
- * @cstat: subchannel status
- * @fcxs: FCX status
- * @schxs: subchannel-extended status
- */
-struct tm_scsw {
-        u32 key:4;
-        u32 :1;
-        u32 eswf:1;
-        u32 cc:2;
-        u32 fmt:3;
-        u32 x:1;
-        u32 q:1;
-        u32 :1;
-        u32 ectl:1;
-        u32 pno:1;
-        u32 :1;
-        u32 fctl:3;
-        u32 actl:7;
-        u32 stctl:5;
-        u32 tcw;
-        u32 dstat:8;
-        u32 cstat:8;
-        u32 fcxs:8;
-        u32 schxs:8;
-} __attribute__ ((packed));
-
-/**
- * union scsw - subchannel status word
- * @cmd: command-mode SCSW
- * @tm: transport-mode SCSW
- */
-union scsw {
-        struct cmd_scsw cmd;
-        struct tm_scsw tm;
-} __attribute__ ((packed));
-
-int scsw_is_tm(union scsw *scsw);
-u32 scsw_key(union scsw *scsw);
-u32 scsw_eswf(union scsw *scsw);
-u32 scsw_cc(union scsw *scsw);
-u32 scsw_ectl(union scsw *scsw);
-u32 scsw_pno(union scsw *scsw);
-u32 scsw_fctl(union scsw *scsw);
-u32 scsw_actl(union scsw *scsw);
-u32 scsw_stctl(union scsw *scsw);
-u32 scsw_dstat(union scsw *scsw);
-u32 scsw_cstat(union scsw *scsw);
-int scsw_is_solicited(union scsw *scsw);
-int scsw_is_valid_key(union scsw *scsw);
-int scsw_is_valid_eswf(union scsw *scsw);
-int scsw_is_valid_cc(union scsw *scsw);
-int scsw_is_valid_ectl(union scsw *scsw);
-int scsw_is_valid_pno(union scsw *scsw);
-int scsw_is_valid_fctl(union scsw *scsw);
-int scsw_is_valid_actl(union scsw *scsw);
-int scsw_is_valid_stctl(union scsw *scsw);
-int scsw_is_valid_dstat(union scsw *scsw);
-int scsw_is_valid_cstat(union scsw *scsw);
-int scsw_cmd_is_valid_key(union scsw *scsw);
-int scsw_cmd_is_valid_sctl(union scsw *scsw);
-int scsw_cmd_is_valid_eswf(union scsw *scsw);
-int scsw_cmd_is_valid_cc(union scsw *scsw);
-int scsw_cmd_is_valid_fmt(union scsw *scsw);
-int scsw_cmd_is_valid_pfch(union scsw *scsw);
-int scsw_cmd_is_valid_isic(union scsw *scsw);
-int scsw_cmd_is_valid_alcc(union scsw *scsw);
-int scsw_cmd_is_valid_ssi(union scsw *scsw);
-int scsw_cmd_is_valid_zcc(union scsw *scsw);
-int scsw_cmd_is_valid_ectl(union scsw *scsw);
-int scsw_cmd_is_valid_pno(union scsw *scsw);
-int scsw_cmd_is_valid_fctl(union scsw *scsw);
-int scsw_cmd_is_valid_actl(union scsw *scsw);
-int scsw_cmd_is_valid_stctl(union scsw *scsw);
-int scsw_cmd_is_valid_dstat(union scsw *scsw);
-int scsw_cmd_is_valid_cstat(union scsw *scsw);
-int scsw_cmd_is_solicited(union scsw *scsw);
-int scsw_tm_is_valid_key(union scsw *scsw);
-int scsw_tm_is_valid_eswf(union scsw *scsw);
-int scsw_tm_is_valid_cc(union scsw *scsw);
-int scsw_tm_is_valid_fmt(union scsw *scsw);
-int scsw_tm_is_valid_x(union scsw *scsw);
-int scsw_tm_is_valid_q(union scsw *scsw);
-int scsw_tm_is_valid_ectl(union scsw *scsw);
-int scsw_tm_is_valid_pno(union scsw *scsw);
-int scsw_tm_is_valid_fctl(union scsw *scsw);
-int scsw_tm_is_valid_actl(union scsw *scsw);
-int scsw_tm_is_valid_stctl(union scsw *scsw);
-int scsw_tm_is_valid_dstat(union scsw *scsw);
-int scsw_tm_is_valid_cstat(union scsw *scsw);
-int scsw_tm_is_valid_fcxs(union scsw *scsw);
-int scsw_tm_is_valid_schxs(union scsw *scsw);
-int scsw_tm_is_solicited(union scsw *scsw);
-
-#define SCSW_FCTL_CLEAR_FUNC     0x1
-#define SCSW_FCTL_HALT_FUNC      0x2
-#define SCSW_FCTL_START_FUNC     0x4
-
-#define SCSW_ACTL_SUSPENDED      0x1
-#define SCSW_ACTL_DEVACT         0x2
-#define SCSW_ACTL_SCHACT         0x4
-#define SCSW_ACTL_CLEAR_PEND     0x8
-#define SCSW_ACTL_HALT_PEND      0x10
-#define SCSW_ACTL_START_PEND     0x20
-#define SCSW_ACTL_RESUME_PEND    0x40
-
-#define SCSW_STCTL_STATUS_PEND   0x1
-#define SCSW_STCTL_SEC_STATUS    0x2
-#define SCSW_STCTL_PRIM_STATUS   0x4
-#define SCSW_STCTL_INTER_STATUS  0x8
-#define SCSW_STCTL_ALERT_STATUS  0x10
-
-#define DEV_STAT_ATTENTION       0x80
-#define DEV_STAT_STAT_MOD        0x40
-#define DEV_STAT_CU_END          0x20
-#define DEV_STAT_BUSY            0x10
-#define DEV_STAT_CHN_END         0x08
-#define DEV_STAT_DEV_END         0x04
-#define DEV_STAT_UNIT_CHECK      0x02
-#define DEV_STAT_UNIT_EXCEP      0x01
-
-#define SCHN_STAT_PCI            0x80
-#define SCHN_STAT_INCORR_LEN     0x40
-#define SCHN_STAT_PROG_CHECK     0x20
-#define SCHN_STAT_PROT_CHECK     0x10
-#define SCHN_STAT_CHN_DATA_CHK   0x08
-#define SCHN_STAT_CHN_CTRL_CHK   0x04
-#define SCHN_STAT_INTF_CTRL_CHK  0x02
-#define SCHN_STAT_CHAIN_CHECK    0x01
-
-/*
- * architectured values for first sense byte
- */
-#define SNS0_CMD_REJECT         0x80
-#define SNS_CMD_REJECT          SNS0_CMD_REJEC
-#define SNS0_INTERVENTION_REQ   0x40
-#define SNS0_BUS_OUT_CHECK      0x20
-#define SNS0_EQUIPMENT_CHECK    0x10
-#define SNS0_DATA_CHECK         0x08
-#define SNS0_OVERRUN            0x04
-#define SNS0_INCOMPL_DOMAIN     0x01
-
-/*
- * architectured values for second sense byte
- */
-#define SNS1_PERM_ERR           0x80
-#define SNS1_INV_TRACK_FORMAT   0x40
-#define SNS1_EOC                0x20
-#define SNS1_MESSAGE_TO_OPER    0x10
-#define SNS1_NO_REC_FOUND       0x08
-#define SNS1_FILE_PROTECTED     0x04
-#define SNS1_WRITE_INHIBITED    0x02
-#define SNS1_INPRECISE_END      0x01
-
-/*
- * architectured values for third sense byte
- */
-#define SNS2_REQ_INH_WRITE      0x80
-#define SNS2_CORRECTABLE        0x40
-#define SNS2_FIRST_LOG_ERR      0x20
-#define SNS2_ENV_DATA_PRESENT   0x10
-#define SNS2_INPRECISE_END      0x04
-
-/**
- * struct ccw1 - channel command word
- * @cmd_code: command code
- * @flags: flags, like IDA adressing, etc.
- * @count: byte count
- * @cda: data address
- *
- * The ccw is the basic structure to build channel programs that perform
- * operations with the device or the control unit. Only Format-1 channel
- * command words are supported.
- */
-struct ccw1 {
-        __u8  cmd_code;
-        __u8  flags;
-        __u16 count;
-        __u32 cda;
-} __attribute__ ((packed,aligned(8)));
-
-#define CCW_FLAG_DC             0x80
-#define CCW_FLAG_CC             0x40
-#define CCW_FLAG_SLI            0x20
-#define CCW_FLAG_SKIP           0x10
-#define CCW_FLAG_PCI            0x08
-#define CCW_FLAG_IDA            0x04
-#define CCW_FLAG_SUSPEND        0x02
-
-#define CCW_CMD_READ_IPL        0x02
-#define CCW_CMD_NOOP            0x03
-#define CCW_CMD_BASIC_SENSE     0x04
-#define CCW_CMD_TIC             0x08
-#define CCW_CMD_STLCK           0x14
-#define CCW_CMD_SENSE_PGID      0x34
-#define CCW_CMD_SUSPEND_RECONN  0x5B
-#define CCW_CMD_RDC             0x64
-#define CCW_CMD_RELEASE         0x94
-#define CCW_CMD_SET_PGID        0xAF
-#define CCW_CMD_SENSE_ID        0xE4
-#define CCW_CMD_DCTL            0xF3
-
-#define SENSE_MAX_COUNT         0x20
-
-/**
- * struct erw - extended report word
- * @res0: reserved
- * @auth: authorization check
- * @pvrf: path-verification-required flag
- * @cpt: channel-path timeout
- * @fsavf: failing storage address validity flag
- * @cons: concurrent sense
- * @scavf: secondary ccw address validity flag
- * @fsaf: failing storage address format
- * @scnt: sense count, if @cons == %1
- * @res16: reserved
- */
-struct erw {
-        __u32 res0  : 3;
-        __u32 auth  : 1;
-        __u32 pvrf  : 1;
-        __u32 cpt   : 1;
-        __u32 fsavf : 1;
-        __u32 cons  : 1;
-        __u32 scavf : 1;
-        __u32 fsaf  : 1;
-        __u32 scnt  : 6;
-        __u32 res16 : 16;
-} __attribute__ ((packed));
-
-/**
- * struct sublog - subchannel logout area
- * @res0: reserved
- * @esf: extended status flags
- * @lpum: last path used mask
- * @arep: ancillary report
- * @fvf: field-validity flags
- * @sacc: storage access code
- * @termc: termination code
- * @devsc: device-status check
- * @serr: secondary error
- * @ioerr: i/o-error alert
- * @seqc: sequence code
- */
-struct sublog {
-        __u32 res0  : 1;
-        __u32 esf   : 7;
-        __u32 lpum  : 8;
-        __u32 arep  : 1;
-        __u32 fvf   : 5;
-        __u32 sacc  : 2;
-        __u32 termc : 2;
-        __u32 devsc : 1;
-        __u32 serr  : 1;
-        __u32 ioerr : 1;
-        __u32 seqc  : 3;
-} __attribute__ ((packed));
-
-/**
- * struct esw0 - Format 0 Extended Status Word (ESW)
- * @sublog: subchannel logout
- * @erw: extended report word
- * @faddr: failing storage address
- * @saddr: secondary ccw address
- */
-struct esw0 {
-        struct sublog sublog;
-        struct erw erw;
-        __u32  faddr[2];
-        __u32  saddr;
-} __attribute__ ((packed));
-
-/**
- * struct esw1 - Format 1 Extended Status Word (ESW)
- * @zero0: reserved zeros
- * @lpum: last path used mask
- * @zero16: reserved zeros
- * @erw: extended report word
- * @zeros: three fullwords of zeros
- */
-struct esw1 {
-        __u8  zero0;
-        __u8  lpum;
-        __u16 zero16;
-        struct erw erw;
-        __u32 zeros[3];
-} __attribute__ ((packed));
-
-/**
- * struct esw2 - Format 2 Extended Status Word (ESW)
- * @zero0: reserved zeros
- * @lpum: last path used mask
- * @dcti: device-connect-time interval
- * @erw: extended report word
- * @zeros: three fullwords of zeros
- */
-struct esw2 {
-        __u8  zero0;
-        __u8  lpum;
-        __u16 dcti;
-        struct erw erw;
-        __u32 zeros[3];
-} __attribute__ ((packed));
-
-/**
- * struct esw3 - Format 3 Extended Status Word (ESW)
- * @zero0: reserved zeros
- * @lpum: last path used mask
- * @res: reserved
- * @erw: extended report word
- * @zeros: three fullwords of zeros
- */
-struct esw3 {
-        __u8  zero0;
-        __u8  lpum;
-        __u16 res;
-        struct erw erw;
-        __u32 zeros[3];
-} __attribute__ ((packed));
-
-/**
- * struct irb - interruption response block
- * @scsw: subchannel status word
- * @esw: extened status word, 4 formats
- * @ecw: extended control word
- *
- * The irb that is handed to the device driver when an interrupt occurs. For
- * solicited interrupts, the common I/O layer already performs checks whether
- * a field is valid; a field not being valid is always passed as %0.
- * If a unit check occured, @ecw may contain sense data; this is retrieved
- * by the common I/O layer itself if the device doesn't support concurrent
- * sense (so that the device driver never needs to perform basic sene itself).
- * For unsolicited interrupts, the irb is passed as-is (expect for sense data,
- * if applicable).
- */
-struct irb {
-        union scsw scsw;
-        union {
-                struct esw0 esw0;
-                struct esw1 esw1;
-                struct esw2 esw2;
-                struct esw3 esw3;
-        } esw;
-        __u8   ecw[32];
-} __attribute__ ((packed,aligned(4)));
-
-/**
- * struct ciw - command information word  (CIW) layout
- * @et: entry type
- * @reserved: reserved bits
- * @ct: command type
- * @cmd: command code
- * @count: command count
- */
-struct ciw {
-        __u32 et       :  2;
-        __u32 reserved :  2;
-        __u32 ct       :  4;
-        __u32 cmd      :  8;
-        __u32 count    : 16;
-} __attribute__ ((packed));
-
-#define CIW_TYPE_RCD    0x0     /* read configuration data */
-#define CIW_TYPE_SII    0x1     /* set interface identifier */
-#define CIW_TYPE_RNI    0x2     /* read node identifier */
-
-/*
- * Flags used as input parameters for do_IO()
- */
-#define DOIO_ALLOW_SUSPEND       0x0001 /* allow for channel prog. suspend */
-#define DOIO_DENY_PREFETCH       0x0002 /* don't allow for CCW prefetch */
-#define DOIO_SUPPRESS_INTER      0x0004 /* suppress intermediate inter. */
-                                        /* ... for suspended CCWs */
-/* Device or subchannel gone. */
-#define CIO_GONE       0x0001
-/* No path to device. */
-#define CIO_NO_PATH    0x0002
-/* Device has appeared. */
-#define CIO_OPER       0x0004
-/* Sick revalidation of device. */
-#define CIO_REVALIDATE 0x0008
-
-/**
- * struct ccw_dev_id - unique identifier for ccw devices
- * @ssid: subchannel set id
- * @devno: device number
- *
- * This structure is not directly based on any hardware structure. The
- * hardware identifies a device by its device number and its subchannel,
- * which is in turn identified by its id. In order to get a unique identifier
- * for ccw devices across subchannel sets, @struct ccw_dev_id has been
- * introduced.
- */
-struct ccw_dev_id {
-        u8 ssid;
-        u16 devno;
-};
-
-/**
- * ccw_device_id_is_equal() - compare two ccw_dev_ids
- * @dev_id1: a ccw_dev_id
- * @dev_id2: another ccw_dev_id
- * Returns:
- *  %1 if the two structures are equal field-by-field,
- *  %0 if not.
- * Context:
- *  any
- */
-static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
-                                      struct ccw_dev_id *dev_id2)
-{
-        if ((dev_id1->ssid == dev_id2->ssid) &&
-            (dev_id1->devno == dev_id2->devno))
-                return 1;
-        return 0;
-}
-
-extern void wait_cons_dev(void);
-
-extern void css_schedule_reprobe(void);
-
-extern void reipl_ccw_dev(struct ccw_dev_id *id);
-
-struct cio_iplinfo {
-        u16 devno;
-        int is_qdio;
-};
-
-extern int cio_get_iplinfo(struct cio_iplinfo *iplinfo);
-
-/* Function from drivers/s390/cio/chsc.c */
-int chsc_sstpc(void *page, unsigned int op, u16 ctrl);
-int chsc_sstpi(void *page, void *result, size_t size);
-
-#endif
-
-#endif
diff --git a/include/asm-s390/cmb.h b/include/asm-s390/cmb.h
deleted file mode 100644
index 50196857d27a..000000000000
--- a/include/asm-s390/cmb.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef S390_CMB_H
-#define S390_CMB_H
-/**
- * struct cmbdata - channel measurement block data for user space
- * @size: size of the stored data
- * @elapsed_time: time since last sampling
- * @ssch_rsch_count: number of ssch and rsch
- * @sample_count: number of samples
- * @device_connect_time: time of device connect
- * @function_pending_time: time of function pending
- * @device_disconnect_time: time of device disconnect
- * @control_unit_queuing_time: time of control unit queuing
- * @device_active_only_time: time of device active only
- * @device_busy_time: time of device busy (ext. format)
- * @initial_command_response_time: initial command response time (ext. format)
- *
- * All values are stored as 64 bit for simplicity, especially
- * in 32 bit emulation mode. All time values are normalized to
- * nanoseconds.
- * Currently, two formats are known, which differ by the size of
- * this structure, i.e. the last two members are only set when
- * the extended channel measurement facility (first shipped in
- * z990 machines) is activated.
- * Potentially, more fields could be added, which would result in a
- * new ioctl number.
- */
-struct cmbdata {
-        __u64 size;
-        __u64 elapsed_time;
- /* basic and exended format: */
-        __u64 ssch_rsch_count;
-        __u64 sample_count;
-        __u64 device_connect_time;
-        __u64 function_pending_time;
-        __u64 device_disconnect_time;
-        __u64 control_unit_queuing_time;
-        __u64 device_active_only_time;
- /* extended format only: */
-        __u64 device_busy_time;
-        __u64 initial_command_response_time;
-};
-
-/* enable channel measurement */
-#define BIODASDCMFENABLE        _IO(DASD_IOCTL_LETTER, 32)
-/* enable channel measurement */
-#define BIODASDCMFDISABLE       _IO(DASD_IOCTL_LETTER, 33)
-/* read channel measurement data */
-#define BIODASDREADALLCMB       _IOWR(DASD_IOCTL_LETTER, 33, struct cmbdata)
-
-#ifdef __KERNEL__
-struct ccw_device;
-extern int enable_cmf(struct ccw_device *cdev);
-extern int disable_cmf(struct ccw_device *cdev);
-extern u64 cmf_read(struct ccw_device *cdev, int index);
-extern int cmf_readall(struct ccw_device *cdev, struct cmbdata *data);
-
-#endif /* __KERNEL__ */
-#endif /* S390_CMB_H */
diff --git a/include/asm-s390/compat.h b/include/asm-s390/compat.h
deleted file mode 100644
index de065b32381a..000000000000
--- a/include/asm-s390/compat.h
+++ /dev/null
@@ -1,233 +0,0 @@
-#ifndef _ASM_S390X_COMPAT_H
-#define _ASM_S390X_COMPAT_H
-/*
- * Architecture specific compatibility types
- */
-#include <linux/types.h>
-#include <linux/sched.h>
-
-#define PSW32_MASK_PER          0x40000000UL
-#define PSW32_MASK_DAT          0x04000000UL
-#define PSW32_MASK_IO           0x02000000UL
-#define PSW32_MASK_EXT          0x01000000UL
-#define PSW32_MASK_KEY          0x00F00000UL
-#define PSW32_MASK_MCHECK       0x00040000UL
-#define PSW32_MASK_WAIT         0x00020000UL
-#define PSW32_MASK_PSTATE       0x00010000UL
-#define PSW32_MASK_ASC          0x0000C000UL
-#define PSW32_MASK_CC           0x00003000UL
-#define PSW32_MASK_PM           0x00000f00UL
-
-#define PSW32_ADDR_AMODE31      0x80000000UL
-#define PSW32_ADDR_INSN         0x7FFFFFFFUL
-
-#define PSW32_BASE_BITS         0x00080000UL
-
-#define PSW32_ASC_PRIMARY       0x00000000UL
-#define PSW32_ASC_ACCREG        0x00004000UL
-#define PSW32_ASC_SECONDARY     0x00008000UL
-#define PSW32_ASC_HOME          0x0000C000UL
-
-#define PSW32_MASK_MERGE(CURRENT,NEW) \
-        (((CURRENT) & ~(PSW32_MASK_CC|PSW32_MASK_PM)) | \
-         ((NEW) & (PSW32_MASK_CC|PSW32_MASK_PM)))
-
-extern long psw32_user_bits;
-
-#define COMPAT_USER_HZ  100
-
-typedef u32             compat_size_t;
-typedef s32             compat_ssize_t;
-typedef s32             compat_time_t;
-typedef s32             compat_clock_t;
-typedef s32             compat_pid_t;
-typedef u16             __compat_uid_t;
-typedef u16             __compat_gid_t;
-typedef u32             __compat_uid32_t;
-typedef u32             __compat_gid32_t;
-typedef u16             compat_mode_t;
-typedef u32             compat_ino_t;
-typedef u16             compat_dev_t;
-typedef s32             compat_off_t;
-typedef s64             compat_loff_t;
-typedef u16             compat_nlink_t;
-typedef u16             compat_ipc_pid_t;
-typedef s32             compat_daddr_t;
-typedef u32             compat_caddr_t;
-typedef __kernel_fsid_t compat_fsid_t;
-typedef s32             compat_key_t;
-typedef s32             compat_timer_t;
-
-typedef s32             compat_int_t;
-typedef s32             compat_long_t;
-typedef s64             compat_s64;
-typedef u32             compat_uint_t;
-typedef u32             compat_ulong_t;
-typedef u64             compat_u64;
-
-struct compat_timespec {
-        compat_time_t   tv_sec;
-        s32             tv_nsec;
-};
-
-struct compat_timeval {
-        compat_time_t   tv_sec;
-        s32             tv_usec;
-};
-
-struct compat_stat {
-        compat_dev_t    st_dev;
-        u16             __pad1;
-        compat_ino_t    st_ino;
-        compat_mode_t   st_mode;
-        compat_nlink_t  st_nlink;
-        __compat_uid_t  st_uid;
-        __compat_gid_t  st_gid;
-        compat_dev_t    st_rdev;
-        u16             __pad2;
-        u32             st_size;
-        u32             st_blksize;
-        u32             st_blocks;
-        u32             st_atime;
-        u32             st_atime_nsec;
-        u32             st_mtime;
-        u32             st_mtime_nsec;
-        u32             st_ctime;
-        u32             st_ctime_nsec;
-        u32             __unused4;
-        u32             __unused5;
-};
-
-struct compat_flock {
-        short           l_type;
-        short           l_whence;
-        compat_off_t    l_start;
-        compat_off_t    l_len;
-        compat_pid_t    l_pid;
-};
-
-#define F_GETLK64       12
-#define F_SETLK64       13
-#define F_SETLKW64      14    
-
-struct compat_flock64 {
-        short           l_type;
-        short           l_whence;
-        compat_loff_t   l_start;
-        compat_loff_t   l_len;
-        compat_pid_t    l_pid;
-};
-
-struct compat_statfs {
-        s32             f_type;
-        s32             f_bsize;
-        s32             f_blocks;
-        s32             f_bfree;
-        s32             f_bavail;
-        s32             f_files;
-        s32             f_ffree;
-        compat_fsid_t   f_fsid;
-        s32             f_namelen;
-        s32             f_frsize;
-        s32             f_spare[6];
-};
-
-#define COMPAT_RLIM_OLD_INFINITY        0x7fffffff
-#define COMPAT_RLIM_INFINITY            0xffffffff
-
-typedef u32             compat_old_sigset_t;    /* at least 32 bits */
-
-#define _COMPAT_NSIG            64
-#define _COMPAT_NSIG_BPW        32
-
-typedef u32             compat_sigset_word;
-
-#define COMPAT_OFF_T_MAX        0x7fffffff
-#define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
-
-/*
- * A pointer passed in from user mode. This should not
- * be used for syscall parameters, just declare them
- * as pointers because the syscall entry code will have
- * appropriately converted them already.
- */
-typedef u32             compat_uptr_t;
-
-static inline void __user *compat_ptr(compat_uptr_t uptr)
-{
-        return (void __user *)(unsigned long)(uptr & 0x7fffffffUL);
-}
-
-static inline compat_uptr_t ptr_to_compat(void __user *uptr)
-{
-        return (u32)(unsigned long)uptr;
-}
-
-static inline void __user *compat_alloc_user_space(long len)
-{
-        unsigned long stack;
-
-        stack = KSTK_ESP(current);
-        if (test_thread_flag(TIF_31BIT))
-                stack &= 0x7fffffffUL;
-        return (void __user *) (stack - len);
-}
-
-struct compat_ipc64_perm {
-        compat_key_t key;
-        __compat_uid32_t uid;
-        __compat_gid32_t gid;
-        __compat_uid32_t cuid;
-        __compat_gid32_t cgid;
-        compat_mode_t mode;
-        unsigned short __pad1;
-        unsigned short seq;
-        unsigned short __pad2;
-        unsigned int __unused1;
-        unsigned int __unused2;
-};
-
-struct compat_semid64_ds {
-        struct compat_ipc64_perm sem_perm;
-        compat_time_t  sem_otime;
-        compat_ulong_t __pad1;
-        compat_time_t  sem_ctime;
-        compat_ulong_t __pad2;
-        compat_ulong_t sem_nsems;
-        compat_ulong_t __unused1;
-        compat_ulong_t __unused2;
-};
-
-struct compat_msqid64_ds {
-        struct compat_ipc64_perm msg_perm;
-        compat_time_t   msg_stime;
-        compat_ulong_t __pad1;
-        compat_time_t   msg_rtime;
-        compat_ulong_t __pad2;
-        compat_time_t   msg_ctime;
-        compat_ulong_t __pad3;
-        compat_ulong_t msg_cbytes;
-        compat_ulong_t msg_qnum;
-        compat_ulong_t msg_qbytes;
-        compat_pid_t   msg_lspid;
-        compat_pid_t   msg_lrpid;
-        compat_ulong_t __unused1;
-        compat_ulong_t __unused2;
-};
-
-struct compat_shmid64_ds {
-        struct compat_ipc64_perm shm_perm;
-        compat_size_t  shm_segsz;
-        compat_time_t  shm_atime;
-        compat_ulong_t __pad1;
-        compat_time_t  shm_dtime;
-        compat_ulong_t __pad2;
-        compat_time_t  shm_ctime;
-        compat_ulong_t __pad3;
-        compat_pid_t   shm_cpid;
-        compat_pid_t   shm_lpid;
-        compat_ulong_t shm_nattch;
-        compat_ulong_t __unused1;
-        compat_ulong_t __unused2;
-};
-#endif /* _ASM_S390X_COMPAT_H */
diff --git a/include/asm-s390/cpcmd.h b/include/asm-s390/cpcmd.h
deleted file mode 100644
index 48a9eab16429..000000000000
--- a/include/asm-s390/cpcmd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  arch/s390/kernel/cpcmd.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *               Christian Borntraeger (cborntra@de.ibm.com),
- */
-
-#ifndef _ASM_S390_CPCMD_H
-#define _ASM_S390_CPCMD_H
-
-/*
- * the lowlevel function for cpcmd
- * the caller of __cpcmd has to ensure that the response buffer is below 2 GB
- */
-extern int __cpcmd(const char *cmd, char *response, int rlen, int *response_code);
-
-/*
- * cpcmd is the in-kernel interface for issuing CP commands
- *
- * cmd:         null-terminated command string, max 240 characters
- * response:    response buffer for VM's textual response
- * rlen:        size of the response buffer, cpcmd will not exceed this size
- *              but will cap the output, if its too large. Everything that
- *              did not fit into the buffer will be silently dropped
- * response_code: return pointer for VM's error code
- * return value: the size of the response. The caller can check if the buffer
- *              was large enough by comparing the return value and rlen
- * NOTE: If the response buffer is not below 2 GB, cpcmd can sleep
- */
-extern int cpcmd(const char *cmd, char *response, int rlen, int *response_code);
-
-#endif /* _ASM_S390_CPCMD_H */
diff --git a/include/asm-s390/cpu.h b/include/asm-s390/cpu.h
deleted file mode 100644
index e5a6a9ba3adf..000000000000
--- a/include/asm-s390/cpu.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  include/asm-s390/cpu.h
- *
- *    Copyright IBM Corp. 2007
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- */
-
-#ifndef _ASM_S390_CPU_H_
-#define _ASM_S390_CPU_H_
-
-#include <linux/types.h>
-#include <linux/percpu.h>
-#include <linux/spinlock.h>
-
-struct s390_idle_data {
-        spinlock_t lock;
-        unsigned int in_idle;
-        unsigned long long idle_count;
-        unsigned long long idle_enter;
-        unsigned long long idle_time;
-};
-
-DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
-
-void s390_idle_leave(void);
-
-static inline void s390_idle_check(void)
-{
-        if ((&__get_cpu_var(s390_idle))->in_idle)
-                s390_idle_leave();
-}
-
-#endif /* _ASM_S390_CPU_H_ */
diff --git a/include/asm-s390/cputime.h b/include/asm-s390/cputime.h
deleted file mode 100644
index 133ce054fc89..000000000000
--- a/include/asm-s390/cputime.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *  include/asm-s390/cputime.h
- *
- *  (C) Copyright IBM Corp. 2004
- *
- *  Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
- */
-
-#ifndef _S390_CPUTIME_H
-#define _S390_CPUTIME_H
-
-#include <asm/div64.h>
-
-/* We want to use micro-second resolution. */
-
-typedef unsigned long long cputime_t;
-typedef unsigned long long cputime64_t;
-
-#ifndef __s390x__
-
-static inline unsigned int
-__div(unsigned long long n, unsigned int base)
-{
-        register_pair rp;
-
-        rp.pair = n >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (base >> 1));
-        return rp.subreg.odd;
-}
-
-#else /* __s390x__ */
-
-static inline unsigned int
-__div(unsigned long long n, unsigned int base)
-{
-        return n / base;
-}
-
-#endif /* __s390x__ */
-
-#define cputime_zero                    (0ULL)
-#define cputime_max                     ((~0UL >> 1) - 1)
-#define cputime_add(__a, __b)           ((__a) +  (__b))
-#define cputime_sub(__a, __b)           ((__a) -  (__b))
-#define cputime_div(__a, __n) ({                \
-        unsigned long long __div = (__a);       \
-        do_div(__div,__n);                      \
-        __div;                                  \
-})
-#define cputime_halve(__a)              ((__a) >> 1)
-#define cputime_eq(__a, __b)            ((__a) == (__b))
-#define cputime_gt(__a, __b)            ((__a) >  (__b))
-#define cputime_ge(__a, __b)            ((__a) >= (__b))
-#define cputime_lt(__a, __b)            ((__a) <  (__b))
-#define cputime_le(__a, __b)            ((__a) <= (__b))
-#define cputime_to_jiffies(__ct)        (__div((__ct), 1000000 / HZ))
-#define cputime_to_scaled(__ct)         (__ct)
-#define jiffies_to_cputime(__hz)        ((cputime_t)(__hz) * (1000000 / HZ))
-
-#define cputime64_zero                  (0ULL)
-#define cputime64_add(__a, __b)         ((__a) + (__b))
-#define cputime_to_cputime64(__ct)      (__ct)
-
-static inline u64
-cputime64_to_jiffies64(cputime64_t cputime)
-{
-        do_div(cputime, 1000000 / HZ);
-        return cputime;
-}
-
-/*
- * Convert cputime to milliseconds and back.
- */
-static inline unsigned int
-cputime_to_msecs(const cputime_t cputime)
-{
-        return __div(cputime, 1000);
-}
-
-static inline cputime_t
-msecs_to_cputime(const unsigned int m)
-{
-        return (cputime_t) m * 1000;
-}
-
-/*
- * Convert cputime to milliseconds and back.
- */
-static inline unsigned int
-cputime_to_secs(const cputime_t cputime)
-{
-        return __div(cputime, 1000000);
-}
-
-static inline cputime_t
-secs_to_cputime(const unsigned int s)
-{
-        return (cputime_t) s * 1000000;
-}
-
-/*
- * Convert cputime to timespec and back.
- */
-static inline cputime_t
-timespec_to_cputime(const struct timespec *value)
-{
-        return value->tv_nsec / 1000 + (u64) value->tv_sec * 1000000;
-}
-
-static inline void
-cputime_to_timespec(const cputime_t cputime, struct timespec *value)
-{
-#ifndef __s390x__
-        register_pair rp;
-
-        rp.pair = cputime >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (1000000 >> 1));
-        value->tv_nsec = rp.subreg.even * 1000;
-        value->tv_sec = rp.subreg.odd;
-#else
-        value->tv_nsec = (cputime % 1000000) * 1000;
-        value->tv_sec = cputime / 1000000;
-#endif
-}
-
-/*
- * Convert cputime to timeval and back.
- * Since cputime and timeval have the same resolution (microseconds)
- * this is easy.
- */
-static inline cputime_t
-timeval_to_cputime(const struct timeval *value)
-{
-        return value->tv_usec + (u64) value->tv_sec * 1000000;
-}
-
-static inline void
-cputime_to_timeval(const cputime_t cputime, struct timeval *value)
-{
-#ifndef __s390x__
-        register_pair rp;
-
-        rp.pair = cputime >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (1000000 >> 1));
-        value->tv_usec = rp.subreg.even;
-        value->tv_sec = rp.subreg.odd;
-#else
-        value->tv_usec = cputime % 1000000;
-        value->tv_sec = cputime / 1000000;
-#endif
-}
-
-/*
- * Convert cputime to clock and back.
- */
-static inline clock_t
-cputime_to_clock_t(cputime_t cputime)
-{
-        return __div(cputime, 1000000 / USER_HZ);
-}
-
-static inline cputime_t
-clock_t_to_cputime(unsigned long x)
-{
-        return (cputime_t) x * (1000000 / USER_HZ);
-}
-
-/*
- * Convert cputime64 to clock.
- */
-static inline clock_t
-cputime64_to_clock_t(cputime64_t cputime)
-{
-       return __div(cputime, 1000000 / USER_HZ);
-}
-
-#endif /* _S390_CPUTIME_H */
diff --git a/include/asm-s390/current.h b/include/asm-s390/current.h
deleted file mode 100644
index 83cf36cde2da..000000000000
--- a/include/asm-s390/current.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  include/asm-s390/current.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/current.h"
- */
-
-#ifndef _S390_CURRENT_H
-#define _S390_CURRENT_H
-
-#ifdef __KERNEL__
-#include <asm/lowcore.h>
-
-struct task_struct;
-
-#define current ((struct task_struct *const)S390_lowcore.current_task)
-
-#endif
-
-#endif /* !(_S390_CURRENT_H) */
diff --git a/include/asm-s390/dasd.h b/include/asm-s390/dasd.h
deleted file mode 100644
index 3f002e13d024..000000000000
--- a/include/asm-s390/dasd.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/* 
- * File...........: linux/drivers/s390/block/dasd.c
- * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
- * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
- *
- * This file is the interface of the DASD device driver, which is exported to user space
- * any future changes wrt the API will result in a change of the APIVERSION reported
- * to userspace by the DASDAPIVER-ioctl
- *
- */
-
-#ifndef DASD_H
-#define DASD_H
-#include <linux/ioctl.h>
-
-#define DASD_IOCTL_LETTER 'D'
-
-#define DASD_API_VERSION 6
-
-/* 
- * struct dasd_information2_t
- * represents any data about the device, which is visible to userspace.
- *  including foramt and featueres.
- */
-typedef struct dasd_information2_t {
-        unsigned int devno;         /* S/390 devno */
-        unsigned int real_devno;    /* for aliases */
-        unsigned int schid;         /* S/390 subchannel identifier */
-        unsigned int cu_type  : 16; /* from SenseID */
-        unsigned int cu_model :  8; /* from SenseID */
-        unsigned int dev_type : 16; /* from SenseID */
-        unsigned int dev_model : 8; /* from SenseID */
-        unsigned int open_count; 
-        unsigned int req_queue_len; 
-        unsigned int chanq_len;     /* length of chanq */
-        char type[4];               /* from discipline.name, 'none' for unknown */
-        unsigned int status;        /* current device level */
-        unsigned int label_block;   /* where to find the VOLSER */
-        unsigned int FBA_layout;    /* fixed block size (like AIXVOL) */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-        char characteristics[64];   /* from read_device_characteristics */
-        char configuration_data[256]; /* from read_configuration_data */
-        unsigned int format;          /* format info like formatted/cdl/ldl/... */
-        unsigned int features;        /* dasd features like 'ro',...            */
-        unsigned int reserved0;       /* reserved for further use ,...          */
-        unsigned int reserved1;       /* reserved for further use ,...          */
-        unsigned int reserved2;       /* reserved for further use ,...          */
-        unsigned int reserved3;       /* reserved for further use ,...          */
-        unsigned int reserved4;       /* reserved for further use ,...          */
-        unsigned int reserved5;       /* reserved for further use ,...          */
-        unsigned int reserved6;       /* reserved for further use ,...          */
-        unsigned int reserved7;       /* reserved for further use ,...          */
-} dasd_information2_t;
-
-/*
- * values to be used for dasd_information_t.format
- * 0x00: NOT formatted
- * 0x01: Linux disc layout
- * 0x02: Common disc layout
- */
-#define DASD_FORMAT_NONE 0
-#define DASD_FORMAT_LDL  1
-#define DASD_FORMAT_CDL  2
-/*
- * values to be used for dasd_information_t.features
- * 0x00: default features
- * 0x01: readonly (ro)
- * 0x02: use diag discipline (diag)
- * 0x04: set the device initially online (internal use only)
- * 0x08: enable ERP related logging
- */
-#define DASD_FEATURE_DEFAULT         0x00
-#define DASD_FEATURE_READONLY        0x01
-#define DASD_FEATURE_USEDIAG         0x02
-#define DASD_FEATURE_INITIAL_ONLINE  0x04
-#define DASD_FEATURE_ERPLOG          0x08
-
-#define DASD_PARTN_BITS 2
-
-/* 
- * struct dasd_information_t
- * represents any data about the data, which is visible to userspace
- */
-typedef struct dasd_information_t {
-        unsigned int devno;         /* S/390 devno */
-        unsigned int real_devno;    /* for aliases */
-        unsigned int schid;         /* S/390 subchannel identifier */
-        unsigned int cu_type  : 16; /* from SenseID */
-        unsigned int cu_model :  8; /* from SenseID */
-        unsigned int dev_type : 16; /* from SenseID */
-        unsigned int dev_model : 8; /* from SenseID */
-        unsigned int open_count; 
-        unsigned int req_queue_len; 
-        unsigned int chanq_len;     /* length of chanq */
-        char type[4];               /* from discipline.name, 'none' for unknown */
-        unsigned int status;        /* current device level */
-        unsigned int label_block;   /* where to find the VOLSER */
-        unsigned int FBA_layout;    /* fixed block size (like AIXVOL) */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-        char characteristics[64];   /* from read_device_characteristics */
-        char configuration_data[256]; /* from read_configuration_data */
-} dasd_information_t;
-
-/*
- * Read Subsystem Data - Performance Statistics
- */ 
-typedef struct dasd_rssd_perf_stats_t {
-        unsigned char  invalid:1;
-        unsigned char  format:3;
-        unsigned char  data_format:4;
-        unsigned char  unit_address;
-        unsigned short device_status;
-        unsigned int   nr_read_normal;
-        unsigned int   nr_read_normal_hits;
-        unsigned int   nr_write_normal;
-        unsigned int   nr_write_fast_normal_hits;
-        unsigned int   nr_read_seq;
-        unsigned int   nr_read_seq_hits;
-        unsigned int   nr_write_seq;
-        unsigned int   nr_write_fast_seq_hits;
-        unsigned int   nr_read_cache;
-        unsigned int   nr_read_cache_hits;
-        unsigned int   nr_write_cache;
-        unsigned int   nr_write_fast_cache_hits;
-        unsigned int   nr_inhibit_cache;
-        unsigned int   nr_bybass_cache;
-        unsigned int   nr_seq_dasd_to_cache;
-        unsigned int   nr_dasd_to_cache;
-        unsigned int   nr_cache_to_dasd;
-        unsigned int   nr_delayed_fast_write;
-        unsigned int   nr_normal_fast_write;
-        unsigned int   nr_seq_fast_write;
-        unsigned int   nr_cache_miss;
-        unsigned char  status2;
-        unsigned int   nr_quick_write_promotes;
-        unsigned char  reserved;
-        unsigned short ssid;
-        unsigned char  reseved2[96];
-} __attribute__((packed)) dasd_rssd_perf_stats_t;
-
-/* 
- * struct profile_info_t
- * holds the profinling information 
- */
-typedef struct dasd_profile_info_t {
-        unsigned int dasd_io_reqs;       /* number of requests processed at all */
-        unsigned int dasd_io_sects;      /* number of sectors processed at all */
-        unsigned int dasd_io_secs[32];   /* histogram of request's sizes */
-        unsigned int dasd_io_times[32];  /* histogram of requests's times */
-        unsigned int dasd_io_timps[32];  /* histogram of requests's times per sector */
-        unsigned int dasd_io_time1[32];  /* histogram of time from build to start */
-        unsigned int dasd_io_time2[32];  /* histogram of time from start to irq */
-        unsigned int dasd_io_time2ps[32]; /* histogram of time from start to irq */
-        unsigned int dasd_io_time3[32];  /* histogram of time from irq to end */
-        unsigned int dasd_io_nr_req[32]; /* histogram of # of requests in chanq */
-} dasd_profile_info_t;
-
-/* 
- * struct format_data_t
- * represents all data necessary to format a dasd
- */
-typedef struct format_data_t {
-        int start_unit; /* from track */
-        int stop_unit;  /* to track */
-        int blksize;    /* sectorsize */
-        int intensity;  
-} format_data_t;
-
-/*
- * values to be used for format_data_t.intensity
- * 0/8: normal format
- * 1/9: also write record zero
- * 3/11: also write home address
- * 4/12: invalidate track
- */
-#define DASD_FMT_INT_FMT_R0 1 /* write record zero */
-#define DASD_FMT_INT_FMT_HA 2 /* write home address, also set FMT_R0 ! */
-#define DASD_FMT_INT_INVAL  4 /* invalidate tracks */
-#define DASD_FMT_INT_COMPAT 8 /* use OS/390 compatible disk layout */
-
-
-/* 
- * struct attrib_data_t
- * represents the operation (cache) bits for the device.
- * Used in DE to influence caching of the DASD.
- */
-typedef struct attrib_data_t {
-        unsigned char operation:3;     /* cache operation mode */
-        unsigned char reserved:5;      /* cache operation mode */
-        __u16         nr_cyl;          /* no of cyliners for read ahaed */
-        __u8          reserved2[29];   /* for future use */
-} __attribute__ ((packed)) attrib_data_t;
-
-/* definition of operation (cache) bits within attributes of DE */
-#define DASD_NORMAL_CACHE  0x0
-#define DASD_BYPASS_CACHE  0x1
-#define DASD_INHIBIT_LOAD  0x2
-#define DASD_SEQ_ACCESS    0x3
-#define DASD_SEQ_PRESTAGE  0x4
-#define DASD_REC_ACCESS    0x5
-
-
-/********************************************************************************
- * SECTION: Definition of IOCTLs
- *
- * Here ist how the ioctl-nr should be used:
- *    0 -   31   DASD driver itself
- *   32 -  239   still open
- *  240 -  255   reserved for EMC 
- *******************************************************************************/
-
-/* Disable the volume (for Linux) */
-#define BIODASDDISABLE _IO(DASD_IOCTL_LETTER,0) 
-/* Enable the volume (for Linux) */
-#define BIODASDENABLE  _IO(DASD_IOCTL_LETTER,1)  
-/* Issue a reserve/release command, rsp. */
-#define BIODASDRSRV    _IO(DASD_IOCTL_LETTER,2) /* reserve */
-#define BIODASDRLSE    _IO(DASD_IOCTL_LETTER,3) /* release */
-#define BIODASDSLCK    _IO(DASD_IOCTL_LETTER,4) /* steal lock */
-/* reset profiling information of a device */
-#define BIODASDPRRST   _IO(DASD_IOCTL_LETTER,5)
-/* Quiesce IO on device */
-#define BIODASDQUIESCE _IO(DASD_IOCTL_LETTER,6) 
-/* Resume IO on device */
-#define BIODASDRESUME  _IO(DASD_IOCTL_LETTER,7) 
-
-
-/* retrieve API version number */
-#define DASDAPIVER     _IOR(DASD_IOCTL_LETTER,0,int)
-/* Get information on a dasd device */
-#define BIODASDINFO    _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
-/* retrieve profiling information of a device */
-#define BIODASDPRRD    _IOR(DASD_IOCTL_LETTER,2,dasd_profile_info_t)
-/* Get information on a dasd device (enhanced) */
-#define BIODASDINFO2   _IOR(DASD_IOCTL_LETTER,3,dasd_information2_t)
-/* Performance Statistics Read */
-#define BIODASDPSRD    _IOR(DASD_IOCTL_LETTER,4,dasd_rssd_perf_stats_t)
-/* Get Attributes (cache operations) */
-#define BIODASDGATTR   _IOR(DASD_IOCTL_LETTER,5,attrib_data_t) 
-
-
-/* #define BIODASDFORMAT  _IOW(IOCTL_LETTER,0,format_data_t) , deprecated */
-#define BIODASDFMT     _IOW(DASD_IOCTL_LETTER,1,format_data_t) 
-/* Set Attributes (cache operations) */
-#define BIODASDSATTR   _IOW(DASD_IOCTL_LETTER,2,attrib_data_t) 
-
-
-#endif                          /* DASD_H */
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4 
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: nil
- * tab-width: 8
- * End:
- */
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h
deleted file mode 100644
index 9450ce6e32de..000000000000
--- a/include/asm-s390/debug.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  include/asm-s390/debug.h
- *   S/390 debug facility
- *
- *    Copyright (C) 1999, 2000 IBM Deutschland Entwicklung GmbH,
- *                             IBM Corporation
- */
-
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#include <linux/fs.h>
-
-/* Note:
- * struct __debug_entry must be defined outside of #ifdef __KERNEL__ 
- * in order to allow a user program to analyze the 'raw'-view.
- */
-
-struct __debug_entry{
-        union {
-                struct {
-                        unsigned long long clock:52;
-                        unsigned long long exception:1;
-                        unsigned long long level:3;
-                        unsigned long long cpuid:8;
-                } fields;
-
-                unsigned long long stck;
-        } id;
-        void* caller;
-} __attribute__((packed));
-
-
-#define __DEBUG_FEATURE_VERSION      2  /* version of debug feature */
-
-#ifdef __KERNEL__
-#include <linux/string.h>
-#include <linux/spinlock.h>
-#include <linux/kernel.h>
-#include <linux/time.h>
-
-#define DEBUG_MAX_LEVEL            6  /* debug levels range from 0 to 6 */
-#define DEBUG_OFF_LEVEL            -1 /* level where debug is switched off */
-#define DEBUG_FLUSH_ALL            -1 /* parameter to flush all areas */
-#define DEBUG_MAX_VIEWS            10 /* max number of views in proc fs */
-#define DEBUG_MAX_NAME_LEN         64 /* max length for a debugfs file name */
-#define DEBUG_DEFAULT_LEVEL        3  /* initial debug level */
-
-#define DEBUG_DIR_ROOT "s390dbf" /* name of debug root directory in proc fs */
-
-#define DEBUG_DATA(entry) (char*)(entry + 1) /* data is stored behind */
-                                             /* the entry information */
-
-typedef struct __debug_entry debug_entry_t;
-
-struct debug_view;
-
-typedef struct debug_info {     
-        struct debug_info* next;
-        struct debug_info* prev;
-        atomic_t ref_count;
-        spinlock_t lock;                        
-        int level;
-        int nr_areas;
-        int pages_per_area;
-        int buf_size;
-        int entry_size; 
-        debug_entry_t*** areas;
-        int active_area;
-        int *active_pages;
-        int *active_entries;
-        struct dentry* debugfs_root_entry;
-        struct dentry* debugfs_entries[DEBUG_MAX_VIEWS];
-        struct debug_view* views[DEBUG_MAX_VIEWS];      
-        char name[DEBUG_MAX_NAME_LEN];
-        mode_t mode;
-} debug_info_t;
-
-typedef int (debug_header_proc_t) (debug_info_t* id,
-                                   struct debug_view* view,
-                                   int area,
-                                   debug_entry_t* entry,
-                                   char* out_buf);
-
-typedef int (debug_format_proc_t) (debug_info_t* id,
-                                   struct debug_view* view, char* out_buf,
-                                   const char* in_buf);
-typedef int (debug_prolog_proc_t) (debug_info_t* id,
-                                   struct debug_view* view,
-                                   char* out_buf);
-typedef int (debug_input_proc_t) (debug_info_t* id,
-                                  struct debug_view* view,
-                                  struct file* file,
-                                  const char __user *user_buf,
-                                  size_t in_buf_size, loff_t* offset);
-
-int debug_dflt_header_fn(debug_info_t* id, struct debug_view* view,
-                         int area, debug_entry_t* entry, char* out_buf);                                                
-                                
-struct debug_view {
-        char name[DEBUG_MAX_NAME_LEN];
-        debug_prolog_proc_t* prolog_proc;
-        debug_header_proc_t* header_proc;
-        debug_format_proc_t* format_proc;
-        debug_input_proc_t*  input_proc;
-        void*                private_data;
-};
-
-extern struct debug_view debug_hex_ascii_view;
-extern struct debug_view debug_raw_view;
-extern struct debug_view debug_sprintf_view;
-
-/* do NOT use the _common functions */
-
-debug_entry_t* debug_event_common(debug_info_t* id, int level, 
-                                  const void* data, int length);
-
-debug_entry_t* debug_exception_common(debug_info_t* id, int level, 
-                                      const void* data, int length);
-
-/* Debug Feature API: */
-
-debug_info_t *debug_register(const char *name, int pages, int nr_areas,
-                             int buf_size);
-
-debug_info_t *debug_register_mode(const char *name, int pages, int nr_areas,
-                                  int buf_size, mode_t mode, uid_t uid,
-                                  gid_t gid);
-
-void debug_unregister(debug_info_t* id);
-
-void debug_set_level(debug_info_t* id, int new_level);
-
-void debug_stop_all(void);
-
-static inline debug_entry_t*
-debug_event(debug_info_t* id, int level, void* data, int length)
-{
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_event_common(id,level,data,length);
-}
-
-static inline debug_entry_t*
-debug_int_event(debug_info_t* id, int level, unsigned int tag)
-{
-        unsigned int t=tag;
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_event_common(id,level,&t,sizeof(unsigned int));
-}
-
-static inline debug_entry_t *
-debug_long_event (debug_info_t* id, int level, unsigned long tag)
-{
-        unsigned long t=tag;
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_event_common(id,level,&t,sizeof(unsigned long));
-}
-
-static inline debug_entry_t*
-debug_text_event(debug_info_t* id, int level, const char* txt)
-{
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_event_common(id,level,txt,strlen(txt));
-}
-
-extern debug_entry_t *
-debug_sprintf_event(debug_info_t* id,int level,char *string,...)
-        __attribute__ ((format(printf, 3, 4)));
-
-
-static inline debug_entry_t*
-debug_exception(debug_info_t* id, int level, void* data, int length)
-{
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_exception_common(id,level,data,length);
-}
-
-static inline debug_entry_t*
-debug_int_exception(debug_info_t* id, int level, unsigned int tag)
-{
-        unsigned int t=tag;
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_exception_common(id,level,&t,sizeof(unsigned int));
-}
-
-static inline debug_entry_t *
-debug_long_exception (debug_info_t* id, int level, unsigned long tag)
-{
-        unsigned long t=tag;
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_exception_common(id,level,&t,sizeof(unsigned long));
-}
-
-static inline debug_entry_t*
-debug_text_exception(debug_info_t* id, int level, const char* txt)
-{
-        if ((!id) || (level > id->level) || (id->pages_per_area == 0))
-                return NULL;
-        return debug_exception_common(id,level,txt,strlen(txt));
-}
-
-
-extern debug_entry_t *
-debug_sprintf_exception(debug_info_t* id,int level,char *string,...)
-        __attribute__ ((format(printf, 3, 4)));
-
-int debug_register_view(debug_info_t* id, struct debug_view* view);
-int debug_unregister_view(debug_info_t* id, struct debug_view* view);
-
-/*
-   define the debug levels:
-   - 0 No debugging output to console or syslog
-   - 1 Log internal errors to syslog, ignore check conditions 
-   - 2 Log internal errors and check conditions to syslog
-   - 3 Log internal errors to console, log check conditions to syslog
-   - 4 Log internal errors and check conditions to console
-   - 5 panic on internal errors, log check conditions to console
-   - 6 panic on both, internal errors and check conditions
- */
-
-#ifndef DEBUG_LEVEL
-#define DEBUG_LEVEL 4
-#endif
-
-#define INTERNAL_ERRMSG(x,y...) "E" __FILE__ "%d: " x, __LINE__, y
-#define INTERNAL_WRNMSG(x,y...) "W" __FILE__ "%d: " x, __LINE__, y
-#define INTERNAL_INFMSG(x,y...) "I" __FILE__ "%d: " x, __LINE__, y
-#define INTERNAL_DEBMSG(x,y...) "D" __FILE__ "%d: " x, __LINE__, y
-
-#if DEBUG_LEVEL > 0
-#define PRINT_DEBUG(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#define PRINT_INFO(x...) printk ( KERN_INFO PRINTK_HEADER x )
-#define PRINT_WARN(x...) printk ( KERN_WARNING PRINTK_HEADER x )
-#define PRINT_ERR(x...) printk ( KERN_ERR PRINTK_HEADER x )
-#define PRINT_FATAL(x...) panic ( PRINTK_HEADER x )
-#else
-#define PRINT_DEBUG(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#define PRINT_INFO(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#define PRINT_WARN(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#define PRINT_ERR(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )
-#endif                          /* DASD_DEBUG */
-
-#undef DEBUG_MALLOC
-#ifdef DEBUG_MALLOC
-void *b;
-#define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b)
-#define kfree(x) PRINT_INFO(" kfree %p\n",x);kfree(x)
-#define get_zeroed_page(x...) (PRINT_INFO(" gfp %p\n",b=get_zeroed_page(x)),b)
-#define __get_free_pages(x...) (PRINT_INFO(" gfps %p\n",b=__get_free_pages(x)),b)
-#endif                          /* DEBUG_MALLOC */
-
-#endif                          /* __KERNEL__ */
-#endif                          /* DEBUG_H */
diff --git a/include/asm-s390/delay.h b/include/asm-s390/delay.h
deleted file mode 100644
index 78357314c450..000000000000
--- a/include/asm-s390/delay.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  include/asm-s390/delay.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/delay.h"
- *    Copyright (C) 1993 Linus Torvalds
- *
- *  Delay routines calling functions in arch/s390/lib/delay.c
- */
- 
-#ifndef _S390_DELAY_H
-#define _S390_DELAY_H
-
-extern void __udelay(unsigned long usecs);
-extern void __delay(unsigned long loops);
-
-#define udelay(n) __udelay(n)
-
-#endif /* defined(_S390_DELAY_H) */
diff --git a/include/asm-s390/device.h b/include/asm-s390/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-s390/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include <asm-generic/device.h>
-
diff --git a/include/asm-s390/diag.h b/include/asm-s390/diag.h
deleted file mode 100644
index 72b2e2f2d32d..000000000000
--- a/include/asm-s390/diag.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * s390 diagnose functions
- *
- * Copyright IBM Corp. 2007
- * Author(s): Michael Holzheu <holzheu@de.ibm.com>
- */
-
-#ifndef _ASM_S390_DIAG_H
-#define _ASM_S390_DIAG_H
-
-/*
- * Diagnose 10: Release pages
- */
-extern void diag10(unsigned long addr);
-
-/*
- * Diagnose 14: Input spool file manipulation
- */
-extern int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode);
-
-/*
- * Diagnose 210: Get information about a virtual device
- */
-struct diag210 {
-        u16 vrdcdvno;   /* device number (input) */
-        u16 vrdclen;    /* data block length (input) */
-        u8 vrdcvcla;    /* virtual device class (output) */
-        u8 vrdcvtyp;    /* virtual device type (output) */
-        u8 vrdcvsta;    /* virtual device status (output) */
-        u8 vrdcvfla;    /* virtual device flags (output) */
-        u8 vrdcrccl;    /* real device class (output) */
-        u8 vrdccrty;    /* real device type (output) */
-        u8 vrdccrmd;    /* real device model (output) */
-        u8 vrdccrft;    /* real device feature (output) */
-} __attribute__((packed, aligned(4)));
-
-extern int diag210(struct diag210 *addr);
-
-#endif /* _ASM_S390_DIAG_H */
diff --git a/include/asm-s390/div64.h b/include/asm-s390/div64.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/include/asm-s390/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/include/asm-s390/dma.h b/include/asm-s390/dma.h
deleted file mode 100644
index 7425c6af6cd4..000000000000
--- a/include/asm-s390/dma.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *  include/asm-s390/dma.h
- *
- *  S390 version
- */
-
-#ifndef _ASM_DMA_H
-#define _ASM_DMA_H
-
-#include <asm/io.h>             /* need byte IO */
-
-#define MAX_DMA_ADDRESS         0x80000000
-
-#define free_dma(x)     do { } while (0)
-
-#endif /* _ASM_DMA_H */
diff --git a/include/asm-s390/ebcdic.h b/include/asm-s390/ebcdic.h
deleted file mode 100644
index 7f6f641d32f4..000000000000
--- a/include/asm-s390/ebcdic.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  include/asm-s390/ebcdic.h
- *    EBCDIC -> ASCII, ASCII -> EBCDIC conversion routines.
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
- */
-
-#ifndef _EBCDIC_H
-#define _EBCDIC_H
-
-#ifndef _S390_TYPES_H
-#include <types.h>
-#endif
-
-extern __u8 _ascebc_500[256];   /* ASCII -> EBCDIC 500 conversion table */
-extern __u8 _ebcasc_500[256];   /* EBCDIC 500 -> ASCII conversion table */
-extern __u8 _ascebc[256];   /* ASCII -> EBCDIC conversion table */
-extern __u8 _ebcasc[256];   /* EBCDIC -> ASCII conversion table */
-extern __u8 _ebc_tolower[256]; /* EBCDIC -> lowercase */
-extern __u8 _ebc_toupper[256]; /* EBCDIC -> uppercase */
-
-static inline void
-codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
-{
-        if (nr-- <= 0)
-                return;
-        asm volatile(
-                "       bras    1,1f\n"
-                "       tr      0(1,%0),0(%2)\n"
-                "0:     tr      0(256,%0),0(%2)\n"
-                "       la      %0,256(%0)\n"
-                "1:     ahi     %1,-256\n"
-                "       jnm     0b\n"
-                "       ex      %1,0(1)"
-                : "+&a" (addr), "+&a" (nr)
-                : "a" (codepage) : "cc", "memory", "1");
-}
-
-#define ASCEBC(addr,nr) codepage_convert(_ascebc, addr, nr)
-#define EBCASC(addr,nr) codepage_convert(_ebcasc, addr, nr)
-#define ASCEBC_500(addr,nr) codepage_convert(_ascebc_500, addr, nr)
-#define EBCASC_500(addr,nr) codepage_convert(_ebcasc_500, addr, nr)
-#define EBC_TOLOWER(addr,nr) codepage_convert(_ebc_tolower, addr, nr)
-#define EBC_TOUPPER(addr,nr) codepage_convert(_ebc_toupper, addr, nr)
-
-#endif
-
diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h
deleted file mode 100644
index 3cad56923815..000000000000
--- a/include/asm-s390/elf.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  include/asm-s390/elf.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/elf.h"
- */
-
-#ifndef __ASMS390_ELF_H
-#define __ASMS390_ELF_H
-
-/* s390 relocations defined by the ABIs */
-#define R_390_NONE              0       /* No reloc.  */
-#define R_390_8                 1       /* Direct 8 bit.  */
-#define R_390_12                2       /* Direct 12 bit.  */
-#define R_390_16                3       /* Direct 16 bit.  */
-#define R_390_32                4       /* Direct 32 bit.  */
-#define R_390_PC32              5       /* PC relative 32 bit.  */
-#define R_390_GOT12             6       /* 12 bit GOT offset.  */
-#define R_390_GOT32             7       /* 32 bit GOT offset.  */
-#define R_390_PLT32             8       /* 32 bit PC relative PLT address.  */
-#define R_390_COPY              9       /* Copy symbol at runtime.  */
-#define R_390_GLOB_DAT          10      /* Create GOT entry.  */
-#define R_390_JMP_SLOT          11      /* Create PLT entry.  */
-#define R_390_RELATIVE          12      /* Adjust by program base.  */
-#define R_390_GOTOFF32          13      /* 32 bit offset to GOT.         */
-#define R_390_GOTPC             14      /* 32 bit PC rel. offset to GOT.  */
-#define R_390_GOT16             15      /* 16 bit GOT offset.  */
-#define R_390_PC16              16      /* PC relative 16 bit.  */
-#define R_390_PC16DBL           17      /* PC relative 16 bit shifted by 1.  */
-#define R_390_PLT16DBL          18      /* 16 bit PC rel. PLT shifted by 1.  */
-#define R_390_PC32DBL           19      /* PC relative 32 bit shifted by 1.  */
-#define R_390_PLT32DBL          20      /* 32 bit PC rel. PLT shifted by 1.  */
-#define R_390_GOTPCDBL          21      /* 32 bit PC rel. GOT shifted by 1.  */
-#define R_390_64                22      /* Direct 64 bit.  */
-#define R_390_PC64              23      /* PC relative 64 bit.  */
-#define R_390_GOT64             24      /* 64 bit GOT offset.  */
-#define R_390_PLT64             25      /* 64 bit PC relative PLT address.  */
-#define R_390_GOTENT            26      /* 32 bit PC rel. to GOT entry >> 1. */
-#define R_390_GOTOFF16          27      /* 16 bit offset to GOT. */
-#define R_390_GOTOFF64          28      /* 64 bit offset to GOT. */
-#define R_390_GOTPLT12          29      /* 12 bit offset to jump slot.  */
-#define R_390_GOTPLT16          30      /* 16 bit offset to jump slot.  */
-#define R_390_GOTPLT32          31      /* 32 bit offset to jump slot.  */
-#define R_390_GOTPLT64          32      /* 64 bit offset to jump slot.  */
-#define R_390_GOTPLTENT         33      /* 32 bit rel. offset to jump slot.  */
-#define R_390_PLTOFF16          34      /* 16 bit offset from GOT to PLT. */
-#define R_390_PLTOFF32          35      /* 32 bit offset from GOT to PLT. */
-#define R_390_PLTOFF64          36      /* 16 bit offset from GOT to PLT. */
-#define R_390_TLS_LOAD          37      /* Tag for load insn in TLS code. */
-#define R_390_TLS_GDCALL        38      /* Tag for function call in general
-                                           dynamic TLS code.  */
-#define R_390_TLS_LDCALL        39      /* Tag for function call in local
-                                           dynamic TLS code.  */
-#define R_390_TLS_GD32          40      /* Direct 32 bit for general dynamic
-                                           thread local data.  */
-#define R_390_TLS_GD64          41      /* Direct 64 bit for general dynamic
-                                           thread local data.  */
-#define R_390_TLS_GOTIE12       42      /* 12 bit GOT offset for static TLS
-                                           block offset.  */
-#define R_390_TLS_GOTIE32       43      /* 32 bit GOT offset for static TLS
-                                           block offset.  */
-#define R_390_TLS_GOTIE64       44      /* 64 bit GOT offset for static TLS
-                                           block offset.  */
-#define R_390_TLS_LDM32         45      /* Direct 32 bit for local dynamic
-                                           thread local data in LD code.  */
-#define R_390_TLS_LDM64         46      /* Direct 64 bit for local dynamic
-                                           thread local data in LD code.  */
-#define R_390_TLS_IE32          47      /* 32 bit address of GOT entry for
-                                           negated static TLS block offset.  */
-#define R_390_TLS_IE64          48      /* 64 bit address of GOT entry for
-                                           negated static TLS block offset.  */
-#define R_390_TLS_IEENT         49      /* 32 bit rel. offset to GOT entry for
-                                           negated static TLS block offset.  */
-#define R_390_TLS_LE32          50      /* 32 bit negated offset relative to
-                                           static TLS block.  */
-#define R_390_TLS_LE64          51      /* 64 bit negated offset relative to
-                                           static TLS block.  */
-#define R_390_TLS_LDO32         52      /* 32 bit offset relative to TLS
-                                           block.  */
-#define R_390_TLS_LDO64         53      /* 64 bit offset relative to TLS
-                                           block.  */
-#define R_390_TLS_DTPMOD        54      /* ID of module containing symbol.  */
-#define R_390_TLS_DTPOFF        55      /* Offset in TLS block.  */
-#define R_390_TLS_TPOFF         56      /* Negate offset in static TLS
-                                           block.  */
-#define R_390_20                57      /* Direct 20 bit.  */
-#define R_390_GOT20             58      /* 20 bit GOT offset.  */
-#define R_390_GOTPLT20          59      /* 20 bit offset to jump slot.  */
-#define R_390_TLS_GOTIE20       60      /* 20 bit GOT offset for static TLS
-                                           block offset.  */
-/* Keep this the last entry.  */
-#define R_390_NUM       61
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#ifndef __s390x__
-#define ELF_CLASS       ELFCLASS32
-#else /* __s390x__ */
-#define ELF_CLASS       ELFCLASS64
-#endif /* __s390x__ */
-#define ELF_DATA        ELFDATA2MSB
-#define ELF_ARCH        EM_S390
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-typedef s390_fp_regs elf_fpregset_t;
-typedef s390_regs elf_gregset_t;
-
-typedef s390_fp_regs compat_elf_fpregset_t;
-typedef s390_compat_regs compat_elf_gregset_t;
-
-#include <linux/sched.h>        /* for task_struct */
-#include <asm/system.h>         /* for save_access_regs */
-#include <asm/mmu_context.h>
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) \
-        (((x)->e_machine == EM_S390 || (x)->e_machine == EM_S390_OLD) \
-         && (x)->e_ident[EI_CLASS] == ELF_CLASS) 
-#define compat_elf_check_arch(x) \
-        (((x)->e_machine == EM_S390 || (x)->e_machine == EM_S390_OLD) \
-         && (x)->e_ident[EI_CLASS] == ELF_CLASS)
-#define compat_start_thread     start_thread31
-
-/* For SVR4/S390 the function pointer to be registered with `atexit` is
-   passed in R14. */
-#define ELF_PLAT_INIT(_r, load_addr) \
-        do { \
-                _r->gprs[14] = 0; \
-        } while (0)
-
-#define CORE_DUMP_USE_REGSET
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       4096
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-#define ELF_ET_DYN_BASE         (STACK_TOP / 3 * 2)
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this CPU supports. */
-
-extern unsigned long elf_hwcap;
-#define ELF_HWCAP (elf_hwcap)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.
-
-   For the moment, we have only optimizations for the Intel generations,
-   but that could change... */
-
-#define ELF_PLATFORM_SIZE 8
-extern char elf_platform[];
-#define ELF_PLATFORM (elf_platform)
-
-#ifndef __s390x__
-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#else /* __s390x__ */
-#define SET_PERSONALITY(ex, ibcs2)                      \
-do {                                                    \
-        if (ibcs2)                                      \
-                set_personality(PER_SVR4);              \
-        else if (current->personality != PER_LINUX32)   \
-                set_personality(PER_LINUX);             \
-        if ((ex).e_ident[EI_CLASS] == ELFCLASS32)       \
-                set_thread_flag(TIF_31BIT);             \
-        else                                            \
-                clear_thread_flag(TIF_31BIT);           \
-} while (0)
-#endif /* __s390x__ */
-
-/*
- * An executable for which elf_read_implies_exec() returns TRUE will
- * have the READ_IMPLIES_EXEC personality flag set automatically.
- */
-#define elf_read_implies_exec(ex, executable_stack)     \
-({                                                      \
-        if (current->mm->context.noexec &&              \
-            executable_stack != EXSTACK_DISABLE_X)      \
-                disable_noexec(current->mm, current);   \
-        current->mm->context.noexec == 0;               \
-})
-
-#endif
diff --git a/include/asm-s390/emergency-restart.h b/include/asm-s390/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-s390/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-s390/errno.h b/include/asm-s390/errno.h
deleted file mode 100644
index e41d5b37c4d6..000000000000
--- a/include/asm-s390/errno.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  include/asm-s390/errno.h
- *
- *  S390 version
- *
- */
-
-#ifndef _S390_ERRNO_H
-#define _S390_ERRNO_H
-
-#include <asm-generic/errno.h>
-
-#endif
diff --git a/include/asm-s390/etr.h b/include/asm-s390/etr.h
deleted file mode 100644
index 80ef58c61970..000000000000
--- a/include/asm-s390/etr.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- *  include/asm-s390/etr.h
- *
- *  Copyright IBM Corp. 2006
- *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- */
-#ifndef __S390_ETR_H
-#define __S390_ETR_H
-
-/* ETR attachment control register */
-struct etr_eacr {
-        unsigned int e0         : 1;    /* port 0 stepping control */
-        unsigned int e1         : 1;    /* port 1 stepping control */
-        unsigned int _pad0      : 5;    /* must be 00100 */
-        unsigned int dp         : 1;    /* data port control */
-        unsigned int p0         : 1;    /* port 0 change recognition control */
-        unsigned int p1         : 1;    /* port 1 change recognition control */
-        unsigned int _pad1      : 3;    /* must be 000 */
-        unsigned int ea         : 1;    /* ETR alert control */
-        unsigned int es         : 1;    /* ETR sync check control */
-        unsigned int sl         : 1;    /* switch to local control */
-} __attribute__ ((packed));
-
-/* Port state returned by steai */
-enum etr_psc {
-        etr_psc_operational = 0,
-        etr_psc_semi_operational = 1,
-        etr_psc_protocol_error =  4,
-        etr_psc_no_symbols = 8,
-        etr_psc_no_signal = 12,
-        etr_psc_pps_mode = 13
-};
-
-/* Logical port state returned by stetr */
-enum etr_lpsc {
-        etr_lpsc_operational_step = 0,
-        etr_lpsc_operational_alt = 1,
-        etr_lpsc_semi_operational = 2,
-        etr_lpsc_protocol_error =  4,
-        etr_lpsc_no_symbol_sync = 8,
-        etr_lpsc_no_signal = 12,
-        etr_lpsc_pps_mode = 13
-};
-
-/* ETR status words */
-struct etr_esw {
-        struct etr_eacr eacr;           /* attachment control register */
-        unsigned int y          : 1;    /* stepping mode */
-        unsigned int _pad0      : 5;    /* must be 00000 */
-        unsigned int p          : 1;    /* stepping port number */
-        unsigned int q          : 1;    /* data port number */
-        unsigned int psc0       : 4;    /* port 0 state code */
-        unsigned int psc1       : 4;    /* port 1 state code */
-} __attribute__ ((packed));
-
-/* Second level data register status word */
-struct etr_slsw {
-        unsigned int vv1        : 1;    /* copy of validity bit data frame 1 */
-        unsigned int vv2        : 1;    /* copy of validity bit data frame 2 */
-        unsigned int vv3        : 1;    /* copy of validity bit data frame 3 */
-        unsigned int vv4        : 1;    /* copy of validity bit data frame 4 */
-        unsigned int _pad0      : 19;   /* must by all zeroes */
-        unsigned int n          : 1;    /* EAF port number */
-        unsigned int v1         : 1;    /* validity bit ETR data frame 1 */
-        unsigned int v2         : 1;    /* validity bit ETR data frame 2 */
-        unsigned int v3         : 1;    /* validity bit ETR data frame 3 */
-        unsigned int v4         : 1;    /* validity bit ETR data frame 4 */
-        unsigned int _pad1      : 4;    /* must be 0000 */
-} __attribute__ ((packed));
-
-/* ETR data frames */
-struct etr_edf1 {
-        unsigned int u          : 1;    /* untuned bit */
-        unsigned int _pad0      : 1;    /* must be 0 */
-        unsigned int r          : 1;    /* service request bit */
-        unsigned int _pad1      : 4;    /* must be 0000 */
-        unsigned int a          : 1;    /* time adjustment bit */
-        unsigned int net_id     : 8;    /* ETR network id */
-        unsigned int etr_id     : 8;    /* id of ETR which sends data frames */
-        unsigned int etr_pn     : 8;    /* port number of ETR output port */
-} __attribute__ ((packed));
-
-struct etr_edf2 {
-        unsigned int etv        : 32;   /* Upper 32 bits of TOD. */
-} __attribute__ ((packed));
-
-struct etr_edf3 {
-        unsigned int rc         : 8;    /* failure reason code */
-        unsigned int _pad0      : 3;    /* must be 000 */
-        unsigned int c          : 1;    /* ETR coupled bit */
-        unsigned int tc         : 4;    /* ETR type code */
-        unsigned int blto       : 8;    /* biased local time offset */
-                                        /* (blto - 128) * 15 = minutes */
-        unsigned int buo        : 8;    /* biased utc offset */
-                                        /* (buo - 128) = leap seconds */
-} __attribute__ ((packed));
-
-struct etr_edf4 {
-        unsigned int ed         : 8;    /* ETS device dependent data */
-        unsigned int _pad0      : 1;    /* must be 0 */
-        unsigned int buc        : 5;    /* biased ut1 correction */
-                                        /* (buc - 16) * 0.1 seconds */
-        unsigned int em         : 6;    /* ETS error magnitude */
-        unsigned int dc         : 6;    /* ETS drift code */
-        unsigned int sc         : 6;    /* ETS steering code */
-} __attribute__ ((packed));
-
-/*
- * ETR attachment information block, two formats
- * format 1 has 4 reserved words with a size of 64 bytes
- * format 2 has 16 reserved words with a size of 96 bytes
- */
-struct etr_aib {
-        struct etr_esw esw;
-        struct etr_slsw slsw;
-        unsigned long long tsp;
-        struct etr_edf1 edf1;
-        struct etr_edf2 edf2;
-        struct etr_edf3 edf3;
-        struct etr_edf4 edf4;
-        unsigned int reserved[16];
-} __attribute__ ((packed,aligned(8)));
-
-/* ETR interruption parameter */
-struct etr_irq_parm {
-        unsigned int _pad0      : 8;
-        unsigned int pc0        : 1;    /* port 0 state change */
-        unsigned int pc1        : 1;    /* port 1 state change */
-        unsigned int _pad1      : 3;
-        unsigned int eai        : 1;    /* ETR alert indication */
-        unsigned int _pad2      : 18;
-} __attribute__ ((packed));
-
-/* Query TOD offset result */
-struct etr_ptff_qto {
-        unsigned long long physical_clock;
-        unsigned long long tod_offset;
-        unsigned long long logical_tod_offset;
-        unsigned long long tod_epoch_difference;
-} __attribute__ ((packed));
-
-/* Inline assembly helper functions */
-static inline int etr_setr(struct etr_eacr *ctrl)
-{
-        int rc = -ENOSYS;
-
-        asm volatile(
-                "       .insn   s,0xb2160000,0(%2)\n"
-                "0:     la      %0,0\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "+d" (rc) : "m" (*ctrl), "a" (ctrl));
-        return rc;
-}
-
-/* Stores a format 1 aib with 64 bytes */
-static inline int etr_stetr(struct etr_aib *aib)
-{
-        int rc = -ENOSYS;
-
-        asm volatile(
-                "       .insn   s,0xb2170000,0(%2)\n"
-                "0:     la      %0,0\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "+d" (rc) : "m" (*aib), "a" (aib));
-        return rc;
-}
-
-/* Stores a format 2 aib with 96 bytes for specified port */
-static inline int etr_steai(struct etr_aib *aib, unsigned int func)
-{
-        register unsigned int reg0 asm("0") = func;
-        int rc = -ENOSYS;
-
-        asm volatile(
-                "       .insn   s,0xb2b30000,0(%2)\n"
-                "0:     la      %0,0\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "+d" (rc) : "m" (*aib), "a" (aib), "d" (reg0));
-        return rc;
-}
-
-/* Function codes for the steai instruction. */
-#define ETR_STEAI_STEPPING_PORT         0x10
-#define ETR_STEAI_ALTERNATE_PORT        0x11
-#define ETR_STEAI_PORT_0                0x12
-#define ETR_STEAI_PORT_1                0x13
-
-static inline int etr_ptff(void *ptff_block, unsigned int func)
-{
-        register unsigned int reg0 asm("0") = func;
-        register unsigned long reg1 asm("1") = (unsigned long) ptff_block;
-        int rc = -ENOSYS;
-
-        asm volatile(
-                "       .word   0x0104\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (rc), "=m" (ptff_block)
-                : "d" (reg0), "d" (reg1), "m" (ptff_block) : "cc");
-        return rc;
-}
-
-/* Function codes for the ptff instruction. */
-#define ETR_PTFF_QAF    0x00    /* query available functions */
-#define ETR_PTFF_QTO    0x01    /* query tod offset */
-#define ETR_PTFF_QSI    0x02    /* query steering information */
-#define ETR_PTFF_ATO    0x40    /* adjust tod offset */
-#define ETR_PTFF_STO    0x41    /* set tod offset */
-#define ETR_PTFF_SFS    0x42    /* set fine steering rate */
-#define ETR_PTFF_SGS    0x43    /* set gross steering rate */
-
-/* Functions needed by the machine check handler */
-void etr_switch_to_local(void);
-void etr_sync_check(void);
-
-/* STP interruption parameter */
-struct stp_irq_parm {
-        unsigned int _pad0      : 14;
-        unsigned int tsc        : 1;    /* Timing status change */
-        unsigned int lac        : 1;    /* Link availability change */
-        unsigned int tcpc       : 1;    /* Time control parameter change */
-        unsigned int _pad2      : 15;
-} __attribute__ ((packed));
-
-#define STP_OP_SYNC     1
-#define STP_OP_CTRL     3
-
-struct stp_sstpi {
-        unsigned int rsvd0;
-        unsigned int rsvd1 : 8;
-        unsigned int stratum : 8;
-        unsigned int vbits : 16;
-        unsigned int leaps : 16;
-        unsigned int tmd : 4;
-        unsigned int ctn : 4;
-        unsigned int rsvd2 : 3;
-        unsigned int c : 1;
-        unsigned int tst : 4;
-        unsigned int tzo : 16;
-        unsigned int dsto : 16;
-        unsigned int ctrl : 16;
-        unsigned int rsvd3 : 16;
-        unsigned int tto;
-        unsigned int rsvd4;
-        unsigned int ctnid[3];
-        unsigned int rsvd5;
-        unsigned int todoff[4];
-        unsigned int rsvd6[48];
-} __attribute__ ((packed));
-
-/* Functions needed by the machine check handler */
-void stp_sync_check(void);
-void stp_island_check(void);
-
-#endif /* __S390_ETR_H */
diff --git a/include/asm-s390/extmem.h b/include/asm-s390/extmem.h
deleted file mode 100644
index 33837d756184..000000000000
--- a/include/asm-s390/extmem.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  include/asm-s390x/extmem.h
- *
- *  definitions for external memory segment support
- *  Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
- */
-
-#ifndef _ASM_S390X_DCSS_H
-#define _ASM_S390X_DCSS_H
-#ifndef __ASSEMBLY__
-
-/* possible values for segment type as returned by segment_info */
-#define SEG_TYPE_SW 0
-#define SEG_TYPE_EW 1
-#define SEG_TYPE_SR 2
-#define SEG_TYPE_ER 3
-#define SEG_TYPE_SN 4
-#define SEG_TYPE_EN 5
-#define SEG_TYPE_SC 6
-#define SEG_TYPE_EWEN 7
-
-#define SEGMENT_SHARED 0
-#define SEGMENT_EXCLUSIVE 1
-
-int segment_load (char *name, int segtype, unsigned long *addr, unsigned long *length);
-void segment_unload(char *name);
-void segment_save(char *name);
-int segment_type (char* name);
-int segment_modify_shared (char *name, int do_nonshared);
-void segment_warning(int rc, char *seg_name);
-
-#endif
-#endif
diff --git a/include/asm-s390/fb.h b/include/asm-s390/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/include/asm-s390/fb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/include/asm-s390/fcntl.h b/include/asm-s390/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-s390/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-s390/fcx.h b/include/asm-s390/fcx.h
deleted file mode 100644
index 8be1f3a58042..000000000000
--- a/include/asm-s390/fcx.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- *  Functions for assembling fcx enabled I/O control blocks.
- *
- *    Copyright IBM Corp. 2008
- *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
- */
-
-#ifndef _ASM_S390_FCX_H
-#define _ASM_S390_FCX_H _ASM_S390_FCX_H
-
-#include <linux/types.h>
-
-#define TCW_FORMAT_DEFAULT              0
-#define TCW_TIDAW_FORMAT_DEFAULT        0
-#define TCW_FLAGS_INPUT_TIDA            1 << (23 - 5)
-#define TCW_FLAGS_TCCB_TIDA             1 << (23 - 6)
-#define TCW_FLAGS_OUTPUT_TIDA           1 << (23 - 7)
-#define TCW_FLAGS_TIDAW_FORMAT(x)       ((x) & 3) << (23 - 9)
-#define TCW_FLAGS_GET_TIDAW_FORMAT(x)   (((x) >> (23 - 9)) & 3)
-
-/**
- * struct tcw - Transport Control Word (TCW)
- * @format: TCW format
- * @flags: TCW flags
- * @tccbl: Transport-Command-Control-Block Length
- * @r: Read Operations
- * @w: Write Operations
- * @output: Output-Data Address
- * @input: Input-Data Address
- * @tsb: Transport-Status-Block Address
- * @tccb: Transport-Command-Control-Block Address
- * @output_count: Output Count
- * @input_count: Input Count
- * @intrg: Interrogate TCW Address
- */
-struct tcw {
-        u32 format:2;
-        u32 :6;
-        u32 flags:24;
-        u32 :8;
-        u32 tccbl:6;
-        u32 r:1;
-        u32 w:1;
-        u32 :16;
-        u64 output;
-        u64 input;
-        u64 tsb;
-        u64 tccb;
-        u32 output_count;
-        u32 input_count;
-        u32 :32;
-        u32 :32;
-        u32 :32;
-        u32 intrg;
-} __attribute__ ((packed, aligned(64)));
-
-#define TIDAW_FLAGS_LAST                1 << (7 - 0)
-#define TIDAW_FLAGS_SKIP                1 << (7 - 1)
-#define TIDAW_FLAGS_DATA_INT            1 << (7 - 2)
-#define TIDAW_FLAGS_TTIC                1 << (7 - 3)
-#define TIDAW_FLAGS_INSERT_CBC          1 << (7 - 4)
-
-/**
- * struct tidaw - Transport-Indirect-Addressing Word (TIDAW)
- * @flags: TIDAW flags. Can be an arithmetic OR of the following constants:
- * %TIDAW_FLAGS_LAST, %TIDAW_FLAGS_SKIP, %TIDAW_FLAGS_DATA_INT,
- * %TIDAW_FLAGS_TTIC, %TIDAW_FLAGS_INSERT_CBC
- * @count: Count
- * @addr: Address
- */
-struct tidaw {
-        u32 flags:8;
-        u32 :24;
-        u32 count;
-        u64 addr;
-} __attribute__ ((packed, aligned(16)));
-
-/**
- * struct tsa_iostat - I/O-Status Transport-Status Area (IO-Stat TSA)
- * @dev_time: Device Time
- * @def_time: Defer Time
- * @queue_time: Queue Time
- * @dev_busy_time: Device-Busy Time
- * @dev_act_time: Device-Active-Only Time
- * @sense: Sense Data (if present)
- */
-struct tsa_iostat {
-        u32 dev_time;
-        u32 def_time;
-        u32 queue_time;
-        u32 dev_busy_time;
-        u32 dev_act_time;
-        u8 sense[32];
-} __attribute__ ((packed));
-
-/**
- * struct tsa_ddpcs - Device-Detected-Program-Check Transport-Status Area (DDPC TSA)
- * @rc: Reason Code
- * @rcq: Reason Code Qualifier
- * @sense: Sense Data (if present)
- */
-struct tsa_ddpc {
-        u32 :24;
-        u32 rc:8;
-        u8 rcq[16];
-        u8 sense[32];
-} __attribute__ ((packed));
-
-#define TSA_INTRG_FLAGS_CU_STATE_VALID          1 << (7 - 0)
-#define TSA_INTRG_FLAGS_DEV_STATE_VALID         1 << (7 - 1)
-#define TSA_INTRG_FLAGS_OP_STATE_VALID          1 << (7 - 2)
-
-/**
- * struct tsa_intrg - Interrogate Transport-Status Area (Intrg. TSA)
- * @format: Format
- * @flags: Flags. Can be an arithmetic OR of the following constants:
- * %TSA_INTRG_FLAGS_CU_STATE_VALID, %TSA_INTRG_FLAGS_DEV_STATE_VALID,
- * %TSA_INTRG_FLAGS_OP_STATE_VALID
- * @cu_state: Controle-Unit State
- * @dev_state: Device State
- * @op_state: Operation State
- * @sd_info: State-Dependent Information
- * @dl_id: Device-Level Identifier
- * @dd_data: Device-Dependent Data
- */
-struct tsa_intrg {
-        u32 format:8;
-        u32 flags:8;
-        u32 cu_state:8;
-        u32 dev_state:8;
-        u32 op_state:8;
-        u32 :24;
-        u8 sd_info[12];
-        u32 dl_id;
-        u8 dd_data[28];
-} __attribute__ ((packed));
-
-#define TSB_FORMAT_NONE         0
-#define TSB_FORMAT_IOSTAT       1
-#define TSB_FORMAT_DDPC         2
-#define TSB_FORMAT_INTRG        3
-
-#define TSB_FLAGS_DCW_OFFSET_VALID      1 << (7 - 0)
-#define TSB_FLAGS_COUNT_VALID           1 << (7 - 1)
-#define TSB_FLAGS_CACHE_MISS            1 << (7 - 2)
-#define TSB_FLAGS_TIME_VALID            1 << (7 - 3)
-#define TSB_FLAGS_FORMAT(x)             ((x) & 7)
-#define TSB_FORMAT(t)                   ((t)->flags & 7)
-
-/**
- * struct tsb - Transport-Status Block (TSB)
- * @length: Length
- * @flags: Flags. Can be an arithmetic OR of the following constants:
- * %TSB_FLAGS_DCW_OFFSET_VALID, %TSB_FLAGS_COUNT_VALID, %TSB_FLAGS_CACHE_MISS,
- * %TSB_FLAGS_TIME_VALID
- * @dcw_offset: DCW Offset
- * @count: Count
- * @tsa: Transport-Status-Area
- */
-struct tsb {
-        u32 length:8;
-        u32 flags:8;
-        u32 dcw_offset:16;
-        u32 count;
-        u32 :32;
-        union {
-                struct tsa_iostat iostat;
-                struct tsa_ddpc ddpc;
-                struct tsa_intrg intrg;
-        } __attribute__ ((packed)) tsa;
-} __attribute__ ((packed, aligned(8)));
-
-#define DCW_INTRG_FORMAT_DEFAULT        0
-
-#define DCW_INTRG_RC_UNSPECIFIED        0
-#define DCW_INTRG_RC_TIMEOUT            1
-
-#define DCW_INTRG_RCQ_UNSPECIFIED       0
-#define DCW_INTRG_RCQ_PRIMARY           1
-#define DCW_INTRG_RCQ_SECONDARY         2
-
-#define DCW_INTRG_FLAGS_MPM             1 < (7 - 0)
-#define DCW_INTRG_FLAGS_PPR             1 < (7 - 1)
-#define DCW_INTRG_FLAGS_CRIT            1 < (7 - 2)
-
-/**
- * struct dcw_intrg_data - Interrogate DCW data
- * @format: Format. Should be %DCW_INTRG_FORMAT_DEFAULT
- * @rc: Reason Code. Can be one of %DCW_INTRG_RC_UNSPECIFIED,
- * %DCW_INTRG_RC_TIMEOUT
- * @rcq: Reason Code Qualifier: Can be one of %DCW_INTRG_RCQ_UNSPECIFIED,
- * %DCW_INTRG_RCQ_PRIMARY, %DCW_INTRG_RCQ_SECONDARY
- * @lpm: Logical-Path Mask
- * @pam: Path-Available Mask
- * @pim: Path-Installed Mask
- * @timeout: Timeout
- * @flags: Flags. Can be an arithmetic OR of %DCW_INTRG_FLAGS_MPM,
- * %DCW_INTRG_FLAGS_PPR, %DCW_INTRG_FLAGS_CRIT
- * @time: Time
- * @prog_id: Program Identifier
- * @prog_data: Program-Dependent Data
- */
-struct dcw_intrg_data {
-        u32 format:8;
-        u32 rc:8;
-        u32 rcq:8;
-        u32 lpm:8;
-        u32 pam:8;
-        u32 pim:8;
-        u32 timeout:16;
-        u32 flags:8;
-        u32 :24;
-        u32 :32;
-        u64 time;
-        u64 prog_id;
-        u8  prog_data[0];
-} __attribute__ ((packed));
-
-#define DCW_FLAGS_CC            1 << (7 - 1)
-
-#define DCW_CMD_WRITE           0x01
-#define DCW_CMD_READ            0x02
-#define DCW_CMD_CONTROL         0x03
-#define DCW_CMD_SENSE           0x04
-#define DCW_CMD_SENSE_ID        0xe4
-#define DCW_CMD_INTRG           0x40
-
-/**
- * struct dcw - Device-Command Word (DCW)
- * @cmd: Command Code. Can be one of %DCW_CMD_WRITE, %DCW_CMD_READ,
- * %DCW_CMD_CONTROL, %DCW_CMD_SENSE, %DCW_CMD_SENSE_ID, %DCW_CMD_INTRG
- * @flags: Flags. Can be an arithmetic OR of %DCW_FLAGS_CC
- * @cd_count: Control-Data Count
- * @count: Count
- * @cd: Control Data
- */
-struct dcw {
-        u32 cmd:8;
-        u32 flags:8;
-        u32 :8;
-        u32 cd_count:8;
-        u32 count;
-        u8 cd[0];
-} __attribute__ ((packed));
-
-#define TCCB_FORMAT_DEFAULT     0x7f
-#define TCCB_MAX_DCW            30
-#define TCCB_MAX_SIZE           (sizeof(struct tccb_tcah) + \
-                                 TCCB_MAX_DCW * sizeof(struct dcw) + \
-                                 sizeof(struct tccb_tcat))
-#define TCCB_SAC_DEFAULT        0xf901
-#define TCCB_SAC_INTRG          0xf902
-
-/**
- * struct tccb_tcah - Transport-Command-Area Header (TCAH)
- * @format: Format. Should be %TCCB_FORMAT_DEFAULT
- * @tcal: Transport-Command-Area Length
- * @sac: Service-Action Code. Can be one of %TCCB_SAC_DEFAULT, %TCCB_SAC_INTRG
- * @prio: Priority
- */
-struct tccb_tcah {
-        u32 format:8;
-        u32 :24;
-        u32 :24;
-        u32 tcal:8;
-        u32 sac:16;
-        u32 :8;
-        u32 prio:8;
-        u32 :32;
-} __attribute__ ((packed));
-
-/**
- * struct tccb_tcat - Transport-Command-Area Trailer (TCAT)
- * @count: Transport Count
- */
-struct tccb_tcat {
-        u32 :32;
-        u32 count;
-} __attribute__ ((packed));
-
-/**
- * struct tccb - (partial) Transport-Command-Control Block (TCCB)
- * @tcah: TCAH
- * @tca: Transport-Command Area
- */
-struct tccb {
-        struct tccb_tcah tcah;
-        u8 tca[0];
-} __attribute__ ((packed, aligned(8)));
-
-struct tcw *tcw_get_intrg(struct tcw *tcw);
-void *tcw_get_data(struct tcw *tcw);
-struct tccb *tcw_get_tccb(struct tcw *tcw);
-struct tsb *tcw_get_tsb(struct tcw *tcw);
-
-void tcw_init(struct tcw *tcw, int r, int w);
-void tcw_finalize(struct tcw *tcw, int num_tidaws);
-
-void tcw_set_intrg(struct tcw *tcw, struct tcw *intrg_tcw);
-void tcw_set_data(struct tcw *tcw, void *data, int use_tidal);
-void tcw_set_tccb(struct tcw *tcw, struct tccb *tccb);
-void tcw_set_tsb(struct tcw *tcw, struct tsb *tsb);
-
-void tccb_init(struct tccb *tccb, size_t tccb_size, u32 sac);
-void tsb_init(struct tsb *tsb);
-struct dcw *tccb_add_dcw(struct tccb *tccb, size_t tccb_size, u8 cmd, u8 flags,
-                         void *cd, u8 cd_count, u32 count);
-struct tidaw *tcw_add_tidaw(struct tcw *tcw, int num_tidaws, u8 flags,
-                            void *addr, u32 count);
-
-#endif /* _ASM_S390_FCX_H */
diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h
deleted file mode 100644
index 5c5d02de49e9..000000000000
--- a/include/asm-s390/futex.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _ASM_S390_FUTEX_H
-#define _ASM_S390_FUTEX_H
-
-#ifdef __KERNEL__
-
-#include <linux/futex.h>
-#include <linux/uaccess.h>
-#include <asm/errno.h>
-
-static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
-{
-        int op = (encoded_op >> 28) & 7;
-        int cmp = (encoded_op >> 24) & 15;
-        int oparg = (encoded_op << 8) >> 20;
-        int cmparg = (encoded_op << 20) >> 20;
-        int oldval, ret;
-
-        if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
-                oparg = 1 << oparg;
-
-        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
-                return -EFAULT;
-
-        pagefault_disable();
-        ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval);
-        pagefault_enable();
-
-        if (!ret) {
-                switch (cmp) {
-                case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
-                case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
-                case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
-                case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
-                case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
-                case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
-                default: ret = -ENOSYS;
-                }
-        }
-        return ret;
-}
-
-static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr,
-                                                int oldval, int newval)
-{
-        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
-                return -EFAULT;
-
-        return uaccess.futex_atomic_cmpxchg(uaddr, oldval, newval);
-}
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_S390_FUTEX_H */
diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h
deleted file mode 100644
index 89ec7056da28..000000000000
--- a/include/asm-s390/hardirq.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  include/asm-s390/hardirq.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
- *
- *  Derived from "include/asm-i386/hardirq.h"
- */
-
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/sched.h>
-#include <linux/cache.h>
-#include <linux/interrupt.h>
-#include <asm/lowcore.h>
-
-/* irq_cpustat_t is unused currently, but could be converted
- * into a percpu variable instead of storing softirq_pending
- * on the lowcore */
-typedef struct {
-        unsigned int __softirq_pending;
-} irq_cpustat_t;
-
-#define local_softirq_pending() (S390_lowcore.softirq_pending)
-
-#define __ARCH_IRQ_STAT
-#define __ARCH_HAS_DO_SOFTIRQ
-
-#define HARDIRQ_BITS    8
-
-void clock_comparator_work(void);
-
-static inline unsigned long long local_tick_disable(void)
-{
-        unsigned long long old;
-
-        old = S390_lowcore.clock_comparator;
-        S390_lowcore.clock_comparator = -1ULL;
-        return old;
-}
-
-static inline void local_tick_enable(unsigned long long comp)
-{
-        S390_lowcore.clock_comparator = comp;
-}
-
-#endif /* __ASM_HARDIRQ_H */
diff --git a/include/asm-s390/hugetlb.h b/include/asm-s390/hugetlb.h
deleted file mode 100644
index 670a1d1745d2..000000000000
--- a/include/asm-s390/hugetlb.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  IBM System z Huge TLB Page Support for Kernel.
- *
- *    Copyright IBM Corp. 2008
- *    Author(s): Gerald Schaefer <gerald.schaefer@de.ibm.com>
- */
-
-#ifndef _ASM_S390_HUGETLB_H
-#define _ASM_S390_HUGETLB_H
-
-#include <asm/page.h>
-#include <asm/pgtable.h>
-
-
-#define is_hugepage_only_range(mm, addr, len)   0
-#define hugetlb_free_pgd_range                  free_pgd_range
-
-void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
-                     pte_t *ptep, pte_t pte);
-
-/*
- * If the arch doesn't supply something else, assume that hugepage
- * size aligned regions are ok without further preparation.
- */
-static inline int prepare_hugepage_range(struct file *file,
-                        unsigned long addr, unsigned long len)
-{
-        if (len & ~HPAGE_MASK)
-                return -EINVAL;
-        if (addr & ~HPAGE_MASK)
-                return -EINVAL;
-        return 0;
-}
-
-#define hugetlb_prefault_arch_hook(mm)          do { } while (0)
-
-int arch_prepare_hugepage(struct page *page);
-void arch_release_hugepage(struct page *page);
-
-static inline pte_t pte_mkhuge(pte_t pte)
-{
-        /*
-         * PROT_NONE needs to be remapped from the pte type to the ste type.
-         * The HW invalid bit is also different for pte and ste. The pte
-         * invalid bit happens to be the same as the ste _SEGMENT_ENTRY_LARGE
-         * bit, so we don't have to clear it.
-         */
-        if (pte_val(pte) & _PAGE_INVALID) {
-                if (pte_val(pte) & _PAGE_SWT)
-                        pte_val(pte) |= _HPAGE_TYPE_NONE;
-                pte_val(pte) |= _SEGMENT_ENTRY_INV;
-        }
-        /*
-         * Clear SW pte bits SWT and SWX, there are no SW bits in a segment
-         * table entry.
-         */
-        pte_val(pte) &= ~(_PAGE_SWT | _PAGE_SWX);
-        /*
-         * Also set the change-override bit because we don't need dirty bit
-         * tracking for hugetlbfs pages.
-         */
-        pte_val(pte) |= (_SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO);
-        return pte;
-}
-
-static inline pte_t huge_pte_wrprotect(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_RO;
-        return pte;
-}
-
-static inline int huge_pte_none(pte_t pte)
-{
-        return (pte_val(pte) & _SEGMENT_ENTRY_INV) &&
-                !(pte_val(pte) & _SEGMENT_ENTRY_RO);
-}
-
-static inline pte_t huge_ptep_get(pte_t *ptep)
-{
-        pte_t pte = *ptep;
-        unsigned long mask;
-
-        if (!MACHINE_HAS_HPAGE) {
-                ptep = (pte_t *) (pte_val(pte) & _SEGMENT_ENTRY_ORIGIN);
-                if (ptep) {
-                        mask = pte_val(pte) &
-                                (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
-                        pte = pte_mkhuge(*ptep);
-                        pte_val(pte) |= mask;
-                }
-        }
-        return pte;
-}
-
-static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
-                                            unsigned long addr, pte_t *ptep)
-{
-        pte_t pte = huge_ptep_get(ptep);
-
-        pmd_clear((pmd_t *) ptep);
-        return pte;
-}
-
-static inline void __pmd_csp(pmd_t *pmdp)
-{
-        register unsigned long reg2 asm("2") = pmd_val(*pmdp);
-        register unsigned long reg3 asm("3") = pmd_val(*pmdp) |
-                                               _SEGMENT_ENTRY_INV;
-        register unsigned long reg4 asm("4") = ((unsigned long) pmdp) + 5;
-
-        asm volatile(
-                "       csp %1,%3"
-                : "=m" (*pmdp)
-                : "d" (reg2), "d" (reg3), "d" (reg4), "m" (*pmdp) : "cc");
-        pmd_val(*pmdp) = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY;
-}
-
-static inline void __pmd_idte(unsigned long address, pmd_t *pmdp)
-{
-        unsigned long sto = (unsigned long) pmdp -
-                                pmd_index(address) * sizeof(pmd_t);
-
-        if (!(pmd_val(*pmdp) & _SEGMENT_ENTRY_INV)) {
-                asm volatile(
-                        "       .insn   rrf,0xb98e0000,%2,%3,0,0"
-                        : "=m" (*pmdp)
-                        : "m" (*pmdp), "a" (sto),
-                          "a" ((address & HPAGE_MASK))
-                );
-        }
-        pmd_val(*pmdp) = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY;
-}
-
-static inline void huge_ptep_invalidate(struct mm_struct *mm,
-                                        unsigned long address, pte_t *ptep)
-{
-        pmd_t *pmdp = (pmd_t *) ptep;
-
-        if (!MACHINE_HAS_IDTE) {
-                __pmd_csp(pmdp);
-                if (mm->context.noexec) {
-                        pmdp = get_shadow_table(pmdp);
-                        __pmd_csp(pmdp);
-                }
-                return;
-        }
-
-        __pmd_idte(address, pmdp);
-        if (mm->context.noexec) {
-                pmdp = get_shadow_table(pmdp);
-                __pmd_idte(address, pmdp);
-        }
-        return;
-}
-
-#define huge_ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty) \
-({                                                                          \
-        int __changed = !pte_same(huge_ptep_get(__ptep), __entry);          \
-        if (__changed) {                                                    \
-                huge_ptep_invalidate((__vma)->vm_mm, __addr, __ptep);       \
-                set_huge_pte_at((__vma)->vm_mm, __addr, __ptep, __entry);   \
-        }                                                                   \
-        __changed;                                                          \
-})
-
-#define huge_ptep_set_wrprotect(__mm, __addr, __ptep)                   \
-({                                                                      \
-        pte_t __pte = huge_ptep_get(__ptep);                            \
-        if (pte_write(__pte)) {                                         \
-                if (atomic_read(&(__mm)->mm_users) > 1 ||               \
-                    (__mm) != current->active_mm)                       \
-                        huge_ptep_invalidate(__mm, __addr, __ptep);     \
-                set_huge_pte_at(__mm, __addr, __ptep,                   \
-                                huge_pte_wrprotect(__pte));             \
-        }                                                               \
-})
-
-static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
-                                         unsigned long address, pte_t *ptep)
-{
-        huge_ptep_invalidate(vma->vm_mm, address, ptep);
-}
-
-#endif /* _ASM_S390_HUGETLB_H */
diff --git a/include/asm-s390/idals.h b/include/asm-s390/idals.h
deleted file mode 100644
index e82c10efe65a..000000000000
--- a/include/asm-s390/idals.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* 
- * File...........: linux/include/asm-s390x/idals.h
- * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
- *                  Martin Schwidefsky <schwidefsky@de.ibm.com>
- * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000a
- 
- * History of changes
- * 07/24/00 new file
- * 05/04/02 code restructuring.
- */
-
-#ifndef _S390_IDALS_H
-#define _S390_IDALS_H
-
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/cio.h>
-#include <asm/uaccess.h>
-
-#ifdef __s390x__
-#define IDA_SIZE_LOG 12 /* 11 for 2k , 12 for 4k */
-#else
-#define IDA_SIZE_LOG 11 /* 11 for 2k , 12 for 4k */
-#endif
-#define IDA_BLOCK_SIZE (1L<<IDA_SIZE_LOG)
-
-/*
- * Test if an address/length pair needs an idal list.
- */
-static inline int
-idal_is_needed(void *vaddr, unsigned int length)
-{
-#ifdef __s390x__
-        return ((__pa(vaddr) + length - 1) >> 31) != 0;
-#else
-        return 0;
-#endif
-}
-
-
-/*
- * Return the number of idal words needed for an address/length pair.
- */
-static inline unsigned int
-idal_nr_words(void *vaddr, unsigned int length)
-{
-#ifdef __s390x__
-        if (idal_is_needed(vaddr, length))
-                return ((__pa(vaddr) & (IDA_BLOCK_SIZE-1)) + length + 
-                        (IDA_BLOCK_SIZE-1)) >> IDA_SIZE_LOG;
-#endif
-        return 0;
-}
-
-/*
- * Create the list of idal words for an address/length pair.
- */
-static inline unsigned long *
-idal_create_words(unsigned long *idaws, void *vaddr, unsigned int length)
-{
-#ifdef __s390x__
-        unsigned long paddr;
-        unsigned int cidaw;
-
-        paddr = __pa(vaddr);
-        cidaw = ((paddr & (IDA_BLOCK_SIZE-1)) + length + 
-                 (IDA_BLOCK_SIZE-1)) >> IDA_SIZE_LOG;
-        *idaws++ = paddr;
-        paddr &= -IDA_BLOCK_SIZE;
-        while (--cidaw > 0) {
-                paddr += IDA_BLOCK_SIZE;
-                *idaws++ = paddr;
-        }
-#endif
-        return idaws;
-}
-
-/*
- * Sets the address of the data in CCW.
- * If necessary it allocates an IDAL and sets the appropriate flags.
- */
-static inline int
-set_normalized_cda(struct ccw1 * ccw, void *vaddr)
-{
-#ifdef __s390x__
-        unsigned int nridaws;
-        unsigned long *idal;
-
-        if (ccw->flags & CCW_FLAG_IDA)
-                return -EINVAL;
-        nridaws = idal_nr_words(vaddr, ccw->count);
-        if (nridaws > 0) {
-                idal = kmalloc(nridaws * sizeof(unsigned long),
-                               GFP_ATOMIC | GFP_DMA );
-                if (idal == NULL)
-                        return -ENOMEM;
-                idal_create_words(idal, vaddr, ccw->count);
-                ccw->flags |= CCW_FLAG_IDA;
-                vaddr = idal;
-        }
-#endif
-        ccw->cda = (__u32)(unsigned long) vaddr;
-        return 0;
-}
-
-/*
- * Releases any allocated IDAL related to the CCW.
- */
-static inline void
-clear_normalized_cda(struct ccw1 * ccw)
-{
-#ifdef __s390x__
-        if (ccw->flags & CCW_FLAG_IDA) {
-                kfree((void *)(unsigned long) ccw->cda);
-                ccw->flags &= ~CCW_FLAG_IDA;
-        }
-#endif
-        ccw->cda = 0;
-}
-
-/*
- * Idal buffer extension
- */
-struct idal_buffer {
-        size_t size;
-        size_t page_order;
-        void *data[0];
-};
-
-/*
- * Allocate an idal buffer
- */
-static inline struct idal_buffer *
-idal_buffer_alloc(size_t size, int page_order)
-{
-        struct idal_buffer *ib;
-        int nr_chunks, nr_ptrs, i;
-
-        nr_ptrs = (size + IDA_BLOCK_SIZE - 1) >> IDA_SIZE_LOG;
-        nr_chunks = (4096 << page_order) >> IDA_SIZE_LOG;
-        ib = kmalloc(sizeof(struct idal_buffer) + nr_ptrs*sizeof(void *),
-                     GFP_DMA | GFP_KERNEL);
-        if (ib == NULL)
-                return ERR_PTR(-ENOMEM);
-        ib->size = size;
-        ib->page_order = page_order;
-        for (i = 0; i < nr_ptrs; i++) {
-                if ((i & (nr_chunks - 1)) != 0) {
-                        ib->data[i] = ib->data[i-1] + IDA_BLOCK_SIZE;
-                        continue;
-                }
-                ib->data[i] = (void *)
-                        __get_free_pages(GFP_KERNEL, page_order);
-                if (ib->data[i] != NULL)
-                        continue;
-                // Not enough memory
-                while (i >= nr_chunks) {
-                        i -= nr_chunks;
-                        free_pages((unsigned long) ib->data[i],
-                                   ib->page_order);
-                }
-                kfree(ib);
-                return ERR_PTR(-ENOMEM);
-        }
-        return ib;
-}
-
-/*
- * Free an idal buffer.
- */
-static inline void
-idal_buffer_free(struct idal_buffer *ib)
-{
-        int nr_chunks, nr_ptrs, i;
-
-        nr_ptrs = (ib->size + IDA_BLOCK_SIZE - 1) >> IDA_SIZE_LOG;
-        nr_chunks = (4096 << ib->page_order) >> IDA_SIZE_LOG;
-        for (i = 0; i < nr_ptrs; i += nr_chunks)
-                free_pages((unsigned long) ib->data[i], ib->page_order);
-        kfree(ib);
-}
-
-/*
- * Test if a idal list is really needed.
- */
-static inline int
-__idal_buffer_is_needed(struct idal_buffer *ib)
-{
-#ifdef __s390x__
-        return ib->size > (4096ul << ib->page_order) ||
-                idal_is_needed(ib->data[0], ib->size);
-#else
-        return ib->size > (4096ul << ib->page_order);
-#endif
-}
-
-/*
- * Set channel data address to idal buffer.
- */
-static inline void
-idal_buffer_set_cda(struct idal_buffer *ib, struct ccw1 *ccw)
-{
-        if (__idal_buffer_is_needed(ib)) {
-                // setup idals;
-                ccw->cda = (u32)(addr_t) ib->data;
-                ccw->flags |= CCW_FLAG_IDA;
-        } else
-                // we do not need idals - use direct addressing
-                ccw->cda = (u32)(addr_t) ib->data[0];
-        ccw->count = ib->size;
-}
-
-/*
- * Copy count bytes from an idal buffer to user memory
- */
-static inline size_t
-idal_buffer_to_user(struct idal_buffer *ib, void __user *to, size_t count)
-{
-        size_t left;
-        int i;
-
-        BUG_ON(count > ib->size);
-        for (i = 0; count > IDA_BLOCK_SIZE; i++) {
-                left = copy_to_user(to, ib->data[i], IDA_BLOCK_SIZE);
-                if (left)
-                        return left + count - IDA_BLOCK_SIZE;
-                to = (void __user *) to + IDA_BLOCK_SIZE;
-                count -= IDA_BLOCK_SIZE;
-        }
-        return copy_to_user(to, ib->data[i], count);
-}
-
-/*
- * Copy count bytes from user memory to an idal buffer
- */
-static inline size_t
-idal_buffer_from_user(struct idal_buffer *ib, const void __user *from, size_t count)
-{
-        size_t left;
-        int i;
-
-        BUG_ON(count > ib->size);
-        for (i = 0; count > IDA_BLOCK_SIZE; i++) {
-                left = copy_from_user(ib->data[i], from, IDA_BLOCK_SIZE);
-                if (left)
-                        return left + count - IDA_BLOCK_SIZE;
-                from = (void __user *) from + IDA_BLOCK_SIZE;
-                count -= IDA_BLOCK_SIZE;
-        }
-        return copy_from_user(ib->data[i], from, count);
-}
-
-#endif
diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
deleted file mode 100644
index b7ff6afc3caa..000000000000
--- a/include/asm-s390/io.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  include/asm-s390/io.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/io.h"
- */
-
-#ifndef _S390_IO_H
-#define _S390_IO_H
-
-#ifdef __KERNEL__
-
-#include <asm/page.h>
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are pretty trivial
- */
-static inline unsigned long virt_to_phys(volatile void * address)
-{
-        unsigned long real_address;
-        asm volatile(
-                 "      lra     %0,0(%1)\n"
-                 "      jz      0f\n"
-                 "      la      %0,0\n"
-                 "0:"
-                 : "=a" (real_address) : "a" (address) : "cc");
-        return real_address;
-}
-
-static inline void * phys_to_virt(unsigned long address)
-{
-        return (void *) address;
-}
-
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/include/asm-s390/ioctl.h b/include/asm-s390/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-s390/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-s390/ioctls.h b/include/asm-s390/ioctls.h
deleted file mode 100644
index 40e481b1b461..000000000000
--- a/include/asm-s390/ioctls.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  include/asm-s390/ioctls.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/ioctls.h"
- */
-
-#ifndef __ARCH_S390_IOCTLS_H__
-#define __ARCH_S390_IOCTLS_H__
-
-#include <asm/ioctl.h>
-
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-
-#define TCGETS          0x5401
-#define TCSETS          0x5402
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T',0x2A, struct termios2)
-#define TCSETS2         _IOW('T',0x2B, struct termios2)
-#define TCSETSW2        _IOW('T',0x2C, struct termios2)
-#define TCSETSF2        _IOW('T',0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
-
-#define FIONCLEX        0x5450  /* these numbers need to be adjusted. */
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define FIOQSIZE        0x545E
-
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
-
-#endif
diff --git a/include/asm-s390/ipcbuf.h b/include/asm-s390/ipcbuf.h
deleted file mode 100644
index 37f293d12c8f..000000000000
--- a/include/asm-s390/ipcbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __S390_IPCBUF_H__
-#define __S390_IPCBUF_H__
-
-/*
- * The user_ipc_perm structure for S/390 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 32-bit mode_t and seq
- * - 2 miscellaneous 32-bit values
- */
-
-struct ipc64_perm
-{
-        __kernel_key_t          key;
-        __kernel_uid32_t        uid;
-        __kernel_gid32_t        gid;
-        __kernel_uid32_t        cuid;
-        __kernel_gid32_t        cgid;
-        __kernel_mode_t         mode;
-        unsigned short          __pad1;
-        unsigned short          seq;
-#ifndef __s390x__
-        unsigned short          __pad2;
-#endif /* ! __s390x__ */
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-
-#endif /* __S390_IPCBUF_H__ */
diff --git a/include/asm-s390/ipl.h b/include/asm-s390/ipl.h
deleted file mode 100644
index 1171e6d144a3..000000000000
--- a/include/asm-s390/ipl.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * s390 (re)ipl support
- *
- * Copyright IBM Corp. 2007
- */
-
-#ifndef _ASM_S390_IPL_H
-#define _ASM_S390_IPL_H
-
-#include <asm/types.h>
-#include <asm/cio.h>
-#include <asm/setup.h>
-
-#define IPL_PARMBLOCK_ORIGIN    0x2000
-
-#define IPL_PARM_BLK_FCP_LEN (sizeof(struct ipl_list_hdr) + \
-                              sizeof(struct ipl_block_fcp))
-
-#define IPL_PARM_BLK0_FCP_LEN (sizeof(struct ipl_block_fcp) + 8)
-
-#define IPL_PARM_BLK_CCW_LEN (sizeof(struct ipl_list_hdr) + \
-                              sizeof(struct ipl_block_ccw))
-
-#define IPL_PARM_BLK0_CCW_LEN (sizeof(struct ipl_block_ccw) + 8)
-
-#define IPL_MAX_SUPPORTED_VERSION (0)
-
-#define IPL_PARMBLOCK_START     ((struct ipl_parameter_block *) \
-                                 IPL_PARMBLOCK_ORIGIN)
-#define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.len)
-
-struct ipl_list_hdr {
-        u32 len;
-        u8  reserved1[3];
-        u8  version;
-        u32 blk0_len;
-        u8  pbt;
-        u8  flags;
-        u16 reserved2;
-} __attribute__((packed));
-
-struct ipl_block_fcp {
-        u8  reserved1[313-1];
-        u8  opt;
-        u8  reserved2[3];
-        u16 reserved3;
-        u16 devno;
-        u8  reserved4[4];
-        u64 wwpn;
-        u64 lun;
-        u32 bootprog;
-        u8  reserved5[12];
-        u64 br_lba;
-        u32 scp_data_len;
-        u8  reserved6[260];
-        u8  scp_data[];
-} __attribute__((packed));
-
-#define DIAG308_VMPARM_SIZE     64
-
-struct ipl_block_ccw {
-        u8  load_parm[8];
-        u8  reserved1[84];
-        u8  reserved2[2];
-        u16 devno;
-        u8  vm_flags;
-        u8  reserved3[3];
-        u32 vm_parm_len;
-        u8  nss_name[8];
-        u8  vm_parm[DIAG308_VMPARM_SIZE];
-        u8  reserved4[8];
-} __attribute__((packed));
-
-struct ipl_parameter_block {
-        struct ipl_list_hdr hdr;
-        union {
-                struct ipl_block_fcp fcp;
-                struct ipl_block_ccw ccw;
-        } ipl_info;
-} __attribute__((packed,aligned(4096)));
-
-/*
- * IPL validity flags
- */
-extern u32 ipl_flags;
-extern u32 dump_prefix_page;
-extern unsigned int zfcpdump_prefix_array[];
-
-extern void do_reipl(void);
-extern void do_halt(void);
-extern void do_poff(void);
-extern void ipl_save_parameters(void);
-extern void ipl_update_parameters(void);
-extern void get_ipl_vmparm(char *);
-
-enum {
-        IPL_DEVNO_VALID         = 1,
-        IPL_PARMBLOCK_VALID     = 2,
-        IPL_NSS_VALID           = 4,
-};
-
-enum ipl_type {
-        IPL_TYPE_UNKNOWN        = 1,
-        IPL_TYPE_CCW            = 2,
-        IPL_TYPE_FCP            = 4,
-        IPL_TYPE_FCP_DUMP       = 8,
-        IPL_TYPE_NSS            = 16,
-};
-
-struct ipl_info
-{
-        enum ipl_type type;
-        union {
-                struct {
-                        struct ccw_dev_id dev_id;
-                } ccw;
-                struct {
-                        struct ccw_dev_id dev_id;
-                        u64 wwpn;
-                        u64 lun;
-                } fcp;
-                struct {
-                        char name[NSS_NAME_SIZE + 1];
-                } nss;
-        } data;
-};
-
-extern struct ipl_info ipl_info;
-extern void setup_ipl(void);
-
-/*
- * DIAG 308 support
- */
-enum diag308_subcode  {
-        DIAG308_REL_HSA = 2,
-        DIAG308_IPL     = 3,
-        DIAG308_DUMP    = 4,
-        DIAG308_SET     = 5,
-        DIAG308_STORE   = 6,
-};
-
-enum diag308_ipl_type {
-        DIAG308_IPL_TYPE_FCP    = 0,
-        DIAG308_IPL_TYPE_CCW    = 2,
-};
-
-enum diag308_opt {
-        DIAG308_IPL_OPT_IPL     = 0x10,
-        DIAG308_IPL_OPT_DUMP    = 0x20,
-};
-
-enum diag308_flags {
-        DIAG308_FLAGS_LP_VALID  = 0x80,
-};
-
-enum diag308_vm_flags {
-        DIAG308_VM_FLAGS_NSS_VALID      = 0x80,
-        DIAG308_VM_FLAGS_VP_VALID       = 0x40,
-};
-
-enum diag308_rc {
-        DIAG308_RC_OK           = 0x0001,
-        DIAG308_RC_NOCONFIG     = 0x0102,
-};
-
-extern int diag308(unsigned long subcode, void *addr);
-
-#endif /* _ASM_S390_IPL_H */
diff --git a/include/asm-s390/irq.h b/include/asm-s390/irq.h
deleted file mode 100644
index 7da991a858f8..000000000000
--- a/include/asm-s390/irq.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _ASM_IRQ_H
-#define _ASM_IRQ_H
-
-#ifdef __KERNEL__
-#include <linux/hardirq.h>
-
-/*
- * the definition of irqs has changed in 2.5.46:
- * NR_IRQS is no longer the number of i/o
- * interrupts (65536), but rather the number
- * of interrupt classes (2).
- * Only external and i/o interrupts make much sense here (CH).
- */
-
-enum interruption_class {
-        EXTERNAL_INTERRUPT,
-        IO_INTERRUPT,
-
-        NR_IRQS,
-};
-
-#endif /* __KERNEL__ */
-#endif
diff --git a/include/asm-s390/irq_regs.h b/include/asm-s390/irq_regs.h
deleted file mode 100644
index 3dd9c0b70270..000000000000
--- a/include/asm-s390/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
diff --git a/include/asm-s390/irqflags.h b/include/asm-s390/irqflags.h
deleted file mode 100644
index 3f26131120b7..000000000000
--- a/include/asm-s390/irqflags.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  include/asm-s390/irqflags.h
- *
- *    Copyright (C) IBM Corp. 2006
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- */
-
-#ifndef __ASM_IRQFLAGS_H
-#define __ASM_IRQFLAGS_H
-
-#ifdef __KERNEL__
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-/* store then or system mask. */
-#define __raw_local_irq_stosm(__or)                                     \
-({                                                                      \
-        unsigned long __mask;                                           \
-        asm volatile(                                                   \
-                "       stosm   %0,%1"                                  \
-                : "=Q" (__mask) : "i" (__or) : "memory");               \
-        __mask;                                                         \
-})
-
-/* store then and system mask. */
-#define __raw_local_irq_stnsm(__and)                                    \
-({                                                                      \
-        unsigned long __mask;                                           \
-        asm volatile(                                                   \
-                "       stnsm   %0,%1"                                  \
-                : "=Q" (__mask) : "i" (__and) : "memory");              \
-        __mask;                                                         \
-})
-
-/* set system mask. */
-#define __raw_local_irq_ssm(__mask)                                     \
-({                                                                      \
-        asm volatile("ssm   %0" : : "Q" (__mask) : "memory");           \
-})
-
-#else /* __GNUC__ */
-
-/* store then or system mask. */
-#define __raw_local_irq_stosm(__or)                                     \
-({                                                                      \
-        unsigned long __mask;                                           \
-        asm volatile(                                                   \
-                "       stosm   0(%1),%2"                               \
-                : "=m" (__mask)                                         \
-                : "a" (&__mask), "i" (__or) : "memory");                \
-        __mask;                                                         \
-})
-
-/* store then and system mask. */
-#define __raw_local_irq_stnsm(__and)                                    \
-({                                                                      \
-        unsigned long __mask;                                           \
-        asm volatile(                                                   \
-                "       stnsm   0(%1),%2"                               \
-                : "=m" (__mask)                                         \
-                : "a" (&__mask), "i" (__and) : "memory");               \
-        __mask;                                                         \
-})
-
-/* set system mask. */
-#define __raw_local_irq_ssm(__mask)                                     \
-({                                                                      \
-        asm volatile(                                                   \
-                "       ssm     0(%0)"                                  \
-                : : "a" (&__mask), "m" (__mask) : "memory");            \
-})
-
-#endif /* __GNUC__ */
-
-/* interrupt control.. */
-static inline unsigned long raw_local_irq_enable(void)
-{
-        return __raw_local_irq_stosm(0x03);
-}
-
-static inline unsigned long raw_local_irq_disable(void)
-{
-        return __raw_local_irq_stnsm(0xfc);
-}
-
-#define raw_local_save_flags(x)                                         \
-do {                                                                    \
-        typecheck(unsigned long, x);                                    \
-        (x) = __raw_local_irq_stosm(0x00);                              \
-} while (0)
-
-static inline void raw_local_irq_restore(unsigned long flags)
-{
-        __raw_local_irq_ssm(flags);
-}
-
-static inline int raw_irqs_disabled_flags(unsigned long flags)
-{
-        return !(flags & (3UL << (BITS_PER_LONG - 8)));
-}
-
-/* For spinlocks etc */
-#define raw_local_irq_save(x)   ((x) = raw_local_irq_disable())
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_IRQFLAGS_H */
diff --git a/include/asm-s390/isc.h b/include/asm-s390/isc.h
deleted file mode 100644
index 34bb8916db4f..000000000000
--- a/include/asm-s390/isc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASM_S390_ISC_H
-#define _ASM_S390_ISC_H
-
-#include <linux/types.h>
-
-/*
- * I/O interruption subclasses used by drivers.
- * Please add all used iscs here so that it is possible to distribute
- * isc usage between drivers.
- * Reminder: 0 is highest priority, 7 lowest.
- */
-#define MAX_ISC 7
-
-/* Regular I/O interrupts. */
-#define IO_SCH_ISC 3                    /* regular I/O subchannels */
-#define CONSOLE_ISC 1                   /* console I/O subchannel */
-#define CHSC_SCH_ISC 7                  /* CHSC subchannels */
-/* Adapter interrupts. */
-#define QDIO_AIRQ_ISC IO_SCH_ISC        /* I/O subchannel in qdio mode */
-
-/* Functions for registration of I/O interruption subclasses */
-void isc_register(unsigned int isc);
-void isc_unregister(unsigned int isc);
-
-#endif /* _ASM_S390_ISC_H */
diff --git a/include/asm-s390/itcw.h b/include/asm-s390/itcw.h
deleted file mode 100644
index a9bc5c36b32a..000000000000
--- a/include/asm-s390/itcw.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Functions for incremental construction of fcx enabled I/O control blocks.
- *
- *    Copyright IBM Corp. 2008
- *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
- */
-
-#ifndef _ASM_S390_ITCW_H
-#define _ASM_S390_ITCW_H _ASM_S390_ITCW_H
-
-#include <linux/types.h>
-#include <asm/fcx.h>
-
-#define ITCW_OP_READ    0
-#define ITCW_OP_WRITE   1
-
-struct itcw;
-
-struct tcw *itcw_get_tcw(struct itcw *itcw);
-size_t itcw_calc_size(int intrg, int max_tidaws, int intrg_max_tidaws);
-struct itcw *itcw_init(void *buffer, size_t size, int op, int intrg,
-                       int max_tidaws, int intrg_max_tidaws);
-struct dcw *itcw_add_dcw(struct itcw *itcw, u8 cmd, u8 flags, void *cd,
-                         u8 cd_count, u32 count);
-struct tidaw *itcw_add_tidaw(struct itcw *itcw, u8 flags, void *addr,
-                             u32 count);
-void itcw_set_data(struct itcw *itcw, void *addr, int use_tidal);
-void itcw_finalize(struct itcw *itcw);
-
-#endif /* _ASM_S390_ITCW_H */
diff --git a/include/asm-s390/kdebug.h b/include/asm-s390/kdebug.h
deleted file mode 100644
index 40db27cd6e60..000000000000
--- a/include/asm-s390/kdebug.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _S390_KDEBUG_H
-#define _S390_KDEBUG_H
-
-/*
- * Feb 2006 Ported to s390 <grundym@us.ibm.com>
- */
-
-struct pt_regs;
-
-enum die_val {
-        DIE_OOPS = 1,
-        DIE_BPT,
-        DIE_SSTEP,
-        DIE_PANIC,
-        DIE_NMI,
-        DIE_DIE,
-        DIE_NMIWATCHDOG,
-        DIE_KERNELDEBUG,
-        DIE_TRAP,
-        DIE_GPF,
-        DIE_CALL,
-        DIE_NMI_IPI,
-};
-
-extern void die(const char *, struct pt_regs *, long);
-
-#endif
diff --git a/include/asm-s390/kexec.h b/include/asm-s390/kexec.h
deleted file mode 100644
index f219c6411e0b..000000000000
--- a/include/asm-s390/kexec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * include/asm-s390/kexec.h
- *
- * (C) Copyright IBM Corp. 2005
- *
- * Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
- *
- */
-
-#ifndef _S390_KEXEC_H
-#define _S390_KEXEC_H
-
-#ifdef __KERNEL__
-#include <asm/page.h>
-#endif
-#include <asm/processor.h>
-/*
- * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
- * I.e. Maximum page that is mapped directly into kernel memory,
- * and kmap is not required.
- */
-
-/* Maximum physical address we can use pages from */
-#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
-
-/* Maximum address we can reach in physical address mode */
-#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
-
-/* Maximum address we can use for the control pages */
-/* Not more than 2GB */
-#define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
-
-/* Allocate one page for the pdp and the second for the code */
-#define KEXEC_CONTROL_CODE_SIZE 4096
-
-/* The native architecture */
-#define KEXEC_ARCH KEXEC_ARCH_S390
-
-/* Provide a dummy definition to avoid build failures. */
-static inline void crash_setup_regs(struct pt_regs *newregs,
-                                        struct pt_regs *oldregs) { }
-
-#endif /*_S390_KEXEC_H */
diff --git a/include/asm-s390/kmap_types.h b/include/asm-s390/kmap_types.h
deleted file mode 100644
index fd1574648223..000000000000
--- a/include/asm-s390/kmap_types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,    
-        KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
diff --git a/include/asm-s390/kprobes.h b/include/asm-s390/kprobes.h
deleted file mode 100644
index 330f68caffe4..000000000000
--- a/include/asm-s390/kprobes.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef _ASM_S390_KPROBES_H
-#define _ASM_S390_KPROBES_H
-/*
- *  Kernel Probes (KProbes)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright (C) IBM Corporation, 2002, 2006
- *
- * 2002-Oct     Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
- *              Probes initial implementation ( includes suggestions from
- *              Rusty Russell).
- * 2004-Nov     Modified for PPC64 by Ananth N Mavinakayanahalli
- *              <ananth@in.ibm.com>
- * 2005-Dec     Used as a template for s390 by Mike Grundy
- *              <grundym@us.ibm.com>
- */
-#include <linux/types.h>
-#include <linux/ptrace.h>
-#include <linux/percpu.h>
-
-#define  __ARCH_WANT_KPROBES_INSN_SLOT
-struct pt_regs;
-struct kprobe;
-
-typedef u16 kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0x0002
-
-/* Maximum instruction size is 3 (16bit) halfwords: */
-#define MAX_INSN_SIZE           0x0003
-#define MAX_STACK_SIZE          64
-#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
-        (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR))) \
-        ? (MAX_STACK_SIZE) \
-        : (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
-
-#define kretprobe_blacklist_size 0
-
-#define KPROBE_SWAP_INST        0x10
-
-#define FIXUP_PSW_NORMAL        0x08
-#define FIXUP_BRANCH_NOT_TAKEN  0x04
-#define FIXUP_RETURN_REGISTER   0x02
-#define FIXUP_NOT_REQUIRED      0x01
-
-/* Architecture specific copy of original instruction */
-struct arch_specific_insn {
-        /* copy of original instruction */
-        kprobe_opcode_t *insn;
-        int fixup;
-        int ilen;
-        int reg;
-};
-
-struct ins_replace_args {
-        kprobe_opcode_t *ptr;
-        kprobe_opcode_t old;
-        kprobe_opcode_t new;
-};
-struct prev_kprobe {
-        struct kprobe *kp;
-        unsigned long status;
-        unsigned long saved_psw;
-        unsigned long kprobe_saved_imask;
-        unsigned long kprobe_saved_ctl[3];
-};
-
-/* per-cpu kprobe control block */
-struct kprobe_ctlblk {
-        unsigned long kprobe_status;
-        unsigned long kprobe_saved_imask;
-        unsigned long kprobe_saved_ctl[3];
-        struct pt_regs jprobe_saved_regs;
-        unsigned long jprobe_saved_r14;
-        unsigned long jprobe_saved_r15;
-        struct prev_kprobe prev_kprobe;
-        kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
-};
-
-void arch_remove_kprobe(struct kprobe *p);
-void kretprobe_trampoline(void);
-int  is_prohibited_opcode(kprobe_opcode_t *instruction);
-void get_instruction_type(struct arch_specific_insn *ainsn);
-
-int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
-int kprobe_exceptions_notify(struct notifier_block *self,
-        unsigned long val, void *data);
-
-#define flush_insn_slot(p)      do { } while (0)
-
-#endif  /* _ASM_S390_KPROBES_H */
diff --git a/include/asm-s390/kvm.h b/include/asm-s390/kvm.h
deleted file mode 100644
index d74002f95794..000000000000
--- a/include/asm-s390/kvm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __LINUX_KVM_S390_H
-#define __LINUX_KVM_S390_H
-
-/*
- * asm-s390/kvm.h - KVM s390 specific structures and definitions
- *
- * Copyright IBM Corp. 2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Carsten Otte <cotte@de.ibm.com>
- *               Christian Borntraeger <borntraeger@de.ibm.com>
- */
-#include <asm/types.h>
-
-/* for KVM_GET_IRQCHIP and KVM_SET_IRQCHIP */
-struct kvm_pic_state {
-        /* no PIC for s390 */
-};
-
-struct kvm_ioapic_state {
-        /* no IOAPIC for s390 */
-};
-
-/* for KVM_GET_REGS and KVM_SET_REGS */
-struct kvm_regs {
-        /* general purpose regs for s390 */
-        __u64 gprs[16];
-};
-
-/* for KVM_GET_SREGS and KVM_SET_SREGS */
-struct kvm_sregs {
-        __u32 acrs[16];
-        __u64 crs[16];
-};
-
-/* for KVM_GET_FPU and KVM_SET_FPU */
-struct kvm_fpu {
-        __u32 fpc;
-        __u64 fprs[16];
-};
-
-#endif
diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h
deleted file mode 100644
index 3c55e4107dcc..000000000000
--- a/include/asm-s390/kvm_host.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * asm-s390/kvm_host.h - definition for kernel virtual machines on s390
- *
- * Copyright IBM Corp. 2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Carsten Otte <cotte@de.ibm.com>
- */
-
-
-#ifndef ASM_KVM_HOST_H
-#define ASM_KVM_HOST_H
-#include <linux/kvm_host.h>
-#include <asm/debug.h>
-
-#define KVM_MAX_VCPUS 64
-#define KVM_MEMORY_SLOTS 32
-/* memory slots that does not exposed to userspace */
-#define KVM_PRIVATE_MEM_SLOTS 4
-
-struct kvm_guest_debug {
-};
-
-struct sca_entry {
-        atomic_t scn;
-        __u64   reserved;
-        __u64   sda;
-        __u64   reserved2[2];
-} __attribute__((packed));
-
-
-struct sca_block {
-        __u64   ipte_control;
-        __u64   reserved[5];
-        __u64   mcn;
-        __u64   reserved2;
-        struct sca_entry cpu[64];
-} __attribute__((packed));
-
-#define KVM_PAGES_PER_HPAGE 256
-
-#define CPUSTAT_HOST       0x80000000
-#define CPUSTAT_WAIT       0x10000000
-#define CPUSTAT_ECALL_PEND 0x08000000
-#define CPUSTAT_STOP_INT   0x04000000
-#define CPUSTAT_IO_INT     0x02000000
-#define CPUSTAT_EXT_INT    0x01000000
-#define CPUSTAT_RUNNING    0x00800000
-#define CPUSTAT_RETAINED   0x00400000
-#define CPUSTAT_TIMING_SUB 0x00020000
-#define CPUSTAT_SIE_SUB    0x00010000
-#define CPUSTAT_RRF        0x00008000
-#define CPUSTAT_SLSV       0x00004000
-#define CPUSTAT_SLSR       0x00002000
-#define CPUSTAT_ZARCH      0x00000800
-#define CPUSTAT_MCDS       0x00000100
-#define CPUSTAT_SM         0x00000080
-#define CPUSTAT_G          0x00000008
-#define CPUSTAT_J          0x00000002
-#define CPUSTAT_P          0x00000001
-
-struct kvm_s390_sie_block {
-        atomic_t cpuflags;              /* 0x0000 */
-        __u32   prefix;                 /* 0x0004 */
-        __u8    reserved8[32];          /* 0x0008 */
-        __u64   cputm;                  /* 0x0028 */
-        __u64   ckc;                    /* 0x0030 */
-        __u64   epoch;                  /* 0x0038 */
-        __u8    reserved40[4];          /* 0x0040 */
-#define LCTL_CR0        0x8000
-        __u16   lctl;                   /* 0x0044 */
-        __s16   icpua;                  /* 0x0046 */
-        __u32   ictl;                   /* 0x0048 */
-        __u32   eca;                    /* 0x004c */
-        __u8    icptcode;               /* 0x0050 */
-        __u8    reserved51;             /* 0x0051 */
-        __u16   ihcpu;                  /* 0x0052 */
-        __u8    reserved54[2];          /* 0x0054 */
-        __u16   ipa;                    /* 0x0056 */
-        __u32   ipb;                    /* 0x0058 */
-        __u32   scaoh;                  /* 0x005c */
-        __u8    reserved60;             /* 0x0060 */
-        __u8    ecb;                    /* 0x0061 */
-        __u8    reserved62[2];          /* 0x0062 */
-        __u32   scaol;                  /* 0x0064 */
-        __u8    reserved68[4];          /* 0x0068 */
-        __u32   todpr;                  /* 0x006c */
-        __u8    reserved70[16];         /* 0x0070 */
-        __u64   gmsor;                  /* 0x0080 */
-        __u64   gmslm;                  /* 0x0088 */
-        psw_t   gpsw;                   /* 0x0090 */
-        __u64   gg14;                   /* 0x00a0 */
-        __u64   gg15;                   /* 0x00a8 */
-        __u8    reservedb0[30];         /* 0x00b0 */
-        __u16   iprcc;                  /* 0x00ce */
-        __u8    reservedd0[48];         /* 0x00d0 */
-        __u64   gcr[16];                /* 0x0100 */
-        __u64   gbea;                   /* 0x0180 */
-        __u8    reserved188[120];       /* 0x0188 */
-} __attribute__((packed));
-
-struct kvm_vcpu_stat {
-        u32 exit_userspace;
-        u32 exit_null;
-        u32 exit_external_request;
-        u32 exit_external_interrupt;
-        u32 exit_stop_request;
-        u32 exit_validity;
-        u32 exit_instruction;
-        u32 instruction_lctl;
-        u32 instruction_lctlg;
-        u32 exit_program_interruption;
-        u32 exit_instr_and_program;
-        u32 deliver_emergency_signal;
-        u32 deliver_service_signal;
-        u32 deliver_virtio_interrupt;
-        u32 deliver_stop_signal;
-        u32 deliver_prefix_signal;
-        u32 deliver_restart_signal;
-        u32 deliver_program_int;
-        u32 exit_wait_state;
-        u32 instruction_stidp;
-        u32 instruction_spx;
-        u32 instruction_stpx;
-        u32 instruction_stap;
-        u32 instruction_storage_key;
-        u32 instruction_stsch;
-        u32 instruction_chsc;
-        u32 instruction_stsi;
-        u32 instruction_stfl;
-        u32 instruction_sigp_sense;
-        u32 instruction_sigp_emergency;
-        u32 instruction_sigp_stop;
-        u32 instruction_sigp_arch;
-        u32 instruction_sigp_prefix;
-        u32 instruction_sigp_restart;
-        u32 diagnose_44;
-};
-
-struct kvm_s390_io_info {
-        __u16        subchannel_id;            /* 0x0b8 */
-        __u16        subchannel_nr;            /* 0x0ba */
-        __u32        io_int_parm;              /* 0x0bc */
-        __u32        io_int_word;              /* 0x0c0 */
-};
-
-struct kvm_s390_ext_info {
-        __u32 ext_params;
-        __u64 ext_params2;
-};
-
-#define PGM_OPERATION            0x01
-#define PGM_PRIVILEGED_OPERATION 0x02
-#define PGM_EXECUTE              0x03
-#define PGM_PROTECTION           0x04
-#define PGM_ADDRESSING           0x05
-#define PGM_SPECIFICATION        0x06
-#define PGM_DATA                 0x07
-
-struct kvm_s390_pgm_info {
-        __u16 code;
-};
-
-struct kvm_s390_prefix_info {
-        __u32 address;
-};
-
-struct kvm_s390_interrupt_info {
-        struct list_head list;
-        u64     type;
-        union {
-                struct kvm_s390_io_info io;
-                struct kvm_s390_ext_info ext;
-                struct kvm_s390_pgm_info pgm;
-                struct kvm_s390_prefix_info prefix;
-        };
-};
-
-/* for local_interrupt.action_flags */
-#define ACTION_STORE_ON_STOP 1
-#define ACTION_STOP_ON_STOP  2
-
-struct kvm_s390_local_interrupt {
-        spinlock_t lock;
-        struct list_head list;
-        atomic_t active;
-        struct kvm_s390_float_interrupt *float_int;
-        int timer_due; /* event indicator for waitqueue below */
-        wait_queue_head_t wq;
-        atomic_t *cpuflags;
-        unsigned int action_bits;
-};
-
-struct kvm_s390_float_interrupt {
-        spinlock_t lock;
-        struct list_head list;
-        atomic_t active;
-        int next_rr_cpu;
-        unsigned long idle_mask [(64 + sizeof(long) - 1) / sizeof(long)];
-        struct kvm_s390_local_interrupt *local_int[64];
-};
-
-
-struct kvm_vcpu_arch {
-        struct kvm_s390_sie_block *sie_block;
-        unsigned long     guest_gprs[16];
-        s390_fp_regs      host_fpregs;
-        unsigned int      host_acrs[NUM_ACRS];
-        s390_fp_regs      guest_fpregs;
-        unsigned int      guest_acrs[NUM_ACRS];
-        struct kvm_s390_local_interrupt local_int;
-        struct timer_list ckc_timer;
-        union  {
-                cpuid_t   cpu_id;
-                u64       stidp_data;
-        };
-};
-
-struct kvm_vm_stat {
-        u32 remote_tlb_flush;
-};
-
-struct kvm_arch{
-        unsigned long guest_origin;
-        unsigned long guest_memsize;
-        struct sca_block *sca;
-        debug_info_t *dbf;
-        struct kvm_s390_float_interrupt float_int;
-};
-
-extern int sie64a(struct kvm_s390_sie_block *, unsigned long *);
-#endif
diff --git a/include/asm-s390/kvm_para.h b/include/asm-s390/kvm_para.h
deleted file mode 100644
index 2c503796b619..000000000000
--- a/include/asm-s390/kvm_para.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * asm-s390/kvm_para.h - definition for paravirtual devices on s390
- *
- * Copyright IBM Corp. 2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
- */
-
-#ifndef __S390_KVM_PARA_H
-#define __S390_KVM_PARA_H
-
-/*
- * Hypercalls for KVM on s390. The calling convention is similar to the
- * s390 ABI, so we use R2-R6 for parameters 1-5. In addition we use R1
- * as hypercall number and R7 as parameter 6. The return value is
- * written to R2. We use the diagnose instruction as hypercall. To avoid
- * conflicts with existing diagnoses for LPAR and z/VM, we do not use
- * the instruction encoded number, but specify the number in R1 and
- * use 0x500 as KVM hypercall
- *
- * Copyright IBM Corp. 2007,2008
- * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.
- */
-
-static inline long kvm_hypercall0(unsigned long nr)
-{
-        register unsigned long __nr asm("1") = nr;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr): "memory", "cc");
-        return __rc;
-}
-
-static inline long kvm_hypercall1(unsigned long nr, unsigned long p1)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1) : "memory", "cc");
-        return __rc;
-}
-
-static inline long kvm_hypercall2(unsigned long nr, unsigned long p1,
-                               unsigned long p2)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register unsigned long __p2 asm("3") = p2;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1), "d" (__p2)
-                      : "memory", "cc");
-        return __rc;
-}
-
-static inline long kvm_hypercall3(unsigned long nr, unsigned long p1,
-                               unsigned long p2, unsigned long p3)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register unsigned long __p2 asm("3") = p2;
-        register unsigned long __p3 asm("4") = p3;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1), "d" (__p2),
-                        "d" (__p3) : "memory", "cc");
-        return __rc;
-}
-
-
-static inline long kvm_hypercall4(unsigned long nr, unsigned long p1,
-                               unsigned long p2, unsigned long p3,
-                               unsigned long p4)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register unsigned long __p2 asm("3") = p2;
-        register unsigned long __p3 asm("4") = p3;
-        register unsigned long __p4 asm("5") = p4;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1), "d" (__p2),
-                        "d" (__p3), "d" (__p4) : "memory", "cc");
-        return __rc;
-}
-
-static inline long kvm_hypercall5(unsigned long nr, unsigned long p1,
-                               unsigned long p2, unsigned long p3,
-                               unsigned long p4, unsigned long p5)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register unsigned long __p2 asm("3") = p2;
-        register unsigned long __p3 asm("4") = p3;
-        register unsigned long __p4 asm("5") = p4;
-        register unsigned long __p5 asm("6") = p5;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1), "d" (__p2),
-                        "d" (__p3), "d" (__p4), "d" (__p5)  : "memory", "cc");
-        return __rc;
-}
-
-static inline long kvm_hypercall6(unsigned long nr, unsigned long p1,
-                               unsigned long p2, unsigned long p3,
-                               unsigned long p4, unsigned long p5,
-                               unsigned long p6)
-{
-        register unsigned long __nr asm("1") = nr;
-        register unsigned long __p1 asm("2") = p1;
-        register unsigned long __p2 asm("3") = p2;
-        register unsigned long __p3 asm("4") = p3;
-        register unsigned long __p4 asm("5") = p4;
-        register unsigned long __p5 asm("6") = p5;
-        register unsigned long __p6 asm("7") = p6;
-        register long __rc asm("2");
-
-        asm volatile ("diag 2,4,0x500\n"
-                      : "=d" (__rc) : "d" (__nr), "0" (__p1), "d" (__p2),
-                        "d" (__p3), "d" (__p4), "d" (__p5), "d" (__p6)
-                      : "memory", "cc");
-        return __rc;
-}
-
-/* kvm on s390 is always paravirtualization enabled */
-static inline int kvm_para_available(void)
-{
-        return 1;
-}
-
-/* No feature bits are currently assigned for kvm on s390 */
-static inline unsigned int kvm_arch_para_features(void)
-{
-        return 0;
-}
-
-#endif /* __S390_KVM_PARA_H */
diff --git a/include/asm-s390/kvm_virtio.h b/include/asm-s390/kvm_virtio.h
deleted file mode 100644
index 146100224def..000000000000
--- a/include/asm-s390/kvm_virtio.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * kvm_virtio.h - definition for virtio for kvm on s390
- *
- * Copyright IBM Corp. 2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
- */
-
-#ifndef __KVM_S390_VIRTIO_H
-#define __KVM_S390_VIRTIO_H
-
-#include <linux/types.h>
-
-struct kvm_device_desc {
-        /* The device type: console, network, disk etc.  Type 0 terminates. */
-        __u8 type;
-        /* The number of virtqueues (first in config array) */
-        __u8 num_vq;
-        /*
-         * The number of bytes of feature bits.  Multiply by 2: one for host
-         * features and one for guest acknowledgements.
-         */
-        __u8 feature_len;
-        /* The number of bytes of the config array after virtqueues. */
-        __u8 config_len;
-        /* A status byte, written by the Guest. */
-        __u8 status;
-        __u8 config[0];
-};
-
-/*
- * This is how we expect the device configuration field for a virtqueue
- * to be laid out in config space.
- */
-struct kvm_vqconfig {
-        /* The token returned with an interrupt. Set by the guest */
-        __u64 token;
-        /* The address of the virtio ring */
-        __u64 address;
-        /* The number of entries in the virtio_ring */
-        __u16 num;
-
-};
-
-#define KVM_S390_VIRTIO_NOTIFY          0
-#define KVM_S390_VIRTIO_RESET           1
-#define KVM_S390_VIRTIO_SET_STATUS      2
-
-#ifdef __KERNEL__
-/* early virtio console setup */
-#ifdef CONFIG_VIRTIO_CONSOLE
-extern void s390_virtio_console_init(void);
-#else
-static inline void s390_virtio_console_init(void)
-{
-}
-#endif /* CONFIG_VIRTIO_CONSOLE */
-#endif /* __KERNEL__ */
-#endif
diff --git a/include/asm-s390/linkage.h b/include/asm-s390/linkage.h
deleted file mode 100644
index 291c2d01c44f..000000000000
--- a/include/asm-s390/linkage.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-
-/* Nothing to see here... */
-
-#endif
diff --git a/include/asm-s390/local.h b/include/asm-s390/local.h
deleted file mode 100644
index c11c530f74d0..000000000000
--- a/include/asm-s390/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
deleted file mode 100644
index 0bc51d52a899..000000000000
--- a/include/asm-s390/lowcore.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- *  include/asm-s390/lowcore.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com),
- *               Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
- */
-
-#ifndef _ASM_S390_LOWCORE_H
-#define _ASM_S390_LOWCORE_H
-
-#ifndef __s390x__
-#define __LC_EXT_OLD_PSW                0x018
-#define __LC_SVC_OLD_PSW                0x020
-#define __LC_PGM_OLD_PSW                0x028
-#define __LC_MCK_OLD_PSW                0x030
-#define __LC_IO_OLD_PSW                 0x038
-#define __LC_EXT_NEW_PSW                0x058
-#define __LC_SVC_NEW_PSW                0x060
-#define __LC_PGM_NEW_PSW                0x068
-#define __LC_MCK_NEW_PSW                0x070
-#define __LC_IO_NEW_PSW                 0x078
-#else /* !__s390x__ */
-#define __LC_EXT_OLD_PSW                0x0130
-#define __LC_SVC_OLD_PSW                0x0140
-#define __LC_PGM_OLD_PSW                0x0150
-#define __LC_MCK_OLD_PSW                0x0160
-#define __LC_IO_OLD_PSW                 0x0170
-#define __LC_EXT_NEW_PSW                0x01b0
-#define __LC_SVC_NEW_PSW                0x01c0
-#define __LC_PGM_NEW_PSW                0x01d0
-#define __LC_MCK_NEW_PSW                0x01e0
-#define __LC_IO_NEW_PSW                 0x01f0
-#endif /* !__s390x__ */
-
-#define __LC_IPL_PARMBLOCK_PTR          0x014
-#define __LC_EXT_PARAMS                 0x080
-#define __LC_CPU_ADDRESS                0x084
-#define __LC_EXT_INT_CODE               0x086
-
-#define __LC_SVC_ILC                    0x088
-#define __LC_SVC_INT_CODE               0x08A
-#define __LC_PGM_ILC                    0x08C
-#define __LC_PGM_INT_CODE               0x08E
-
-#define __LC_PER_ATMID                  0x096
-#define __LC_PER_ADDRESS                0x098
-#define __LC_PER_ACCESS_ID              0x0A1
-#define __LC_AR_MODE_ID                 0x0A3
-
-#define __LC_SUBCHANNEL_ID              0x0B8
-#define __LC_SUBCHANNEL_NR              0x0BA
-#define __LC_IO_INT_PARM                0x0BC
-#define __LC_IO_INT_WORD                0x0C0
-#define __LC_MCCK_CODE                  0x0E8
-
-#define __LC_LAST_BREAK                 0x110
-
-#define __LC_RETURN_PSW                 0x200
-
-#define __LC_SAVE_AREA                  0xC00
-
-#ifndef __s390x__
-#define __LC_IRB                        0x208
-#define __LC_SYNC_ENTER_TIMER           0x248
-#define __LC_ASYNC_ENTER_TIMER          0x250
-#define __LC_EXIT_TIMER                 0x258
-#define __LC_LAST_UPDATE_TIMER          0x260
-#define __LC_USER_TIMER                 0x268
-#define __LC_SYSTEM_TIMER               0x270
-#define __LC_LAST_UPDATE_CLOCK          0x278
-#define __LC_STEAL_CLOCK                0x280
-#define __LC_RETURN_MCCK_PSW            0x288
-#define __LC_KERNEL_STACK               0xC40
-#define __LC_THREAD_INFO                0xC44
-#define __LC_ASYNC_STACK                0xC48
-#define __LC_KERNEL_ASCE                0xC4C
-#define __LC_USER_ASCE                  0xC50
-#define __LC_PANIC_STACK                0xC54
-#define __LC_CPUID                      0xC60
-#define __LC_CPUADDR                    0xC68
-#define __LC_IPLDEV                     0xC7C
-#define __LC_CURRENT                    0xC90
-#define __LC_INT_CLOCK                  0xC98
-#else /* __s390x__ */
-#define __LC_IRB                        0x210
-#define __LC_SYNC_ENTER_TIMER           0x250
-#define __LC_ASYNC_ENTER_TIMER          0x258
-#define __LC_EXIT_TIMER                 0x260
-#define __LC_LAST_UPDATE_TIMER          0x268
-#define __LC_USER_TIMER                 0x270
-#define __LC_SYSTEM_TIMER               0x278
-#define __LC_LAST_UPDATE_CLOCK          0x280
-#define __LC_STEAL_CLOCK                0x288
-#define __LC_RETURN_MCCK_PSW            0x290
-#define __LC_KERNEL_STACK               0xD40
-#define __LC_THREAD_INFO                0xD48
-#define __LC_ASYNC_STACK                0xD50
-#define __LC_KERNEL_ASCE                0xD58
-#define __LC_USER_ASCE                  0xD60
-#define __LC_PANIC_STACK                0xD68
-#define __LC_CPUID                      0xD80
-#define __LC_CPUADDR                    0xD88
-#define __LC_IPLDEV                     0xDB8
-#define __LC_CURRENT                    0xDD8
-#define __LC_INT_CLOCK                  0xDE8
-#endif /* __s390x__ */
-
-
-#define __LC_PANIC_MAGIC                0xE00
-#ifndef __s390x__
-#define __LC_PFAULT_INTPARM             0x080
-#define __LC_CPU_TIMER_SAVE_AREA        0x0D8
-#define __LC_CLOCK_COMP_SAVE_AREA       0x0E0
-#define __LC_PSW_SAVE_AREA              0x100
-#define __LC_PREFIX_SAVE_AREA           0x108
-#define __LC_AREGS_SAVE_AREA            0x120
-#define __LC_FPREGS_SAVE_AREA           0x160
-#define __LC_GPREGS_SAVE_AREA           0x180
-#define __LC_CREGS_SAVE_AREA            0x1C0
-#else /* __s390x__ */
-#define __LC_PFAULT_INTPARM             0x11B8
-#define __LC_FPREGS_SAVE_AREA           0x1200
-#define __LC_GPREGS_SAVE_AREA           0x1280
-#define __LC_PSW_SAVE_AREA              0x1300
-#define __LC_PREFIX_SAVE_AREA           0x1318
-#define __LC_FP_CREG_SAVE_AREA          0x131C
-#define __LC_TODREG_SAVE_AREA           0x1324
-#define __LC_CPU_TIMER_SAVE_AREA        0x1328
-#define __LC_CLOCK_COMP_SAVE_AREA       0x1331
-#define __LC_AREGS_SAVE_AREA            0x1340
-#define __LC_CREGS_SAVE_AREA            0x1380
-#endif /* __s390x__ */
-
-#ifndef __ASSEMBLY__
-
-#include <asm/processor.h>
-#include <linux/types.h>
-#include <asm/sigp.h>
-
-void restart_int_handler(void);
-void ext_int_handler(void);
-void system_call(void);
-void pgm_check_handler(void);
-void mcck_int_handler(void);
-void io_int_handler(void);
-
-struct save_area_s390 {
-        u32     ext_save;
-        u64     timer;
-        u64     clk_cmp;
-        u8      pad1[24];
-        u8      psw[8];
-        u32     pref_reg;
-        u8      pad2[20];
-        u32     acc_regs[16];
-        u64     fp_regs[4];
-        u32     gp_regs[16];
-        u32     ctrl_regs[16];
-}  __attribute__((packed));
-
-struct save_area_s390x {
-        u64     fp_regs[16];
-        u64     gp_regs[16];
-        u8      psw[16];
-        u8      pad1[8];
-        u32     pref_reg;
-        u32     fp_ctrl_reg;
-        u8      pad2[4];
-        u32     tod_reg;
-        u64     timer;
-        u64     clk_cmp;
-        u8      pad3[8];
-        u32     acc_regs[16];
-        u64     ctrl_regs[16];
-}  __attribute__((packed));
-
-union save_area {
-        struct save_area_s390   s390;
-        struct save_area_s390x  s390x;
-};
-
-#define SAVE_AREA_BASE_S390     0xd4
-#define SAVE_AREA_BASE_S390X    0x1200
-
-#ifndef __s390x__
-#define SAVE_AREA_SIZE sizeof(struct save_area_s390)
-#define SAVE_AREA_BASE SAVE_AREA_BASE_S390
-#else
-#define SAVE_AREA_SIZE sizeof(struct save_area_s390x)
-#define SAVE_AREA_BASE SAVE_AREA_BASE_S390X
-#endif
-
-struct _lowcore
-{
-#ifndef __s390x__
-        /* prefix area: defined by architecture */
-        psw_t        restart_psw;              /* 0x000 */
-        __u32        ccw2[4];                  /* 0x008 */
-        psw_t        external_old_psw;         /* 0x018 */
-        psw_t        svc_old_psw;              /* 0x020 */
-        psw_t        program_old_psw;          /* 0x028 */
-        psw_t        mcck_old_psw;             /* 0x030 */
-        psw_t        io_old_psw;               /* 0x038 */
-        __u8         pad1[0x58-0x40];          /* 0x040 */
-        psw_t        external_new_psw;         /* 0x058 */
-        psw_t        svc_new_psw;              /* 0x060 */
-        psw_t        program_new_psw;          /* 0x068 */
-        psw_t        mcck_new_psw;             /* 0x070 */
-        psw_t        io_new_psw;               /* 0x078 */
-        __u32        ext_params;               /* 0x080 */
-        __u16        cpu_addr;                 /* 0x084 */
-        __u16        ext_int_code;             /* 0x086 */
-        __u16        svc_ilc;                  /* 0x088 */
-        __u16        svc_code;                 /* 0x08a */
-        __u16        pgm_ilc;                  /* 0x08c */
-        __u16        pgm_code;                 /* 0x08e */
-        __u32        trans_exc_code;           /* 0x090 */
-        __u16        mon_class_num;            /* 0x094 */
-        __u16        per_perc_atmid;           /* 0x096 */
-        __u32        per_address;              /* 0x098 */
-        __u32        monitor_code;             /* 0x09c */
-        __u8         exc_access_id;            /* 0x0a0 */
-        __u8         per_access_id;            /* 0x0a1 */
-        __u8         pad2[0xB8-0xA2];          /* 0x0a2 */
-        __u16        subchannel_id;            /* 0x0b8 */
-        __u16        subchannel_nr;            /* 0x0ba */
-        __u32        io_int_parm;              /* 0x0bc */
-        __u32        io_int_word;              /* 0x0c0 */
-        __u8         pad3[0xc8-0xc4];          /* 0x0c4 */
-        __u32        stfl_fac_list;            /* 0x0c8 */
-        __u8         pad4[0xd4-0xcc];          /* 0x0cc */
-        __u32        extended_save_area_addr;  /* 0x0d4 */
-        __u32        cpu_timer_save_area[2];   /* 0x0d8 */
-        __u32        clock_comp_save_area[2];  /* 0x0e0 */
-        __u32        mcck_interruption_code[2]; /* 0x0e8 */
-        __u8         pad5[0xf4-0xf0];          /* 0x0f0 */
-        __u32        external_damage_code;     /* 0x0f4 */
-        __u32        failing_storage_address;  /* 0x0f8 */
-        __u8         pad6[0x100-0xfc];         /* 0x0fc */
-        __u32        st_status_fixed_logout[4];/* 0x100 */
-        __u8         pad7[0x120-0x110];        /* 0x110 */
-        __u32        access_regs_save_area[16];/* 0x120 */
-        __u32        floating_pt_save_area[8]; /* 0x160 */
-        __u32        gpregs_save_area[16];     /* 0x180 */
-        __u32        cregs_save_area[16];      /* 0x1c0 */      
-
-        psw_t        return_psw;               /* 0x200 */
-        __u8         irb[64];                  /* 0x208 */
-        __u64        sync_enter_timer;         /* 0x248 */
-        __u64        async_enter_timer;        /* 0x250 */
-        __u64        exit_timer;               /* 0x258 */
-        __u64        last_update_timer;        /* 0x260 */
-        __u64        user_timer;               /* 0x268 */
-        __u64        system_timer;             /* 0x270 */
-        __u64        last_update_clock;        /* 0x278 */
-        __u64        steal_clock;              /* 0x280 */
-        psw_t        return_mcck_psw;          /* 0x288 */
-        __u8         pad8[0xc00-0x290];        /* 0x290 */
-
-        /* System info area */
-        __u32        save_area[16];            /* 0xc00 */
-        __u32        kernel_stack;             /* 0xc40 */
-        __u32        thread_info;              /* 0xc44 */
-        __u32        async_stack;              /* 0xc48 */
-        __u32        kernel_asce;              /* 0xc4c */
-        __u32        user_asce;                /* 0xc50 */
-        __u32        panic_stack;              /* 0xc54 */
-        __u32        user_exec_asce;           /* 0xc58 */
-        __u8         pad10[0xc60-0xc5c];       /* 0xc5c */
-        /* entry.S sensitive area start */
-        struct       cpuinfo_S390 cpu_data;    /* 0xc60 */
-        __u32        ipl_device;               /* 0xc7c */
-        /* entry.S sensitive area end */
-
-        /* SMP info area: defined by DJB */
-        __u64        clock_comparator;         /* 0xc80 */
-        __u32        ext_call_fast;            /* 0xc88 */
-        __u32        percpu_offset;            /* 0xc8c */
-        __u32        current_task;             /* 0xc90 */
-        __u32        softirq_pending;          /* 0xc94 */
-        __u64        int_clock;                /* 0xc98 */
-        __u8         pad11[0xe00-0xca0];       /* 0xca0 */
-
-        /* 0xe00 is used as indicator for dump tools */
-        /* whether the kernel died with panic() or not */
-        __u32        panic_magic;              /* 0xe00 */
-
-        /* Align to the top 1k of prefix area */
-        __u8         pad12[0x1000-0xe04];      /* 0xe04 */
-#else /* !__s390x__ */
-        /* prefix area: defined by architecture */
-        __u32        ccw1[2];                  /* 0x000 */
-        __u32        ccw2[4];                  /* 0x008 */
-        __u8         pad1[0x80-0x18];          /* 0x018 */
-        __u32        ext_params;               /* 0x080 */
-        __u16        cpu_addr;                 /* 0x084 */
-        __u16        ext_int_code;             /* 0x086 */
-        __u16        svc_ilc;                  /* 0x088 */
-        __u16        svc_code;                 /* 0x08a */
-        __u16        pgm_ilc;                  /* 0x08c */
-        __u16        pgm_code;                 /* 0x08e */
-        __u32        data_exc_code;            /* 0x090 */
-        __u16        mon_class_num;            /* 0x094 */
-        __u16        per_perc_atmid;           /* 0x096 */
-        addr_t       per_address;              /* 0x098 */
-        __u8         exc_access_id;            /* 0x0a0 */
-        __u8         per_access_id;            /* 0x0a1 */
-        __u8         op_access_id;             /* 0x0a2 */
-        __u8         ar_access_id;             /* 0x0a3 */
-        __u8         pad2[0xA8-0xA4];          /* 0x0a4 */
-        addr_t       trans_exc_code;           /* 0x0A0 */
-        addr_t       monitor_code;             /* 0x09c */
-        __u16        subchannel_id;            /* 0x0b8 */
-        __u16        subchannel_nr;            /* 0x0ba */
-        __u32        io_int_parm;              /* 0x0bc */
-        __u32        io_int_word;              /* 0x0c0 */
-        __u8         pad3[0xc8-0xc4];          /* 0x0c4 */
-        __u32        stfl_fac_list;            /* 0x0c8 */
-        __u8         pad4[0xe8-0xcc];          /* 0x0cc */
-        __u32        mcck_interruption_code[2]; /* 0x0e8 */
-        __u8         pad5[0xf4-0xf0];          /* 0x0f0 */
-        __u32        external_damage_code;     /* 0x0f4 */
-        addr_t       failing_storage_address;  /* 0x0f8 */
-        __u8         pad6[0x120-0x100];        /* 0x100 */
-        psw_t        restart_old_psw;          /* 0x120 */
-        psw_t        external_old_psw;         /* 0x130 */
-        psw_t        svc_old_psw;              /* 0x140 */
-        psw_t        program_old_psw;          /* 0x150 */
-        psw_t        mcck_old_psw;             /* 0x160 */
-        psw_t        io_old_psw;               /* 0x170 */
-        __u8         pad7[0x1a0-0x180];        /* 0x180 */
-        psw_t        restart_psw;              /* 0x1a0 */
-        psw_t        external_new_psw;         /* 0x1b0 */
-        psw_t        svc_new_psw;              /* 0x1c0 */
-        psw_t        program_new_psw;          /* 0x1d0 */
-        psw_t        mcck_new_psw;             /* 0x1e0 */
-        psw_t        io_new_psw;               /* 0x1f0 */
-        psw_t        return_psw;               /* 0x200 */
-        __u8         irb[64];                  /* 0x210 */
-        __u64        sync_enter_timer;         /* 0x250 */
-        __u64        async_enter_timer;        /* 0x258 */
-        __u64        exit_timer;               /* 0x260 */
-        __u64        last_update_timer;        /* 0x268 */
-        __u64        user_timer;               /* 0x270 */
-        __u64        system_timer;             /* 0x278 */
-        __u64        last_update_clock;        /* 0x280 */
-        __u64        steal_clock;              /* 0x288 */
-        psw_t        return_mcck_psw;          /* 0x290 */
-        __u8         pad8[0xc00-0x2a0];        /* 0x2a0 */
-        /* System info area */
-        __u64        save_area[16];            /* 0xc00 */
-        __u8         pad9[0xd40-0xc80];        /* 0xc80 */
-        __u64        kernel_stack;             /* 0xd40 */
-        __u64        thread_info;              /* 0xd48 */
-        __u64        async_stack;              /* 0xd50 */
-        __u64        kernel_asce;              /* 0xd58 */
-        __u64        user_asce;                /* 0xd60 */
-        __u64        panic_stack;              /* 0xd68 */
-        __u64        user_exec_asce;           /* 0xd70 */
-        __u8         pad10[0xd80-0xd78];       /* 0xd78 */
-        /* entry.S sensitive area start */
-        struct       cpuinfo_S390 cpu_data;    /* 0xd80 */
-        __u32        ipl_device;               /* 0xdb8 */
-        __u32        pad11;                    /* 0xdbc */
-        /* entry.S sensitive area end */
-
-        /* SMP info area: defined by DJB */
-        __u64        clock_comparator;         /* 0xdc0 */
-        __u64        ext_call_fast;            /* 0xdc8 */
-        __u64        percpu_offset;            /* 0xdd0 */
-        __u64        current_task;             /* 0xdd8 */
-        __u32        softirq_pending;          /* 0xde0 */
-        __u32        pad_0x0de4;               /* 0xde4 */
-        __u64        int_clock;                /* 0xde8 */
-        __u8         pad12[0xe00-0xdf0];       /* 0xdf0 */
-
-        /* 0xe00 is used as indicator for dump tools */
-        /* whether the kernel died with panic() or not */
-        __u32        panic_magic;              /* 0xe00 */
-
-        __u8         pad13[0x11b8-0xe04];      /* 0xe04 */
-
-        /* 64 bit extparam used for pfault, diag 250 etc  */
-        __u64        ext_params2;               /* 0x11B8 */
-
-        __u8         pad14[0x1200-0x11C0];      /* 0x11C0 */
-
-        /* System info area */ 
-
-        __u64        floating_pt_save_area[16]; /* 0x1200 */
-        __u64        gpregs_save_area[16];      /* 0x1280 */
-        __u32        st_status_fixed_logout[4]; /* 0x1300 */
-        __u8         pad15[0x1318-0x1310];      /* 0x1310 */
-        __u32        prefixreg_save_area;       /* 0x1318 */
-        __u32        fpt_creg_save_area;        /* 0x131c */
-        __u8         pad16[0x1324-0x1320];      /* 0x1320 */
-        __u32        tod_progreg_save_area;     /* 0x1324 */
-        __u32        cpu_timer_save_area[2];    /* 0x1328 */
-        __u32        clock_comp_save_area[2];   /* 0x1330 */
-        __u8         pad17[0x1340-0x1338];      /* 0x1338 */
-        __u32        access_regs_save_area[16]; /* 0x1340 */ 
-        __u64        cregs_save_area[16];       /* 0x1380 */
-
-        /* align to the top of the prefix area */
-
-        __u8         pad18[0x2000-0x1400];      /* 0x1400 */
-#endif /* !__s390x__ */
-} __attribute__((packed)); /* End structure*/
-
-#define S390_lowcore (*((struct _lowcore *) 0))
-extern struct _lowcore *lowcore_ptr[];
-
-static inline void set_prefix(__u32 address)
-{
-        asm volatile("spx %0" : : "m" (address) : "memory");
-}
-
-static inline __u32 store_prefix(void)
-{
-        __u32 address;
-
-        asm volatile("stpx %0" : "=m" (address));
-        return address;
-}
-
-#define __PANIC_MAGIC           0xDEADC0DE
-
-#endif
-
-#endif
diff --git a/include/asm-s390/mathemu.h b/include/asm-s390/mathemu.h
deleted file mode 100644
index e8dd1ba8edb0..000000000000
--- a/include/asm-s390/mathemu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  arch/s390/kernel/mathemu.h
- *    IEEE floating point emulation.
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- */
-
-#ifndef __MATHEMU__
-#define __MATHEMU__
-
-extern int math_emu_b3(__u8 *, struct pt_regs *);
-extern int math_emu_ed(__u8 *, struct pt_regs *);
-extern int math_emu_ldr(__u8 *);
-extern int math_emu_ler(__u8 *);
-extern int math_emu_std(__u8 *, struct pt_regs *);
-extern int math_emu_ld(__u8 *, struct pt_regs *);
-extern int math_emu_ste(__u8 *, struct pt_regs *);
-extern int math_emu_le(__u8 *, struct pt_regs *);
-extern int math_emu_lfpc(__u8 *, struct pt_regs *);
-extern int math_emu_stfpc(__u8 *, struct pt_regs *);
-extern int math_emu_srnm(__u8 *, struct pt_regs *);
-
-#endif                                 /* __MATHEMU__                      */
-
-
-
-
diff --git a/include/asm-s390/mman.h b/include/asm-s390/mman.h
deleted file mode 100644
index 7839767d837e..000000000000
--- a/include/asm-s390/mman.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  include/asm-s390/mman.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/mman.h"
- */
-
-#ifndef __S390_MMAN_H__
-#define __S390_MMAN_H__
-
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MAP_LOCKED      0x2000          /* pages are locked */
-#define MAP_NORESERVE   0x4000          /* don't check for reservations */
-#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
-
-#endif /* __S390_MMAN_H__ */
diff --git a/include/asm-s390/mmu.h b/include/asm-s390/mmu.h
deleted file mode 100644
index 5dd5e7b3476f..000000000000
--- a/include/asm-s390/mmu.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-typedef struct {
-        struct list_head crst_list;
-        struct list_head pgtable_list;
-        unsigned long asce_bits;
-        unsigned long asce_limit;
-        int noexec;
-        int pgstes;
-} mm_context_t;
-
-#endif
diff --git a/include/asm-s390/mmu_context.h b/include/asm-s390/mmu_context.h
deleted file mode 100644
index 4c2fbf48c9c4..000000000000
--- a/include/asm-s390/mmu_context.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  include/asm-s390/mmu_context.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/mmu_context.h"
- */
-
-#ifndef __S390_MMU_CONTEXT_H
-#define __S390_MMU_CONTEXT_H
-
-#include <asm/pgalloc.h>
-#include <asm/uaccess.h>
-#include <asm-generic/mm_hooks.h>
-
-static inline int init_new_context(struct task_struct *tsk,
-                                   struct mm_struct *mm)
-{
-        mm->context.asce_bits = _ASCE_TABLE_LENGTH | _ASCE_USER_BITS;
-#ifdef CONFIG_64BIT
-        mm->context.asce_bits |= _ASCE_TYPE_REGION3;
-#endif
-        if (current->mm->context.pgstes) {
-                mm->context.noexec = 0;
-                mm->context.pgstes = 1;
-        } else {
-                mm->context.noexec = s390_noexec;
-                mm->context.pgstes = 0;
-        }
-        mm->context.asce_limit = STACK_TOP_MAX;
-        crst_table_init((unsigned long *) mm->pgd, pgd_entry_type(mm));
-        return 0;
-}
-
-#define destroy_context(mm)             do { } while (0)
-
-#ifndef __s390x__
-#define LCTL_OPCODE "lctl"
-#else
-#define LCTL_OPCODE "lctlg"
-#endif
-
-static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk)
-{
-        pgd_t *pgd = mm->pgd;
-
-        S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);
-        if (switch_amode) {
-                /* Load primary space page table origin. */
-                pgd = mm->context.noexec ? get_shadow_table(pgd) : pgd;
-                S390_lowcore.user_exec_asce = mm->context.asce_bits | __pa(pgd);
-                asm volatile(LCTL_OPCODE" 1,1,%0\n"
-                             : : "m" (S390_lowcore.user_exec_asce) );
-        } else
-                /* Load home space page table origin. */
-                asm volatile(LCTL_OPCODE" 13,13,%0"
-                             : : "m" (S390_lowcore.user_asce) );
-        set_fs(current->thread.mm_segment);
-}
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
-                             struct task_struct *tsk)
-{
-        cpu_set(smp_processor_id(), next->cpu_vm_mask);
-        update_mm(next, tsk);
-}
-
-#define enter_lazy_tlb(mm,tsk)  do { } while (0)
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-static inline void activate_mm(struct mm_struct *prev,
-                               struct mm_struct *next)
-{
-        switch_mm(prev, next, current);
-}
-
-#endif /* __S390_MMU_CONTEXT_H */
diff --git a/include/asm-s390/module.h b/include/asm-s390/module.h
deleted file mode 100644
index 1cc1c5af705a..000000000000
--- a/include/asm-s390/module.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _ASM_S390_MODULE_H
-#define _ASM_S390_MODULE_H
-/*
- * This file contains the s390 architecture specific module code.
- */
-
-struct mod_arch_syminfo
-{
-        unsigned long got_offset;
-        unsigned long plt_offset;
-        int got_initialized;
-        int plt_initialized;
-};
-
-struct mod_arch_specific
-{
-        /* Starting offset of got in the module core memory. */
-        unsigned long got_offset;
-        /* Starting offset of plt in the module core memory. */
-        unsigned long plt_offset;
-        /* Size of the got. */
-        unsigned long got_size;
-        /* Size of the plt. */
-        unsigned long plt_size;
-        /* Number of symbols in syminfo. */
-        int nsyms;
-        /* Additional symbol information (got and plt offsets). */
-        struct mod_arch_syminfo *syminfo;
-};
-
-#ifdef __s390x__
-#define ElfW(x) Elf64_ ## x
-#define ELFW(x) ELF64_ ## x
-#else
-#define ElfW(x) Elf32_ ## x
-#define ELFW(x) ELF32_ ## x
-#endif
-
-#define Elf_Addr ElfW(Addr)
-#define Elf_Rela ElfW(Rela)
-#define Elf_Shdr ElfW(Shdr)
-#define Elf_Sym ElfW(Sym)
-#define Elf_Ehdr ElfW(Ehdr)
-#define ELF_R_SYM ELFW(R_SYM)
-#define ELF_R_TYPE ELFW(R_TYPE)
-#endif /* _ASM_S390_MODULE_H */
diff --git a/include/asm-s390/monwriter.h b/include/asm-s390/monwriter.h
deleted file mode 100644
index f0cbf96c52e6..000000000000
--- a/include/asm-s390/monwriter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * include/asm-s390/monwriter.h
- *
- * Copyright (C) IBM Corp. 2006
- * Character device driver for writing z/VM APPLDATA monitor records
- * Version 1.0
- * Author(s): Melissa Howland <melissah@us.ibm.com>
- *
- */
-
-#ifndef _ASM_390_MONWRITER_H
-#define _ASM_390_MONWRITER_H
-
-/* mon_function values */
-#define MONWRITE_START_INTERVAL 0x00 /* start interval recording */
-#define MONWRITE_STOP_INTERVAL  0x01 /* stop interval or config recording */
-#define MONWRITE_GEN_EVENT      0x02 /* generate event record */
-#define MONWRITE_START_CONFIG   0x03 /* start configuration recording */
-
-/* the header the app uses in its write() data */
-struct monwrite_hdr {
-        unsigned char mon_function;
-        unsigned short applid;
-        unsigned char record_num;
-        unsigned short version;
-        unsigned short release;
-        unsigned short mod_level;
-        unsigned short datalen;
-        unsigned char hdrlen;
-
-} __attribute__((packed));
-
-#endif /* _ASM_390_MONWRITER_H */
diff --git a/include/asm-s390/msgbuf.h b/include/asm-s390/msgbuf.h
deleted file mode 100644
index 1bbdee927924..000000000000
--- a/include/asm-s390/msgbuf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _S390_MSGBUF_H
-#define _S390_MSGBUF_H
-
-/* 
- * The msqid64_ds structure for S/390 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-#ifndef __s390x__
-        unsigned long   __unused1;
-#endif /* ! __s390x__ */
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-#ifndef __s390x__
-        unsigned long   __unused2;
-#endif /* ! __s390x__ */
-        __kernel_time_t msg_ctime;      /* last change time */
-#ifndef __s390x__
-        unsigned long   __unused3;
-#endif /* ! __s390x__ */
-        unsigned long  msg_cbytes;      /* current number of bytes on queue */
-        unsigned long  msg_qnum;        /* number of messages in queue */
-        unsigned long  msg_qbytes;      /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-#endif /* _S390_MSGBUF_H */
diff --git a/include/asm-s390/mutex.h b/include/asm-s390/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/include/asm-s390/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
deleted file mode 100644
index 991ba939408c..000000000000
--- a/include/asm-s390/page.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  include/asm-s390/page.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com)
- */
-
-#ifndef _S390_PAGE_H
-#define _S390_PAGE_H
-
-#include <linux/const.h>
-#include <asm/types.h>
-
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
-#define PAGE_SIZE       (_AC(1,UL) << PAGE_SHIFT)
-#define PAGE_MASK       (~(PAGE_SIZE-1))
-#define PAGE_DEFAULT_ACC        0
-#define PAGE_DEFAULT_KEY        (PAGE_DEFAULT_ACC << 4)
-
-#define HPAGE_SHIFT     20
-#define HPAGE_SIZE      (1UL << HPAGE_SHIFT)
-#define HPAGE_MASK      (~(HPAGE_SIZE - 1))
-#define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT - PAGE_SHIFT)
-
-#define ARCH_HAS_SETCLEAR_HUGE_PTE
-#define ARCH_HAS_HUGE_PTE_TYPE
-#define ARCH_HAS_PREPARE_HUGEPAGE
-#define ARCH_HAS_HUGEPAGE_CLEAR_FLUSH
-
-#include <asm/setup.h>
-#ifndef __ASSEMBLY__
-
-static inline void clear_page(void *page)
-{
-        if (MACHINE_HAS_PFMF) {
-                asm volatile(
-                        "       .insn   rre,0xb9af0000,%0,%1"
-                        : : "d" (0x10000), "a" (page) : "memory", "cc");
-        } else {
-                register unsigned long reg1 asm ("1") = 0;
-                register void *reg2 asm ("2") = page;
-                register unsigned long reg3 asm ("3") = 4096;
-                asm volatile(
-                        "       mvcl    2,0"
-                        : "+d" (reg2), "+d" (reg3) : "d" (reg1)
-                        : "memory", "cc");
-        }
-}
-
-static inline void copy_page(void *to, void *from)
-{
-        if (MACHINE_HAS_MVPG) {
-                register unsigned long reg0 asm ("0") = 0;
-                asm volatile(
-                        "       mvpg    %0,%1"
-                        : : "a" (to), "a" (from), "d" (reg0)
-                        : "memory", "cc");
-        } else
-                asm volatile(
-                        "       mvc     0(256,%0),0(%1)\n"
-                        "       mvc     256(256,%0),256(%1)\n"
-                        "       mvc     512(256,%0),512(%1)\n"
-                        "       mvc     768(256,%0),768(%1)\n"
-                        "       mvc     1024(256,%0),1024(%1)\n"
-                        "       mvc     1280(256,%0),1280(%1)\n"
-                        "       mvc     1536(256,%0),1536(%1)\n"
-                        "       mvc     1792(256,%0),1792(%1)\n"
-                        "       mvc     2048(256,%0),2048(%1)\n"
-                        "       mvc     2304(256,%0),2304(%1)\n"
-                        "       mvc     2560(256,%0),2560(%1)\n"
-                        "       mvc     2816(256,%0),2816(%1)\n"
-                        "       mvc     3072(256,%0),3072(%1)\n"
-                        "       mvc     3328(256,%0),3328(%1)\n"
-                        "       mvc     3584(256,%0),3584(%1)\n"
-                        "       mvc     3840(256,%0),3840(%1)\n"
-                        : : "a" (to), "a" (from) : "memory");
-}
-
-#define clear_user_page(page, vaddr, pg)        clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
-
-#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
-        alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
-#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
-
-/*
- * These are used to make use of C type-checking..
- */
-
-typedef struct { unsigned long pgprot; } pgprot_t;
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
-typedef struct { unsigned long pud; } pud_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef pte_t *pgtable_t;
-
-#define pgprot_val(x)   ((x).pgprot)
-#define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).pmd)
-#define pud_val(x)      ((x).pud)
-#define pgd_val(x)      ((x).pgd)
-
-#define __pte(x)        ((pte_t) { (x) } )
-#define __pmd(x)        ((pmd_t) { (x) } )
-#define __pgd(x)        ((pgd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-
-/* default storage key used for all pages */
-extern unsigned int default_storage_key;
-
-static inline void
-page_set_storage_key(unsigned long addr, unsigned int skey)
-{
-        asm volatile("sske %0,%1" : : "d" (skey), "a" (addr));
-}
-
-static inline unsigned int
-page_get_storage_key(unsigned long addr)
-{
-        unsigned int skey;
-
-        asm volatile("iske %0,%1" : "=d" (skey) : "a" (addr), "0" (0));
-        return skey;
-}
-
-#ifdef CONFIG_PAGE_STATES
-
-struct page;
-void arch_free_page(struct page *page, int order);
-void arch_alloc_page(struct page *page, int order);
-
-#define HAVE_ARCH_FREE_PAGE
-#define HAVE_ARCH_ALLOC_PAGE
-
-#endif
-
-#endif /* !__ASSEMBLY__ */
-
-#define __PAGE_OFFSET           0x0UL
-#define PAGE_OFFSET             0x0UL
-#define __pa(x)                 (unsigned long)(x)
-#define __va(x)                 (void *)(unsigned long)(x)
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
-#endif /* _S390_PAGE_H */
diff --git a/include/asm-s390/param.h b/include/asm-s390/param.h
deleted file mode 100644
index 34aaa4603347..000000000000
--- a/include/asm-s390/param.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  include/asm-s390/param.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/param.h"
- */
-
-#ifndef _ASMS390_PARAM_H
-#define _ASMS390_PARAM_H
-
-#ifdef __KERNEL__
-# define HZ             CONFIG_HZ       /* Internal kernel timer frequency */
-# define USER_HZ        100             /* .. some user interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ)       /* like times() */
-#endif
-
-#ifndef HZ
-#define HZ 100
-#endif
-
-#define EXEC_PAGESIZE   4096
-
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-
-#endif
diff --git a/include/asm-s390/pci.h b/include/asm-s390/pci.h
deleted file mode 100644
index 42a145c9ddd6..000000000000
--- a/include/asm-s390/pci.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_S390_PCI_H
-#define __ASM_S390_PCI_H
-
-/* S/390 systems don't have a PCI bus. This file is just here because some stupid .c code
- * includes it even if CONFIG_PCI is not set.
- */
-#define PCI_DMA_BUS_IS_PHYS (0)
-
-#endif /* __ASM_S390_PCI_H */
-
diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h
deleted file mode 100644
index 408d60b4f75b..000000000000
--- a/include/asm-s390/percpu.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __ARCH_S390_PERCPU__
-#define __ARCH_S390_PERCPU__
-
-#include <linux/compiler.h>
-#include <asm/lowcore.h>
-
-/*
- * s390 uses its own implementation for per cpu data, the offset of
- * the cpu local data area is cached in the cpu's lowcore memory.
- * For 64 bit module code s390 forces the use of a GOT slot for the
- * address of the per cpu variable. This is needed because the module
- * may be more than 4G above the per cpu area.
- */
-#if defined(__s390x__) && defined(MODULE)
-
-#define SHIFT_PERCPU_PTR(ptr,offset) (({                        \
-        extern int simple_identifier_##var(void);       \
-        unsigned long *__ptr;                           \
-        asm ( "larl %0, %1@GOTENT"              \
-            : "=a" (__ptr) : "X" (ptr) );               \
-        (typeof(ptr))((*__ptr) + (offset));     }))
-
-#else
-
-#define SHIFT_PERCPU_PTR(ptr, offset) (({                               \
-        extern int simple_identifier_##var(void);               \
-        unsigned long __ptr;                                    \
-        asm ( "" : "=a" (__ptr) : "0" (ptr) );                  \
-        (typeof(ptr)) (__ptr + (offset)); }))
-
-#endif
-
-#define __my_cpu_offset S390_lowcore.percpu_offset
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ARCH_S390_PERCPU__ */
diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h
deleted file mode 100644
index f5b2bf3d7c1d..000000000000
--- a/include/asm-s390/pgalloc.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  include/asm-s390/pgalloc.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com)
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/pgalloc.h"
- *    Copyright (C) 1994  Linus Torvalds
- */
-
-#ifndef _S390_PGALLOC_H
-#define _S390_PGALLOC_H
-
-#include <linux/threads.h>
-#include <linux/gfp.h>
-#include <linux/mm.h>
-
-#define check_pgt_cache()       do {} while (0)
-
-unsigned long *crst_table_alloc(struct mm_struct *, int);
-void crst_table_free(struct mm_struct *, unsigned long *);
-
-unsigned long *page_table_alloc(struct mm_struct *);
-void page_table_free(struct mm_struct *, unsigned long *);
-void disable_noexec(struct mm_struct *, struct task_struct *);
-
-static inline void clear_table(unsigned long *s, unsigned long val, size_t n)
-{
-        *s = val;
-        n = (n / 256) - 1;
-        asm volatile(
-#ifdef CONFIG_64BIT
-                "       mvc     8(248,%0),0(%0)\n"
-#else
-                "       mvc     4(252,%0),0(%0)\n"
-#endif
-                "0:     mvc     256(256,%0),0(%0)\n"
-                "       la      %0,256(%0)\n"
-                "       brct    %1,0b\n"
-                : "+a" (s), "+d" (n));
-}
-
-static inline void crst_table_init(unsigned long *crst, unsigned long entry)
-{
-        clear_table(crst, entry, sizeof(unsigned long)*2048);
-        crst = get_shadow_table(crst);
-        if (crst)
-                clear_table(crst, entry, sizeof(unsigned long)*2048);
-}
-
-#ifndef __s390x__
-
-static inline unsigned long pgd_entry_type(struct mm_struct *mm)
-{
-        return _SEGMENT_ENTRY_EMPTY;
-}
-
-#define pud_alloc_one(mm,address)               ({ BUG(); ((pud_t *)2); })
-#define pud_free(mm, x)                         do { } while (0)
-
-#define pmd_alloc_one(mm,address)               ({ BUG(); ((pmd_t *)2); })
-#define pmd_free(mm, x)                         do { } while (0)
-
-#define pgd_populate(mm, pgd, pud)              BUG()
-#define pgd_populate_kernel(mm, pgd, pud)       BUG()
-
-#define pud_populate(mm, pud, pmd)              BUG()
-#define pud_populate_kernel(mm, pud, pmd)       BUG()
-
-#else /* __s390x__ */
-
-static inline unsigned long pgd_entry_type(struct mm_struct *mm)
-{
-        if (mm->context.asce_limit <= (1UL << 31))
-                return _SEGMENT_ENTRY_EMPTY;
-        if (mm->context.asce_limit <= (1UL << 42))
-                return _REGION3_ENTRY_EMPTY;
-        return _REGION2_ENTRY_EMPTY;
-}
-
-int crst_table_upgrade(struct mm_struct *, unsigned long limit);
-void crst_table_downgrade(struct mm_struct *, unsigned long limit);
-
-static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
-{
-        unsigned long *table = crst_table_alloc(mm, mm->context.noexec);
-        if (table)
-                crst_table_init(table, _REGION3_ENTRY_EMPTY);
-        return (pud_t *) table;
-}
-#define pud_free(mm, pud) crst_table_free(mm, (unsigned long *) pud)
-
-static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
-{
-        unsigned long *table = crst_table_alloc(mm, mm->context.noexec);
-        if (table)
-                crst_table_init(table, _SEGMENT_ENTRY_EMPTY);
-        return (pmd_t *) table;
-}
-#define pmd_free(mm, pmd) crst_table_free(mm, (unsigned long *) pmd)
-
-static inline void pgd_populate_kernel(struct mm_struct *mm,
-                                       pgd_t *pgd, pud_t *pud)
-{
-        pgd_val(*pgd) = _REGION2_ENTRY | __pa(pud);
-}
-
-static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
-{
-        pgd_populate_kernel(mm, pgd, pud);
-        if (mm->context.noexec) {
-                pgd = get_shadow_table(pgd);
-                pud = get_shadow_table(pud);
-                pgd_populate_kernel(mm, pgd, pud);
-        }
-}
-
-static inline void pud_populate_kernel(struct mm_struct *mm,
-                                       pud_t *pud, pmd_t *pmd)
-{
-        pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);
-}
-
-static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
-{
-        pud_populate_kernel(mm, pud, pmd);
-        if (mm->context.noexec) {
-                pud = get_shadow_table(pud);
-                pmd = get_shadow_table(pmd);
-                pud_populate_kernel(mm, pud, pmd);
-        }
-}
-
-#endif /* __s390x__ */
-
-static inline pgd_t *pgd_alloc(struct mm_struct *mm)
-{
-        INIT_LIST_HEAD(&mm->context.crst_list);
-        INIT_LIST_HEAD(&mm->context.pgtable_list);
-        return (pgd_t *) crst_table_alloc(mm, s390_noexec);
-}
-#define pgd_free(mm, pgd) crst_table_free(mm, (unsigned long *) pgd)
-
-static inline void pmd_populate_kernel(struct mm_struct *mm,
-                                       pmd_t *pmd, pte_t *pte)
-{
-        pmd_val(*pmd) = _SEGMENT_ENTRY + __pa(pte);
-}
-
-static inline void pmd_populate(struct mm_struct *mm,
-                                pmd_t *pmd, pgtable_t pte)
-{
-        pmd_populate_kernel(mm, pmd, pte);
-        if (mm->context.noexec) {
-                pmd = get_shadow_table(pmd);
-                pmd_populate_kernel(mm, pmd, pte + PTRS_PER_PTE);
-        }
-}
-
-#define pmd_pgtable(pmd) \
-        (pgtable_t)(pmd_val(pmd) & -sizeof(pte_t)*PTRS_PER_PTE)
-
-/*
- * page table entry allocation/free routines.
- */
-#define pte_alloc_one_kernel(mm, vmaddr) ((pte_t *) page_table_alloc(mm))
-#define pte_alloc_one(mm, vmaddr) ((pte_t *) page_table_alloc(mm))
-
-#define pte_free_kernel(mm, pte) page_table_free(mm, (unsigned long *) pte)
-#define pte_free(mm, pte) page_table_free(mm, (unsigned long *) pte)
-
-#endif /* _S390_PGALLOC_H */
diff --git a/include/asm-s390/pgtable.h b/include/asm-s390/pgtable.h
deleted file mode 100644
index 0bdb704ae051..000000000000
--- a/include/asm-s390/pgtable.h
+++ /dev/null
@@ -1,1093 +0,0 @@
-/*
- *  include/asm-s390/pgtable.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com)
- *               Ulrich Weigand (weigand@de.ibm.com)
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/pgtable.h"
- */
-
-#ifndef _ASM_S390_PGTABLE_H
-#define _ASM_S390_PGTABLE_H
-
-/*
- * The Linux memory management assumes a three-level page table setup. For
- * s390 31 bit we "fold" the mid level into the top-level page table, so
- * that we physically have the same two-level page table as the s390 mmu
- * expects in 31 bit mode. For s390 64 bit we use three of the five levels
- * the hardware provides (region first and region second tables are not
- * used).
- *
- * The "pgd_xxx()" functions are trivial for a folded two-level
- * setup: the pgd is never bad, and a pmd always exists (as it's folded
- * into the pgd entry)
- *
- * This file contains the functions and defines necessary to modify and use
- * the S390 page table tree.
- */
-#ifndef __ASSEMBLY__
-#include <linux/sched.h>
-#include <linux/mm_types.h>
-#include <asm/bitops.h>
-#include <asm/bug.h>
-#include <asm/processor.h>
-
-extern pgd_t swapper_pg_dir[] __attribute__ ((aligned (4096)));
-extern void paging_init(void);
-extern void vmem_map_init(void);
-
-/*
- * The S390 doesn't have any external MMU info: the kernel page
- * tables contain all the necessary information.
- */
-#define update_mmu_cache(vma, address, pte)     do { } while (0)
-
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern char empty_zero_page[PAGE_SIZE];
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-#endif /* !__ASSEMBLY__ */
-
-/*
- * PMD_SHIFT determines the size of the area a second-level page
- * table can map
- * PGDIR_SHIFT determines what a third-level page table entry can map
- */
-#ifndef __s390x__
-# define PMD_SHIFT      20
-# define PUD_SHIFT      20
-# define PGDIR_SHIFT    20
-#else /* __s390x__ */
-# define PMD_SHIFT      20
-# define PUD_SHIFT      31
-# define PGDIR_SHIFT    42
-#endif /* __s390x__ */
-
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PMD_MASK        (~(PMD_SIZE-1))
-#define PUD_SIZE        (1UL << PUD_SHIFT)
-#define PUD_MASK        (~(PUD_SIZE-1))
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE-1))
-
-/*
- * entries per page directory level: the S390 is two-level, so
- * we don't really have any PMD directory physically.
- * for S390 segment-table entries are combined to one PGD
- * that leads to 1024 pte per pgd
- */
-#define PTRS_PER_PTE    256
-#ifndef __s390x__
-#define PTRS_PER_PMD    1
-#define PTRS_PER_PUD    1
-#else /* __s390x__ */
-#define PTRS_PER_PMD    2048
-#define PTRS_PER_PUD    2048
-#endif /* __s390x__ */
-#define PTRS_PER_PGD    2048
-
-#define FIRST_USER_ADDRESS  0
-
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %p.\n", __FILE__, __LINE__, (void *) pte_val(e))
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %p.\n", __FILE__, __LINE__, (void *) pmd_val(e))
-#define pud_ERROR(e) \
-        printk("%s:%d: bad pud %p.\n", __FILE__, __LINE__, (void *) pud_val(e))
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %p.\n", __FILE__, __LINE__, (void *) pgd_val(e))
-
-#ifndef __ASSEMBLY__
-/*
- * The vmalloc area will always be on the topmost area of the kernel
- * mapping. We reserve 96MB (31bit) / 1GB (64bit) for vmalloc,
- * which should be enough for any sane case.
- * By putting vmalloc at the top, we maximise the gap between physical
- * memory and vmalloc to catch misplaced memory accesses. As a side
- * effect, this also makes sure that 64 bit module code cannot be used
- * as system call address.
- */
-#ifndef __s390x__
-#define VMALLOC_START   0x78000000UL
-#define VMALLOC_END     0x7e000000UL
-#define VMEM_MAP_END    0x80000000UL
-#else /* __s390x__ */
-#define VMALLOC_START   0x3e000000000UL
-#define VMALLOC_END     0x3e040000000UL
-#define VMEM_MAP_END    0x40000000000UL
-#endif /* __s390x__ */
-
-/*
- * VMEM_MAX_PHYS is the highest physical address that can be added to the 1:1
- * mapping. This needs to be calculated at compile time since the size of the
- * VMEM_MAP is static but the size of struct page can change.
- */
-#define VMEM_MAX_PAGES  ((VMEM_MAP_END - VMALLOC_END) / sizeof(struct page))
-#define VMEM_MAX_PFN    min(VMALLOC_START >> PAGE_SHIFT, VMEM_MAX_PAGES)
-#define VMEM_MAX_PHYS   ((VMEM_MAX_PFN << PAGE_SHIFT) & ~((16 << 20) - 1))
-#define vmemmap         ((struct page *) VMALLOC_END)
-
-/*
- * A 31 bit pagetable entry of S390 has following format:
- *  |   PFRA          |    |  OS  |
- * 0                   0IP0
- * 00000000001111111111222222222233
- * 01234567890123456789012345678901
- *
- * I Page-Invalid Bit:    Page is not available for address-translation
- * P Page-Protection Bit: Store access not possible for page
- *
- * A 31 bit segmenttable entry of S390 has following format:
- *  |   P-table origin      |  |PTL
- * 0                         IC
- * 00000000001111111111222222222233
- * 01234567890123456789012345678901
- *
- * I Segment-Invalid Bit:    Segment is not available for address-translation
- * C Common-Segment Bit:     Segment is not private (PoP 3-30)
- * PTL Page-Table-Length:    Page-table length (PTL+1*16 entries -> up to 256)
- *
- * The 31 bit segmenttable origin of S390 has following format:
- *
- *  |S-table origin   |     | STL |
- * X                   **GPS
- * 00000000001111111111222222222233
- * 01234567890123456789012345678901
- *
- * X Space-Switch event:
- * G Segment-Invalid Bit:     *
- * P Private-Space Bit:       Segment is not private (PoP 3-30)
- * S Storage-Alteration:
- * STL Segment-Table-Length:  Segment-table length (STL+1*16 entries -> up to 2048)
- *
- * A 64 bit pagetable entry of S390 has following format:
- * |                     PFRA                         |0IP0|  OS  |
- * 0000000000111111111122222222223333333333444444444455555555556666
- * 0123456789012345678901234567890123456789012345678901234567890123
- *
- * I Page-Invalid Bit:    Page is not available for address-translation
- * P Page-Protection Bit: Store access not possible for page
- *
- * A 64 bit segmenttable entry of S390 has following format:
- * |        P-table origin                              |      TT
- * 0000000000111111111122222222223333333333444444444455555555556666
- * 0123456789012345678901234567890123456789012345678901234567890123
- *
- * I Segment-Invalid Bit:    Segment is not available for address-translation
- * C Common-Segment Bit:     Segment is not private (PoP 3-30)
- * P Page-Protection Bit: Store access not possible for page
- * TT Type 00
- *
- * A 64 bit region table entry of S390 has following format:
- * |        S-table origin                             |   TF  TTTL
- * 0000000000111111111122222222223333333333444444444455555555556666
- * 0123456789012345678901234567890123456789012345678901234567890123
- *
- * I Segment-Invalid Bit:    Segment is not available for address-translation
- * TT Type 01
- * TF
- * TL Table length
- *
- * The 64 bit regiontable origin of S390 has following format:
- * |      region table origon                          |       DTTL
- * 0000000000111111111122222222223333333333444444444455555555556666
- * 0123456789012345678901234567890123456789012345678901234567890123
- *
- * X Space-Switch event:
- * G Segment-Invalid Bit:  
- * P Private-Space Bit:    
- * S Storage-Alteration:
- * R Real space
- * TL Table-Length:
- *
- * A storage key has the following format:
- * | ACC |F|R|C|0|
- *  0   3 4 5 6 7
- * ACC: access key
- * F  : fetch protection bit
- * R  : referenced bit
- * C  : changed bit
- */
-
-/* Hardware bits in the page table entry */
-#define _PAGE_RO        0x200           /* HW read-only bit  */
-#define _PAGE_INVALID   0x400           /* HW invalid bit    */
-
-/* Software bits in the page table entry */
-#define _PAGE_SWT       0x001           /* SW pte type bit t */
-#define _PAGE_SWX       0x002           /* SW pte type bit x */
-#define _PAGE_SPECIAL   0x004           /* SW associated with special page */
-#define __HAVE_ARCH_PTE_SPECIAL
-
-/* Set of bits not changed in pte_modify */
-#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_SPECIAL)
-
-/* Six different types of pages. */
-#define _PAGE_TYPE_EMPTY        0x400
-#define _PAGE_TYPE_NONE         0x401
-#define _PAGE_TYPE_SWAP         0x403
-#define _PAGE_TYPE_FILE         0x601   /* bit 0x002 is used for offset !! */
-#define _PAGE_TYPE_RO           0x200
-#define _PAGE_TYPE_RW           0x000
-#define _PAGE_TYPE_EX_RO        0x202
-#define _PAGE_TYPE_EX_RW        0x002
-
-/*
- * Only four types for huge pages, using the invalid bit and protection bit
- * of a segment table entry.
- */
-#define _HPAGE_TYPE_EMPTY       0x020   /* _SEGMENT_ENTRY_INV */
-#define _HPAGE_TYPE_NONE        0x220
-#define _HPAGE_TYPE_RO          0x200   /* _SEGMENT_ENTRY_RO  */
-#define _HPAGE_TYPE_RW          0x000
-
-/*
- * PTE type bits are rather complicated. handle_pte_fault uses pte_present,
- * pte_none and pte_file to find out the pte type WITHOUT holding the page
- * table lock. ptep_clear_flush on the other hand uses ptep_clear_flush to
- * invalidate a given pte. ipte sets the hw invalid bit and clears all tlbs
- * for the page. The page table entry is set to _PAGE_TYPE_EMPTY afterwards.
- * This change is done while holding the lock, but the intermediate step
- * of a previously valid pte with the hw invalid bit set can be observed by
- * handle_pte_fault. That makes it necessary that all valid pte types with
- * the hw invalid bit set must be distinguishable from the four pte types
- * empty, none, swap and file.
- *
- *                      irxt  ipte  irxt
- * _PAGE_TYPE_EMPTY     1000   ->   1000
- * _PAGE_TYPE_NONE      1001   ->   1001
- * _PAGE_TYPE_SWAP      1011   ->   1011
- * _PAGE_TYPE_FILE      11?1   ->   11?1
- * _PAGE_TYPE_RO        0100   ->   1100
- * _PAGE_TYPE_RW        0000   ->   1000
- * _PAGE_TYPE_EX_RO     0110   ->   1110
- * _PAGE_TYPE_EX_RW     0010   ->   1010
- *
- * pte_none is true for bits combinations 1000, 1010, 1100, 1110
- * pte_present is true for bits combinations 0000, 0010, 0100, 0110, 1001
- * pte_file is true for bits combinations 1101, 1111
- * swap pte is 1011 and 0001, 0011, 0101, 0111 are invalid.
- */
-
-/* Page status table bits for virtualization */
-#define RCP_PCL_BIT     55
-#define RCP_HR_BIT      54
-#define RCP_HC_BIT      53
-#define RCP_GR_BIT      50
-#define RCP_GC_BIT      49
-
-#ifndef __s390x__
-
-/* Bits in the segment table address-space-control-element */
-#define _ASCE_SPACE_SWITCH      0x80000000UL    /* space switch event       */
-#define _ASCE_ORIGIN_MASK       0x7ffff000UL    /* segment table origin     */
-#define _ASCE_PRIVATE_SPACE     0x100   /* private space control            */
-#define _ASCE_ALT_EVENT         0x80    /* storage alteration event control */
-#define _ASCE_TABLE_LENGTH      0x7f    /* 128 x 64 entries = 8k            */
-
-/* Bits in the segment table entry */
-#define _SEGMENT_ENTRY_ORIGIN   0x7fffffc0UL    /* page table origin        */
-#define _SEGMENT_ENTRY_INV      0x20    /* invalid segment table entry      */
-#define _SEGMENT_ENTRY_COMMON   0x10    /* common segment bit               */
-#define _SEGMENT_ENTRY_PTL      0x0f    /* page table length                */
-
-#define _SEGMENT_ENTRY          (_SEGMENT_ENTRY_PTL)
-#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INV)
-
-#else /* __s390x__ */
-
-/* Bits in the segment/region table address-space-control-element */
-#define _ASCE_ORIGIN            ~0xfffUL/* segment table origin             */
-#define _ASCE_PRIVATE_SPACE     0x100   /* private space control            */
-#define _ASCE_ALT_EVENT         0x80    /* storage alteration event control */
-#define _ASCE_SPACE_SWITCH      0x40    /* space switch event               */
-#define _ASCE_REAL_SPACE        0x20    /* real space control               */
-#define _ASCE_TYPE_MASK         0x0c    /* asce table type mask             */
-#define _ASCE_TYPE_REGION1      0x0c    /* region first table type          */
-#define _ASCE_TYPE_REGION2      0x08    /* region second table type         */
-#define _ASCE_TYPE_REGION3      0x04    /* region third table type          */
-#define _ASCE_TYPE_SEGMENT      0x00    /* segment table type               */
-#define _ASCE_TABLE_LENGTH      0x03    /* region table length              */
-
-/* Bits in the region table entry */
-#define _REGION_ENTRY_ORIGIN    ~0xfffUL/* region/segment table origin      */
-#define _REGION_ENTRY_INV       0x20    /* invalid region table entry       */
-#define _REGION_ENTRY_TYPE_MASK 0x0c    /* region/segment table type mask   */
-#define _REGION_ENTRY_TYPE_R1   0x0c    /* region first table type          */
-#define _REGION_ENTRY_TYPE_R2   0x08    /* region second table type         */
-#define _REGION_ENTRY_TYPE_R3   0x04    /* region third table type          */
-#define _REGION_ENTRY_LENGTH    0x03    /* region third length              */
-
-#define _REGION1_ENTRY          (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_LENGTH)
-#define _REGION1_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_INV)
-#define _REGION2_ENTRY          (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_LENGTH)
-#define _REGION2_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_INV)
-#define _REGION3_ENTRY          (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_LENGTH)
-#define _REGION3_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INV)
-
-/* Bits in the segment table entry */
-#define _SEGMENT_ENTRY_ORIGIN   ~0x7ffUL/* segment table origin             */
-#define _SEGMENT_ENTRY_RO       0x200   /* page protection bit              */
-#define _SEGMENT_ENTRY_INV      0x20    /* invalid segment table entry      */
-
-#define _SEGMENT_ENTRY          (0)
-#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INV)
-
-#define _SEGMENT_ENTRY_LARGE    0x400   /* STE-format control, large page   */
-#define _SEGMENT_ENTRY_CO       0x100   /* change-recording override   */
-
-#endif /* __s390x__ */
-
-/*
- * A user page table pointer has the space-switch-event bit, the
- * private-space-control bit and the storage-alteration-event-control
- * bit set. A kernel page table pointer doesn't need them.
- */
-#define _ASCE_USER_BITS         (_ASCE_SPACE_SWITCH | _ASCE_PRIVATE_SPACE | \
-                                 _ASCE_ALT_EVENT)
-
-/* Bits int the storage key */
-#define _PAGE_CHANGED    0x02          /* HW changed bit                   */
-#define _PAGE_REFERENCED 0x04          /* HW referenced bit                */
-
-/*
- * Page protection definitions.
- */
-#define PAGE_NONE       __pgprot(_PAGE_TYPE_NONE)
-#define PAGE_RO         __pgprot(_PAGE_TYPE_RO)
-#define PAGE_RW         __pgprot(_PAGE_TYPE_RW)
-#define PAGE_EX_RO      __pgprot(_PAGE_TYPE_EX_RO)
-#define PAGE_EX_RW      __pgprot(_PAGE_TYPE_EX_RW)
-
-#define PAGE_KERNEL     PAGE_RW
-#define PAGE_COPY       PAGE_RO
-
-/*
- * Dependent on the EXEC_PROTECT option s390 can do execute protection.
- * Write permission always implies read permission. In theory with a
- * primary/secondary page table execute only can be implemented but
- * it would cost an additional bit in the pte to distinguish all the
- * different pte types. To avoid that execute permission currently
- * implies read permission as well.
- */
-         /*xwr*/
-#define __P000  PAGE_NONE
-#define __P001  PAGE_RO
-#define __P010  PAGE_RO
-#define __P011  PAGE_RO
-#define __P100  PAGE_EX_RO
-#define __P101  PAGE_EX_RO
-#define __P110  PAGE_EX_RO
-#define __P111  PAGE_EX_RO
-
-#define __S000  PAGE_NONE
-#define __S001  PAGE_RO
-#define __S010  PAGE_RW
-#define __S011  PAGE_RW
-#define __S100  PAGE_EX_RO
-#define __S101  PAGE_EX_RO
-#define __S110  PAGE_EX_RW
-#define __S111  PAGE_EX_RW
-
-#ifndef __s390x__
-# define PxD_SHADOW_SHIFT       1
-#else /* __s390x__ */
-# define PxD_SHADOW_SHIFT       2
-#endif /* __s390x__ */
-
-static inline void *get_shadow_table(void *table)
-{
-        unsigned long addr, offset;
-        struct page *page;
-
-        addr = (unsigned long) table;
-        offset = addr & ((PAGE_SIZE << PxD_SHADOW_SHIFT) - 1);
-        page = virt_to_page((void *)(addr ^ offset));
-        return (void *)(addr_t)(page->index ? (page->index | offset) : 0UL);
-}
-
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
-                              pte_t *ptep, pte_t entry)
-{
-        *ptep = entry;
-        if (mm->context.noexec) {
-                if (!(pte_val(entry) & _PAGE_INVALID) &&
-                    (pte_val(entry) & _PAGE_SWX))
-                        pte_val(entry) |= _PAGE_RO;
-                else
-                        pte_val(entry) = _PAGE_TYPE_EMPTY;
-                ptep[PTRS_PER_PTE] = entry;
-        }
-}
-
-/*
- * pgd/pmd/pte query functions
- */
-#ifndef __s390x__
-
-static inline int pgd_present(pgd_t pgd) { return 1; }
-static inline int pgd_none(pgd_t pgd)    { return 0; }
-static inline int pgd_bad(pgd_t pgd)     { return 0; }
-
-static inline int pud_present(pud_t pud) { return 1; }
-static inline int pud_none(pud_t pud)    { return 0; }
-static inline int pud_bad(pud_t pud)     { return 0; }
-
-#else /* __s390x__ */
-
-static inline int pgd_present(pgd_t pgd)
-{
-        if ((pgd_val(pgd) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R2)
-                return 1;
-        return (pgd_val(pgd) & _REGION_ENTRY_ORIGIN) != 0UL;
-}
-
-static inline int pgd_none(pgd_t pgd)
-{
-        if ((pgd_val(pgd) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R2)
-                return 0;
-        return (pgd_val(pgd) & _REGION_ENTRY_INV) != 0UL;
-}
-
-static inline int pgd_bad(pgd_t pgd)
-{
-        /*
-         * With dynamic page table levels the pgd can be a region table
-         * entry or a segment table entry. Check for the bit that are
-         * invalid for either table entry.
-         */
-        unsigned long mask =
-                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INV &
-                ~_REGION_ENTRY_TYPE_MASK & ~_REGION_ENTRY_LENGTH;
-        return (pgd_val(pgd) & mask) != 0;
-}
-
-static inline int pud_present(pud_t pud)
-{
-        if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R3)
-                return 1;
-        return (pud_val(pud) & _REGION_ENTRY_ORIGIN) != 0UL;
-}
-
-static inline int pud_none(pud_t pud)
-{
-        if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R3)
-                return 0;
-        return (pud_val(pud) & _REGION_ENTRY_INV) != 0UL;
-}
-
-static inline int pud_bad(pud_t pud)
-{
-        /*
-         * With dynamic page table levels the pud can be a region table
-         * entry or a segment table entry. Check for the bit that are
-         * invalid for either table entry.
-         */
-        unsigned long mask =
-                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INV &
-                ~_REGION_ENTRY_TYPE_MASK & ~_REGION_ENTRY_LENGTH;
-        return (pud_val(pud) & mask) != 0;
-}
-
-#endif /* __s390x__ */
-
-static inline int pmd_present(pmd_t pmd)
-{
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN) != 0UL;
-}
-
-static inline int pmd_none(pmd_t pmd)
-{
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_INV) != 0UL;
-}
-
-static inline int pmd_bad(pmd_t pmd)
-{
-        unsigned long mask = ~_SEGMENT_ENTRY_ORIGIN & ~_SEGMENT_ENTRY_INV;
-        return (pmd_val(pmd) & mask) != _SEGMENT_ENTRY;
-}
-
-static inline int pte_none(pte_t pte)
-{
-        return (pte_val(pte) & _PAGE_INVALID) && !(pte_val(pte) & _PAGE_SWT);
-}
-
-static inline int pte_present(pte_t pte)
-{
-        unsigned long mask = _PAGE_RO | _PAGE_INVALID | _PAGE_SWT | _PAGE_SWX;
-        return (pte_val(pte) & mask) == _PAGE_TYPE_NONE ||
-                (!(pte_val(pte) & _PAGE_INVALID) &&
-                 !(pte_val(pte) & _PAGE_SWT));
-}
-
-static inline int pte_file(pte_t pte)
-{
-        unsigned long mask = _PAGE_RO | _PAGE_INVALID | _PAGE_SWT;
-        return (pte_val(pte) & mask) == _PAGE_TYPE_FILE;
-}
-
-static inline int pte_special(pte_t pte)
-{
-        return (pte_val(pte) & _PAGE_SPECIAL);
-}
-
-#define __HAVE_ARCH_PTE_SAME
-#define pte_same(a,b)  (pte_val(a) == pte_val(b))
-
-static inline void rcp_lock(pte_t *ptep)
-{
-#ifdef CONFIG_PGSTE
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-        preempt_disable();
-        while (test_and_set_bit(RCP_PCL_BIT, pgste))
-                ;
-#endif
-}
-
-static inline void rcp_unlock(pte_t *ptep)
-{
-#ifdef CONFIG_PGSTE
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-        clear_bit(RCP_PCL_BIT, pgste);
-        preempt_enable();
-#endif
-}
-
-/* forward declaration for SetPageUptodate in page-flags.h*/
-static inline void page_clear_dirty(struct page *page);
-#include <linux/page-flags.h>
-
-static inline void ptep_rcp_copy(pte_t *ptep)
-{
-#ifdef CONFIG_PGSTE
-        struct page *page = virt_to_page(pte_val(*ptep));
-        unsigned int skey;
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-
-        skey = page_get_storage_key(page_to_phys(page));
-        if (skey & _PAGE_CHANGED)
-                set_bit_simple(RCP_GC_BIT, pgste);
-        if (skey & _PAGE_REFERENCED)
-                set_bit_simple(RCP_GR_BIT, pgste);
-        if (test_and_clear_bit_simple(RCP_HC_BIT, pgste))
-                SetPageDirty(page);
-        if (test_and_clear_bit_simple(RCP_HR_BIT, pgste))
-                SetPageReferenced(page);
-#endif
-}
-
-/*
- * query functions pte_write/pte_dirty/pte_young only work if
- * pte_present() is true. Undefined behaviour if not..
- */
-static inline int pte_write(pte_t pte)
-{
-        return (pte_val(pte) & _PAGE_RO) == 0;
-}
-
-static inline int pte_dirty(pte_t pte)
-{
-        /* A pte is neither clean nor dirty on s/390. The dirty bit
-         * is in the storage key. See page_test_and_clear_dirty for
-         * details.
-         */
-        return 0;
-}
-
-static inline int pte_young(pte_t pte)
-{
-        /* A pte is neither young nor old on s/390. The young bit
-         * is in the storage key. See page_test_and_clear_young for
-         * details.
-         */
-        return 0;
-}
-
-/*
- * pgd/pmd/pte modification functions
- */
-
-#ifndef __s390x__
-
-#define pgd_clear(pgd)          do { } while (0)
-#define pud_clear(pud)          do { } while (0)
-
-#else /* __s390x__ */
-
-static inline void pgd_clear_kernel(pgd_t * pgd)
-{
-        if ((pgd_val(*pgd) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)
-                pgd_val(*pgd) = _REGION2_ENTRY_EMPTY;
-}
-
-static inline void pgd_clear(pgd_t * pgd)
-{
-        pgd_t *shadow = get_shadow_table(pgd);
-
-        pgd_clear_kernel(pgd);
-        if (shadow)
-                pgd_clear_kernel(shadow);
-}
-
-static inline void pud_clear_kernel(pud_t *pud)
-{
-        if ((pud_val(*pud) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)
-                pud_val(*pud) = _REGION3_ENTRY_EMPTY;
-}
-
-static inline void pud_clear(pud_t *pud)
-{
-        pud_t *shadow = get_shadow_table(pud);
-
-        pud_clear_kernel(pud);
-        if (shadow)
-                pud_clear_kernel(shadow);
-}
-
-#endif /* __s390x__ */
-
-static inline void pmd_clear_kernel(pmd_t * pmdp)
-{
-        pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;
-}
-
-static inline void pmd_clear(pmd_t *pmd)
-{
-        pmd_t *shadow = get_shadow_table(pmd);
-
-        pmd_clear_kernel(pmd);
-        if (shadow)
-                pmd_clear_kernel(shadow);
-}
-
-static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        if (mm->context.pgstes)
-                ptep_rcp_copy(ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-        if (mm->context.noexec)
-                pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY;
-}
-
-/*
- * The following pte modification functions only work if
- * pte_present() is true. Undefined behaviour if not..
- */
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte_val(pte) &= _PAGE_CHG_MASK;
-        pte_val(pte) |= pgprot_val(newprot);
-        return pte;
-}
-
-static inline pte_t pte_wrprotect(pte_t pte)
-{
-        /* Do not clobber _PAGE_TYPE_NONE pages!  */
-        if (!(pte_val(pte) & _PAGE_INVALID))
-                pte_val(pte) |= _PAGE_RO;
-        return pte;
-}
-
-static inline pte_t pte_mkwrite(pte_t pte)
-{
-        pte_val(pte) &= ~_PAGE_RO;
-        return pte;
-}
-
-static inline pte_t pte_mkclean(pte_t pte)
-{
-        /* The only user of pte_mkclean is the fork() code.
-           We must *not* clear the *physical* page dirty bit
-           just because fork() wants to clear the dirty bit in
-           *one* of the page's mappings.  So we just do nothing. */
-        return pte;
-}
-
-static inline pte_t pte_mkdirty(pte_t pte)
-{
-        /* We do not explicitly set the dirty bit because the
-         * sske instruction is slow. It is faster to let the
-         * next instruction set the dirty bit.
-         */
-        return pte;
-}
-
-static inline pte_t pte_mkold(pte_t pte)
-{
-        /* S/390 doesn't keep its dirty/referenced bit in the pte.
-         * There is no point in clearing the real referenced bit.
-         */
-        return pte;
-}
-
-static inline pte_t pte_mkyoung(pte_t pte)
-{
-        /* S/390 doesn't keep its dirty/referenced bit in the pte.
-         * There is no point in setting the real referenced bit.
-         */
-        return pte;
-}
-
-static inline pte_t pte_mkspecial(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_SPECIAL;
-        return pte;
-}
-
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
-                                            unsigned long addr, pte_t *ptep)
-{
-#ifdef CONFIG_PGSTE
-        unsigned long physpage;
-        int young;
-        unsigned long *pgste;
-
-        if (!vma->vm_mm->context.pgstes)
-                return 0;
-        physpage = pte_val(*ptep) & PAGE_MASK;
-        pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-
-        young = ((page_get_storage_key(physpage) & _PAGE_REFERENCED) != 0);
-        rcp_lock(ptep);
-        if (young)
-                set_bit_simple(RCP_GR_BIT, pgste);
-        young |= test_and_clear_bit_simple(RCP_HR_BIT, pgste);
-        rcp_unlock(ptep);
-        return young;
-#endif
-        return 0;
-}
-
-#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
-static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
-                                         unsigned long address, pte_t *ptep)
-{
-        /* No need to flush TLB
-         * On s390 reference bits are in storage key and never in TLB
-         * With virtualization we handle the reference bit, without we
-         * we can simply return */
-#ifdef CONFIG_PGSTE
-        return ptep_test_and_clear_young(vma, address, ptep);
-#endif
-        return 0;
-}
-
-static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
-{
-        if (!(pte_val(*ptep) & _PAGE_INVALID)) {
-#ifndef __s390x__
-                /* pto must point to the start of the segment table */
-                pte_t *pto = (pte_t *) (((unsigned long) ptep) & 0x7ffffc00);
-#else
-                /* ipte in zarch mode can do the math */
-                pte_t *pto = ptep;
-#endif
-                asm volatile(
-                        "       ipte    %2,%3"
-                        : "=m" (*ptep) : "m" (*ptep),
-                          "a" (pto), "a" (address));
-        }
-}
-
-static inline void ptep_invalidate(struct mm_struct *mm,
-                                   unsigned long address, pte_t *ptep)
-{
-        if (mm->context.pgstes) {
-                rcp_lock(ptep);
-                __ptep_ipte(address, ptep);
-                ptep_rcp_copy(ptep);
-                pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-                rcp_unlock(ptep);
-                return;
-        }
-        __ptep_ipte(address, ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-        if (mm->context.noexec) {
-                __ptep_ipte(address, ptep + PTRS_PER_PTE);
-                pte_val(*(ptep + PTRS_PER_PTE)) = _PAGE_TYPE_EMPTY;
-        }
-}
-
-/*
- * This is hard to understand. ptep_get_and_clear and ptep_clear_flush
- * both clear the TLB for the unmapped pte. The reason is that
- * ptep_get_and_clear is used in common code (e.g. change_pte_range)
- * to modify an active pte. The sequence is
- *   1) ptep_get_and_clear
- *   2) set_pte_at
- *   3) flush_tlb_range
- * On s390 the tlb needs to get flushed with the modification of the pte
- * if the pte is active. The only way how this can be implemented is to
- * have ptep_get_and_clear do the tlb flush. In exchange flush_tlb_range
- * is a nop.
- */
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define ptep_get_and_clear(__mm, __address, __ptep)                     \
-({                                                                      \
-        pte_t __pte = *(__ptep);                                        \
-        if (atomic_read(&(__mm)->mm_users) > 1 ||                       \
-            (__mm) != current->active_mm)                               \
-                ptep_invalidate(__mm, __address, __ptep);               \
-        else                                                            \
-                pte_clear((__mm), (__address), (__ptep));               \
-        __pte;                                                          \
-})
-
-#define __HAVE_ARCH_PTEP_CLEAR_FLUSH
-static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
-                                     unsigned long address, pte_t *ptep)
-{
-        pte_t pte = *ptep;
-        ptep_invalidate(vma->vm_mm, address, ptep);
-        return pte;
-}
-
-/*
- * The batched pte unmap code uses ptep_get_and_clear_full to clear the
- * ptes. Here an optimization is possible. tlb_gather_mmu flushes all
- * tlbs of an mm if it can guarantee that the ptes of the mm_struct
- * cannot be accessed while the batched unmap is running. In this case
- * full==1 and a simple pte_clear is enough. See tlb.h.
- */
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
-static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
-                                            unsigned long addr,
-                                            pte_t *ptep, int full)
-{
-        pte_t pte = *ptep;
-
-        if (full)
-                pte_clear(mm, addr, ptep);
-        else
-                ptep_invalidate(mm, addr, ptep);
-        return pte;
-}
-
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define ptep_set_wrprotect(__mm, __addr, __ptep)                        \
-({                                                                      \
-        pte_t __pte = *(__ptep);                                        \
-        if (pte_write(__pte)) {                                         \
-                if (atomic_read(&(__mm)->mm_users) > 1 ||               \
-                    (__mm) != current->active_mm)                       \
-                        ptep_invalidate(__mm, __addr, __ptep);          \
-                set_pte_at(__mm, __addr, __ptep, pte_wrprotect(__pte)); \
-        }                                                               \
-})
-
-#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-#define ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty)  \
-({                                                                      \
-        int __changed = !pte_same(*(__ptep), __entry);                  \
-        if (__changed) {                                                \
-                ptep_invalidate((__vma)->vm_mm, __addr, __ptep);        \
-                set_pte_at((__vma)->vm_mm, __addr, __ptep, __entry);    \
-        }                                                               \
-        __changed;                                                      \
-})
-
-/*
- * Test and clear dirty bit in storage key.
- * We can't clear the changed bit atomically. This is a potential
- * race against modification of the referenced bit. This function
- * should therefore only be called if it is not mapped in any
- * address space.
- */
-#define __HAVE_ARCH_PAGE_TEST_DIRTY
-static inline int page_test_dirty(struct page *page)
-{
-        return (page_get_storage_key(page_to_phys(page)) & _PAGE_CHANGED) != 0;
-}
-
-#define __HAVE_ARCH_PAGE_CLEAR_DIRTY
-static inline void page_clear_dirty(struct page *page)
-{
-        page_set_storage_key(page_to_phys(page), PAGE_DEFAULT_KEY);
-}
-
-/*
- * Test and clear referenced bit in storage key.
- */
-#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
-static inline int page_test_and_clear_young(struct page *page)
-{
-        unsigned long physpage = page_to_phys(page);
-        int ccode;
-
-        asm volatile(
-                "       rrbe    0,%1\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode) : "a" (physpage) : "cc" );
-        return ccode & 2;
-}
-
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
-{
-        pte_t __pte;
-        pte_val(__pte) = physpage + pgprot_val(pgprot);
-        return __pte;
-}
-
-static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)
-{
-        unsigned long physpage = page_to_phys(page);
-
-        return mk_pte_phys(physpage, pgprot);
-}
-
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
-#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
-#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
-
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-
-#ifndef __s390x__
-
-#define pmd_deref(pmd) (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN)
-#define pud_deref(pmd) ({ BUG(); 0UL; })
-#define pgd_deref(pmd) ({ BUG(); 0UL; })
-
-#define pud_offset(pgd, address) ((pud_t *) pgd)
-#define pmd_offset(pud, address) ((pmd_t *) pud + pmd_index(address))
-
-#else /* __s390x__ */
-
-#define pmd_deref(pmd) (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN)
-#define pud_deref(pud) (pud_val(pud) & _REGION_ENTRY_ORIGIN)
-#define pgd_deref(pgd) (pgd_val(pgd) & _REGION_ENTRY_ORIGIN)
-
-static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
-{
-        pud_t *pud = (pud_t *) pgd;
-        if ((pgd_val(*pgd) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)
-                pud = (pud_t *) pgd_deref(*pgd);
-        return pud  + pud_index(address);
-}
-
-static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-{
-        pmd_t *pmd = (pmd_t *) pud;
-        if ((pud_val(*pud) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)
-                pmd = (pmd_t *) pud_deref(*pud);
-        return pmd + pmd_index(address);
-}
-
-#endif /* __s390x__ */
-
-#define pfn_pte(pfn,pgprot) mk_pte_phys(__pa((pfn) << PAGE_SHIFT),(pgprot))
-#define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
-#define pte_page(x) pfn_to_page(pte_pfn(x))
-
-#define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
-
-/* Find an entry in the lowest level page table.. */
-#define pte_offset(pmd, addr) ((pte_t *) pmd_deref(*(pmd)) + pte_index(addr))
-#define pte_offset_kernel(pmd, address) pte_offset(pmd,address)
-#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
-#define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
-#define pte_unmap(pte) do { } while (0)
-#define pte_unmap_nested(pte) do { } while (0)
-
-/*
- * 31 bit swap entry format:
- * A page-table entry has some bits we have to treat in a special way.
- * Bits 0, 20 and bit 23 have to be zero, otherwise an specification
- * exception will occur instead of a page translation exception. The
- * specifiation exception has the bad habit not to store necessary
- * information in the lowcore.
- * Bit 21 and bit 22 are the page invalid bit and the page protection
- * bit. We set both to indicate a swapped page.
- * Bit 30 and 31 are used to distinguish the different page types. For
- * a swapped page these bits need to be zero.
- * This leaves the bits 1-19 and bits 24-29 to store type and offset.
- * We use the 5 bits from 25-29 for the type and the 20 bits from 1-19
- * plus 24 for the offset.
- * 0|     offset        |0110|o|type |00|
- * 0 0000000001111111111 2222 2 22222 33
- * 0 1234567890123456789 0123 4 56789 01
- *
- * 64 bit swap entry format:
- * A page-table entry has some bits we have to treat in a special way.
- * Bits 52 and bit 55 have to be zero, otherwise an specification
- * exception will occur instead of a page translation exception. The
- * specifiation exception has the bad habit not to store necessary
- * information in the lowcore.
- * Bit 53 and bit 54 are the page invalid bit and the page protection
- * bit. We set both to indicate a swapped page.
- * Bit 62 and 63 are used to distinguish the different page types. For
- * a swapped page these bits need to be zero.
- * This leaves the bits 0-51 and bits 56-61 to store type and offset.
- * We use the 5 bits from 57-61 for the type and the 53 bits from 0-51
- * plus 56 for the offset.
- * |                      offset                        |0110|o|type |00|
- *  0000000000111111111122222222223333333333444444444455 5555 5 55566 66
- *  0123456789012345678901234567890123456789012345678901 2345 6 78901 23
- */
-#ifndef __s390x__
-#define __SWP_OFFSET_MASK (~0UL >> 12)
-#else
-#define __SWP_OFFSET_MASK (~0UL >> 11)
-#endif
-static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
-{
-        pte_t pte;
-        offset &= __SWP_OFFSET_MASK;
-        pte_val(pte) = _PAGE_TYPE_SWAP | ((type & 0x1f) << 2) |
-                ((offset & 1UL) << 7) | ((offset & ~1UL) << 11);
-        return pte;
-}
-
-#define __swp_type(entry)       (((entry).val >> 2) & 0x1f)
-#define __swp_offset(entry)     (((entry).val >> 11) | (((entry).val >> 7) & 1))
-#define __swp_entry(type,offset) ((swp_entry_t) { pte_val(mk_swap_pte((type),(offset))) })
-
-#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
-
-#ifndef __s390x__
-# define PTE_FILE_MAX_BITS      26
-#else /* __s390x__ */
-# define PTE_FILE_MAX_BITS      59
-#endif /* __s390x__ */
-
-#define pte_to_pgoff(__pte) \
-        ((((__pte).pte >> 12) << 7) + (((__pte).pte >> 1) & 0x7f))
-
-#define pgoff_to_pte(__off) \
-        ((pte_t) { ((((__off) & 0x7f) << 1) + (((__off) >> 7) << 12)) \
-                   | _PAGE_TYPE_FILE })
-
-#endif /* !__ASSEMBLY__ */
-
-#define kern_addr_valid(addr)   (1)
-
-extern int vmem_add_mapping(unsigned long start, unsigned long size);
-extern int vmem_remove_mapping(unsigned long start, unsigned long size);
-extern int s390_enable_sie(void);
-
-/*
- * No page table caches to initialise
- */
-#define pgtable_cache_init()    do { } while (0)
-
-#include <asm-generic/pgtable.h>
-
-#endif /* _S390_PAGE_H */
diff --git a/include/asm-s390/poll.h b/include/asm-s390/poll.h
deleted file mode 100644
index c98509d3149e..000000000000
--- a/include/asm-s390/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/include/asm-s390/posix_types.h b/include/asm-s390/posix_types.h
deleted file mode 100644
index 397d93fba3a7..000000000000
--- a/include/asm-s390/posix_types.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  include/asm-s390/posix_types.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/posix_types.h"
- */
-
-#ifndef __ARCH_S390_POSIX_TYPES_H
-#define __ARCH_S390_POSIX_TYPES_H
-
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned long   __kernel_size_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-#ifndef __s390x__
-
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
-typedef unsigned short  __kernel_old_dev_t;
-
-#else /* __s390x__ */
-
-typedef unsigned int    __kernel_ino_t;
-typedef unsigned int    __kernel_mode_t;
-typedef unsigned int    __kernel_nlink_t;
-typedef int             __kernel_ipc_pid_t;
-typedef unsigned int    __kernel_uid_t;
-typedef unsigned int    __kernel_gid_t;
-typedef long            __kernel_ssize_t;
-typedef long            __kernel_ptrdiff_t;
-typedef unsigned long   __kernel_sigset_t;      /* at least 32 bits */
-typedef __kernel_uid_t __kernel_old_uid_t;
-typedef __kernel_gid_t __kernel_old_gid_t;
-typedef __kernel_uid_t __kernel_uid32_t;
-typedef __kernel_gid_t __kernel_gid32_t;
-typedef unsigned short __kernel_old_dev_t;
-
-#endif /* __s390x__ */
-
-typedef struct {
-#if defined(__KERNEL__) || defined(__USE_ALL)
-        int     val[2];
-#else                        /* !defined(__KERNEL__) && !defined(__USE_ALL)*/
-        int     __val[2];
-#endif                       /* !defined(__KERNEL__) && !defined(__USE_ALL)*/
-} __kernel_fsid_t;
-
-
-#ifdef __KERNEL__
-
-#undef __FD_SET
-static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
-}
-
-#undef __FD_CLR
-static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
-}
-
-#undef __FD_ISSET
-static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        return (fdsetp->fds_bits[_tmp] & (1UL<<_rem)) != 0;
-}
-
-#undef  __FD_ZERO
-#define __FD_ZERO(fdsetp) \
-        ((void) memset ((void *) (fdsetp), 0, sizeof (__kernel_fd_set)))
-
-#endif     /* __KERNEL__ */
-
-#endif
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
deleted file mode 100644
index 4af80af2a88f..000000000000
--- a/include/asm-s390/processor.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- *  include/asm-s390/processor.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/processor.h"
- *    Copyright (C) 1994, Linus Torvalds
- */
-
-#ifndef __ASM_S390_PROCESSOR_H
-#define __ASM_S390_PROCESSOR_H
-
-#include <asm/ptrace.h>
-
-#ifdef __KERNEL__
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; })
-
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- *  Members of this structure are referenced in head.S, so think twice
- *  before touching them. [mj]
- */
-
-typedef struct
-{
-        unsigned int version :  8;
-        unsigned int ident   : 24;
-        unsigned int machine : 16;
-        unsigned int unused  : 16;
-} __attribute__ ((packed)) cpuid_t;
-
-static inline void get_cpu_id(cpuid_t *ptr)
-{
-        asm volatile("stidp 0(%1)" : "=m" (*ptr) : "a" (ptr));
-}
-
-struct cpuinfo_S390
-{
-        cpuid_t  cpu_id;
-        __u16    cpu_addr;
-        __u16    cpu_nr;
-        unsigned long loops_per_jiffy;
-        unsigned long *pgd_quick;
-#ifdef __s390x__
-        unsigned long *pmd_quick;
-#endif /* __s390x__ */
-        unsigned long *pte_quick;
-        unsigned long pgtable_cache_sz;
-};
-
-extern void s390_adjust_jiffies(void);
-extern void print_cpu_info(struct cpuinfo_S390 *);
-extern int get_cpu_capability(unsigned int *);
-
-/*
- * User space process size: 2GB for 31 bit, 4TB for 64 bit.
- */
-#ifndef __s390x__
-
-#define TASK_SIZE               (1UL << 31)
-#define TASK_UNMAPPED_BASE      (1UL << 30)
-
-#else /* __s390x__ */
-
-#define TASK_SIZE_OF(tsk)       (test_tsk_thread_flag(tsk,TIF_31BIT) ? \
-                                        (1UL << 31) : (1UL << 53))
-#define TASK_UNMAPPED_BASE      (test_thread_flag(TIF_31BIT) ? \
-                                        (1UL << 30) : (1UL << 41))
-#define TASK_SIZE               TASK_SIZE_OF(current)
-
-#endif /* __s390x__ */
-
-#ifdef __KERNEL__
-
-#ifndef __s390x__
-#define STACK_TOP               (1UL << 31)
-#define STACK_TOP_MAX           (1UL << 31)
-#else /* __s390x__ */
-#define STACK_TOP               (1UL << (test_thread_flag(TIF_31BIT) ? 31:42))
-#define STACK_TOP_MAX           (1UL << 42)
-#endif /* __s390x__ */
-
-
-#endif
-
-#define HAVE_ARCH_PICK_MMAP_LAYOUT
-
-typedef struct {
-        __u32 ar4;
-} mm_segment_t;
-
-/*
- * Thread structure
- */
-struct thread_struct {
-        s390_fp_regs fp_regs;
-        unsigned int  acrs[NUM_ACRS];
-        unsigned long ksp;              /* kernel stack pointer             */
-        mm_segment_t mm_segment;
-        unsigned long prot_addr;        /* address of protection-excep.     */
-        unsigned int trap_no;
-        per_struct per_info;
-        /* Used to give failing instruction back to user for ieee exceptions */
-        unsigned long ieee_instruction_pointer; 
-        /* pfault_wait is used to block the process on a pfault event */
-        unsigned long pfault_wait;
-};
-
-typedef struct thread_struct thread_struct;
-
-/*
- * Stack layout of a C stack frame.
- */
-#ifndef __PACK_STACK
-struct stack_frame {
-        unsigned long back_chain;
-        unsigned long empty1[5];
-        unsigned long gprs[10];
-        unsigned int  empty2[8];
-};
-#else
-struct stack_frame {
-        unsigned long empty1[5];
-        unsigned int  empty2[8];
-        unsigned long gprs[10];
-        unsigned long back_chain;
-};
-#endif
-
-#define ARCH_MIN_TASKALIGN      8
-
-#define INIT_THREAD {                                                   \
-        .ksp = sizeof(init_stack) + (unsigned long) &init_stack,        \
-}
-
-/*
- * Do necessary setup to start up a new thread.
- */
-#define start_thread(regs, new_psw, new_stackp) do {            \
-        set_fs(USER_DS);                                        \
-        regs->psw.mask  = psw_user_bits;                        \
-        regs->psw.addr  = new_psw | PSW_ADDR_AMODE;             \
-        regs->gprs[15]  = new_stackp;                           \
-} while (0)
-
-#define start_thread31(regs, new_psw, new_stackp) do {          \
-        set_fs(USER_DS);                                        \
-        regs->psw.mask  = psw_user32_bits;                      \
-        regs->psw.addr  = new_psw | PSW_ADDR_AMODE;             \
-        regs->gprs[15]  = new_stackp;                           \
-        crst_table_downgrade(current->mm, 1UL << 31);           \
-} while (0)
-
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-struct seq_file;
-
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-
-/* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)    do { } while (0)
-
-/*
- * Return saved PC of a blocked thread.
- */
-extern unsigned long thread_saved_pc(struct task_struct *t);
-
-/*
- * Print register of task into buffer. Used in fs/proc/array.c.
- */
-extern void task_show_regs(struct seq_file *m, struct task_struct *task);
-
-extern void show_code(struct pt_regs *regs);
-
-unsigned long get_wchan(struct task_struct *p);
-#define task_pt_regs(tsk) ((struct pt_regs *) \
-        (task_stack_page(tsk) + THREAD_SIZE) - 1)
-#define KSTK_EIP(tsk)   (task_pt_regs(tsk)->psw.addr)
-#define KSTK_ESP(tsk)   (task_pt_regs(tsk)->gprs[15])
-
-/*
- * Give up the time slice of the virtual PU.
- */
-static inline void cpu_relax(void)
-{
-        if (MACHINE_HAS_DIAG44)
-                asm volatile("diag 0,0,68");
-        barrier();
-}
-
-static inline void psw_set_key(unsigned int key)
-{
-        asm volatile("spka 0(%0)" : : "d" (key));
-}
-
-/*
- * Set PSW to specified value.
- */
-static inline void __load_psw(psw_t psw)
-{
-#ifndef __s390x__
-        asm volatile("lpsw  0(%0)" : : "a" (&psw), "m" (psw) : "cc");
-#else
-        asm volatile("lpswe 0(%0)" : : "a" (&psw), "m" (psw) : "cc");
-#endif
-}
-
-/*
- * Set PSW mask to specified value, while leaving the
- * PSW addr pointing to the next instruction.
- */
-
-static inline void __load_psw_mask (unsigned long mask)
-{
-        unsigned long addr;
-        psw_t psw;
-
-        psw.mask = mask;
-
-#ifndef __s390x__
-        asm volatile(
-                "       basr    %0,0\n"
-                "0:     ahi     %0,1f-0b\n"
-                "       st      %0,4(%1)\n"
-                "       lpsw    0(%1)\n"
-                "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
-#else /* __s390x__ */
-        asm volatile(
-                "       larl    %0,1f\n"
-                "       stg     %0,8(%1)\n"
-                "       lpswe   0(%1)\n"
-                "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
-#endif /* __s390x__ */
-}
- 
-/*
- * Function to stop a processor until an interruption occurred
- */
-static inline void enabled_wait(void)
-{
-        __load_psw_mask(PSW_BASE_BITS | PSW_MASK_IO | PSW_MASK_EXT |
-                        PSW_MASK_MCHECK | PSW_MASK_WAIT | PSW_DEFAULT_KEY);
-}
-
-/*
- * Function to drop a processor into disabled wait state
- */
-
-static inline void disabled_wait(unsigned long code)
-{
-        unsigned long ctl_buf;
-        psw_t dw_psw;
-
-        dw_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
-        dw_psw.addr = code;
-        /* 
-         * Store status and then load disabled wait psw,
-         * the processor is dead afterwards
-         */
-#ifndef __s390x__
-        asm volatile(
-                "       stctl   0,0,0(%2)\n"
-                "       ni      0(%2),0xef\n"   /* switch off protection */
-                "       lctl    0,0,0(%2)\n"
-                "       stpt    0xd8\n"         /* store timer */
-                "       stckc   0xe0\n"         /* store clock comparator */
-                "       stpx    0x108\n"        /* store prefix register */
-                "       stam    0,15,0x120\n"   /* store access registers */
-                "       std     0,0x160\n"      /* store f0 */
-                "       std     2,0x168\n"      /* store f2 */
-                "       std     4,0x170\n"      /* store f4 */
-                "       std     6,0x178\n"      /* store f6 */
-                "       stm     0,15,0x180\n"   /* store general registers */
-                "       stctl   0,15,0x1c0\n"   /* store control registers */
-                "       oi      0x1c0,0x10\n"   /* fake protection bit */
-                "       lpsw    0(%1)"
-                : "=m" (ctl_buf)
-                : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc");
-#else /* __s390x__ */
-        asm volatile(
-                "       stctg   0,0,0(%2)\n"
-                "       ni      4(%2),0xef\n"   /* switch off protection */
-                "       lctlg   0,0,0(%2)\n"
-                "       lghi    1,0x1000\n"
-                "       stpt    0x328(1)\n"     /* store timer */
-                "       stckc   0x330(1)\n"     /* store clock comparator */
-                "       stpx    0x318(1)\n"     /* store prefix register */
-                "       stam    0,15,0x340(1)\n"/* store access registers */
-                "       stfpc   0x31c(1)\n"     /* store fpu control */
-                "       std     0,0x200(1)\n"   /* store f0 */
-                "       std     1,0x208(1)\n"   /* store f1 */
-                "       std     2,0x210(1)\n"   /* store f2 */
-                "       std     3,0x218(1)\n"   /* store f3 */
-                "       std     4,0x220(1)\n"   /* store f4 */
-                "       std     5,0x228(1)\n"   /* store f5 */
-                "       std     6,0x230(1)\n"   /* store f6 */
-                "       std     7,0x238(1)\n"   /* store f7 */
-                "       std     8,0x240(1)\n"   /* store f8 */
-                "       std     9,0x248(1)\n"   /* store f9 */
-                "       std     10,0x250(1)\n"  /* store f10 */
-                "       std     11,0x258(1)\n"  /* store f11 */
-                "       std     12,0x260(1)\n"  /* store f12 */
-                "       std     13,0x268(1)\n"  /* store f13 */
-                "       std     14,0x270(1)\n"  /* store f14 */
-                "       std     15,0x278(1)\n"  /* store f15 */
-                "       stmg    0,15,0x280(1)\n"/* store general registers */
-                "       stctg   0,15,0x380(1)\n"/* store control registers */
-                "       oi      0x384(1),0x10\n"/* fake protection bit */
-                "       lpswe   0(%1)"
-                : "=m" (ctl_buf)
-                : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0");
-#endif /* __s390x__ */
-}
-
-/*
- * Basic Machine Check/Program Check Handler.
- */
-
-extern void s390_base_mcck_handler(void);
-extern void s390_base_pgm_handler(void);
-extern void s390_base_ext_handler(void);
-
-extern void (*s390_base_mcck_handler_fn)(void);
-extern void (*s390_base_pgm_handler_fn)(void);
-extern void (*s390_base_ext_handler_fn)(void);
-
-#define ARCH_LOW_ADDRESS_LIMIT  0x7fffffffUL
-
-#endif
-
-/*
- * Helper macro for exception table entries
- */
-#ifndef __s390x__
-#define EX_TABLE(_fault,_target)                        \
-        ".section __ex_table,\"a\"\n"                   \
-        "       .align 4\n"                             \
-        "       .long  " #_fault "," #_target "\n"      \
-        ".previous\n"
-#else
-#define EX_TABLE(_fault,_target)                        \
-        ".section __ex_table,\"a\"\n"                   \
-        "       .align 8\n"                             \
-        "       .quad  " #_fault "," #_target "\n"      \
-        ".previous\n"
-#endif
-
-#endif                                 /* __ASM_S390_PROCESSOR_H           */
diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
deleted file mode 100644
index af2c9ac28a07..000000000000
--- a/include/asm-s390/ptrace.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- *  include/asm-s390/ptrace.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
- */
-
-#ifndef _S390_PTRACE_H
-#define _S390_PTRACE_H
-
-/*
- * Offsets in the user_regs_struct. They are used for the ptrace
- * system call and in entry.S
- */
-#ifndef __s390x__
-
-#define PT_PSWMASK  0x00
-#define PT_PSWADDR  0x04
-#define PT_GPR0     0x08
-#define PT_GPR1     0x0C
-#define PT_GPR2     0x10
-#define PT_GPR3     0x14
-#define PT_GPR4     0x18
-#define PT_GPR5     0x1C
-#define PT_GPR6     0x20
-#define PT_GPR7     0x24
-#define PT_GPR8     0x28
-#define PT_GPR9     0x2C
-#define PT_GPR10    0x30
-#define PT_GPR11    0x34
-#define PT_GPR12    0x38
-#define PT_GPR13    0x3C
-#define PT_GPR14    0x40
-#define PT_GPR15    0x44
-#define PT_ACR0     0x48
-#define PT_ACR1     0x4C
-#define PT_ACR2     0x50
-#define PT_ACR3     0x54
-#define PT_ACR4     0x58
-#define PT_ACR5     0x5C
-#define PT_ACR6     0x60
-#define PT_ACR7     0x64
-#define PT_ACR8     0x68
-#define PT_ACR9     0x6C
-#define PT_ACR10    0x70
-#define PT_ACR11    0x74
-#define PT_ACR12    0x78
-#define PT_ACR13    0x7C
-#define PT_ACR14    0x80
-#define PT_ACR15    0x84
-#define PT_ORIGGPR2 0x88
-#define PT_FPC      0x90
-/*
- * A nasty fact of life that the ptrace api
- * only supports passing of longs.
- */
-#define PT_FPR0_HI  0x98
-#define PT_FPR0_LO  0x9C
-#define PT_FPR1_HI  0xA0
-#define PT_FPR1_LO  0xA4
-#define PT_FPR2_HI  0xA8
-#define PT_FPR2_LO  0xAC
-#define PT_FPR3_HI  0xB0
-#define PT_FPR3_LO  0xB4
-#define PT_FPR4_HI  0xB8
-#define PT_FPR4_LO  0xBC
-#define PT_FPR5_HI  0xC0
-#define PT_FPR5_LO  0xC4
-#define PT_FPR6_HI  0xC8
-#define PT_FPR6_LO  0xCC
-#define PT_FPR7_HI  0xD0
-#define PT_FPR7_LO  0xD4
-#define PT_FPR8_HI  0xD8
-#define PT_FPR8_LO  0XDC
-#define PT_FPR9_HI  0xE0
-#define PT_FPR9_LO  0xE4
-#define PT_FPR10_HI 0xE8
-#define PT_FPR10_LO 0xEC
-#define PT_FPR11_HI 0xF0
-#define PT_FPR11_LO 0xF4
-#define PT_FPR12_HI 0xF8
-#define PT_FPR12_LO 0xFC
-#define PT_FPR13_HI 0x100
-#define PT_FPR13_LO 0x104
-#define PT_FPR14_HI 0x108
-#define PT_FPR14_LO 0x10C
-#define PT_FPR15_HI 0x110
-#define PT_FPR15_LO 0x114
-#define PT_CR_9     0x118
-#define PT_CR_10    0x11C
-#define PT_CR_11    0x120
-#define PT_IEEE_IP  0x13C
-#define PT_LASTOFF  PT_IEEE_IP
-#define PT_ENDREGS  0x140-1
-
-#define GPR_SIZE        4
-#define CR_SIZE         4
-
-#define STACK_FRAME_OVERHEAD    96      /* size of minimum stack frame */
-
-#else /* __s390x__ */
-
-#define PT_PSWMASK  0x00
-#define PT_PSWADDR  0x08
-#define PT_GPR0     0x10
-#define PT_GPR1     0x18
-#define PT_GPR2     0x20
-#define PT_GPR3     0x28
-#define PT_GPR4     0x30
-#define PT_GPR5     0x38
-#define PT_GPR6     0x40
-#define PT_GPR7     0x48
-#define PT_GPR8     0x50
-#define PT_GPR9     0x58
-#define PT_GPR10    0x60
-#define PT_GPR11    0x68
-#define PT_GPR12    0x70
-#define PT_GPR13    0x78
-#define PT_GPR14    0x80
-#define PT_GPR15    0x88
-#define PT_ACR0     0x90
-#define PT_ACR1     0x94
-#define PT_ACR2     0x98
-#define PT_ACR3     0x9C
-#define PT_ACR4     0xA0
-#define PT_ACR5     0xA4
-#define PT_ACR6     0xA8
-#define PT_ACR7     0xAC
-#define PT_ACR8     0xB0
-#define PT_ACR9     0xB4
-#define PT_ACR10    0xB8
-#define PT_ACR11    0xBC
-#define PT_ACR12    0xC0
-#define PT_ACR13    0xC4
-#define PT_ACR14    0xC8
-#define PT_ACR15    0xCC
-#define PT_ORIGGPR2 0xD0
-#define PT_FPC      0xD8
-#define PT_FPR0     0xE0
-#define PT_FPR1     0xE8
-#define PT_FPR2     0xF0
-#define PT_FPR3     0xF8
-#define PT_FPR4     0x100
-#define PT_FPR5     0x108
-#define PT_FPR6     0x110
-#define PT_FPR7     0x118
-#define PT_FPR8     0x120
-#define PT_FPR9     0x128
-#define PT_FPR10    0x130
-#define PT_FPR11    0x138
-#define PT_FPR12    0x140
-#define PT_FPR13    0x148
-#define PT_FPR14    0x150
-#define PT_FPR15    0x158
-#define PT_CR_9     0x160
-#define PT_CR_10    0x168
-#define PT_CR_11    0x170
-#define PT_IEEE_IP  0x1A8
-#define PT_LASTOFF  PT_IEEE_IP
-#define PT_ENDREGS  0x1B0-1
-
-#define GPR_SIZE        8
-#define CR_SIZE         8
-
-#define STACK_FRAME_OVERHEAD    160      /* size of minimum stack frame */
-
-#endif /* __s390x__ */
-
-#define NUM_GPRS        16
-#define NUM_FPRS        16
-#define NUM_CRS         16
-#define NUM_ACRS        16
-
-#define FPR_SIZE        8
-#define FPC_SIZE        4
-#define FPC_PAD_SIZE    4 /* gcc insists on aligning the fpregs */
-#define ACR_SIZE        4
-
-
-#define PTRACE_OLDSETOPTIONS         21
-
-#ifndef __ASSEMBLY__
-#include <linux/stddef.h>
-#include <linux/types.h>
-
-typedef union
-{
-        float   f;
-        double  d;
-        __u64   ui;
-        struct
-        {
-                __u32 hi;
-                __u32 lo;
-        } fp;
-} freg_t;
-
-typedef struct
-{
-        __u32   fpc;
-        freg_t  fprs[NUM_FPRS];              
-} s390_fp_regs;
-
-#define FPC_EXCEPTION_MASK      0xF8000000
-#define FPC_FLAGS_MASK          0x00F80000
-#define FPC_DXC_MASK            0x0000FF00
-#define FPC_RM_MASK             0x00000003
-#define FPC_VALID_MASK          0xF8F8FF03
-
-/* this typedef defines how a Program Status Word looks like */
-typedef struct 
-{
-        unsigned long mask;
-        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
-#define PSW_MASK_DAT            0x04000000UL
-#define PSW_MASK_IO             0x02000000UL
-#define PSW_MASK_EXT            0x01000000UL
-#define PSW_MASK_KEY            0x00F00000UL
-#define PSW_MASK_MCHECK         0x00040000UL
-#define PSW_MASK_WAIT           0x00020000UL
-#define PSW_MASK_PSTATE         0x00010000UL
-#define PSW_MASK_ASC            0x0000C000UL
-#define PSW_MASK_CC             0x00003000UL
-#define PSW_MASK_PM             0x00000F00UL
-
-#define PSW_ADDR_AMODE          0x80000000UL
-#define PSW_ADDR_INSN           0x7FFFFFFFUL
-
-#define PSW_BASE_BITS           0x00080000UL
-#define PSW_DEFAULT_KEY         (((unsigned long) PAGE_DEFAULT_ACC) << 20)
-
-#define PSW_ASC_PRIMARY         0x00000000UL
-#define PSW_ASC_ACCREG          0x00004000UL
-#define PSW_ASC_SECONDARY       0x00008000UL
-#define PSW_ASC_HOME            0x0000C000UL
-
-#else /* __s390x__ */
-
-#define PSW_MASK_PER            0x4000000000000000UL
-#define PSW_MASK_DAT            0x0400000000000000UL
-#define PSW_MASK_IO             0x0200000000000000UL
-#define PSW_MASK_EXT            0x0100000000000000UL
-#define PSW_MASK_KEY            0x00F0000000000000UL
-#define PSW_MASK_MCHECK         0x0004000000000000UL
-#define PSW_MASK_WAIT           0x0002000000000000UL
-#define PSW_MASK_PSTATE         0x0001000000000000UL
-#define PSW_MASK_ASC            0x0000C00000000000UL
-#define PSW_MASK_CC             0x0000300000000000UL
-#define PSW_MASK_PM             0x00000F0000000000UL
-
-#define PSW_ADDR_AMODE          0x0000000000000000UL
-#define PSW_ADDR_INSN           0xFFFFFFFFFFFFFFFFUL
-
-#define PSW_BASE_BITS           0x0000000180000000UL
-#define PSW_BASE32_BITS         0x0000000080000000UL
-#define PSW_DEFAULT_KEY         (((unsigned long) PAGE_DEFAULT_ACC) << 52)
-
-#define PSW_ASC_PRIMARY         0x0000000000000000UL
-#define PSW_ASC_ACCREG          0x0000400000000000UL
-#define PSW_ASC_SECONDARY       0x0000800000000000UL
-#define PSW_ASC_HOME            0x0000C00000000000UL
-
-extern long psw_user32_bits;
-
-#endif /* __s390x__ */
-
-extern long psw_kernel_bits;
-extern long psw_user_bits;
-
-/* This macro merges a NEW PSW mask specified by the user into
-   the currently active PSW mask CURRENT, modifying only those
-   bits in CURRENT that the user may be allowed to change: this
-   is the condition code and the program mask bits.  */
-#define PSW_MASK_MERGE(CURRENT,NEW) \
-        (((CURRENT) & ~(PSW_MASK_CC|PSW_MASK_PM)) | \
-         ((NEW) & (PSW_MASK_CC|PSW_MASK_PM)))
-
-/*
- * The s390_regs structure is used to define the elf_gregset_t.
- */
-typedef struct
-{
-        psw_t psw;
-        unsigned long gprs[NUM_GPRS];
-        unsigned int  acrs[NUM_ACRS];
-        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;
-
-
-#ifdef __KERNEL__
-#include <asm/setup.h>
-#include <asm/page.h>
-
-/*
- * The pt_regs struct defines the way the registers are stored on
- * the stack during a system call.
- */
-struct pt_regs 
-{
-        unsigned long args[1];
-        psw_t psw;
-        unsigned long gprs[NUM_GPRS];
-        unsigned long orig_gpr2;
-        unsigned short ilc;
-        unsigned short trap;
-};
-#endif
-
-/*
- * Now for the program event recording (trace) definitions.
- */
-typedef struct
-{
-        unsigned long cr[3];
-} per_cr_words;
-
-#define PER_EM_MASK 0xE8000000UL
-
-typedef struct
-{
-#ifdef __s390x__
-        unsigned                       : 32;
-#endif /* __s390x__ */
-        unsigned em_branching          : 1;
-        unsigned em_instruction_fetch  : 1;
-        /*
-         * Switching on storage alteration automatically fixes
-         * the storage alteration event bit in the users std.
-         */
-        unsigned em_storage_alteration : 1;
-        unsigned em_gpr_alt_unused     : 1;
-        unsigned em_store_real_address : 1;
-        unsigned                       : 3;
-        unsigned branch_addr_ctl       : 1;
-        unsigned                       : 1;
-        unsigned storage_alt_space_ctl : 1;
-        unsigned                       : 21;
-        unsigned long starting_addr;
-        unsigned long ending_addr;
-} per_cr_bits;
-
-typedef struct
-{
-        unsigned short perc_atmid;
-        unsigned long address;
-        unsigned char access_id;
-} per_lowcore_words;
-
-typedef struct
-{
-        unsigned perc_branching          : 1;
-        unsigned perc_instruction_fetch  : 1;
-        unsigned perc_storage_alteration : 1;
-        unsigned perc_gpr_alt_unused     : 1;
-        unsigned perc_store_real_address : 1;
-        unsigned                         : 3;
-        unsigned atmid_psw_bit_31        : 1;
-        unsigned atmid_validity_bit      : 1;
-        unsigned atmid_psw_bit_32        : 1;
-        unsigned atmid_psw_bit_5         : 1;
-        unsigned atmid_psw_bit_16        : 1;
-        unsigned atmid_psw_bit_17        : 1;
-        unsigned si                      : 2;
-        unsigned long address;
-        unsigned                         : 4;
-        unsigned access_id               : 4;
-} per_lowcore_bits;
-
-typedef struct
-{
-        union {
-                per_cr_words   words;
-                per_cr_bits    bits;
-        } control_regs;
-        /*
-         * Use these flags instead of setting em_instruction_fetch
-         * directly they are used so that single stepping can be
-         * switched on & off while not affecting other tracing
-         */
-        unsigned  single_step       : 1;
-        unsigned  instruction_fetch : 1;
-        unsigned                    : 30;
-        /*
-         * These addresses are copied into cr10 & cr11 if single
-         * stepping is switched off
-         */
-        unsigned long starting_addr;
-        unsigned long ending_addr;
-        union {
-                per_lowcore_words words;
-                per_lowcore_bits  bits;
-        } lowcore; 
-} per_struct;
-
-typedef struct
-{
-        unsigned int  len;
-        unsigned long kernel_addr;
-        unsigned long process_addr;
-} ptrace_area;
-
-/*
- * S/390 specific non posix ptrace requests. I chose unusual values so
- * they are unlikely to clash with future ptrace definitions.
- */
-#define PTRACE_PEEKUSR_AREA           0x5000
-#define PTRACE_POKEUSR_AREA           0x5001
-#define PTRACE_PEEKTEXT_AREA          0x5002
-#define PTRACE_PEEKDATA_AREA          0x5003
-#define PTRACE_POKETEXT_AREA          0x5004
-#define PTRACE_POKEDATA_AREA          0x5005
-
-/*
- * PT_PROT definition is loosely based on hppa bsd definition in
- * gdb/hppab-nat.c
- */
-#define PTRACE_PROT                       21
-
-typedef enum
-{
-        ptprot_set_access_watchpoint,
-        ptprot_set_write_watchpoint,
-        ptprot_disable_watchpoint
-} ptprot_flags;
-
-typedef struct
-{
-        unsigned long lowaddr;
-        unsigned long hiaddr;
-        ptprot_flags prot;
-} ptprot_area;                     
-
-/* Sequence of bytes for breakpoint illegal instruction.  */
-#define S390_BREAKPOINT     {0x0,0x1}
-#define S390_BREAKPOINT_U16 ((__u16)0x0001)
-#define S390_SYSCALL_OPCODE ((__u16)0x0a00)
-#define S390_SYSCALL_SIZE   2
-
-/*
- * The user_regs_struct defines the way the user registers are
- * store on the stack for signal handling.
- */
-struct user_regs_struct
-{
-        psw_t psw;
-        unsigned long gprs[NUM_GPRS];
-        unsigned int  acrs[NUM_ACRS];
-        unsigned long orig_gpr2;
-        s390_fp_regs fp_regs;
-        /*
-         * These per registers are in here so that gdb can modify them
-         * itself as there is no "official" ptrace interface for hardware
-         * watchpoints. This is the way intel does it.
-         */
-        per_struct per_info;
-        unsigned long ieee_instruction_pointer; 
-        /* Used to give failing instruction back to user for ieee exceptions */
-};
-
-#ifdef __KERNEL__
-/*
- * These are defined as per linux/ptrace.h, which see.
- */
-#define arch_has_single_step()  (1)
-struct task_struct;
-extern void user_enable_single_step(struct task_struct *);
-extern void user_disable_single_step(struct task_struct *);
-
-#define __ARCH_WANT_COMPAT_SYS_PTRACE
-
-#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
-#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
-#define regs_return_value(regs)((regs)->gprs[2])
-#define profile_pc(regs) instruction_pointer(regs)
-extern void show_regs(struct pt_regs * regs);
-#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
-
-#endif /* _S390_PTRACE_H */
diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h
deleted file mode 100644
index 6813772171f2..000000000000
--- a/include/asm-s390/qdio.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * linux/include/asm-s390/qdio.h
- *
- * Copyright 2000,2008 IBM Corp.
- * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
- *            Jan Glauber <jang@linux.vnet.ibm.com>
- *
- */
-#ifndef __QDIO_H__
-#define __QDIO_H__
-
-#include <linux/interrupt.h>
-#include <asm/cio.h>
-#include <asm/ccwdev.h>
-
-#define QDIO_MAX_QUEUES_PER_IRQ         32
-#define QDIO_MAX_BUFFERS_PER_Q          128
-#define QDIO_MAX_BUFFERS_MASK           (QDIO_MAX_BUFFERS_PER_Q - 1)
-#define QDIO_MAX_ELEMENTS_PER_BUFFER    16
-#define QDIO_SBAL_SIZE                  256
-
-#define QDIO_QETH_QFMT                  0
-#define QDIO_ZFCP_QFMT                  1
-#define QDIO_IQDIO_QFMT                 2
-
-/**
- * struct qdesfmt0 - queue descriptor, format 0
- * @sliba: storage list information block address
- * @sla: storage list address
- * @slsba: storage list state block address
- * @akey: access key for DLIB
- * @bkey: access key for SL
- * @ckey: access key for SBALs
- * @dkey: access key for SLSB
- */
-struct qdesfmt0 {
-        u64 sliba;
-        u64 sla;
-        u64 slsba;
-        u32      : 32;
-        u32 akey : 4;
-        u32 bkey : 4;
-        u32 ckey : 4;
-        u32 dkey : 4;
-        u32      : 16;
-} __attribute__ ((packed));
-
-/**
- * struct qdr - queue description record (QDR)
- * @qfmt: queue format
- * @pfmt: implementation dependent parameter format
- * @ac: adapter characteristics
- * @iqdcnt: input queue descriptor count
- * @oqdcnt: output queue descriptor count
- * @iqdsz: inpout queue descriptor size
- * @oqdsz: output queue descriptor size
- * @qiba: queue information block address
- * @qkey: queue information block key
- * @qdf0: queue descriptions
- */
-struct qdr {
-        u32 qfmt   : 8;
-        u32 pfmt   : 8;
-        u32        : 8;
-        u32 ac     : 8;
-        u32        : 8;
-        u32 iqdcnt : 8;
-        u32        : 8;
-        u32 oqdcnt : 8;
-        u32        : 8;
-        u32 iqdsz  : 8;
-        u32        : 8;
-        u32 oqdsz  : 8;
-        /* private: */
-        u32 res[9];
-        /* public: */
-        u64 qiba;
-        u32        : 32;
-        u32 qkey   : 4;
-        u32        : 28;
-        struct qdesfmt0 qdf0[126];
-} __attribute__ ((packed, aligned(4096)));
-
-#define QIB_AC_OUTBOUND_PCI_SUPPORTED   0x40
-#define QIB_RFLAGS_ENABLE_QEBSM         0x80
-
-/**
- * struct qib - queue information block (QIB)
- * @qfmt: queue format
- * @pfmt: implementation dependent parameter format
- * @rflags: QEBSM
- * @ac: adapter characteristics
- * @isliba: absolute address of first input SLIB
- * @osliba: absolute address of first output SLIB
- * @ebcnam: adapter identifier in EBCDIC
- * @parm: implementation dependent parameters
- */
-struct qib {
-        u32 qfmt   : 8;
-        u32 pfmt   : 8;
-        u32 rflags : 8;
-        u32 ac     : 8;
-        u32        : 32;
-        u64 isliba;
-        u64 osliba;
-        u32        : 32;
-        u32        : 32;
-        u8 ebcnam[8];
-        /* private: */
-        u8 res[88];
-        /* public: */
-        u8 parm[QDIO_MAX_BUFFERS_PER_Q];
-} __attribute__ ((packed, aligned(256)));
-
-/**
- * struct slibe - storage list information block element (SLIBE)
- * @parms: implementation dependent parameters
- */
-struct slibe {
-        u64 parms;
-};
-
-/**
- * struct slib - storage list information block (SLIB)
- * @nsliba: next SLIB address (if any)
- * @sla: SL address
- * @slsba: SLSB address
- * @slibe: SLIB elements
- */
-struct slib {
-        u64 nsliba;
-        u64 sla;
-        u64 slsba;
-        /* private: */
-        u8 res[1000];
-        /* public: */
-        struct slibe slibe[QDIO_MAX_BUFFERS_PER_Q];
-} __attribute__ ((packed, aligned(2048)));
-
-/**
- * struct sbal_flags - storage block address list flags
- * @last: last entry
- * @cont: contiguous storage
- * @frag: fragmentation
- */
-struct sbal_flags {
-        u8      : 1;
-        u8 last : 1;
-        u8 cont : 1;
-        u8      : 1;
-        u8 frag : 2;
-        u8      : 2;
-} __attribute__ ((packed));
-
-#define SBAL_FLAGS_FIRST_FRAG           0x04000000UL
-#define SBAL_FLAGS_MIDDLE_FRAG          0x08000000UL
-#define SBAL_FLAGS_LAST_FRAG            0x0c000000UL
-#define SBAL_FLAGS_LAST_ENTRY           0x40000000UL
-#define SBAL_FLAGS_CONTIGUOUS           0x20000000UL
-
-#define SBAL_FLAGS0_DATA_CONTINUATION   0x20UL
-
-/* Awesome OpenFCP extensions */
-#define SBAL_FLAGS0_TYPE_STATUS         0x00UL
-#define SBAL_FLAGS0_TYPE_WRITE          0x08UL
-#define SBAL_FLAGS0_TYPE_READ           0x10UL
-#define SBAL_FLAGS0_TYPE_WRITE_READ     0x18UL
-#define SBAL_FLAGS0_MORE_SBALS          0x04UL
-#define SBAL_FLAGS0_COMMAND             0x02UL
-#define SBAL_FLAGS0_LAST_SBAL           0x00UL
-#define SBAL_FLAGS0_ONLY_SBAL           SBAL_FLAGS0_COMMAND
-#define SBAL_FLAGS0_MIDDLE_SBAL         SBAL_FLAGS0_MORE_SBALS
-#define SBAL_FLAGS0_FIRST_SBAL SBAL_FLAGS0_MORE_SBALS | SBAL_FLAGS0_COMMAND
-#define SBAL_FLAGS0_PCI                 0x40
-
-/**
- * struct sbal_sbalf_0 - sbal flags for sbale 0
- * @pci: PCI indicator
- * @cont: data continuation
- * @sbtype: storage-block type (FCP)
- */
-struct sbal_sbalf_0 {
-        u8        : 1;
-        u8 pci    : 1;
-        u8 cont   : 1;
-        u8 sbtype : 2;
-        u8        : 3;
-} __attribute__ ((packed));
-
-/**
- * struct sbal_sbalf_1 - sbal flags for sbale 1
- * @key: storage key
- */
-struct sbal_sbalf_1 {
-        u8     : 4;
-        u8 key : 4;
-} __attribute__ ((packed));
-
-/**
- * struct sbal_sbalf_14 - sbal flags for sbale 14
- * @erridx: error index
- */
-struct sbal_sbalf_14 {
-        u8        : 4;
-        u8 erridx : 4;
-} __attribute__ ((packed));
-
-/**
- * struct sbal_sbalf_15 - sbal flags for sbale 15
- * @reason: reason for error state
- */
-struct sbal_sbalf_15 {
-        u8 reason;
-} __attribute__ ((packed));
-
-/**
- * union sbal_sbalf - storage block address list flags
- * @i0: sbalf0
- * @i1: sbalf1
- * @i14: sbalf14
- * @i15: sblaf15
- * @value: raw value
- */
-union sbal_sbalf {
-        struct sbal_sbalf_0  i0;
-        struct sbal_sbalf_1  i1;
-        struct sbal_sbalf_14 i14;
-        struct sbal_sbalf_15 i15;
-        u8 value;
-};
-
-/**
- * struct qdio_buffer_element - SBAL entry
- * @flags: flags
- * @length: length
- * @addr: address
-*/
-struct qdio_buffer_element {
-        u32 flags;
-        u32 length;
-#ifdef CONFIG_32BIT
-        /* private: */
-        void *reserved;
-        /* public: */
-#endif
-        void *addr;
-} __attribute__ ((packed, aligned(16)));
-
-/**
- * struct qdio_buffer - storage block address list (SBAL)
- * @element: SBAL entries
- */
-struct qdio_buffer {
-        struct qdio_buffer_element element[QDIO_MAX_ELEMENTS_PER_BUFFER];
-} __attribute__ ((packed, aligned(256)));
-
-/**
- * struct sl_element - storage list entry
- * @sbal: absolute SBAL address
- */
-struct sl_element {
-#ifdef CONFIG_32BIT
-        /* private: */
-        unsigned long reserved;
-        /* public: */
-#endif
-        unsigned long sbal;
-} __attribute__ ((packed));
-
-/**
- * struct sl - storage list (SL)
- * @element: SL entries
- */
-struct sl {
-        struct sl_element element[QDIO_MAX_BUFFERS_PER_Q];
-} __attribute__ ((packed, aligned(1024)));
-
-/**
- * struct slsb - storage list state block (SLSB)
- * @val: state per buffer
- */
-struct slsb {
-        u8 val[QDIO_MAX_BUFFERS_PER_Q];
-} __attribute__ ((packed, aligned(256)));
-
-struct qdio_ssqd_desc {
-        u8 flags;
-        u8:8;
-        u16 sch;
-        u8 qfmt;
-        u8 parm;
-        u8 qdioac1;
-        u8 sch_class;
-        u8 pcnt;
-        u8 icnt;
-        u8:8;
-        u8 ocnt;
-        u8:8;
-        u8 mbccnt;
-        u16 qdioac2;
-        u64 sch_token;
-        u64:64;
-} __attribute__ ((packed));
-
-/* params are: ccw_device, qdio_error, queue_number,
-   first element processed, number of elements processed, int_parm */
-typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
-                            int, int, unsigned long);
-
-/* qdio errors reported to the upper-layer program */
-#define QDIO_ERROR_SIGA_ACCESS_EXCEPTION        0x10
-#define QDIO_ERROR_SIGA_BUSY                    0x20
-#define QDIO_ERROR_ACTIVATE_CHECK_CONDITION     0x40
-#define QDIO_ERROR_SLSB_STATE                   0x80
-
-/* for qdio_initialize */
-#define QDIO_INBOUND_0COPY_SBALS                0x01
-#define QDIO_OUTBOUND_0COPY_SBALS               0x02
-#define QDIO_USE_OUTBOUND_PCIS                  0x04
-
-/* for qdio_cleanup */
-#define QDIO_FLAG_CLEANUP_USING_CLEAR           0x01
-#define QDIO_FLAG_CLEANUP_USING_HALT            0x02
-
-/**
- * struct qdio_initialize - qdio initalization data
- * @cdev: associated ccw device
- * @q_format: queue format
- * @adapter_name: name for the adapter
- * @qib_param_field_format: format for qib_parm_field
- * @qib_param_field: pointer to 128 bytes or NULL, if no param field
- * @input_slib_elements: pointer to no_input_qs * 128 words of data or NULL
- * @output_slib_elements: pointer to no_output_qs * 128 words of data or NULL
- * @no_input_qs: number of input queues
- * @no_output_qs: number of output queues
- * @input_handler: handler to be called for input queues
- * @output_handler: handler to be called for output queues
- * @int_parm: interruption parameter
- * @flags: initialization flags
- * @input_sbal_addr_array:  address of no_input_qs * 128 pointers
- * @output_sbal_addr_array: address of no_output_qs * 128 pointers
- */
-struct qdio_initialize {
-        struct ccw_device *cdev;
-        unsigned char q_format;
-        unsigned char adapter_name[8];
-        unsigned int qib_param_field_format;
-        unsigned char *qib_param_field;
-        unsigned long *input_slib_elements;
-        unsigned long *output_slib_elements;
-        unsigned int no_input_qs;
-        unsigned int no_output_qs;
-        qdio_handler_t *input_handler;
-        qdio_handler_t *output_handler;
-        unsigned long int_parm;
-        unsigned long flags;
-        void **input_sbal_addr_array;
-        void **output_sbal_addr_array;
-};
-
-#define QDIO_STATE_INACTIVE             0x00000002 /* after qdio_cleanup */
-#define QDIO_STATE_ESTABLISHED          0x00000004 /* after qdio_establish */
-#define QDIO_STATE_ACTIVE               0x00000008 /* after qdio_activate */
-#define QDIO_STATE_STOPPED              0x00000010 /* after queues went down */
-
-#define QDIO_FLAG_SYNC_INPUT            0x01
-#define QDIO_FLAG_SYNC_OUTPUT           0x02
-#define QDIO_FLAG_PCI_OUT               0x10
-
-extern int qdio_initialize(struct qdio_initialize *init_data);
-extern int qdio_allocate(struct qdio_initialize *init_data);
-extern int qdio_establish(struct qdio_initialize *init_data);
-extern int qdio_activate(struct ccw_device *);
-
-extern int do_QDIO(struct ccw_device*, unsigned int flags,
-                   int q_nr, int qidx, int count);
-extern int qdio_cleanup(struct ccw_device*, int how);
-extern int qdio_shutdown(struct ccw_device*, int how);
-extern int qdio_free(struct ccw_device *);
-extern struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev);
-
-#endif /* __QDIO_H__ */
diff --git a/include/asm-s390/qeth.h b/include/asm-s390/qeth.h
deleted file mode 100644
index 930d378ef75a..000000000000
--- a/include/asm-s390/qeth.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * include/asm-s390/qeth.h
- *
- * ioctl definitions for qeth driver
- *
- * Copyright (C) 2004 IBM Corporation
- *
- * Author(s):   Thomas Spatzier <tspat@de.ibm.com>
- *
- */
-#ifndef __ASM_S390_QETH_IOCTL_H__
-#define __ASM_S390_QETH_IOCTL_H__
-#include <linux/ioctl.h>
-
-#define SIOC_QETH_ARP_SET_NO_ENTRIES    (SIOCDEVPRIVATE)
-#define SIOC_QETH_ARP_QUERY_INFO        (SIOCDEVPRIVATE + 1)
-#define SIOC_QETH_ARP_ADD_ENTRY         (SIOCDEVPRIVATE + 2)
-#define SIOC_QETH_ARP_REMOVE_ENTRY      (SIOCDEVPRIVATE + 3)
-#define SIOC_QETH_ARP_FLUSH_CACHE       (SIOCDEVPRIVATE + 4)
-#define SIOC_QETH_ADP_SET_SNMP_CONTROL  (SIOCDEVPRIVATE + 5)
-#define SIOC_QETH_GET_CARD_TYPE         (SIOCDEVPRIVATE + 6)
-
-struct qeth_arp_cache_entry {
-        __u8  macaddr[6];
-        __u8  reserved1[2];
-        __u8  ipaddr[16]; /* for both  IPv4 and IPv6 */
-        __u8  reserved2[32];
-} __attribute__ ((packed));
-
-struct qeth_arp_qi_entry7 {
-        __u8 media_specific[32];
-        __u8 macaddr_type;
-        __u8 ipaddr_type;
-        __u8 macaddr[6];
-        __u8 ipaddr[4];
-} __attribute__((packed));
-
-struct qeth_arp_qi_entry7_short {
-        __u8 macaddr_type;
-        __u8 ipaddr_type;
-        __u8 macaddr[6];
-        __u8 ipaddr[4];
-} __attribute__((packed));
-
-struct qeth_arp_qi_entry5 {
-        __u8 media_specific[32];
-        __u8 macaddr_type;
-        __u8 ipaddr_type;
-        __u8 ipaddr[4];
-} __attribute__((packed));
-
-struct qeth_arp_qi_entry5_short {
-        __u8 macaddr_type;
-        __u8 ipaddr_type;
-        __u8 ipaddr[4];
-} __attribute__((packed));
-
-/*
- * can be set by user if no "media specific information" is wanted
- * -> saves a lot of space in user space buffer
- */
-#define QETH_QARP_STRIP_ENTRIES  0x8000
-#define QETH_QARP_REQUEST_MASK   0x00ff
-
-/* data sent to user space as result of query arp ioctl */
-#define QETH_QARP_USER_DATA_SIZE 20000
-#define QETH_QARP_MASK_OFFSET    4
-#define QETH_QARP_ENTRIES_OFFSET 6
-struct qeth_arp_query_user_data {
-        union {
-                __u32 data_len;         /* set by user space program */
-                __u32 no_entries;       /* set by kernel */
-        } u;
-        __u16 mask_bits;
-        char *entries;
-} __attribute__((packed));
-
-#endif /* __ASM_S390_QETH_IOCTL_H__ */
diff --git a/include/asm-s390/reset.h b/include/asm-s390/reset.h
deleted file mode 100644
index f584f4a52581..000000000000
--- a/include/asm-s390/reset.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  include/asm-s390/reset.h
- *
- *    Copyright IBM Corp. 2006
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- */
-
-#ifndef _ASM_S390_RESET_H
-#define _ASM_S390_RESET_H
-
-#include <linux/list.h>
-
-struct reset_call {
-        struct list_head list;
-        void (*fn)(void);
-};
-
-extern void register_reset_call(struct reset_call *reset);
-extern void unregister_reset_call(struct reset_call *reset);
-extern void s390_reset_system(void);
-#endif /* _ASM_S390_RESET_H */
diff --git a/include/asm-s390/resource.h b/include/asm-s390/resource.h
deleted file mode 100644
index 366c01de04f2..000000000000
--- a/include/asm-s390/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  include/asm-s390/resource.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/resources.h"
- */
-
-#ifndef _S390_RESOURCE_H
-#define _S390_RESOURCE_H
-
-#include <asm-generic/resource.h>
-
-#endif
-
diff --git a/include/asm-s390/rwsem.h b/include/asm-s390/rwsem.h
deleted file mode 100644
index 9d2a17971805..000000000000
--- a/include/asm-s390/rwsem.h
+++ /dev/null
@@ -1,387 +0,0 @@
-#ifndef _S390_RWSEM_H
-#define _S390_RWSEM_H
-
-/*
- *  include/asm-s390/rwsem.h
- *
- *  S390 version
- *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Based on asm-alpha/semaphore.h and asm-i386/rwsem.h
- */
-
-/*
- *
- * The MSW of the count is the negated number of active writers and waiting
- * lockers, and the LSW is the total number of active locks
- *
- * The lock count is initialized to 0 (no active and no waiting lockers).
- *
- * When a writer subtracts WRITE_BIAS, it'll get 0xffff0001 for the case of an
- * uncontended lock. This can be determined because XADD returns the old value.
- * Readers increment by 1 and see a positive value when uncontended, negative
- * if there are writers (and maybe) readers waiting (in which case it goes to
- * sleep).
- *
- * The value of WAITING_BIAS supports up to 32766 waiting processes. This can
- * be extended to 65534 by manually checking the whole MSW rather than relying
- * on the S flag.
- *
- * The value of ACTIVE_BIAS supports up to 65535 active processes.
- *
- * This should be totally fair - if anything is waiting, a process that wants a
- * lock will go to the back of the queue. When the currently active lock is
- * released, if there's a writer at the front of the queue, then that and only
- * that will be woken up; if there's a bunch of consequtive readers at the
- * front, then they'll all be woken up, but no other readers will be.
- */
-
-#ifndef _LINUX_RWSEM_H
-#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"
-#endif
-
-#ifdef __KERNEL__
-
-#include <linux/list.h>
-#include <linux/spinlock.h>
-
-struct rwsem_waiter;
-
-extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *);
-extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *);
-extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);
-extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *);
-extern struct rw_semaphore *rwsem_downgrade_write(struct rw_semaphore *);
-
-/*
- * the semaphore definition
- */
-struct rw_semaphore {
-        signed long             count;
-        spinlock_t              wait_lock;
-        struct list_head        wait_list;
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-        struct lockdep_map      dep_map;
-#endif
-};
-
-#ifndef __s390x__
-#define RWSEM_UNLOCKED_VALUE    0x00000000
-#define RWSEM_ACTIVE_BIAS       0x00000001
-#define RWSEM_ACTIVE_MASK       0x0000ffff
-#define RWSEM_WAITING_BIAS      (-0x00010000)
-#else /* __s390x__ */
-#define RWSEM_UNLOCKED_VALUE    0x0000000000000000L
-#define RWSEM_ACTIVE_BIAS       0x0000000000000001L
-#define RWSEM_ACTIVE_MASK       0x00000000ffffffffL
-#define RWSEM_WAITING_BIAS      (-0x0000000100000000L)
-#endif /* __s390x__ */
-#define RWSEM_ACTIVE_READ_BIAS  RWSEM_ACTIVE_BIAS
-#define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
-
-/*
- * initialisation
- */
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }
-#else
-# define __RWSEM_DEP_MAP_INIT(lockname)
-#endif
-
-#define __RWSEM_INITIALIZER(name) \
- { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait.lock), \
-   LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
-
-#define DECLARE_RWSEM(name) \
-        struct rw_semaphore name = __RWSEM_INITIALIZER(name)
-
-static inline void init_rwsem(struct rw_semaphore *sem)
-{
-        sem->count = RWSEM_UNLOCKED_VALUE;
-        spin_lock_init(&sem->wait_lock);
-        INIT_LIST_HEAD(&sem->wait_list);
-}
-
-extern void __init_rwsem(struct rw_semaphore *sem, const char *name,
-                         struct lock_class_key *key);
-
-#define init_rwsem(sem)                         \
-do {                                            \
-        static struct lock_class_key __key;     \
-                                                \
-        __init_rwsem((sem), #sem, &__key);      \
-} while (0)
-
-
-/*
- * lock for reading
- */
-static inline void __down_read(struct rw_semaphore *sem)
-{
-        signed long old, new;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       ahi     %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       aghi    %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count),
-                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory");
-        if (old < 0)
-                rwsem_down_read_failed(sem);
-}
-
-/*
- * trylock for reading -- returns 1 if successful, 0 if contention
- */
-static inline int __down_read_trylock(struct rw_semaphore *sem)
-{
-        signed long old, new;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     ltr     %1,%0\n"
-                "       jm      1f\n"
-                "       ahi     %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b\n"
-                "1:"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     ltgr    %1,%0\n"
-                "       jm      1f\n"
-                "       aghi    %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b\n"
-                "1:"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count),
-                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory");
-        return old >= 0 ? 1 : 0;
-}
-
-/*
- * lock for writing
- */
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
-{
-        signed long old, new, tmp;
-
-        tmp = RWSEM_ACTIVE_WRITE_BIAS;
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       a       %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       ag      %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory");
-        if (old != 0)
-                rwsem_down_write_failed(sem);
-}
-
-static inline void __down_write(struct rw_semaphore *sem)
-{
-        __down_write_nested(sem, 0);
-}
-
-/*
- * trylock for writing -- returns 1 if successful, 0 if contention
- */
-static inline int __down_write_trylock(struct rw_semaphore *sem)
-{
-        signed long old;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%2)\n"
-                "0:     ltr     %0,%0\n"
-                "       jnz     1f\n"
-                "       cs      %0,%4,0(%2)\n"
-                "       jl      0b\n"
-#else /* __s390x__ */
-                "       lg      %0,0(%2)\n"
-                "0:     ltgr    %0,%0\n"
-                "       jnz     1f\n"
-                "       csg     %0,%4,0(%2)\n"
-                "       jl      0b\n"
-#endif /* __s390x__ */
-                "1:"
-                : "=&d" (old), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count),
-                  "d" (RWSEM_ACTIVE_WRITE_BIAS) : "cc", "memory");
-        return (old == RWSEM_UNLOCKED_VALUE) ? 1 : 0;
-}
-
-/*
- * unlock after reading
- */
-static inline void __up_read(struct rw_semaphore *sem)
-{
-        signed long old, new;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       ahi     %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       aghi    %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count),
-                  "i" (-RWSEM_ACTIVE_READ_BIAS)
-                : "cc", "memory");
-        if (new < 0)
-                if ((new & RWSEM_ACTIVE_MASK) == 0)
-                        rwsem_wake(sem);
-}
-
-/*
- * unlock after writing
- */
-static inline void __up_write(struct rw_semaphore *sem)
-{
-        signed long old, new, tmp;
-
-        tmp = -RWSEM_ACTIVE_WRITE_BIAS;
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       a       %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       ag      %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory");
-        if (new < 0)
-                if ((new & RWSEM_ACTIVE_MASK) == 0)
-                        rwsem_wake(sem);
-}
-
-/*
- * downgrade write lock to read lock
- */
-static inline void __downgrade_write(struct rw_semaphore *sem)
-{
-        signed long old, new, tmp;
-
-        tmp = -RWSEM_WAITING_BIAS;
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       a       %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       ag      %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory");
-        if (new > 1)
-                rwsem_downgrade_wake(sem);
-}
-
-/*
- * implement atomic add functionality
- */
-static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
-{
-        signed long old, new;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       ar      %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       agr     %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count), "d" (delta)
-                : "cc", "memory");
-}
-
-/*
- * implement exchange and add functionality
- */
-static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
-{
-        signed long old, new;
-
-        asm volatile(
-#ifndef __s390x__
-                "       l       %0,0(%3)\n"
-                "0:     lr      %1,%0\n"
-                "       ar      %1,%5\n"
-                "       cs      %0,%1,0(%3)\n"
-                "       jl      0b"
-#else /* __s390x__ */
-                "       lg      %0,0(%3)\n"
-                "0:     lgr     %1,%0\n"
-                "       agr     %1,%5\n"
-                "       csg     %0,%1,0(%3)\n"
-                "       jl      0b"
-#endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
-                : "a" (&sem->count), "m" (sem->count), "d" (delta)
-                : "cc", "memory");
-        return new;
-}
-
-static inline int rwsem_is_locked(struct rw_semaphore *sem)
-{
-        return (sem->count != 0);
-}
-
-#endif /* __KERNEL__ */
-#endif /* _S390_RWSEM_H */
diff --git a/include/asm-s390/s390_ext.h b/include/asm-s390/s390_ext.h
deleted file mode 100644
index 2afc060266a2..000000000000
--- a/include/asm-s390/s390_ext.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _S390_EXTINT_H
-#define _S390_EXTINT_H
-
-/*
- *  include/asm-s390/s390_ext.h
- *
- *  S390 version
- *    Copyright IBM Corp. 1999,2007
- *    Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- */
-
-#include <linux/types.h>
-
-typedef void (*ext_int_handler_t)(__u16 code);
-
-typedef struct ext_int_info_t {
-        struct ext_int_info_t *next;
-        ext_int_handler_t handler;
-        __u16 code;
-} ext_int_info_t;
-
-extern ext_int_info_t *ext_int_hash[];
-
-int register_external_interrupt(__u16 code, ext_int_handler_t handler);
-int register_early_external_interrupt(__u16 code, ext_int_handler_t handler,
-                                      ext_int_info_t *info);
-int unregister_external_interrupt(__u16 code, ext_int_handler_t handler);
-int unregister_early_external_interrupt(__u16 code, ext_int_handler_t handler,
-                                        ext_int_info_t *info);
-
-#endif
diff --git a/include/asm-s390/s390_rdev.h b/include/asm-s390/s390_rdev.h
deleted file mode 100644
index 6fa20442a48c..000000000000
--- a/include/asm-s390/s390_rdev.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  include/asm-s390/ccwdev.h
- *
- *    Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
- *               Carsten Otte  <cotte@de.ibm.com>
- *
- *  Interface for s390 root device
- */
-
-#ifndef _S390_RDEV_H_
-#define _S390_RDEV_H_
-extern struct device *s390_root_dev_register(const char *);
-extern void s390_root_dev_unregister(struct device *);
-#endif /* _S390_RDEV_H_ */
diff --git a/include/asm-s390/scatterlist.h b/include/asm-s390/scatterlist.h
deleted file mode 100644
index 29ec8e28c8df..000000000000
--- a/include/asm-s390/scatterlist.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASMS390_SCATTERLIST_H
-#define _ASMS390_SCATTERLIST_H
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-    unsigned long sg_magic;
-#endif
-    unsigned long page_link;
-    unsigned int offset;
-    unsigned int length;
-};
-
-#ifdef __s390x__
-#define ISA_DMA_THRESHOLD (0xffffffffffffffffUL)
-#else
-#define ISA_DMA_THRESHOLD (0xffffffffUL)
-#endif
-
-#endif /* _ASMS390X_SCATTERLIST_H */
diff --git a/include/asm-s390/schid.h b/include/asm-s390/schid.h
deleted file mode 100644
index 825503cf3dc2..000000000000
--- a/include/asm-s390/schid.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef ASM_SCHID_H
-#define ASM_SCHID_H
-
-struct subchannel_id {
-        __u32 cssid : 8;
-        __u32 : 4;
-        __u32 m : 1;
-        __u32 ssid : 2;
-        __u32 one : 1;
-        __u32 sch_no : 16;
-} __attribute__ ((packed, aligned(4)));
-
-#ifdef __KERNEL__
-#include <linux/string.h>
-
-/* Helper function for sane state of pre-allocated subchannel_id. */
-static inline void
-init_subchannel_id(struct subchannel_id *schid)
-{
-        memset(schid, 0, sizeof(struct subchannel_id));
-        schid->one = 1;
-}
-
-static inline int
-schid_equal(struct subchannel_id *schid1, struct subchannel_id *schid2)
-{
-        return !memcmp(schid1, schid2, sizeof(struct subchannel_id));
-}
-
-#endif /* __KERNEL__ */
-
-#endif /* ASM_SCHID_H */
diff --git a/include/asm-s390/sclp.h b/include/asm-s390/sclp.h
deleted file mode 100644
index fed7bee650a0..000000000000
--- a/include/asm-s390/sclp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  include/asm-s390/sclp.h
- *
- *    Copyright IBM Corp. 2007
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- */
-
-#ifndef _ASM_S390_SCLP_H
-#define _ASM_S390_SCLP_H
-
-#include <linux/types.h>
-#include <asm/chpid.h>
-
-#define SCLP_CHP_INFO_MASK_SIZE         32
-
-struct sclp_chp_info {
-        u8 recognized[SCLP_CHP_INFO_MASK_SIZE];
-        u8 standby[SCLP_CHP_INFO_MASK_SIZE];
-        u8 configured[SCLP_CHP_INFO_MASK_SIZE];
-};
-
-#define LOADPARM_LEN 8
-
-struct sclp_ipl_info {
-        int is_valid;
-        int has_dump;
-        char loadparm[LOADPARM_LEN];
-};
-
-struct sclp_cpu_entry {
-        u8 address;
-        u8 reserved0[13];
-        u8 type;
-        u8 reserved1;
-} __attribute__((packed));
-
-struct sclp_cpu_info {
-        unsigned int configured;
-        unsigned int standby;
-        unsigned int combined;
-        int has_cpu_type;
-        struct sclp_cpu_entry cpu[255];
-};
-
-int sclp_get_cpu_info(struct sclp_cpu_info *info);
-int sclp_cpu_configure(u8 cpu);
-int sclp_cpu_deconfigure(u8 cpu);
-void sclp_facilities_detect(void);
-unsigned long long sclp_get_rnmax(void);
-unsigned long long sclp_get_rzm(void);
-int sclp_sdias_blk_count(void);
-int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);
-int sclp_chp_configure(struct chp_id chpid);
-int sclp_chp_deconfigure(struct chp_id chpid);
-int sclp_chp_read_info(struct sclp_chp_info *info);
-void sclp_get_ipl_info(struct sclp_ipl_info *info);
-
-#endif /* _ASM_S390_SCLP_H */
diff --git a/include/asm-s390/sections.h b/include/asm-s390/sections.h
deleted file mode 100644
index fbd9116eb17b..000000000000
--- a/include/asm-s390/sections.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _S390_SECTIONS_H
-#define _S390_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-extern char _eshared[], _ehead[];
-
-#endif
diff --git a/include/asm-s390/segment.h b/include/asm-s390/segment.h
deleted file mode 100644
index 8bfce3475b1c..000000000000
--- a/include/asm-s390/segment.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-#endif
diff --git a/include/asm-s390/sembuf.h b/include/asm-s390/sembuf.h
deleted file mode 100644
index 32626b0cac4b..000000000000
--- a/include/asm-s390/sembuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _S390_SEMBUF_H
-#define _S390_SEMBUF_H
-
-/* 
- * The semid64_ds structure for S/390 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem (for !__s390x__)
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-#ifndef __s390x__
-        unsigned long   __unused1;
-#endif /* ! __s390x__ */
-        __kernel_time_t sem_ctime;              /* last change time */
-#ifndef __s390x__
-        unsigned long   __unused2;
-#endif /* ! __s390x__ */
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _S390_SEMBUF_H */
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
deleted file mode 100644
index 2bd9faeb3919..000000000000
--- a/include/asm-s390/setup.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  include/asm-s390/setup.h
- *
- *  S390 version
- *    Copyright IBM Corp. 1999,2006
- */
-
-#ifndef _ASM_S390_SETUP_H
-#define _ASM_S390_SETUP_H
-
-#define COMMAND_LINE_SIZE       1024
-
-#define ARCH_COMMAND_LINE_SIZE  896
-
-#ifdef __KERNEL__
-
-#include <asm/types.h>
-
-#define PARMAREA                0x10400
-#define MEMORY_CHUNKS           256
-
-#ifndef __ASSEMBLY__
-
-#ifndef __s390x__
-#define IPL_DEVICE        (*(unsigned long *)  (0x10404))
-#define INITRD_START      (*(unsigned long *)  (0x1040C))
-#define INITRD_SIZE       (*(unsigned long *)  (0x10414))
-#else /* __s390x__ */
-#define IPL_DEVICE        (*(unsigned long *)  (0x10400))
-#define INITRD_START      (*(unsigned long *)  (0x10408))
-#define INITRD_SIZE       (*(unsigned long *)  (0x10410))
-#endif /* __s390x__ */
-#define COMMAND_LINE      ((char *)            (0x10480))
-
-#define CHUNK_READ_WRITE 0
-#define CHUNK_READ_ONLY  1
-
-struct mem_chunk {
-        unsigned long addr;
-        unsigned long size;
-        int type;
-};
-
-extern struct mem_chunk memory_chunk[];
-extern unsigned long real_memory_size;
-
-void detect_memory_layout(struct mem_chunk chunk[]);
-
-#ifdef CONFIG_S390_SWITCH_AMODE
-extern unsigned int switch_amode;
-#else
-#define switch_amode    (0)
-#endif
-
-#ifdef CONFIG_S390_EXEC_PROTECT
-extern unsigned int s390_noexec;
-#else
-#define s390_noexec     (0)
-#endif
-
-/*
- * Machine features detected in head.S
- */
-extern unsigned long machine_flags;
-
-#define MACHINE_FLAG_VM         (1UL << 0)
-#define MACHINE_FLAG_IEEE       (1UL << 1)
-#define MACHINE_FLAG_CSP        (1UL << 3)
-#define MACHINE_FLAG_MVPG       (1UL << 4)
-#define MACHINE_FLAG_DIAG44     (1UL << 5)
-#define MACHINE_FLAG_IDTE       (1UL << 6)
-#define MACHINE_FLAG_DIAG9C     (1UL << 7)
-#define MACHINE_FLAG_MVCOS      (1UL << 8)
-#define MACHINE_FLAG_KVM        (1UL << 9)
-#define MACHINE_FLAG_HPAGE      (1UL << 10)
-#define MACHINE_FLAG_PFMF       (1UL << 11)
-
-#define MACHINE_IS_VM           (machine_flags & MACHINE_FLAG_VM)
-#define MACHINE_IS_KVM          (machine_flags & MACHINE_FLAG_KVM)
-#define MACHINE_HAS_DIAG9C      (machine_flags & MACHINE_FLAG_DIAG9C)
-
-#ifndef __s390x__
-#define MACHINE_HAS_IEEE        (machine_flags & MACHINE_FLAG_IEEE)
-#define MACHINE_HAS_CSP         (machine_flags & MACHINE_FLAG_CSP)
-#define MACHINE_HAS_IDTE        (0)
-#define MACHINE_HAS_DIAG44      (1)
-#define MACHINE_HAS_MVPG        (machine_flags & MACHINE_FLAG_MVPG)
-#define MACHINE_HAS_MVCOS       (0)
-#define MACHINE_HAS_HPAGE       (0)
-#define MACHINE_HAS_PFMF        (0)
-#else /* __s390x__ */
-#define MACHINE_HAS_IEEE        (1)
-#define MACHINE_HAS_CSP         (1)
-#define MACHINE_HAS_IDTE        (machine_flags & MACHINE_FLAG_IDTE)
-#define MACHINE_HAS_DIAG44      (machine_flags & MACHINE_FLAG_DIAG44)
-#define MACHINE_HAS_MVPG        (1)
-#define MACHINE_HAS_MVCOS       (machine_flags & MACHINE_FLAG_MVCOS)
-#define MACHINE_HAS_HPAGE       (machine_flags & MACHINE_FLAG_HPAGE)
-#define MACHINE_HAS_PFMF        (machine_flags & MACHINE_FLAG_PFMF)
-#endif /* __s390x__ */
-
-#define ZFCPDUMP_HSA_SIZE       (32UL<<20)
-
-/*
- * Console mode. Override with conmode=
- */
-extern unsigned int console_mode;
-extern unsigned int console_devno;
-extern unsigned int console_irq;
-
-extern char vmhalt_cmd[];
-extern char vmpoff_cmd[];
-
-#define CONSOLE_IS_UNDEFINED    (console_mode == 0)
-#define CONSOLE_IS_SCLP         (console_mode == 1)
-#define CONSOLE_IS_3215         (console_mode == 2)
-#define CONSOLE_IS_3270         (console_mode == 3)
-#define SET_CONSOLE_SCLP        do { console_mode = 1; } while (0)
-#define SET_CONSOLE_3215        do { console_mode = 2; } while (0)
-#define SET_CONSOLE_3270        do { console_mode = 3; } while (0)
-
-#define NSS_NAME_SIZE   8
-extern char kernel_nss_name[];
-
-#else /* __ASSEMBLY__ */
-
-#ifndef __s390x__
-#define IPL_DEVICE        0x10404
-#define INITRD_START      0x1040C
-#define INITRD_SIZE       0x10414
-#else /* __s390x__ */
-#define IPL_DEVICE        0x10400
-#define INITRD_START      0x10408
-#define INITRD_SIZE       0x10410
-#endif /* __s390x__ */
-#define COMMAND_LINE      0x10480
-
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_S390_SETUP_H */
diff --git a/include/asm-s390/sfp-machine.h b/include/asm-s390/sfp-machine.h
deleted file mode 100644
index 4e16aede4b06..000000000000
--- a/include/asm-s390/sfp-machine.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Machine-dependent software floating-point definitions.
-   S/390 kernel version.
-   Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Richard Henderson (rth@cygnus.com),
-                  Jakub Jelinek (jj@ultra.linux.cz),
-                  David S. Miller (davem@redhat.com) and
-                  Peter Maydell (pmaydell@chiark.greenend.org.uk).
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _SFP_MACHINE_H
-#define _SFP_MACHINE_H
-   
-
-#define _FP_W_TYPE_SIZE         32
-#define _FP_W_TYPE              unsigned int
-#define _FP_WS_TYPE             signed int
-#define _FP_I_TYPE              int
-
-#define _FP_MUL_MEAT_S(R,X,Y)                                   \
-  _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
-#define _FP_MUL_MEAT_D(R,X,Y)                                   \
-  _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)
-#define _FP_MUL_MEAT_Q(R,X,Y)                                   \
-  _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm)
-
-#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)
-#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv(D,R,X,Y)
-#define _FP_DIV_MEAT_Q(R,X,Y)   _FP_DIV_MEAT_4_udiv(Q,R,X,Y)
-
-#define _FP_NANFRAC_S           ((_FP_QNANBIT_S << 1) - 1)
-#define _FP_NANFRAC_D           ((_FP_QNANBIT_D << 1) - 1), -1
-#define _FP_NANFRAC_Q           ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1
-#define _FP_NANSIGN_S           0
-#define _FP_NANSIGN_D           0
-#define _FP_NANSIGN_Q           0
-
-#define _FP_KEEPNANFRACP 1
-
-/*
- * If one NaN is signaling and the other is not,
- * we choose that one, otherwise we choose X.
- */
-#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)                      \
-  do {                                                          \
-    if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs)          \
-        && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs))     \
-      {                                                         \
-        R##_s = Y##_s;                                          \
-        _FP_FRAC_COPY_##wc(R,Y);                                \
-      }                                                         \
-    else                                                        \
-      {                                                         \
-        R##_s = X##_s;                                          \
-        _FP_FRAC_COPY_##wc(R,X);                                \
-      }                                                         \
-    R##_c = FP_CLS_NAN;                                         \
-  } while (0)
-
-/* Some assembly to speed things up. */
-#define __FP_FRAC_ADD_3(r2,r1,r0,x2,x1,x0,y2,y1,y0) ({          \
-        unsigned int __r2 = (x2) + (y2);                        \
-        unsigned int __r1 = (x1);                               \
-        unsigned int __r0 = (x0);                               \
-        asm volatile(                                           \
-                "       alr     %2,%3\n"                        \
-                "       brc     12,0f\n"                        \
-                "       lhi     0,1\n"                          \
-                "       alr     %1,0\n"                         \
-                "       brc     12,0f\n"                        \
-                "       alr     %0,0\n"                         \
-                "0:"                                            \
-                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
-                : "d" (y0), "i" (1) : "cc", "0" );              \
-        asm volatile(                                           \
-                "       alr     %1,%2\n"                        \
-                "       brc     12,0f\n"                        \
-                "       ahi     %0,1\n"                         \
-                "0:"                                            \
-                : "+&d" (__r2), "+&d" (__r1)                    \
-                : "d" (y1) : "cc");                             \
-        (r2) = __r2;                                            \
-        (r1) = __r1;                                            \
-        (r0) = __r0;                                            \
-})
-
-#define __FP_FRAC_SUB_3(r2,r1,r0,x2,x1,x0,y2,y1,y0) ({          \
-        unsigned int __r2 = (x2) - (y2);                        \
-        unsigned int __r1 = (x1);                               \
-        unsigned int __r0 = (x0);                               \
-        asm volatile(                                           \
-                "       slr   %2,%3\n"                          \
-                "       brc     3,0f\n"                         \
-                "       lhi     0,1\n"                          \
-                "       slr     %1,0\n"                         \
-                "       brc     3,0f\n"                         \
-                "       slr     %0,0\n"                         \
-                "0:"                                            \
-                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
-                : "d" (y0) : "cc", "0");                        \
-        asm volatile(                                           \
-                "       slr     %1,%2\n"                        \
-                "       brc     3,0f\n"                         \
-                "       ahi     %0,-1\n"                        \
-                "0:"                                            \
-                : "+&d" (__r2), "+&d" (__r1)                    \
-                : "d" (y1) : "cc");                             \
-        (r2) = __r2;                                            \
-        (r1) = __r1;                                            \
-        (r0) = __r0;                                            \
-})
-
-#define __FP_FRAC_DEC_3(x2,x1,x0,y2,y1,y0) __FP_FRAC_SUB_3(x2,x1,x0,x2,x1,x0,y2,y1,y0)
-
-/* Obtain the current rounding mode. */
-#define FP_ROUNDMODE    mode
-
-/* Exception flags. */
-#define FP_EX_INVALID           0x800000
-#define FP_EX_DIVZERO           0x400000
-#define FP_EX_OVERFLOW          0x200000
-#define FP_EX_UNDERFLOW         0x100000
-#define FP_EX_INEXACT           0x080000
-
-/* We write the results always */
-#define FP_INHIBIT_RESULTS 0
-
-#endif
diff --git a/include/asm-s390/sfp-util.h b/include/asm-s390/sfp-util.h
deleted file mode 100644
index 0addc6466d95..000000000000
--- a/include/asm-s390/sfp-util.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) ({           \
-        unsigned int __sh = (ah);                       \
-        unsigned int __sl = (al);                       \
-        asm volatile(                                   \
-                "       alr     %1,%3\n"                \
-                "       brc     12,0f\n"                \
-                "       ahi     %0,1\n"                 \
-                "0:     alr  %0,%2"                     \
-                : "+&d" (__sh), "+d" (__sl)             \
-                : "d" (bh), "d" (bl) : "cc");           \
-        (sh) = __sh;                                    \
-        (sl) = __sl;                                    \
-})
-
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) ({           \
-        unsigned int __sh = (ah);                       \
-        unsigned int __sl = (al);                       \
-        asm volatile(                                   \
-                "       slr     %1,%3\n"                \
-                "       brc     3,0f\n"                 \
-                "       ahi     %0,-1\n"                \
-                "0:     slr     %0,%2"                  \
-                : "+&d" (__sh), "+d" (__sl)             \
-                : "d" (bh), "d" (bl) : "cc");           \
-        (sh) = __sh;                                    \
-        (sl) = __sl;                                    \
-})
-
-/* a umul b = a mul b + (a>=2<<31) ? b<<32:0 + (b>=2<<31) ? a<<32:0 */
-#define umul_ppmm(wh, wl, u, v) ({                      \
-        unsigned int __wh = u;                          \
-        unsigned int __wl = v;                          \
-        asm volatile(                                   \
-                "       ltr     1,%0\n"                 \
-                "       mr      0,%1\n"                 \
-                "       jnm     0f\n"                           \
-                "       alr     0,%1\n"                 \
-                "0:     ltr     %1,%1\n"                        \
-                "       jnm     1f\n"                           \
-                "       alr     0,%0\n"                 \
-                "1:     lr      %0,0\n"                 \
-                "       lr      %1,1\n"                 \
-                : "+d" (__wh), "+d" (__wl)              \
-                : : "0", "1", "cc");                    \
-        wh = __wh;                                      \
-        wl = __wl;                                      \
-})
-
-#ifdef __s390x__
-#define udiv_qrnnd(q, r, n1, n0, d)                     \
-  do { unsigned long __n;                               \
-       unsigned int __r, __d;                           \
-    __n = ((unsigned long)(n1) << 32) + n0;             \
-    __d = (d);                                          \
-    (q) = __n / __d;                                    \
-    (r) = __n % __d;                                    \
-  } while (0)
-#else
-#define udiv_qrnnd(q, r, n1, n0, d)                     \
-  do { unsigned int __r;                                \
-    (q) = __udiv_qrnnd (&__r, (n1), (n0), (d));         \
-    (r) = __r;                                          \
-  } while (0)
-extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int,
-                                   unsigned int , unsigned int);
-#endif
-
-#define UDIV_NEEDS_NORMALIZATION 0
-
-#define abort() return 0
-
-#define __BYTE_ORDER __BIG_ENDIAN
diff --git a/include/asm-s390/shmbuf.h b/include/asm-s390/shmbuf.h
deleted file mode 100644
index eed2e280ce37..000000000000
--- a/include/asm-s390/shmbuf.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _S390_SHMBUF_H
-#define _S390_SHMBUF_H
-
-/* 
- * The shmid64_ds structure for S/390 architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem (for !__s390x__)
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
-        struct ipc64_perm       shm_perm;       /* operation perms */
-        size_t                  shm_segsz;      /* size of segment (bytes) */
-        __kernel_time_t         shm_atime;      /* last attach time */
-#ifndef __s390x__
-        unsigned long           __unused1;
-#endif /* ! __s390x__ */
-        __kernel_time_t         shm_dtime;      /* last detach time */
-#ifndef __s390x__
-        unsigned long           __unused2;
-#endif /* ! __s390x__ */
-        __kernel_time_t         shm_ctime;      /* last change time */
-#ifndef __s390x__
-        unsigned long           __unused3;
-#endif /* ! __s390x__ */
-        __kernel_pid_t          shm_cpid;       /* pid of creator */
-        __kernel_pid_t          shm_lpid;       /* pid of last operator */
-        unsigned long           shm_nattch;     /* no. of current attaches */
-        unsigned long           __unused4;
-        unsigned long           __unused5;
-};
-
-struct shminfo64 {
-        unsigned long   shmmax;
-        unsigned long   shmmin;
-        unsigned long   shmmni;
-        unsigned long   shmseg;
-        unsigned long   shmall;
-        unsigned long   __unused1;
-        unsigned long   __unused2;
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-
-#endif /* _S390_SHMBUF_H */
diff --git a/include/asm-s390/shmparam.h b/include/asm-s390/shmparam.h
deleted file mode 100644
index c2e0c0508e73..000000000000
--- a/include/asm-s390/shmparam.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  include/asm-s390/shmparam.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/shmparam.h"
- */
-#ifndef _ASM_S390_SHMPARAM_H
-#define _ASM_S390_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-
-#endif /* _ASM_S390_SHMPARAM_H */
diff --git a/include/asm-s390/sigcontext.h b/include/asm-s390/sigcontext.h
deleted file mode 100644
index aeb6e0b13329..000000000000
--- a/include/asm-s390/sigcontext.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  include/asm-s390/sigcontext.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- */
-
-#ifndef _ASM_S390_SIGCONTEXT_H
-#define _ASM_S390_SIGCONTEXT_H
-
-#include <linux/compiler.h>
-
-#define __NUM_GPRS 16
-#define __NUM_FPRS 16
-#define __NUM_ACRS 16
-
-#ifndef __s390x__
-
-/* Has to be at least _NSIG_WORDS from asm/signal.h */
-#define _SIGCONTEXT_NSIG        64
-#define _SIGCONTEXT_NSIG_BPW    32
-/* Size of stack frame allocated when calling signal handler. */
-#define __SIGNAL_FRAMESIZE      96
-
-#else /* __s390x__ */
-
-/* Has to be at least _NSIG_WORDS from asm/signal.h */
-#define _SIGCONTEXT_NSIG        64
-#define _SIGCONTEXT_NSIG_BPW    64 
-/* Size of stack frame allocated when calling signal handler. */
-#define __SIGNAL_FRAMESIZE      160
-
-#endif /* __s390x__ */
-
-#define _SIGCONTEXT_NSIG_WORDS  (_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW)
-#define _SIGMASK_COPY_SIZE      (sizeof(unsigned long)*_SIGCONTEXT_NSIG_WORDS)
-
-typedef struct 
-{
-        unsigned long mask;
-        unsigned long addr;
-} __attribute__ ((aligned(8))) _psw_t;
-
-typedef struct
-{
-        _psw_t psw;
-        unsigned long gprs[__NUM_GPRS];
-        unsigned int  acrs[__NUM_ACRS];
-} _s390_regs_common;
-
-typedef struct
-{
-        unsigned int fpc;
-        double   fprs[__NUM_FPRS];
-} _s390_fp_regs;
-
-typedef struct
-{
-        _s390_regs_common regs;
-        _s390_fp_regs     fpregs;
-} _sigregs;
-
-struct sigcontext
-{
-        unsigned long   oldmask[_SIGCONTEXT_NSIG_WORDS];
-        _sigregs        __user *sregs;
-};
-
-
-#endif
-
diff --git a/include/asm-s390/siginfo.h b/include/asm-s390/siginfo.h
deleted file mode 100644
index e0ff1ab054be..000000000000
--- a/include/asm-s390/siginfo.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  include/asm-s390/siginfo.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/siginfo.h"
- */
-
-#ifndef _S390_SIGINFO_H
-#define _S390_SIGINFO_H
-
-#ifdef __s390x__
-#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
-#endif
-
-#include <asm-generic/siginfo.h>
-
-#endif
diff --git a/include/asm-s390/signal.h b/include/asm-s390/signal.h
deleted file mode 100644
index f6cfddb278cb..000000000000
--- a/include/asm-s390/signal.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  include/asm-s390/signal.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/signal.h"
- */
-
-#ifndef _ASMS390_SIGNAL_H
-#define _ASMS390_SIGNAL_H
-
-#include <linux/types.h>
-#include <linux/time.h>
-
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-struct pt_regs;
-
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-#include <asm/sigcontext.h>
-#define _NSIG           _SIGCONTEXT_NSIG
-#define _NSIG_BPW       _SIGCONTEXT_NSIG_BPW
-#define _NSIG_WORDS     _SIGCONTEXT_NSIG_WORDS
-
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-#define NSIG            32
-typedef unsigned long sigset_t;
-
-#endif /* __KERNEL__ */
-
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-
-#define SA_RESTORER     0x04000000
-
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-
-#include <asm-generic/signal.h>
-
-#ifdef __KERNEL__
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-
-struct k_sigaction {
-        struct sigaction sa;
-};
-
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-#ifndef __s390x__ /* lovely */
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-#else  /* __s390x__ */
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-        sigset_t sa_mask;
-#endif /* __s390x__ */
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif /* __KERNEL__ */
-
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-
-
-#endif
diff --git a/include/asm-s390/sigp.h b/include/asm-s390/sigp.h
deleted file mode 100644
index e16d56f8dfe1..000000000000
--- a/include/asm-s390/sigp.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  include/asm-s390/sigp.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *               Heiko Carstens (heiko.carstens@de.ibm.com)
- *
- *  sigp.h by D.J. Barrow (c) IBM 1999
- *  contains routines / structures for signalling other S/390 processors in an
- *  SMP configuration.
- */
-
-#ifndef __SIGP__
-#define __SIGP__
-
-#include <asm/ptrace.h>
-#include <asm/atomic.h>
-
-/* get real cpu address from logical cpu number */
-extern volatile int __cpu_logical_map[];
-
-typedef enum
-{
-        sigp_unassigned=0x0,
-        sigp_sense,
-        sigp_external_call,
-        sigp_emergency_signal,
-        sigp_start,
-        sigp_stop,
-        sigp_restart,
-        sigp_unassigned1,
-        sigp_unassigned2,
-        sigp_stop_and_store_status,
-        sigp_unassigned3,
-        sigp_initial_cpu_reset,
-        sigp_cpu_reset,
-        sigp_set_prefix,
-        sigp_store_status_at_address,
-        sigp_store_extended_status_at_address
-} sigp_order_code;
-
-typedef __u32 sigp_status_word;
-
-typedef enum
-{
-        sigp_order_code_accepted=0,
-        sigp_status_stored,
-        sigp_busy,
-        sigp_not_operational
-} sigp_ccode;
-
-
-/*
- * Definitions for the external call
- */
-
-/* 'Bit' signals, asynchronous */
-typedef enum
-{
-        ec_schedule=0,
-        ec_call_function,
-        ec_bit_last
-} ec_bit_sig;
-
-/*
- * Signal processor
- */
-static inline sigp_ccode
-signal_processor(__u16 cpu_addr, sigp_order_code order_code)
-{
-        register unsigned long reg1 asm ("1") = 0;
-        sigp_ccode ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                :       "=d"    (ccode)
-                : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
-                  "a" (order_code) : "cc" , "memory");
-        return ccode;
-}
-
-/*
- * Signal processor with parameter
- */
-static inline sigp_ccode
-signal_processor_p(__u32 parameter, __u16 cpu_addr, sigp_order_code order_code)
-{
-        register unsigned int reg1 asm ("1") = parameter;
-        sigp_ccode ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode)
-                : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
-                  "a" (order_code) : "cc" , "memory");
-        return ccode;
-}
-
-/*
- * Signal processor with parameter and return status
- */
-static inline sigp_ccode
-signal_processor_ps(__u32 *statusptr, __u32 parameter, __u16 cpu_addr,
-                    sigp_order_code order_code)
-{
-        register unsigned int reg1 asm ("1") = parameter;
-        sigp_ccode ccode;
-
-        asm volatile(
-                "       sigp    %1,%2,0(%3)\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode), "+d" (reg1)
-                : "d" (__cpu_logical_map[cpu_addr]), "a" (order_code)
-                : "cc" , "memory");
-        *statusptr = reg1;
-        return ccode;
-}
-
-#endif /* __SIGP__ */
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
deleted file mode 100644
index ae89cf2478fc..000000000000
--- a/include/asm-s390/smp.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  include/asm-s390/smp.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *               Heiko Carstens (heiko.carstens@de.ibm.com)
- */
-#ifndef __ASM_SMP_H
-#define __ASM_SMP_H
-
-#include <linux/threads.h>
-#include <linux/cpumask.h>
-#include <linux/bitops.h>
-
-#if defined(__KERNEL__) && defined(CONFIG_SMP) && !defined(__ASSEMBLY__)
-
-#include <asm/lowcore.h>
-#include <asm/sigp.h>
-#include <asm/ptrace.h>
-#include <asm/system.h>
-
-/*
-  s390 specific smp.c headers
- */
-typedef struct
-{
-        int        intresting;
-        sigp_ccode ccode; 
-        __u32      status;
-        __u16      cpu;
-} sigp_info;
-
-extern void machine_restart_smp(char *);
-extern void machine_halt_smp(void);
-extern void machine_power_off_smp(void);
-
-#define NO_PROC_ID              0xFF            /* No processor magic marker */
-
-/*
- *      This magic constant controls our willingness to transfer
- *      a process across CPUs. Such a transfer incurs misses on the L1
- *      cache, and on a P6 or P5 with multiple L2 caches L2 hits. My
- *      gut feeling is this will vary by board in value. For a board
- *      with separate L2 cache it probably depends also on the RSS, and
- *      for a board with shared L2 cache it ought to decay fast as other
- *      processes are run.
- */
- 
-#define PROC_CHANGE_PENALTY     20              /* Schedule penalty */
-
-#define raw_smp_processor_id()  (S390_lowcore.cpu_data.cpu_nr)
-
-static inline __u16 hard_smp_processor_id(void)
-{
-        return stap();
-}
-
-/*
- * returns 1 if cpu is in stopped/check stopped state or not operational
- * returns 0 otherwise
- */
-static inline int
-smp_cpu_not_running(int cpu)
-{
-        __u32 status;
-
-        switch (signal_processor_ps(&status, 0, cpu, sigp_sense)) {
-        case sigp_order_code_accepted:
-        case sigp_status_stored:
-                /* Check for stopped and check stop state */
-                if (status & 0x50)
-                        return 1;
-                break;
-        case sigp_not_operational:
-                return 1;
-        default:
-                break;
-        }
-        return 0;
-}
-
-#define cpu_logical_map(cpu) (cpu)
-
-extern int __cpu_disable (void);
-extern void __cpu_die (unsigned int cpu);
-extern void cpu_die (void) __attribute__ ((noreturn));
-extern int __cpu_up (unsigned int cpu);
-
-extern struct mutex smp_cpu_state_mutex;
-extern int smp_cpu_polarization[];
-
-extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
-        void *info, int wait);
-#endif
-
-#ifndef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
-        /* Disable all interrupts/machine checks */
-        __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
-}
-
-#define hard_smp_processor_id()         0
-#define smp_cpu_not_running(cpu)        1
-#endif
-
-#ifdef CONFIG_HOTPLUG_CPU
-extern int smp_rescan_cpus(void);
-#else
-static inline int smp_rescan_cpus(void) { return 0; }
-#endif
-
-extern union save_area *zfcpdump_save_areas[NR_CPUS + 1];
-#endif
diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h
deleted file mode 100644
index c786ab623b2d..000000000000
--- a/include/asm-s390/socket.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  include/asm-s390/socket.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/socket.h"
- */
-
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET      1
-
-#define SO_DEBUG        1
-#define SO_REUSEADDR    2
-#define SO_TYPE         3
-#define SO_ERROR        4
-#define SO_DONTROUTE    5
-#define SO_BROADCAST    6
-#define SO_SNDBUF       7
-#define SO_RCVBUF       8
-#define SO_SNDBUFFORCE  32
-#define SO_RCVBUFFORCE  33
-#define SO_KEEPALIVE    9
-#define SO_OOBINLINE    10
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_LINGER       13
-#define SO_BSDCOMPAT    14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED     16
-#define SO_PEERCRED     17
-#define SO_RCVLOWAT     18
-#define SO_SNDLOWAT     19
-#define SO_RCVTIMEO     20
-#define SO_SNDTIMEO     21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-
-#define SO_ACCEPTCONN           30
-
-#define SO_PEERSEC              31
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-
-#define SO_MARK                 36
-
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-s390/sockios.h b/include/asm-s390/sockios.h
deleted file mode 100644
index f4fc16c7da59..000000000000
--- a/include/asm-s390/sockios.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  include/asm-s390/sockios.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/sockios.h"
- */
-
-#ifndef __ARCH_S390_SOCKIOS__
-#define __ARCH_S390_SOCKIOS__
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-
-#endif
diff --git a/include/asm-s390/sparsemem.h b/include/asm-s390/sparsemem.h
deleted file mode 100644
index 545d219e6a2d..000000000000
--- a/include/asm-s390/sparsemem.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _ASM_S390_SPARSEMEM_H
-#define _ASM_S390_SPARSEMEM_H
-
-#ifdef CONFIG_64BIT
-
-#define SECTION_SIZE_BITS       28
-#define MAX_PHYSADDR_BITS       42
-#define MAX_PHYSMEM_BITS        42
-
-#else
-
-#define SECTION_SIZE_BITS       25
-#define MAX_PHYSADDR_BITS       31
-#define MAX_PHYSMEM_BITS        31
-
-#endif /* CONFIG_64BIT */
-
-#endif /* _ASM_S390_SPARSEMEM_H */
diff --git a/include/asm-s390/spinlock.h b/include/asm-s390/spinlock.h
deleted file mode 100644
index df84ae96915f..000000000000
--- a/include/asm-s390/spinlock.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  include/asm-s390/spinlock.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/spinlock.h"
- */
-
-#ifndef __ASM_SPINLOCK_H
-#define __ASM_SPINLOCK_H
-
-#include <linux/smp.h>
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-
-static inline int
-_raw_compare_and_swap(volatile unsigned int *lock,
-                      unsigned int old, unsigned int new)
-{
-        asm volatile(
-                "       cs      %0,%3,%1"
-                : "=d" (old), "=Q" (*lock)
-                : "0" (old), "d" (new), "Q" (*lock)
-                : "cc", "memory" );
-        return old;
-}
-
-#else /* __GNUC__ */
-
-static inline int
-_raw_compare_and_swap(volatile unsigned int *lock,
-                      unsigned int old, unsigned int new)
-{
-        asm volatile(
-                "       cs      %0,%3,0(%4)"
-                : "=d" (old), "=m" (*lock)
-                : "0" (old), "d" (new), "a" (lock), "m" (*lock)
-                : "cc", "memory" );
-        return old;
-}
-
-#endif /* __GNUC__ */
-
-/*
- * Simple spin lock operations.  There are two variants, one clears IRQ's
- * on the local processor, one does not.
- *
- * We make no fairness assumptions. They have a cost.
- *
- * (the type definitions are in asm/spinlock_types.h)
- */
-
-#define __raw_spin_is_locked(x) ((x)->owner_cpu != 0)
-#define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) \
-                 _raw_spin_relax(lock); } while (0)
-
-extern void _raw_spin_lock_wait(raw_spinlock_t *);
-extern void _raw_spin_lock_wait_flags(raw_spinlock_t *, unsigned long flags);
-extern int _raw_spin_trylock_retry(raw_spinlock_t *);
-extern void _raw_spin_relax(raw_spinlock_t *lock);
-
-static inline void __raw_spin_lock(raw_spinlock_t *lp)
-{
-        int old;
-
-        old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
-        if (likely(old == 0))
-                return;
-        _raw_spin_lock_wait(lp);
-}
-
-static inline void __raw_spin_lock_flags(raw_spinlock_t *lp,
-                                         unsigned long flags)
-{
-        int old;
-
-        old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
-        if (likely(old == 0))
-                return;
-        _raw_spin_lock_wait_flags(lp, flags);
-}
-
-static inline int __raw_spin_trylock(raw_spinlock_t *lp)
-{
-        int old;
-
-        old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
-        if (likely(old == 0))
-                return 1;
-        return _raw_spin_trylock_retry(lp);
-}
-
-static inline void __raw_spin_unlock(raw_spinlock_t *lp)
-{
-        _raw_compare_and_swap(&lp->owner_cpu, lp->owner_cpu, 0);
-}
-                
-/*
- * Read-write spinlocks, allowing multiple readers
- * but only one writer.
- *
- * NOTE! it is quite common to have readers in interrupts
- * but no interrupt writers. For those circumstances we
- * can "mix" irq-safe locks - any writer needs to get a
- * irq-safe write-lock, but readers can get non-irqsafe
- * read-locks.
- */
-
-/**
- * read_can_lock - would read_trylock() succeed?
- * @lock: the rwlock in question.
- */
-#define __raw_read_can_lock(x) ((int)(x)->lock >= 0)
-
-/**
- * write_can_lock - would write_trylock() succeed?
- * @lock: the rwlock in question.
- */
-#define __raw_write_can_lock(x) ((x)->lock == 0)
-
-extern void _raw_read_lock_wait(raw_rwlock_t *lp);
-extern int _raw_read_trylock_retry(raw_rwlock_t *lp);
-extern void _raw_write_lock_wait(raw_rwlock_t *lp);
-extern int _raw_write_trylock_retry(raw_rwlock_t *lp);
-
-static inline void __raw_read_lock(raw_rwlock_t *rw)
-{
-        unsigned int old;
-        old = rw->lock & 0x7fffffffU;
-        if (_raw_compare_and_swap(&rw->lock, old, old + 1) != old)
-                _raw_read_lock_wait(rw);
-}
-
-static inline void __raw_read_unlock(raw_rwlock_t *rw)
-{
-        unsigned int old, cmp;
-
-        old = rw->lock;
-        do {
-                cmp = old;
-                old = _raw_compare_and_swap(&rw->lock, old, old - 1);
-        } while (cmp != old);
-}
-
-static inline void __raw_write_lock(raw_rwlock_t *rw)
-{
-        if (unlikely(_raw_compare_and_swap(&rw->lock, 0, 0x80000000) != 0))
-                _raw_write_lock_wait(rw);
-}
-
-static inline void __raw_write_unlock(raw_rwlock_t *rw)
-{
-        _raw_compare_and_swap(&rw->lock, 0x80000000, 0);
-}
-
-static inline int __raw_read_trylock(raw_rwlock_t *rw)
-{
-        unsigned int old;
-        old = rw->lock & 0x7fffffffU;
-        if (likely(_raw_compare_and_swap(&rw->lock, old, old + 1) == old))
-                return 1;
-        return _raw_read_trylock_retry(rw);
-}
-
-static inline int __raw_write_trylock(raw_rwlock_t *rw)
-{
-        if (likely(_raw_compare_and_swap(&rw->lock, 0, 0x80000000) == 0))
-                return 1;
-        return _raw_write_trylock_retry(rw);
-}
-
-#define _raw_read_relax(lock)   cpu_relax()
-#define _raw_write_relax(lock)  cpu_relax()
-
-#endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-s390/spinlock_types.h b/include/asm-s390/spinlock_types.h
deleted file mode 100644
index 654abc40de04..000000000000
--- a/include/asm-s390/spinlock_types.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SPINLOCK_TYPES_H
-#define __ASM_SPINLOCK_TYPES_H
-
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
-typedef struct {
-        volatile unsigned int owner_cpu;
-} __attribute__ ((aligned (4))) raw_spinlock_t;
-
-#define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
-
-typedef struct {
-        volatile unsigned int lock;
-} raw_rwlock_t;
-
-#define __RAW_RW_LOCK_UNLOCKED          { 0 }
-
-#endif
diff --git a/include/asm-s390/stat.h b/include/asm-s390/stat.h
deleted file mode 100644
index d92959eebb65..000000000000
--- a/include/asm-s390/stat.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  include/asm-s390/stat.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/stat.h"
- */
-
-#ifndef _S390_STAT_H
-#define _S390_STAT_H
-
-#ifndef __s390x__
-struct __old_kernel_stat {
-        unsigned short st_dev;
-        unsigned short st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_mtime;
-        unsigned long  st_ctime;
-};
-
-struct stat {
-        unsigned short st_dev;
-        unsigned short __pad1;
-        unsigned long  st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned short st_rdev;
-        unsigned short __pad2;
-        unsigned long  st_size;
-        unsigned long  st_blksize;
-        unsigned long  st_blocks;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  __unused4;
-        unsigned long  __unused5;
-};
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat64 {
-        unsigned long long      st_dev;
-        unsigned int    __pad1;
-#define STAT64_HAS_BROKEN_ST_INO        1
-        unsigned long   __st_ino;
-        unsigned int    st_mode;
-        unsigned int    st_nlink;
-        unsigned long   st_uid;
-        unsigned long   st_gid;
-        unsigned long long      st_rdev;
-        unsigned int    __pad3;
-        long long       st_size;
-        unsigned long   st_blksize;
-        unsigned char   __pad4[4];
-        unsigned long   __pad5;     /* future possible st_blocks high bits */
-        unsigned long   st_blocks;  /* Number 512-byte blocks allocated. */
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-        unsigned long   st_mtime;
-        unsigned long   st_mtime_nsec;
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;  /* will be high 32 bits of ctime someday */
-        unsigned long long      st_ino;
-};
-
-#else /* __s390x__ */
-
-struct stat {
-        unsigned long  st_dev;
-        unsigned long  st_ino;
-        unsigned long  st_nlink;
-        unsigned int   st_mode;
-        unsigned int   st_uid;
-        unsigned int   st_gid;
-        unsigned int   __pad1;
-        unsigned long  st_rdev;
-        unsigned long  st_size;
-        unsigned long  st_atime;
-        unsigned long  st_atime_nsec;
-        unsigned long  st_mtime;
-        unsigned long  st_mtime_nsec;
-        unsigned long  st_ctime;
-        unsigned long  st_ctime_nsec;
-        unsigned long  st_blksize;
-        long           st_blocks;
-        unsigned long  __unused[3];
-};
-
-#endif /* __s390x__ */
-
-#define STAT_HAVE_NSEC 1
-
-#endif
diff --git a/include/asm-s390/statfs.h b/include/asm-s390/statfs.h
deleted file mode 100644
index 099a45579190..000000000000
--- a/include/asm-s390/statfs.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  include/asm-s390/statfs.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/statfs.h"
- */
-
-#ifndef _S390_STATFS_H
-#define _S390_STATFS_H
-
-#ifndef __s390x__
-#include <asm-generic/statfs.h>
-#else
-
-#ifndef __KERNEL_STRICT_NAMES
-
-#include <linux/types.h>
-
-typedef __kernel_fsid_t fsid_t;
-
-#endif
-
-/*
- * This is ugly -- we're already 64-bit clean, so just duplicate the 
- * definitions.
- */
-struct statfs {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
-        __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_spare[5];
-};
-
-struct statfs64 {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
-        __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_spare[5];
-};
-
-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_spare[5];
-};
-
-#endif /* __s390x__ */
-#endif
diff --git a/include/asm-s390/string.h b/include/asm-s390/string.h
deleted file mode 100644
index d074673a6d9b..000000000000
--- a/include/asm-s390/string.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  include/asm-s390/string.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-#ifndef _S390_STRING_H_
-#define _S390_STRING_H_
-
-#ifdef __KERNEL__
-
-#ifndef _LINUX_TYPES_H
-#include <linux/types.h>
-#endif
-
-#define __HAVE_ARCH_MEMCHR      /* inline & arch function */
-#define __HAVE_ARCH_MEMCMP      /* arch function */
-#define __HAVE_ARCH_MEMCPY      /* gcc builtin & arch function */
-#define __HAVE_ARCH_MEMSCAN     /* inline & arch function */
-#define __HAVE_ARCH_MEMSET      /* gcc builtin & arch function */
-#define __HAVE_ARCH_STRCAT      /* inline & arch function */
-#define __HAVE_ARCH_STRCMP      /* arch function */
-#define __HAVE_ARCH_STRCPY      /* inline & arch function */
-#define __HAVE_ARCH_STRLCAT     /* arch function */
-#define __HAVE_ARCH_STRLCPY     /* arch function */
-#define __HAVE_ARCH_STRLEN      /* inline & arch function */
-#define __HAVE_ARCH_STRNCAT     /* arch function */
-#define __HAVE_ARCH_STRNCPY     /* arch function */
-#define __HAVE_ARCH_STRNLEN     /* inline & arch function */
-#define __HAVE_ARCH_STRRCHR     /* arch function */
-#define __HAVE_ARCH_STRSTR      /* arch function */
-
-/* Prototypes for non-inlined arch strings functions. */
-extern int memcmp(const void *, const void *, size_t);
-extern void *memcpy(void *, const void *, size_t);
-extern void *memset(void *, int, size_t);
-extern int strcmp(const char *,const char *);
-extern size_t strlcat(char *, const char *, size_t);
-extern size_t strlcpy(char *, const char *, size_t);
-extern char *strncat(char *, const char *, size_t);
-extern char *strncpy(char *, const char *, size_t);
-extern char *strrchr(const char *, int);
-extern char *strstr(const char *, const char *);
-
-#undef __HAVE_ARCH_MEMMOVE
-#undef __HAVE_ARCH_STRCHR
-#undef __HAVE_ARCH_STRNCHR
-#undef __HAVE_ARCH_STRNCMP
-#undef __HAVE_ARCH_STRNICMP
-#undef __HAVE_ARCH_STRPBRK
-#undef __HAVE_ARCH_STRSEP
-#undef __HAVE_ARCH_STRSPN
-
-#if !defined(IN_ARCH_STRING_C)
-
-static inline void *memchr(const void * s, int c, size_t n)
-{
-        register int r0 asm("0") = (char) c;
-        const void *ret = s + n;
-
-        asm volatile(
-                "0:     srst    %0,%1\n"
-                "       jo      0b\n"
-                "       jl      1f\n"
-                "       la      %0,0\n"
-                "1:"
-                : "+a" (ret), "+&a" (s) : "d" (r0) : "cc");
-        return (void *) ret;
-}
-
-static inline void *memscan(void *s, int c, size_t n)
-{
-        register int r0 asm("0") = (char) c;
-        const void *ret = s + n;
-
-        asm volatile(
-                "0:     srst    %0,%1\n"
-                "       jo      0b\n"
-                : "+a" (ret), "+&a" (s) : "d" (r0) : "cc");
-        return (void *) ret;
-}
-
-static inline char *strcat(char *dst, const char *src)
-{
-        register int r0 asm("0") = 0;
-        unsigned long dummy;
-        char *ret = dst;
-
-        asm volatile(
-                "0:     srst    %0,%1\n"
-                "       jo      0b\n"
-                "1:     mvst    %0,%2\n"
-                "       jo      1b"
-                : "=&a" (dummy), "+a" (dst), "+a" (src)
-                : "d" (r0), "0" (0) : "cc", "memory" );
-        return ret;
-}
-
-static inline char *strcpy(char *dst, const char *src)
-{
-        register int r0 asm("0") = 0;
-        char *ret = dst;
-
-        asm volatile(
-                "0:     mvst    %0,%1\n"
-                "       jo      0b"
-                : "+&a" (dst), "+&a" (src) : "d" (r0)
-                : "cc", "memory");
-        return ret;
-}
-
-static inline size_t strlen(const char *s)
-{
-        register unsigned long r0 asm("0") = 0;
-        const char *tmp = s;
-
-        asm volatile(
-                "0:     srst    %0,%1\n"
-                "       jo      0b"
-                : "+d" (r0), "+a" (tmp) :  : "cc");
-        return r0 - (unsigned long) s;
-}
-
-static inline size_t strnlen(const char * s, size_t n)
-{
-        register int r0 asm("0") = 0;
-        const char *tmp = s;
-        const char *end = s + n;
-
-        asm volatile(
-                "0:     srst    %0,%1\n"
-                "       jo      0b"
-                : "+a" (end), "+a" (tmp) : "d" (r0)  : "cc");
-        return end - s;
-}
-
-#endif /* !IN_ARCH_STRING_C */
-
-#endif /* __KERNEL__ */
-
-#endif /* __S390_STRING_H_ */
diff --git a/include/asm-s390/suspend.h b/include/asm-s390/suspend.h
deleted file mode 100644
index 1f34580e67a7..000000000000
--- a/include/asm-s390/suspend.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef __ASM_S390_SUSPEND_H
-#define __ASM_S390_SUSPEND_H
-
-#endif
-
diff --git a/include/asm-s390/sysinfo.h b/include/asm-s390/sysinfo.h
deleted file mode 100644
index 79d01343f8b0..000000000000
--- a/include/asm-s390/sysinfo.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * definition for store system information stsi
- *
- * Copyright IBM Corp. 2001,2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Ulrich Weigand <weigand@de.ibm.com>
- *               Christian Borntraeger <borntraeger@de.ibm.com>
- */
-
-#ifndef __ASM_S390_SYSINFO_H
-#define __ASM_S390_SYSINFO_H
-
-struct sysinfo_1_1_1 {
-        char reserved_0[32];
-        char manufacturer[16];
-        char type[4];
-        char reserved_1[12];
-        char model_capacity[16];
-        char sequence[16];
-        char plant[4];
-        char model[16];
-        char model_perm_cap[16];
-        char model_temp_cap[16];
-        char model_cap_rating[4];
-        char model_perm_cap_rating[4];
-        char model_temp_cap_rating[4];
-};
-
-struct sysinfo_1_2_1 {
-        char reserved_0[80];
-        char sequence[16];
-        char plant[4];
-        char reserved_1[2];
-        unsigned short cpu_address;
-};
-
-struct sysinfo_1_2_2 {
-        char format;
-        char reserved_0[1];
-        unsigned short acc_offset;
-        char reserved_1[24];
-        unsigned int secondary_capability;
-        unsigned int capability;
-        unsigned short cpus_total;
-        unsigned short cpus_configured;
-        unsigned short cpus_standby;
-        unsigned short cpus_reserved;
-        unsigned short adjustment[0];
-};
-
-struct sysinfo_1_2_2_extension {
-        unsigned int alt_capability;
-        unsigned short alt_adjustment[0];
-};
-
-struct sysinfo_2_2_1 {
-        char reserved_0[80];
-        char sequence[16];
-        char plant[4];
-        unsigned short cpu_id;
-        unsigned short cpu_address;
-};
-
-struct sysinfo_2_2_2 {
-        char reserved_0[32];
-        unsigned short lpar_number;
-        char reserved_1;
-        unsigned char characteristics;
-        unsigned short cpus_total;
-        unsigned short cpus_configured;
-        unsigned short cpus_standby;
-        unsigned short cpus_reserved;
-        char name[8];
-        unsigned int caf;
-        char reserved_2[16];
-        unsigned short cpus_dedicated;
-        unsigned short cpus_shared;
-};
-
-#define LPAR_CHAR_DEDICATED     (1 << 7)
-#define LPAR_CHAR_SHARED        (1 << 6)
-#define LPAR_CHAR_LIMITED       (1 << 5)
-
-struct sysinfo_3_2_2 {
-        char reserved_0[31];
-        unsigned char count;
-        struct {
-                char reserved_0[4];
-                unsigned short cpus_total;
-                unsigned short cpus_configured;
-                unsigned short cpus_standby;
-                unsigned short cpus_reserved;
-                char name[8];
-                unsigned int caf;
-                char cpi[16];
-                char reserved_1[24];
-
-        } vm[8];
-};
-
-static inline int stsi(void *sysinfo, int fc, int sel1, int sel2)
-{
-        register int r0 asm("0") = (fc << 28) | sel1;
-        register int r1 asm("1") = sel2;
-
-        asm volatile(
-                "   stsi 0(%2)\n"
-                "0: jz   2f\n"
-                "1: lhi  %0,%3\n"
-                "2:\n"
-                EX_TABLE(0b, 1b)
-                : "+d" (r0) : "d" (r1), "a" (sysinfo), "K" (-ENOSYS)
-                : "cc", "memory");
-        return r0;
-}
-
-#endif /* __ASM_S390_SYSINFO_H */
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
deleted file mode 100644
index 819e7d99ca0c..000000000000
--- a/include/asm-s390/system.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- *  include/asm-s390/system.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- *
- *  Derived from "include/asm-i386/system.h"
- */
-
-#ifndef __ASM_SYSTEM_H
-#define __ASM_SYSTEM_H
-
-#include <linux/kernel.h>
-#include <asm/types.h>
-#include <asm/ptrace.h>
-#include <asm/setup.h>
-#include <asm/processor.h>
-#include <asm/lowcore.h>
-
-#ifdef __KERNEL__
-
-struct task_struct;
-
-extern struct task_struct *__switch_to(void *, void *);
-
-static inline void save_fp_regs(s390_fp_regs *fpregs)
-{
-        asm volatile(
-                "       std     0,8(%1)\n"
-                "       std     2,24(%1)\n"
-                "       std     4,40(%1)\n"
-                "       std     6,56(%1)"
-                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory");
-        if (!MACHINE_HAS_IEEE)
-                return;
-        asm volatile(
-                "       stfpc   0(%1)\n"
-                "       std     1,16(%1)\n"
-                "       std     3,32(%1)\n"
-                "       std     5,48(%1)\n"
-                "       std     7,64(%1)\n"
-                "       std     8,72(%1)\n"
-                "       std     9,80(%1)\n"
-                "       std     10,88(%1)\n"
-                "       std     11,96(%1)\n"
-                "       std     12,104(%1)\n"
-                "       std     13,112(%1)\n"
-                "       std     14,120(%1)\n"
-                "       std     15,128(%1)\n"
-                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory");
-}
-
-static inline void restore_fp_regs(s390_fp_regs *fpregs)
-{
-        asm volatile(
-                "       ld      0,8(%0)\n"
-                "       ld      2,24(%0)\n"
-                "       ld      4,40(%0)\n"
-                "       ld      6,56(%0)"
-                : : "a" (fpregs), "m" (*fpregs));
-        if (!MACHINE_HAS_IEEE)
-                return;
-        asm volatile(
-                "       lfpc    0(%0)\n"
-                "       ld      1,16(%0)\n"
-                "       ld      3,32(%0)\n"
-                "       ld      5,48(%0)\n"
-                "       ld      7,64(%0)\n"
-                "       ld      8,72(%0)\n"
-                "       ld      9,80(%0)\n"
-                "       ld      10,88(%0)\n"
-                "       ld      11,96(%0)\n"
-                "       ld      12,104(%0)\n"
-                "       ld      13,112(%0)\n"
-                "       ld      14,120(%0)\n"
-                "       ld      15,128(%0)\n"
-                : : "a" (fpregs), "m" (*fpregs));
-}
-
-static inline void save_access_regs(unsigned int *acrs)
-{
-        asm volatile("stam 0,15,0(%0)" : : "a" (acrs) : "memory");
-}
-
-static inline void restore_access_regs(unsigned int *acrs)
-{
-        asm volatile("lam 0,15,0(%0)" : : "a" (acrs));
-}
-
-#define switch_to(prev,next,last) do {                                       \
-        if (prev == next)                                                    \
-                break;                                                       \
-        save_fp_regs(&prev->thread.fp_regs);                                 \
-        restore_fp_regs(&next->thread.fp_regs);                              \
-        save_access_regs(&prev->thread.acrs[0]);                             \
-        restore_access_regs(&next->thread.acrs[0]);                          \
-        prev = __switch_to(prev,next);                                       \
-} while (0)
-
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-extern void account_vtime(struct task_struct *);
-extern void account_tick_vtime(struct task_struct *);
-extern void account_system_vtime(struct task_struct *);
-#else
-#define account_vtime(x) do { /* empty */ } while (0)
-#endif
-
-#ifdef CONFIG_PFAULT
-extern void pfault_irq_init(void);
-extern int pfault_init(void);
-extern void pfault_fini(void);
-#else /* CONFIG_PFAULT */
-#define pfault_irq_init()       do { } while (0)
-#define pfault_init()           ({-1;})
-#define pfault_fini()           do { } while (0)
-#endif /* CONFIG_PFAULT */
-
-#ifdef CONFIG_PAGE_STATES
-extern void cmma_init(void);
-#else
-static inline void cmma_init(void) { }
-#endif
-
-#define finish_arch_switch(prev) do {                                        \
-        set_fs(current->thread.mm_segment);                                  \
-        account_vtime(prev);                                                 \
-} while (0)
-
-#define nop() asm volatile("nop")
-
-#define xchg(ptr,x)                                                       \
-({                                                                        \
-        __typeof__(*(ptr)) __ret;                                         \
-        __ret = (__typeof__(*(ptr)))                                      \
-                __xchg((unsigned long)(x), (void *)(ptr),sizeof(*(ptr))); \
-        __ret;                                                            \
-})
-
-extern void __xchg_called_with_bad_pointer(void);
-
-static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
-{
-        unsigned long addr, old;
-        int shift;
-
-        switch (size) {
-        case 1:
-                addr = (unsigned long) ptr;
-                shift = (3 ^ (addr & 3)) << 3;
-                addr ^= addr & 3;
-                asm volatile(
-                        "       l       %0,0(%4)\n"
-                        "0:     lr      0,%0\n"
-                        "       nr      0,%3\n"
-                        "       or      0,%2\n"
-                        "       cs      %0,0,0(%4)\n"
-                        "       jl      0b\n"
-                        : "=&d" (old), "=m" (*(int *) addr)
-                        : "d" (x << shift), "d" (~(255 << shift)), "a" (addr),
-                          "m" (*(int *) addr) : "memory", "cc", "0");
-                return old >> shift;
-        case 2:
-                addr = (unsigned long) ptr;
-                shift = (2 ^ (addr & 2)) << 3;
-                addr ^= addr & 2;
-                asm volatile(
-                        "       l       %0,0(%4)\n"
-                        "0:     lr      0,%0\n"
-                        "       nr      0,%3\n"
-                        "       or      0,%2\n"
-                        "       cs      %0,0,0(%4)\n"
-                        "       jl      0b\n"
-                        : "=&d" (old), "=m" (*(int *) addr)
-                        : "d" (x << shift), "d" (~(65535 << shift)), "a" (addr),
-                          "m" (*(int *) addr) : "memory", "cc", "0");
-                return old >> shift;
-        case 4:
-                asm volatile(
-                        "       l       %0,0(%3)\n"
-                        "0:     cs      %0,%2,0(%3)\n"
-                        "       jl      0b\n"
-                        : "=&d" (old), "=m" (*(int *) ptr)
-                        : "d" (x), "a" (ptr), "m" (*(int *) ptr)
-                        : "memory", "cc");
-                return old;
-#ifdef __s390x__
-        case 8:
-                asm volatile(
-                        "       lg      %0,0(%3)\n"
-                        "0:     csg     %0,%2,0(%3)\n"
-                        "       jl      0b\n"
-                        : "=&d" (old), "=m" (*(long *) ptr)
-                        : "d" (x), "a" (ptr), "m" (*(long *) ptr)
-                        : "memory", "cc");
-                return old;
-#endif /* __s390x__ */
-        }
-        __xchg_called_with_bad_pointer();
-        return x;
-}
-
-/*
- * Atomic compare and exchange.  Compare OLD with MEM, if identical,
- * store NEW in MEM.  Return the initial value in MEM.  Success is
- * indicated by comparing RETURN with OLD.
- */
-
-#define __HAVE_ARCH_CMPXCHG 1
-
-#define cmpxchg(ptr, o, n)                                              \
-        ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o),       \
-                                        (unsigned long)(n), sizeof(*(ptr))))
-
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-static inline unsigned long
-__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
-{
-        unsigned long addr, prev, tmp;
-        int shift;
-
-        switch (size) {
-        case 1:
-                addr = (unsigned long) ptr;
-                shift = (3 ^ (addr & 3)) << 3;
-                addr ^= addr & 3;
-                asm volatile(
-                        "       l       %0,0(%4)\n"
-                        "0:     nr      %0,%5\n"
-                        "       lr      %1,%0\n"
-                        "       or      %0,%2\n"
-                        "       or      %1,%3\n"
-                        "       cs      %0,%1,0(%4)\n"
-                        "       jnl     1f\n"
-                        "       xr      %1,%0\n"
-                        "       nr      %1,%5\n"
-                        "       jnz     0b\n"
-                        "1:"
-                        : "=&d" (prev), "=&d" (tmp)
-                        : "d" (old << shift), "d" (new << shift), "a" (ptr),
-                          "d" (~(255 << shift))
-                        : "memory", "cc");
-                return prev >> shift;
-        case 2:
-                addr = (unsigned long) ptr;
-                shift = (2 ^ (addr & 2)) << 3;
-                addr ^= addr & 2;
-                asm volatile(
-                        "       l       %0,0(%4)\n"
-                        "0:     nr      %0,%5\n"
-                        "       lr      %1,%0\n"
-                        "       or      %0,%2\n"
-                        "       or      %1,%3\n"
-                        "       cs      %0,%1,0(%4)\n"
-                        "       jnl     1f\n"
-                        "       xr      %1,%0\n"
-                        "       nr      %1,%5\n"
-                        "       jnz     0b\n"
-                        "1:"
-                        : "=&d" (prev), "=&d" (tmp)
-                        : "d" (old << shift), "d" (new << shift), "a" (ptr),
-                          "d" (~(65535 << shift))
-                        : "memory", "cc");
-                return prev >> shift;
-        case 4:
-                asm volatile(
-                        "       cs      %0,%2,0(%3)\n"
-                        : "=&d" (prev) : "0" (old), "d" (new), "a" (ptr)
-                        : "memory", "cc");
-                return prev;
-#ifdef __s390x__
-        case 8:
-                asm volatile(
-                        "       csg     %0,%2,0(%3)\n"
-                        : "=&d" (prev) : "0" (old), "d" (new), "a" (ptr)
-                        : "memory", "cc");
-                return prev;
-#endif /* __s390x__ */
-        }
-        __cmpxchg_called_with_bad_pointer();
-        return old;
-}
-
-/*
- * Force strict CPU ordering.
- * And yes, this is required on UP too when we're talking
- * to devices.
- *
- * This is very similar to the ppc eieio/sync instruction in that is
- * does a checkpoint syncronisation & makes sure that 
- * all memory ops have completed wrt other CPU's ( see 7-15 POP  DJB ).
- */
-
-#define eieio() asm volatile("bcr 15,0" : : : "memory")
-#define SYNC_OTHER_CORES(x)   eieio()
-#define mb()    eieio()
-#define rmb()   eieio()
-#define wmb()   eieio()
-#define read_barrier_depends() do { } while(0)
-#define smp_mb()       mb()
-#define smp_rmb()      rmb()
-#define smp_wmb()      wmb()
-#define smp_read_barrier_depends()    read_barrier_depends()
-#define smp_mb__before_clear_bit()     smp_mb()
-#define smp_mb__after_clear_bit()      smp_mb()
-
-
-#define set_mb(var, value)      do { var = value; mb(); } while (0)
-
-#ifdef __s390x__
-
-#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       lctlg   %1,%2,0(%0)\n"                  \
-                : : "a" (&array), "i" (low), "i" (high),        \
-                    "m" (*(addrtype *)(&array)));               \
-        })
-
-#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       stctg   %2,%3,0(%1)\n"                  \
-                : "=m" (*(addrtype *)(&array))                  \
-                : "a" (&array), "i" (low), "i" (high));         \
-        })
-
-#else /* __s390x__ */
-
-#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       lctl    %1,%2,0(%0)\n"                  \
-                : : "a" (&array), "i" (low), "i" (high),        \
-                    "m" (*(addrtype *)(&array)));               \
-})
-
-#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        asm volatile(                                           \
-                "       stctl   %2,%3,0(%1)\n"                  \
-                : "=m" (*(addrtype *)(&array))                  \
-                : "a" (&array), "i" (low), "i" (high));         \
-        })
-
-#endif /* __s390x__ */
-
-#define __ctl_set_bit(cr, bit) ({       \
-        unsigned long __dummy;          \
-        __ctl_store(__dummy, cr, cr);   \
-        __dummy |= 1UL << (bit);        \
-        __ctl_load(__dummy, cr, cr);    \
-})
-
-#define __ctl_clear_bit(cr, bit) ({     \
-        unsigned long __dummy;          \
-        __ctl_store(__dummy, cr, cr);   \
-        __dummy &= ~(1UL << (bit));     \
-        __ctl_load(__dummy, cr, cr);    \
-})
-
-#include <linux/irqflags.h>
-
-#include <asm-generic/cmpxchg-local.h>
-
-static inline unsigned long __cmpxchg_local(volatile void *ptr,
-                                      unsigned long old,
-                                      unsigned long new, int size)
-{
-        switch (size) {
-        case 1:
-        case 2:
-        case 4:
-#ifdef __s390x__
-        case 8:
-#endif
-                return __cmpxchg(ptr, old, new, size);
-        default:
-                return __cmpxchg_local_generic(ptr, old, new, size);
-        }
-
-        return old;
-}
-
-/*
- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
- * them available.
- */
-#define cmpxchg_local(ptr, o, n)                                        \
-        ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \
-                        (unsigned long)(n), sizeof(*(ptr))))
-#ifdef __s390x__
-#define cmpxchg64_local(ptr, o, n)                                      \
-  ({                                                                    \
-        BUILD_BUG_ON(sizeof(*(ptr)) != 8);                              \
-        cmpxchg_local((ptr), (o), (n));                                 \
-  })
-#else
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#endif
-
-/*
- * Use to set psw mask except for the first byte which
- * won't be changed by this function.
- */
-static inline void
-__set_psw_mask(unsigned long mask)
-{
-        __load_psw_mask(mask | (__raw_local_irq_stosm(0x00) & ~(-1UL >> 8)));
-}
-
-#define local_mcck_enable()  __set_psw_mask(psw_kernel_bits)
-#define local_mcck_disable() __set_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK)
-
-int stfle(unsigned long long *list, int doublewords);
-
-#ifdef CONFIG_SMP
-
-extern void smp_ctl_set_bit(int cr, int bit);
-extern void smp_ctl_clear_bit(int cr, int bit);
-#define ctl_set_bit(cr, bit) smp_ctl_set_bit(cr, bit)
-#define ctl_clear_bit(cr, bit) smp_ctl_clear_bit(cr, bit)
-
-#else
-
-#define ctl_set_bit(cr, bit) __ctl_set_bit(cr, bit)
-#define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)
-
-#endif /* CONFIG_SMP */
-
-static inline unsigned int stfl(void)
-{
-        asm volatile(
-                "       .insn   s,0xb2b10000,0(0)\n" /* stfl */
-                "0:\n"
-                EX_TABLE(0b,0b));
-        return S390_lowcore.stfl_fac_list;
-}
-
-static inline unsigned short stap(void)
-{
-        unsigned short cpu_address;
-
-        asm volatile("stap %0" : "=m" (cpu_address));
-        return cpu_address;
-}
-
-extern void (*_machine_restart)(char *command);
-extern void (*_machine_halt)(void);
-extern void (*_machine_power_off)(void);
-
-#define arch_align_stack(x) (x)
-
-#ifdef CONFIG_TRACE_IRQFLAGS
-extern psw_t sysc_restore_trace_psw;
-extern psw_t io_restore_trace_psw;
-#endif
-
-#endif /* __KERNEL__ */
-
-#endif
diff --git a/include/asm-s390/tape390.h b/include/asm-s390/tape390.h
deleted file mode 100644
index 884fba48f1ff..000000000000
--- a/include/asm-s390/tape390.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * tape390.h
- *         enables user programs to display messages and control encryption
- *         on s390 tape devices
- *
- *         Copyright IBM Corp. 2001,2006
- *         Author(s): Michael Holzheu <holzheu@de.ibm.com>
- *
- *************************************************************************/
-
-#ifndef _TAPE390_H
-#define _TAPE390_H
-
-#define TAPE390_DISPLAY _IOW('d', 1, struct display_struct)
-
-/*
- * The TAPE390_DISPLAY ioctl calls the Load Display command
- * which transfers 17 bytes of data from the channel to the subsystem:
- *     - 1 format control byte, and
- *     - two 8-byte messages
- *
- * Format control byte:
- *   0-2: New Message Overlay
- *     3: Alternate Messages
- *     4: Blink Message
- *     5: Display Low/High Message
- *     6: Reserved
- *     7: Automatic Load Request
- *
- */
-
-typedef struct display_struct {
-        char cntrl;
-        char message1[8];
-        char message2[8];
-} display_struct;
-
-/*
- * Tape encryption support
- */
-
-struct tape390_crypt_info {
-        char capability;
-        char status;
-        char medium_status;
-} __attribute__ ((packed));
-
-
-/* Macros for "capable" field */
-#define TAPE390_CRYPT_SUPPORTED_MASK 0x01
-#define TAPE390_CRYPT_SUPPORTED(x) \
-        ((x.capability & TAPE390_CRYPT_SUPPORTED_MASK))
-
-/* Macros for "status" field */
-#define TAPE390_CRYPT_ON_MASK 0x01
-#define TAPE390_CRYPT_ON(x) (((x.status) & TAPE390_CRYPT_ON_MASK))
-
-/* Macros for "medium status" field */
-#define TAPE390_MEDIUM_LOADED_MASK 0x01
-#define TAPE390_MEDIUM_ENCRYPTED_MASK 0x02
-#define TAPE390_MEDIUM_ENCRYPTED(x) \
-        (((x.medium_status) & TAPE390_MEDIUM_ENCRYPTED_MASK))
-#define TAPE390_MEDIUM_LOADED(x) \
-        (((x.medium_status) & TAPE390_MEDIUM_LOADED_MASK))
-
-/*
- * The TAPE390_CRYPT_SET ioctl is used to switch on/off encryption.
- * The "encryption_capable" and "tape_status" fields are ignored for this ioctl!
- */
-#define TAPE390_CRYPT_SET _IOW('d', 2, struct tape390_crypt_info)
-
-/*
- * The TAPE390_CRYPT_QUERY ioctl is used to query the encryption state.
- */
-#define TAPE390_CRYPT_QUERY _IOR('d', 3, struct tape390_crypt_info)
-
-/* Values for "kekl1/2_type" and "kekl1/2_type_on_tape" fields */
-#define TAPE390_KEKL_TYPE_NONE 0
-#define TAPE390_KEKL_TYPE_LABEL 1
-#define TAPE390_KEKL_TYPE_HASH 2
-
-struct tape390_kekl {
-        unsigned char type;
-        unsigned char type_on_tape;
-        char label[65];
-} __attribute__ ((packed));
-
-struct tape390_kekl_pair {
-        struct tape390_kekl kekl[2];
-} __attribute__ ((packed));
-
-/*
- * The TAPE390_KEKL_SET ioctl is used to set Key Encrypting Key labels.
- */
-#define TAPE390_KEKL_SET _IOW('d', 4, struct tape390_kekl_pair)
-
-/*
- * The TAPE390_KEKL_QUERY ioctl is used to query Key Encrypting Key labels.
- */
-#define TAPE390_KEKL_QUERY _IOR('d', 5, struct tape390_kekl_pair)
-
-#endif 
diff --git a/include/asm-s390/termbits.h b/include/asm-s390/termbits.h
deleted file mode 100644
index 58731853d529..000000000000
--- a/include/asm-s390/termbits.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- *  include/asm-s390/termbits.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/termbits.h"
- */
-
-#ifndef __ARCH_S390_TERMBITS_H__
-#define __ARCH_S390_TERMBITS_H__
-
-#include <linux/posix_types.h>
-
-typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
-
-#define NCCS 19
-struct termios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-};
-
-struct termios2 {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-struct ktermios {
-        tcflag_t c_iflag;               /* input mode flags */
-        tcflag_t c_oflag;               /* output mode flags */
-        tcflag_t c_cflag;               /* control mode flags */
-        tcflag_t c_lflag;               /* local mode flags */
-        cc_t c_line;                    /* line discipline */
-        cc_t c_cc[NCCS];                /* control characters */
-        speed_t c_ispeed;               /* input speed */
-        speed_t c_ospeed;               /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-/* c_iflag bits */
-#define IGNBRK  0000001
-#define BRKINT  0000002
-#define IGNPAR  0000004
-#define PARMRK  0000010
-#define INPCK   0000020
-#define ISTRIP  0000040
-#define INLCR   0000100
-#define IGNCR   0000200
-#define ICRNL   0000400
-#define IUCLC   0001000
-#define IXON    0002000
-#define IXANY   0004000
-#define IXOFF   0010000
-#define IMAXBEL 0020000
-#define IUTF8   0040000
-
-/* c_oflag bits */
-#define OPOST   0000001
-#define OLCUC   0000002
-#define ONLCR   0000004
-#define OCRNL   0000010
-#define ONOCR   0000020
-#define ONLRET  0000040
-#define OFILL   0000100
-#define OFDEL   0000200
-#define NLDLY   0000400
-#define   NL0   0000000
-#define   NL1   0000400
-#define CRDLY   0003000
-#define   CR0   0000000
-#define   CR1   0001000
-#define   CR2   0002000
-#define   CR3   0003000
-#define TABDLY  0014000
-#define   TAB0  0000000
-#define   TAB1  0004000
-#define   TAB2  0010000
-#define   TAB3  0014000
-#define   XTABS 0014000
-#define BSDLY   0020000
-#define   BS0   0000000
-#define   BS1   0020000
-#define VTDLY   0040000
-#define   VT0   0000000
-#define   VT1   0040000
-#define FFDLY   0100000
-#define   FF0   0000000
-#define   FF1   0100000
-
-/* c_cflag bit meaning */
-#define CBAUD   0010017
-#define  B0     0000000         /* hang up */
-#define  B50    0000001
-#define  B75    0000002
-#define  B110   0000003
-#define  B134   0000004
-#define  B150   0000005
-#define  B200   0000006
-#define  B300   0000007
-#define  B600   0000010
-#define  B1200  0000011
-#define  B1800  0000012
-#define  B2400  0000013
-#define  B4800  0000014
-#define  B9600  0000015
-#define  B19200 0000016
-#define  B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE   0000060
-#define   CS5   0000000
-#define   CS6   0000020
-#define   CS7   0000040
-#define   CS8   0000060
-#define CSTOPB  0000100
-#define CREAD   0000200
-#define PARENB  0000400
-#define PARODD  0001000
-#define HUPCL   0002000
-#define CLOCAL  0004000
-#define CBAUDEX 0010000
-#define  BOTHER  0010000
-#define  B57600  0010001
-#define  B115200 0010002
-#define  B230400 0010003
-#define  B460800 0010004
-#define   B500000 0010005
-#define   B576000 0010006
-#define   B921600 0010007
-#define  B1000000 0010010
-#define  B1152000 0010011
-#define  B1500000 0010012
-#define  B2000000 0010013
-#define  B2500000 0010014
-#define  B3000000 0010015
-#define  B3500000 0010016
-#define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate */
-#define CMSPAR    010000000000          /* mark or space (stick) parity */
-#define CRTSCTS   020000000000          /* flow control */
-
-#define IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG    0000001
-#define ICANON  0000002
-#define XCASE   0000004
-#define ECHO    0000010
-#define ECHOE   0000020
-#define ECHOK   0000040
-#define ECHONL  0000100
-#define NOFLSH  0000200
-#define TOSTOP  0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE  0004000
-#define FLUSHO  0010000
-#define PENDIN  0040000
-#define IEXTEN  0100000
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF          0
-#define TCOON           1
-#define TCIOFF          2
-#define TCION           3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH        0
-#define TCOFLUSH        1
-#define TCIOFLUSH       2
-
-/* tcsetattr uses these */
-#define TCSANOW         0
-#define TCSADRAIN       1
-#define TCSAFLUSH       2
-
-#endif
diff --git a/include/asm-s390/termios.h b/include/asm-s390/termios.h
deleted file mode 100644
index 67f66278f533..000000000000
--- a/include/asm-s390/termios.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  include/asm-s390/termios.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/termios.h"
- */
-
-#ifndef _S390_TERMIOS_H
-#define _S390_TERMIOS_H
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-#ifdef __KERNEL__
-
-/*      intr=^C         quit=^\         erase=del       kill=^U
-        eof=^D          vtime=\0        vmin=\1         sxtc=\0
-        start=^Q        stop=^S         susp=^Z         eol=\0
-        reprint=^R      discard=^U      werase=^W       lnext=^V
-        eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-
-#include <asm-generic/termios.h>
-
-#endif  /* __KERNEL__ */
-
-#endif  /* _S390_TERMIOS_H */
diff --git a/include/asm-s390/thread_info.h b/include/asm-s390/thread_info.h
deleted file mode 100644
index 91a8f93ad355..000000000000
--- a/include/asm-s390/thread_info.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  include/asm-s390/thread_info.h
- *
- *  S390 version
- *    Copyright (C) IBM Corp. 2002,2006
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
- */
-
-#ifndef _ASM_THREAD_INFO_H
-#define _ASM_THREAD_INFO_H
-
-#ifdef __KERNEL__
-
-/*
- * Size of kernel stack for each process
- */
-#ifndef __s390x__
-#ifndef __SMALL_STACK
-#define THREAD_ORDER 1
-#define ASYNC_ORDER  1
-#else
-#define THREAD_ORDER 0
-#define ASYNC_ORDER  0
-#endif
-#else /* __s390x__ */
-#ifndef __SMALL_STACK
-#define THREAD_ORDER 2
-#define ASYNC_ORDER  2
-#else
-#define THREAD_ORDER 1
-#define ASYNC_ORDER  1
-#endif
-#endif /* __s390x__ */
-
-#define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
-#define ASYNC_SIZE  (PAGE_SIZE << ASYNC_ORDER)
-
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#include <asm/lowcore.h>
-
-/*
- * low level task data that entry.S needs immediate access to
- * - this struct should fit entirely inside of one cache line
- * - this struct shares the supervisor stack pages
- * - if the contents of this structure are changed, the assembly constants must also be changed
- */
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        unsigned int            cpu;            /* current CPU */
-        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-        struct restart_block    restart_block;
-};
-
-/*
- * macros/functions for gaining access to the thread information structure
- */
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .restart_block  = {                     \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-
-/* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
-{
-        return (struct thread_info *)((*(unsigned long *) __LC_KERNEL_STACK)-THREAD_SIZE);
-}
-
-#define THREAD_SIZE_ORDER THREAD_ORDER
-
-#endif
-
-/*
- * thread information flags bit numbers
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_RESTART_SVC         4       /* restart svc with new svc number */
-#define TIF_SYSCALL_AUDIT       5       /* syscall auditing active */
-#define TIF_SINGLE_STEP         6       /* deliver sigtrap on return to user */
-#define TIF_MCCK_PENDING        7       /* machine check handling is pending */
-#define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
-#define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling 
-                                           TIF_NEED_RESCHED */
-#define TIF_31BIT               18      /* 32bit process */ 
-#define TIF_MEMDIE              19
-#define TIF_RESTORE_SIGMASK     20      /* restore signal mask in do_signal() */
-
-#define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
-#define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_RESTART_SVC        (1<<TIF_RESTART_SVC)
-#define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
-#define _TIF_SINGLE_STEP        (1<<TIF_SINGLE_STEP)
-#define _TIF_MCCK_PENDING       (1<<TIF_MCCK_PENDING)
-#define _TIF_USEDFPU            (1<<TIF_USEDFPU)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_31BIT              (1<<TIF_31BIT)
-
-#endif /* __KERNEL__ */
-
-#define PREEMPT_ACTIVE          0x4000000
-
-#endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-s390/timer.h b/include/asm-s390/timer.h
deleted file mode 100644
index d98d79e35cd6..000000000000
--- a/include/asm-s390/timer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  include/asm-s390/timer.h
- *
- *  (C) Copyright IBM Corp. 2003,2006
- *  Virtual CPU timer
- *
- *  Author: Jan Glauber (jang@de.ibm.com)
- */
-
-#ifndef _ASM_S390_TIMER_H
-#define _ASM_S390_TIMER_H
-
-#ifdef __KERNEL__
-
-#include <linux/timer.h>
-
-#define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
-
-struct vtimer_list {
-        struct list_head entry;
-
-        int cpu;
-        __u64 expires;
-        __u64 interval;
-
-        spinlock_t lock;
-        unsigned long magic;
-
-        void (*function)(unsigned long);
-        unsigned long data;
-};
-
-/* the offset value will wrap after ca. 71 years */
-struct vtimer_queue {
-        struct list_head list;
-        spinlock_t lock;
-        __u64 to_expire;          /* current event expire time */
-        __u64 offset;             /* list offset to zero */
-        __u64 idle;               /* temp var for idle */
-};
-
-extern void init_virt_timer(struct vtimer_list *timer);
-extern void add_virt_timer(void *new);
-extern void add_virt_timer_periodic(void *new);
-extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
-extern int del_virt_timer(struct vtimer_list *timer);
-
-extern void init_cpu_vtimer(void);
-extern void vtime_init(void);
-
-#ifdef CONFIG_VIRT_TIMER
-
-extern void vtime_start_cpu_timer(void);
-extern void vtime_stop_cpu_timer(void);
-
-#else
-
-static inline void vtime_start_cpu_timer(void) { }
-static inline void vtime_stop_cpu_timer(void) { }
-
-#endif /* CONFIG_VIRT_TIMER */
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_S390_TIMER_H */
diff --git a/include/asm-s390/timex.h b/include/asm-s390/timex.h
deleted file mode 100644
index d744c3d62de5..000000000000
--- a/include/asm-s390/timex.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  include/asm-s390/timex.h
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *
- *  Derived from "include/asm-i386/timex.h"
- *    Copyright (C) 1992, Linus Torvalds
- */
-
-#ifndef _ASM_S390_TIMEX_H
-#define _ASM_S390_TIMEX_H
-
-/* Inline functions for clock register access. */
-static inline int set_clock(__u64 time)
-{
-        int cc;
-
-        asm volatile(
-                "   sck   0(%2)\n"
-                "   ipm   %0\n"
-                "   srl   %0,28\n"
-                : "=d" (cc) : "m" (time), "a" (&time) : "cc");
-        return cc;
-}
-
-static inline int store_clock(__u64 *time)
-{
-        int cc;
-
-        asm volatile(
-                "   stck  0(%2)\n"
-                "   ipm   %0\n"
-                "   srl   %0,28\n"
-                : "=d" (cc), "=m" (*time) : "a" (time) : "cc");
-        return cc;
-}
-
-static inline void set_clock_comparator(__u64 time)
-{
-        asm volatile("sckc 0(%1)" : : "m" (time), "a" (&time));
-}
-
-static inline void store_clock_comparator(__u64 *time)
-{
-        asm volatile("stckc 0(%1)" : "=m" (*time) : "a" (time));
-}
-
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
-
-typedef unsigned long long cycles_t;
-
-static inline unsigned long long get_clock (void)
-{
-        unsigned long long clk;
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        asm volatile("stck %0" : "=Q" (clk) : : "cc");
-#else /* __GNUC__ */
-        asm volatile("stck 0(%1)" : "=m" (clk) : "a" (&clk) : "cc");
-#endif /* __GNUC__ */
-        return clk;
-}
-
-static inline unsigned long long get_clock_xt(void)
-{
-        unsigned char clk[16];
-
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        asm volatile("stcke %0" : "=Q" (clk) : : "cc");
-#else /* __GNUC__ */
-        asm volatile("stcke 0(%1)" : "=m" (clk)
-                                   : "a" (clk) : "cc");
-#endif /* __GNUC__ */
-
-        return *((unsigned long long *)&clk[1]);
-}
-
-static inline cycles_t get_cycles(void)
-{
-        return (cycles_t) get_clock() >> 2;
-}
-
-int get_sync_clock(unsigned long long *clock);
-void init_cpu_timer(void);
-unsigned long long monotonic_clock(void);
-
-#endif
diff --git a/include/asm-s390/tlb.h b/include/asm-s390/tlb.h
deleted file mode 100644
index 3d8a96d39d9d..000000000000
--- a/include/asm-s390/tlb.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef _S390_TLB_H
-#define _S390_TLB_H
-
-/*
- * TLB flushing on s390 is complicated. The following requirement
- * from the principles of operation is the most arduous:
- *
- * "A valid table entry must not be changed while it is attached
- * to any CPU and may be used for translation by that CPU except to
- * (1) invalidate the entry by using INVALIDATE PAGE TABLE ENTRY,
- * or INVALIDATE DAT TABLE ENTRY, (2) alter bits 56-63 of a page
- * table entry, or (3) make a change by means of a COMPARE AND SWAP
- * AND PURGE instruction that purges the TLB."
- *
- * The modification of a pte of an active mm struct therefore is
- * a two step process: i) invalidate the pte, ii) store the new pte.
- * This is true for the page protection bit as well.
- * The only possible optimization is to flush at the beginning of
- * a tlb_gather_mmu cycle if the mm_struct is currently not in use.
- *
- * Pages used for the page tables is a different story. FIXME: more
- */
-
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <asm/processor.h>
-#include <asm/pgalloc.h>
-#include <asm/smp.h>
-#include <asm/tlbflush.h>
-
-#ifndef CONFIG_SMP
-#define TLB_NR_PTRS     1
-#else
-#define TLB_NR_PTRS     508
-#endif
-
-struct mmu_gather {
-        struct mm_struct *mm;
-        unsigned int fullmm;
-        unsigned int nr_ptes;
-        unsigned int nr_pxds;
-        void *array[TLB_NR_PTRS];
-};
-
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm,
-                                                unsigned int full_mm_flush)
-{
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
-        tlb->mm = mm;
-        tlb->fullmm = full_mm_flush || (num_online_cpus() == 1) ||
-                (atomic_read(&mm->mm_users) <= 1 && mm == current->active_mm);
-        tlb->nr_ptes = 0;
-        tlb->nr_pxds = TLB_NR_PTRS;
-        if (tlb->fullmm)
-                __tlb_flush_mm(mm);
-        return tlb;
-}
-
-static inline void tlb_flush_mmu(struct mmu_gather *tlb,
-                                 unsigned long start, unsigned long end)
-{
-        if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pxds < TLB_NR_PTRS))
-                __tlb_flush_mm(tlb->mm);
-        while (tlb->nr_ptes > 0)
-                pte_free(tlb->mm, tlb->array[--tlb->nr_ptes]);
-        while (tlb->nr_pxds < TLB_NR_PTRS)
-                /* pgd_free frees the pointer as region or segment table */
-                pgd_free(tlb->mm, tlb->array[tlb->nr_pxds++]);
-}
-
-static inline void tlb_finish_mmu(struct mmu_gather *tlb,
-                                  unsigned long start, unsigned long end)
-{
-        tlb_flush_mmu(tlb, start, end);
-
-        /* keep the page table cache within bounds */
-        check_pgt_cache();
-
-        put_cpu_var(mmu_gathers);
-}
-
-/*
- * Release the page cache reference for a pte removed by
- * tlb_ptep_clear_flush. In both flush modes the tlb fo a page cache page
- * has already been freed, so just do free_page_and_swap_cache.
- */
-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
-{
-        free_page_and_swap_cache(page);
-}
-
-/*
- * pte_free_tlb frees a pte table and clears the CRSTE for the
- * page table from the tlb.
- */
-static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte)
-{
-        if (!tlb->fullmm) {
-                tlb->array[tlb->nr_ptes++] = pte;
-                if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
-        } else
-                pte_free(tlb->mm, pte);
-}
-
-/*
- * pmd_free_tlb frees a pmd table and clears the CRSTE for the
- * segment table entry from the tlb.
- * If the mm uses a two level page table the single pmd is freed
- * as the pgd. pmd_free_tlb checks the asce_limit against 2GB
- * to avoid the double free of the pmd in this case.
- */
-static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
-{
-#ifdef __s390x__
-        if (tlb->mm->context.asce_limit <= (1UL << 31))
-                return;
-        if (!tlb->fullmm) {
-                tlb->array[--tlb->nr_pxds] = pmd;
-                if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
-        } else
-                pmd_free(tlb->mm, pmd);
-#endif
-}
-
-/*
- * pud_free_tlb frees a pud table and clears the CRSTE for the
- * region third table entry from the tlb.
- * If the mm uses a three level page table the single pud is freed
- * as the pgd. pud_free_tlb checks the asce_limit against 4TB
- * to avoid the double free of the pud in this case.
- */
-static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
-{
-#ifdef __s390x__
-        if (tlb->mm->context.asce_limit <= (1UL << 42))
-                return;
-        if (!tlb->fullmm) {
-                tlb->array[--tlb->nr_pxds] = pud;
-                if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
-        } else
-                pud_free(tlb->mm, pud);
-#endif
-}
-
-#define tlb_start_vma(tlb, vma)                 do { } while (0)
-#define tlb_end_vma(tlb, vma)                   do { } while (0)
-#define tlb_remove_tlb_entry(tlb, ptep, addr)   do { } while (0)
-#define tlb_migrate_finish(mm)                  do { } while (0)
-
-#endif /* _S390_TLB_H */
diff --git a/include/asm-s390/tlbflush.h b/include/asm-s390/tlbflush.h
deleted file mode 100644
index d60394b9745e..000000000000
--- a/include/asm-s390/tlbflush.h
+++ /dev/null
@@ -1,140 +0,0 @@
-#ifndef _S390_TLBFLUSH_H
-#define _S390_TLBFLUSH_H
-
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <asm/processor.h>
-#include <asm/pgalloc.h>
-
-/*
- * Flush all tlb entries on the local cpu.
- */
-static inline void __tlb_flush_local(void)
-{
-        asm volatile("ptlb" : : : "memory");
-}
-
-#ifdef CONFIG_SMP
-/*
- * Flush all tlb entries on all cpus.
- */
-void smp_ptlb_all(void);
-
-static inline void __tlb_flush_global(void)
-{
-        register unsigned long reg2 asm("2");
-        register unsigned long reg3 asm("3");
-        register unsigned long reg4 asm("4");
-        long dummy;
-
-#ifndef __s390x__
-        if (!MACHINE_HAS_CSP) {
-                smp_ptlb_all();
-                return;
-        }
-#endif /* __s390x__ */
-
-        dummy = 0;
-        reg2 = reg3 = 0;
-        reg4 = ((unsigned long) &dummy) + 1;
-        asm volatile(
-                "       csp     %0,%2"
-                : : "d" (reg2), "d" (reg3), "d" (reg4), "m" (dummy) : "cc" );
-}
-
-static inline void __tlb_flush_full(struct mm_struct *mm)
-{
-        cpumask_t local_cpumask;
-
-        preempt_disable();
-        /*
-         * If the process only ran on the local cpu, do a local flush.
-         */
-        local_cpumask = cpumask_of_cpu(smp_processor_id());
-        if (cpus_equal(mm->cpu_vm_mask, local_cpumask))
-                __tlb_flush_local();
-        else
-                __tlb_flush_global();
-        preempt_enable();
-}
-#else
-#define __tlb_flush_full(mm)    __tlb_flush_local()
-#endif
-
-/*
- * Flush all tlb entries of a page table on all cpus.
- */
-static inline void __tlb_flush_idte(unsigned long asce)
-{
-        asm volatile(
-                "       .insn   rrf,0xb98e0000,0,%0,%1,0"
-                : : "a" (2048), "a" (asce) : "cc" );
-}
-
-static inline void __tlb_flush_mm(struct mm_struct * mm)
-{
-        if (unlikely(cpus_empty(mm->cpu_vm_mask)))
-                return;
-        /*
-         * If the machine has IDTE we prefer to do a per mm flush
-         * on all cpus instead of doing a local flush if the mm
-         * only ran on the local cpu.
-         */
-        if (MACHINE_HAS_IDTE) {
-                if (mm->context.noexec)
-                        __tlb_flush_idte((unsigned long)
-                                         get_shadow_table(mm->pgd) |
-                                         mm->context.asce_bits);
-                __tlb_flush_idte((unsigned long) mm->pgd |
-                                 mm->context.asce_bits);
-                return;
-        }
-        __tlb_flush_full(mm);
-}
-
-static inline void __tlb_flush_mm_cond(struct mm_struct * mm)
-{
-        if (atomic_read(&mm->mm_users) <= 1 && mm == current->active_mm)
-                __tlb_flush_mm(mm);
-}
-
-/*
- * TLB flushing:
- *  flush_tlb() - flushes the current mm struct TLBs
- *  flush_tlb_all() - flushes all processes TLBs
- *  flush_tlb_mm(mm) - flushes the specified mm context TLB's
- *  flush_tlb_page(vma, vmaddr) - flushes one page
- *  flush_tlb_range(vma, start, end) - flushes a range of pages
- *  flush_tlb_kernel_range(start, end) - flushes a range of kernel pages
- */
-
-/*
- * flush_tlb_mm goes together with ptep_set_wrprotect for the
- * copy_page_range operation and flush_tlb_range is related to
- * ptep_get_and_clear for change_protection. ptep_set_wrprotect and
- * ptep_get_and_clear do not flush the TLBs directly if the mm has
- * only one user. At the end of the update the flush_tlb_mm and
- * flush_tlb_range functions need to do the flush.
- */
-#define flush_tlb()                             do { } while (0)
-#define flush_tlb_all()                         do { } while (0)
-#define flush_tlb_page(vma, addr)               do { } while (0)
-
-static inline void flush_tlb_mm(struct mm_struct *mm)
-{
-        __tlb_flush_mm_cond(mm);
-}
-
-static inline void flush_tlb_range(struct vm_area_struct *vma,
-                                   unsigned long start, unsigned long end)
-{
-        __tlb_flush_mm_cond(vma->vm_mm);
-}
-
-static inline void flush_tlb_kernel_range(unsigned long start,
-                                          unsigned long end)
-{
-        __tlb_flush_mm(&init_mm);
-}
-
-#endif /* _S390_TLBFLUSH_H */
diff --git a/include/asm-s390/todclk.h b/include/asm-s390/todclk.h
deleted file mode 100644
index c7f62055488a..000000000000
--- a/include/asm-s390/todclk.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * File...........: linux/include/asm/todclk.h
- * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
- * Bugreports.to..: <Linux390@de.ibm.com>
- * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
- *
- * History of changes (starts July 2000)
- */
-
-#ifndef __ASM_TODCLK_H
-#define __ASM_TODCLK_H
-
-#ifdef __KERNEL__
-
-#define TOD_uSEC (0x1000ULL)
-#define TOD_mSEC (1000 * TOD_uSEC)
-#define TOD_SEC (1000 * TOD_mSEC)
-#define TOD_MIN (60 * TOD_SEC)
-#define TOD_HOUR (60 * TOD_MIN)
-
-#endif
-
-#endif
diff --git a/include/asm-s390/topology.h b/include/asm-s390/topology.h
deleted file mode 100644
index d96c91643458..000000000000
--- a/include/asm-s390/topology.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _ASM_S390_TOPOLOGY_H
-#define _ASM_S390_TOPOLOGY_H
-
-#include <linux/cpumask.h>
-
-#define mc_capable()    (1)
-
-cpumask_t cpu_coregroup_map(unsigned int cpu);
-
-extern cpumask_t cpu_core_map[NR_CPUS];
-
-#define topology_core_siblings(cpu)     (cpu_core_map[cpu])
-
-int topology_set_cpu_management(int fc);
-void topology_schedule_update(void);
-
-#define POLARIZATION_UNKNWN     (-1)
-#define POLARIZATION_HRZ        (0)
-#define POLARIZATION_VL         (1)
-#define POLARIZATION_VM         (2)
-#define POLARIZATION_VH         (3)
-
-#ifdef CONFIG_SMP
-void s390_init_cpu_topology(void);
-#else
-static inline void s390_init_cpu_topology(void)
-{
-};
-#endif
-
-#include <asm-generic/topology.h>
-
-#endif /* _ASM_S390_TOPOLOGY_H */
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
deleted file mode 100644
index 41c547656130..000000000000
--- a/include/asm-s390/types.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  include/asm-s390/types.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/types.h"
- */
-
-#ifndef _S390_TYPES_H
-#define _S390_TYPES_H
-
-#ifndef __s390x__
-# include <asm-generic/int-ll64.h>
-#else
-# include <asm-generic/int-l64.h>
-#endif
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned short umode_t;
-
-/* A address type so that arithmetic can be done on it & it can be upgraded to
-   64 bit when necessary 
-*/
-typedef unsigned long addr_t; 
-typedef __signed__ long saddr_t;
-
-#endif /* __ASSEMBLY__ */
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-
-#ifndef __s390x__
-#define BITS_PER_LONG 32
-#else
-#define BITS_PER_LONG 64
-#endif
-
-#ifndef __ASSEMBLY__
-
-typedef u64 dma64_addr_t;
-#ifdef __s390x__
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-
-#ifndef __s390x__
-typedef union {
-        unsigned long long pair;
-        struct {
-                unsigned long even;
-                unsigned long odd;
-        } subreg;
-} register_pair;
-
-#endif /* ! __s390x__   */
-#endif /* __ASSEMBLY__  */
-#endif /* __KERNEL__    */
-#endif /* _S390_TYPES_H */
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
deleted file mode 100644
index 0235970278f0..000000000000
--- a/include/asm-s390/uaccess.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- *  include/asm-s390/uaccess.h
- *
- *  S390 version
- *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Hartmut Penner (hp@de.ibm.com),
- *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *
- *  Derived from "include/asm-i386/uaccess.h"
- */
-#ifndef __S390_UACCESS_H
-#define __S390_UACCESS_H
-
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <linux/errno.h>
-
-#define VERIFY_READ     0
-#define VERIFY_WRITE    1
-
-
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons, these macros are grossly misnamed.
- */
-
-#define MAKE_MM_SEG(a)  ((mm_segment_t) { (a) })
-
-
-#define KERNEL_DS       MAKE_MM_SEG(0)
-#define USER_DS         MAKE_MM_SEG(1)
-
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current->thread.mm_segment)
-
-#define set_fs(x) \
-({                                                                      \
-        unsigned long __pto;                                            \
-        current->thread.mm_segment = (x);                               \
-        __pto = current->thread.mm_segment.ar4 ?                        \
-                S390_lowcore.user_asce : S390_lowcore.kernel_asce;      \
-        __ctl_load(__pto, 7, 7);                                        \
-})
-
-#define segment_eq(a,b) ((a).ar4 == (b).ar4)
-
-
-static inline int __access_ok(const void __user *addr, unsigned long size)
-{
-        return 1;
-}
-#define access_ok(type,addr,size) __access_ok(addr,size)
-
-/*
- * The exception table consists of pairs of addresses: the first is the
- * address of an instruction that is allowed to fault, and the second is
- * the address at which the program should continue.  No registers are
- * modified, so it is entirely up to the continuation code to figure out
- * what to do.
- *
- * All the routines below use bits of fixup code that are out of line
- * with the main instruction path.  This means when everything is well,
- * we don't even have to jump over them.  Further, they do not intrude
- * on our cache or tlb entries.
- */
-
-struct exception_table_entry
-{
-        unsigned long insn, fixup;
-};
-
-struct uaccess_ops {
-        size_t (*copy_from_user)(size_t, const void __user *, void *);
-        size_t (*copy_from_user_small)(size_t, const void __user *, void *);
-        size_t (*copy_to_user)(size_t, void __user *, const void *);
-        size_t (*copy_to_user_small)(size_t, void __user *, const void *);
-        size_t (*copy_in_user)(size_t, void __user *, const void __user *);
-        size_t (*clear_user)(size_t, void __user *);
-        size_t (*strnlen_user)(size_t, const char __user *);
-        size_t (*strncpy_from_user)(size_t, const char __user *, char *);
-        int (*futex_atomic_op)(int op, int __user *, int oparg, int *old);
-        int (*futex_atomic_cmpxchg)(int __user *, int old, int new);
-};
-
-extern struct uaccess_ops uaccess;
-extern struct uaccess_ops uaccess_std;
-extern struct uaccess_ops uaccess_mvcos;
-extern struct uaccess_ops uaccess_mvcos_switch;
-extern struct uaccess_ops uaccess_pt;
-
-static inline int __put_user_fn(size_t size, void __user *ptr, void *x)
-{
-        size = uaccess.copy_to_user_small(size, ptr, x);
-        return size ? -EFAULT : size;
-}
-
-static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
-{
-        size = uaccess.copy_from_user_small(size, ptr, x);
-        return size ? -EFAULT : size;
-}
-
-/*
- * These are the main single-value transfer routines.  They automatically
- * use the right size if we just have the right pointer type.
- */
-#define __put_user(x, ptr) \
-({                                                              \
-        __typeof__(*(ptr)) __x = (x);                           \
-        int __pu_err = -EFAULT;                                 \
-        __chk_user_ptr(ptr);                                    \
-        switch (sizeof (*(ptr))) {                              \
-        case 1:                                                 \
-        case 2:                                                 \
-        case 4:                                                 \
-        case 8:                                                 \
-                __pu_err = __put_user_fn(sizeof (*(ptr)),       \
-                                         ptr, &__x);            \
-                break;                                          \
-        default:                                                \
-                __put_user_bad();                               \
-                break;                                          \
-         }                                                      \
-        __pu_err;                                               \
-})
-
-#define put_user(x, ptr)                                        \
-({                                                              \
-        might_sleep();                                          \
-        __put_user(x, ptr);                                     \
-})
-
-
-extern int __put_user_bad(void) __attribute__((noreturn));
-
-#define __get_user(x, ptr)                                      \
-({                                                              \
-        int __gu_err = -EFAULT;                                 \
-        __chk_user_ptr(ptr);                                    \
-        switch (sizeof(*(ptr))) {                               \
-        case 1: {                                               \
-                unsigned char __x;                              \
-                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
-                                         ptr, &__x);            \
-                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
-                break;                                          \
-        };                                                      \
-        case 2: {                                               \
-                unsigned short __x;                             \
-                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
-                                         ptr, &__x);            \
-                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
-                break;                                          \
-        };                                                      \
-        case 4: {                                               \
-                unsigned int __x;                               \
-                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
-                                         ptr, &__x);            \
-                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
-                break;                                          \
-        };                                                      \
-        case 8: {                                               \
-                unsigned long long __x;                         \
-                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
-                                         ptr, &__x);            \
-                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
-                break;                                          \
-        };                                                      \
-        default:                                                \
-                __get_user_bad();                               \
-                break;                                          \
-        }                                                       \
-        __gu_err;                                               \
-})
-
-#define get_user(x, ptr)                                        \
-({                                                              \
-        might_sleep();                                          \
-        __get_user(x, ptr);                                     \
-})
-
-extern int __get_user_bad(void) __attribute__((noreturn));
-
-#define __put_user_unaligned __put_user
-#define __get_user_unaligned __get_user
-
-/**
- * __copy_to_user: - Copy a block of data into user space, with less checking.
- * @to:   Destination address, in user space.
- * @from: Source address, in kernel space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from kernel space to user space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- */
-static inline unsigned long __must_check
-__copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        if (__builtin_constant_p(n) && (n <= 256))
-                return uaccess.copy_to_user_small(n, to, from);
-        else
-                return uaccess.copy_to_user(n, to, from);
-}
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
-/**
- * copy_to_user: - Copy a block of data into user space.
- * @to:   Destination address, in user space.
- * @from: Source address, in kernel space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from kernel space to user space.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- */
-static inline unsigned long __must_check
-copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        might_sleep();
-        if (access_ok(VERIFY_WRITE, to, n))
-                n = __copy_to_user(to, from, n);
-        return n;
-}
-
-/**
- * __copy_from_user: - Copy a block of data from user space, with less checking.
- * @to:   Destination address, in kernel space.
- * @from: Source address, in user space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from user space to kernel space.  Caller must check
- * the specified block with access_ok() before calling this function.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- *
- * If some data could not be copied, this function will pad the copied
- * data to the requested size using zero bytes.
- */
-static inline unsigned long __must_check
-__copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        if (__builtin_constant_p(n) && (n <= 256))
-                return uaccess.copy_from_user_small(n, from, to);
-        else
-                return uaccess.copy_from_user(n, from, to);
-}
-
-/**
- * copy_from_user: - Copy a block of data from user space.
- * @to:   Destination address, in kernel space.
- * @from: Source address, in user space.
- * @n:    Number of bytes to copy.
- *
- * Context: User context only.  This function may sleep.
- *
- * Copy data from user space to kernel space.
- *
- * Returns number of bytes that could not be copied.
- * On success, this will be zero.
- *
- * If some data could not be copied, this function will pad the copied
- * data to the requested size using zero bytes.
- */
-static inline unsigned long __must_check
-copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        might_sleep();
-        if (access_ok(VERIFY_READ, from, n))
-                n = __copy_from_user(to, from, n);
-        else
-                memset(to, 0, n);
-        return n;
-}
-
-static inline unsigned long __must_check
-__copy_in_user(void __user *to, const void __user *from, unsigned long n)
-{
-        return uaccess.copy_in_user(n, to, from);
-}
-
-static inline unsigned long __must_check
-copy_in_user(void __user *to, const void __user *from, unsigned long n)
-{
-        might_sleep();
-        if (__access_ok(from,n) && __access_ok(to,n))
-                n = __copy_in_user(to, from, n);
-        return n;
-}
-
-/*
- * Copy a null terminated string from userspace.
- */
-static inline long __must_check
-strncpy_from_user(char *dst, const char __user *src, long count)
-{
-        long res = -EFAULT;
-        might_sleep();
-        if (access_ok(VERIFY_READ, src, 1))
-                res = uaccess.strncpy_from_user(count, src, dst);
-        return res;
-}
-
-static inline unsigned long
-strnlen_user(const char __user * src, unsigned long n)
-{
-        might_sleep();
-        return uaccess.strnlen_user(n, src);
-}
-
-/**
- * strlen_user: - Get the size of a string in user space.
- * @str: The string to measure.
- *
- * Context: User context only.  This function may sleep.
- *
- * Get the size of a NUL-terminated string in user space.
- *
- * Returns the size of the string INCLUDING the terminating NUL.
- * On exception, returns 0.
- *
- * If there is a limit on the length of a valid string, you may wish to
- * consider using strnlen_user() instead.
- */
-#define strlen_user(str) strnlen_user(str, ~0UL)
-
-/*
- * Zero Userspace
- */
-
-static inline unsigned long __must_check
-__clear_user(void __user *to, unsigned long n)
-{
-        return uaccess.clear_user(n, to);
-}
-
-static inline unsigned long __must_check
-clear_user(void __user *to, unsigned long n)
-{
-        might_sleep();
-        if (access_ok(VERIFY_WRITE, to, n))
-                n = uaccess.clear_user(n, to);
-        return n;
-}
-
-#endif /* __S390_UACCESS_H */
diff --git a/include/asm-s390/ucontext.h b/include/asm-s390/ucontext.h
deleted file mode 100644
index d69bec0b03f5..000000000000
--- a/include/asm-s390/ucontext.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  include/asm-s390/ucontext.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/ucontext.h"
- */
-
-#ifndef _ASM_S390_UCONTEXT_H
-#define _ASM_S390_UCONTEXT_H
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        _sigregs          uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif /* !_ASM_S390_UCONTEXT_H */
diff --git a/include/asm-s390/unaligned.h b/include/asm-s390/unaligned.h
deleted file mode 100644
index da9627afe5d8..000000000000
--- a/include/asm-s390/unaligned.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_S390_UNALIGNED_H
-#define _ASM_S390_UNALIGNED_H
-
-/*
- * The S390 can do unaligned accesses itself. 
- */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-
-#endif /* _ASM_S390_UNALIGNED_H */
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
deleted file mode 100644
index c8ad350d1444..000000000000
--- a/include/asm-s390/unistd.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- *  include/asm-s390/unistd.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/unistd.h"
- */
-
-#ifndef _ASM_S390_UNISTD_H_
-#define _ASM_S390_UNISTD_H_
-
-/*
- * This file contains the system call numbers.
- */
-
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_restart_syscall      7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_brk                 45
-#define __NR_signal              48
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_setpgid             57
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_symlink             83
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-#define __NR_lookup_dcookie     110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_getdents           141
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188
-#define __NR_putpmsg            189
-#define __NR_vfork              190
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_getdents64         220
-#define __NR_readahead          222
-#define __NR_setxattr           224
-#define __NR_lsetxattr          225
-#define __NR_fsetxattr          226
-#define __NR_getxattr           227
-#define __NR_lgetxattr          228
-#define __NR_fgetxattr          229
-#define __NR_listxattr          230
-#define __NR_llistxattr         231
-#define __NR_flistxattr         232
-#define __NR_removexattr        233
-#define __NR_lremovexattr       234
-#define __NR_fremovexattr       235
-#define __NR_gettid             236
-#define __NR_tkill              237
-#define __NR_futex              238
-#define __NR_sched_setaffinity  239
-#define __NR_sched_getaffinity  240
-#define __NR_tgkill             241
-/* Number 242 is reserved for tux */
-#define __NR_io_setup           243
-#define __NR_io_destroy         244
-#define __NR_io_getevents       245
-#define __NR_io_submit          246
-#define __NR_io_cancel          247
-#define __NR_exit_group         248
-#define __NR_epoll_create       249
-#define __NR_epoll_ctl          250
-#define __NR_epoll_wait         251
-#define __NR_set_tid_address    252
-#define __NR_fadvise64          253
-#define __NR_timer_create       254
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-/* Number 263 is reserved for vserver */
-#define __NR_statfs64           265
-#define __NR_fstatfs64          266
-#define __NR_remap_file_pages   267
-/* Number 268 is reserved for new sys_mbind */
-/* Number 269 is reserved for new sys_get_mempolicy */
-/* Number 270 is reserved for new sys_set_mempolicy */
-#define __NR_mq_open            271
-#define __NR_mq_unlink          272
-#define __NR_mq_timedsend       273
-#define __NR_mq_timedreceive    274
-#define __NR_mq_notify          275
-#define __NR_mq_getsetattr      276
-#define __NR_kexec_load         277
-#define __NR_add_key            278
-#define __NR_request_key        279
-#define __NR_keyctl             280
-#define __NR_waitid             281
-#define __NR_ioprio_set         282
-#define __NR_ioprio_get         283
-#define __NR_inotify_init       284
-#define __NR_inotify_add_watch  285
-#define __NR_inotify_rm_watch   286
-/* Number 287 is reserved for new sys_migrate_pages */
-#define __NR_openat             288
-#define __NR_mkdirat            289
-#define __NR_mknodat            290
-#define __NR_fchownat           291
-#define __NR_futimesat          292
-#define __NR_unlinkat           294
-#define __NR_renameat           295
-#define __NR_linkat             296
-#define __NR_symlinkat          297
-#define __NR_readlinkat         298
-#define __NR_fchmodat           299
-#define __NR_faccessat          300
-#define __NR_pselect6           301
-#define __NR_ppoll              302
-#define __NR_unshare            303
-#define __NR_set_robust_list    304
-#define __NR_get_robust_list    305
-#define __NR_splice             306
-#define __NR_sync_file_range    307
-#define __NR_tee                308
-#define __NR_vmsplice           309
-/* Number 310 is reserved for new sys_move_pages */
-#define __NR_getcpu             311
-#define __NR_epoll_pwait        312
-#define __NR_utimes             313
-#define __NR_fallocate          314
-#define __NR_utimensat          315
-#define __NR_signalfd           316
-#define __NR_timerfd            317
-#define __NR_eventfd            318
-#define __NR_timerfd_create     319
-#define __NR_timerfd_settime    320
-#define __NR_timerfd_gettime    321
-#define __NR_signalfd4          322
-#define __NR_eventfd2           323
-#define __NR_inotify_init1      324
-#define __NR_pipe2              325
-#define __NR_dup3               326
-#define __NR_epoll_create1      327
-#define NR_syscalls 328
-
-/* 
- * There are some system calls that are not present on 64 bit, some
- * have a different name although they do the same (e.g. __NR_chown32
- * is __NR_chown on 64 bit).
- */
-#ifndef __s390x__
-
-#define __NR_time                13
-#define __NR_lchown              16
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_getrlimit           76
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_fchown              95
-#define __NR_ioperm             101
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR__newselect         142
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_chown              182
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_fcntl64            221
-#define __NR_sendfile64         223
-#define __NR_fadvise64_64       264
-#define __NR_fstatat64          293
-
-#else
-
-#define __NR_select             142
-#define __NR_getrlimit          191     /* SuS compliant getrlimit */
-#define __NR_lchown             198
-#define __NR_getuid             199
-#define __NR_getgid             200
-#define __NR_geteuid            201
-#define __NR_getegid            202
-#define __NR_setreuid           203
-#define __NR_setregid           204
-#define __NR_getgroups          205
-#define __NR_setgroups          206
-#define __NR_fchown             207
-#define __NR_setresuid          208
-#define __NR_getresuid          209
-#define __NR_setresgid          210
-#define __NR_getresgid          211
-#define __NR_chown              212
-#define __NR_setuid             213
-#define __NR_setgid             214
-#define __NR_setfsuid           215
-#define __NR_setfsgid           216
-#define __NR_newfstatat         293
-
-#endif
-
-#ifdef __KERNEL__
-
-#ifndef CONFIG_64BIT
-#define __IGNORE_select
-#else
-#define __IGNORE_time
-#endif
-
-/* Ignore NUMA system calls. Not wired up on s390. */
-#define __IGNORE_mbind
-#define __IGNORE_get_mempolicy
-#define __IGNORE_set_mempolicy
-#define __IGNORE_migrate_pages
-#define __IGNORE_move_pages
-
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_SYS_RT_SIGACTION
-#define __ARCH_WANT_SYS_RT_SIGSUSPEND
-# ifndef CONFIG_64BIT
-#   define __ARCH_WANT_STAT64
-#   define __ARCH_WANT_SYS_TIME
-# endif
-# ifdef CONFIG_COMPAT
-#   define __ARCH_WANT_COMPAT_SYS_TIME
-#   define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
-# endif
-
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_S390_UNISTD_H_ */
diff --git a/include/asm-s390/user.h b/include/asm-s390/user.h
deleted file mode 100644
index 1b050e35fdc6..000000000000
--- a/include/asm-s390/user.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  include/asm-s390/user.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/usr.h"
- */
-
-#ifndef _S390_USER_H
-#define _S390_USER_H
-
-#include <asm/page.h>
-#include <asm/ptrace.h>
-/* Core file format: The core file is written in such a way that gdb
-   can understand it and provide useful information to the user (under
-   linux we use the 'trad-core' bfd).  There are quite a number of
-   obstacles to being able to view the contents of the floating point
-   registers, and until these are solved you will not be able to view the
-   contents of them.  Actually, you can read in the core file and look at
-   the contents of the user struct to find out what the floating point
-   registers contain.
-   The actual file contents are as follows:
-   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-   in the file.  Directly after this is a copy of the task_struct, which
-   is currently not used by gdb, but it may come in useful at some point.
-   All of the registers are stored as part of the upage.  The upage should
-   always be only one page.
-   DATA: The data area is stored.  We use current->end_text to
-   current->brk to pick up all of the user variables, plus any memory
-   that may have been malloced.  No attempt is made to determine if a page
-   is demand-zero or if a page is totally unused, we just cover the entire
-   range.  All of the addresses are rounded in such a way that an integral
-   number of pages is written.
-   STACK: We need the stack information in order to get a meaningful
-   backtrace.  We need to write the data from (esp) to
-   current->start_stack, so we round each of these off in order to be able
-   to write an integer number of pages.
-   The minimum core file size is 3 pages, or 12288 bytes.
-*/
-
-
-/*
- * This is the old layout of "struct pt_regs", and
- * is still the layout used by user mode (the new
- * pt_regs doesn't have all registers as the kernel
- * doesn't use the extra segment registers)
- */
-
-/* When the kernel dumps core, it starts by dumping the user struct -
-   this will be used by gdb to figure out where the data and stack segments
-   are within the file, and what virtual addresses to use. */
-struct user {
-/* We start with the registers, to mimic the way that "memory" is returned
-   from the ptrace(3,...) function.  */
-  struct user_regs_struct regs;         /* Where the registers are actually stored */
-/* The rest of this junk is to help gdb figure out what goes where */
-  unsigned long int u_tsize;    /* Text segment size (pages). */
-  unsigned long int u_dsize;    /* Data segment size (pages). */
-  unsigned long int u_ssize;    /* Stack segment size (pages). */
-  unsigned long start_code;     /* Starting virtual address of text. */
-  unsigned long start_stack;    /* Starting virtual address of stack area.
-                                   This is actually the bottom of the stack,
-                                   the top of the stack is always found in the
-                                   esp register.  */
-  long int signal;              /* Signal that caused the core dump. */
-  unsigned long u_ar0;          /* Used by gdb to help find the values for */
-                                /* the registers. */
-  unsigned long magic;          /* To uniquely identify a core file */
-  char u_comm[32];              /* User command that was responsible */
-};
-#define NBPG PAGE_SIZE
-#define UPAGES 1
-#define HOST_TEXT_START_ADDR (u.start_code)
-#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* _S390_USER_H */
diff --git a/include/asm-s390/vtoc.h b/include/asm-s390/vtoc.h
deleted file mode 100644
index 3a5267d90d29..000000000000
--- a/include/asm-s390/vtoc.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * include/asm-s390/vtoc.h
- *
- * This file contains volume label definitions for DASD devices.
- *
- * (C) Copyright IBM Corp. 2005
- *
- * Author(s): Volker Sameske <sameske@de.ibm.com>
- *
- */
-
-#ifndef _ASM_S390_VTOC_H
-#define _ASM_S390_VTOC_H
-
-#include <linux/types.h>
-
-struct vtoc_ttr
-{
-        __u16 tt;
-        __u8 r;
-} __attribute__ ((packed));
-
-struct vtoc_cchhb
-{
-        __u16 cc;
-        __u16 hh;
-        __u8 b;
-} __attribute__ ((packed));
-
-struct vtoc_cchh
-{
-        __u16 cc;
-        __u16 hh;
-} __attribute__ ((packed));
-
-struct vtoc_labeldate
-{
-        __u8 year;
-        __u16 day;
-} __attribute__ ((packed));
-
-struct vtoc_volume_label
-{
-        char volkey[4];         /* volume key = volume label */
-        char vollbl[4];         /* volume label */
-        char volid[6];          /* volume identifier */
-        __u8 security;          /* security byte */
-        struct vtoc_cchhb vtoc; /* VTOC address */
-        char res1[5];           /* reserved */
-        char cisize[4];         /* CI-size for FBA,... */
-                                /* ...blanks for CKD */
-        char blkperci[4];       /* no of blocks per CI (FBA), blanks for CKD */
-        char labperci[4];       /* no of labels per CI (FBA), blanks for CKD */
-        char res2[4];           /* reserved */
-        char lvtoc[14];         /* owner code for LVTOC */
-        char res3[29];          /* reserved */
-} __attribute__ ((packed));
-
-struct vtoc_extent
-{
-        __u8 typeind;                   /* extent type indicator */
-        __u8 seqno;                     /* extent sequence number */
-        struct vtoc_cchh llimit;        /* starting point of this extent */
-        struct vtoc_cchh ulimit;        /* ending point of this extent */
-} __attribute__ ((packed));
-
-struct vtoc_dev_const
-{
-        __u16 DS4DSCYL; /* number of logical cyls */
-        __u16 DS4DSTRK; /* number of tracks in a logical cylinder */
-        __u16 DS4DEVTK; /* device track length */
-        __u8 DS4DEVI;   /* non-last keyed record overhead */
-        __u8 DS4DEVL;   /* last keyed record overhead */
-        __u8 DS4DEVK;   /* non-keyed record overhead differential */
-        __u8 DS4DEVFG;  /* flag byte */
-        __u16 DS4DEVTL; /* device tolerance */
-        __u8 DS4DEVDT;  /* number of DSCB's per track */
-        __u8 DS4DEVDB;  /* number of directory blocks per track */
-} __attribute__ ((packed));
-
-struct vtoc_format1_label
-{
-        char DS1DSNAM[44];      /* data set name */
-        __u8 DS1FMTID;          /* format identifier */
-        char DS1DSSN[6];        /* data set serial number */
-        __u16 DS1VOLSQ;         /* volume sequence number */
-        struct vtoc_labeldate DS1CREDT; /* creation date: ydd */
-        struct vtoc_labeldate DS1EXPDT; /* expiration date */
-        __u8 DS1NOEPV;          /* number of extents on volume */
-        __u8 DS1NOBDB;          /* no. of bytes used in last direction blk */
-        __u8 DS1FLAG1;          /* flag 1 */
-        char DS1SYSCD[13];      /* system code */
-        struct vtoc_labeldate DS1REFD; /* date last referenced  */
-        __u8 DS1SMSFG;          /* system managed storage indicators */
-        __u8 DS1SCXTF;          /* sec. space extension flag byte */
-        __u16 DS1SCXTV;         /* secondary space extension value */
-        __u8 DS1DSRG1;          /* data set organisation byte 1 */
-        __u8 DS1DSRG2;          /* data set organisation byte 2 */
-        __u8 DS1RECFM;          /* record format */
-        __u8 DS1OPTCD;          /* option code */
-        __u16 DS1BLKL;          /* block length */
-        __u16 DS1LRECL;         /* record length */
-        __u8 DS1KEYL;           /* key length */
-        __u16 DS1RKP;           /* relative key position */
-        __u8 DS1DSIND;          /* data set indicators */
-        __u8 DS1SCAL1;          /* secondary allocation flag byte */
-        char DS1SCAL3[3];       /* secondary allocation quantity */
-        struct vtoc_ttr DS1LSTAR; /* last used track and block on track */
-        __u16 DS1TRBAL;         /* space remaining on last used track */
-        __u16 res1;             /* reserved */
-        struct vtoc_extent DS1EXT1; /* first extent description */
-        struct vtoc_extent DS1EXT2; /* second extent description */
-        struct vtoc_extent DS1EXT3; /* third extent description */
-        struct vtoc_cchhb DS1PTRDS; /* possible pointer to f2 or f3 DSCB */
-} __attribute__ ((packed));
-
-struct vtoc_format4_label
-{
-        char DS4KEYCD[44];      /* key code for VTOC labels: 44 times 0x04 */
-        __u8 DS4IDFMT;          /* format identifier */
-        struct vtoc_cchhb DS4HPCHR; /* highest address of a format 1 DSCB */
-        __u16 DS4DSREC;         /* number of available DSCB's */
-        struct vtoc_cchh DS4HCCHH; /* CCHH of next available alternate track */
-        __u16 DS4NOATK;         /* number of remaining alternate tracks */
-        __u8 DS4VTOCI;          /* VTOC indicators */
-        __u8 DS4NOEXT;          /* number of extents in VTOC */
-        __u8 DS4SMSFG;          /* system managed storage indicators */
-        __u8 DS4DEVAC;          /* number of alternate cylinders.
-                                 * Subtract from first two bytes of
-                                 * DS4DEVSZ to get number of usable
-                                 * cylinders. can be zero. valid
-                                 * only if DS4DEVAV on. */
-        struct vtoc_dev_const DS4DEVCT; /* device constants */
-        char DS4AMTIM[8];       /* VSAM time stamp */
-        char DS4AMCAT[3];       /* VSAM catalog indicator */
-        char DS4R2TIM[8];       /* VSAM volume/catalog match time stamp */
-        char res1[5];           /* reserved */
-        char DS4F6PTR[5];       /* pointer to first format 6 DSCB */
-        struct vtoc_extent DS4VTOCE; /* VTOC extent description */
-        char res2[10];          /* reserved */
-        __u8 DS4EFLVL;          /* extended free-space management level */
-        struct vtoc_cchhb DS4EFPTR; /* pointer to extended free-space info */
-        char res3[9];           /* reserved */
-} __attribute__ ((packed));
-
-struct vtoc_ds5ext
-{
-        __u16 t;        /* RTA of the first track of free extent */
-        __u16 fc;       /* number of whole cylinders in free ext. */
-        __u8 ft;        /* number of remaining free tracks */
-} __attribute__ ((packed));
-
-struct vtoc_format5_label
-{
-        char DS5KEYID[4];       /* key identifier */
-        struct vtoc_ds5ext DS5AVEXT; /* first available (free-space) extent. */
-        struct vtoc_ds5ext DS5EXTAV[7]; /* seven available extents */
-        __u8 DS5FMTID;          /* format identifier */
-        struct vtoc_ds5ext DS5MAVET[18]; /* eighteen available extents */
-        struct vtoc_cchhb DS5PTRDS; /* pointer to next format5 DSCB */
-} __attribute__ ((packed));
-
-struct vtoc_ds7ext
-{
-        __u32 a; /* starting RTA value */
-        __u32 b; /* ending RTA value + 1 */
-} __attribute__ ((packed));
-
-struct vtoc_format7_label
-{
-        char DS7KEYID[4];       /* key identifier */
-        struct vtoc_ds7ext DS7EXTNT[5]; /* space for 5 extent descriptions */
-        __u8 DS7FMTID;          /* format identifier */
-        struct vtoc_ds7ext DS7ADEXT[11]; /* space for 11 extent descriptions */
-        char res1[2];           /* reserved */
-        struct vtoc_cchhb DS7PTRDS; /* pointer to next FMT7 DSCB */
-} __attribute__ ((packed));
-
-struct vtoc_cms_label {
-        __u8 label_id[4];               /* Label identifier */
-        __u8 vol_id[6];         /* Volid */
-        __u16 version_id;               /* Version identifier */
-        __u32 block_size;               /* Disk block size */
-        __u32 origin_ptr;               /* Disk origin pointer */
-        __u32 usable_count;     /* Number of usable cylinders/blocks */
-        __u32 formatted_count;  /* Maximum number of formatted cylinders/
-                                 * blocks */
-        __u32 block_count;      /* Disk size in CMS blocks */
-        __u32 used_count;               /* Number of CMS blocks in use */
-        __u32 fst_size;         /* File Status Table (FST) size */
-        __u32 fst_count;                /* Number of FSTs per CMS block */
-        __u8 format_date[6];    /* Disk FORMAT date */
-        __u8 reserved1[2];
-        __u32 disk_offset;      /* Disk offset when reserved*/
-        __u32 map_block;                /* Allocation Map Block with next hole */
-        __u32 hblk_disp;                /* Displacement into HBLK data of next hole */
-        __u32 user_disp;                /* Displacement into user part of Allocation
-                                 * map */
-        __u8 reserved2[4];
-        __u8 segment_name[8];   /* Name of shared segment */
-} __attribute__ ((packed));
-
-#endif /* _ASM_S390_VTOC_H */
diff --git a/include/asm-s390/xor.h b/include/asm-s390/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/include/asm-s390/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/include/asm-s390/zcrypt.h b/include/asm-s390/zcrypt.h
deleted file mode 100644
index 00d3bbd44117..000000000000
--- a/include/asm-s390/zcrypt.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- *  include/asm-s390/zcrypt.h
- *
- *  zcrypt 2.1.0 (user-visible header)
- *
- *  Copyright (C)  2001, 2006 IBM Corporation
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ASM_S390_ZCRYPT_H
-#define __ASM_S390_ZCRYPT_H
-
-#define ZCRYPT_VERSION 2
-#define ZCRYPT_RELEASE 1
-#define ZCRYPT_VARIANT 1
-
-#include <linux/ioctl.h>
-#include <linux/compiler.h>
-
-/**
- * struct ica_rsa_modexpo
- *
- * Requirements:
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(b_key) = inputdatalength
- * - length(n_modulus) = inputdatalength
- */
-struct ica_rsa_modexpo {
-        char __user *   inputdata;
-        unsigned int    inputdatalength;
-        char __user *   outputdata;
-        unsigned int    outputdatalength;
-        char __user *   b_key;
-        char __user *   n_modulus;
-};
-
-/**
- * struct ica_rsa_modexpo_crt
- *
- * Requirements:
- * - inputdatalength is even.
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(bp_key)     = inputdatalength/2 + 8
- * - length(bq_key)     = inputdatalength/2
- * - length(np_key)     = inputdatalength/2 + 8
- * - length(nq_key)     = inputdatalength/2
- * - length(u_mult_inv) = inputdatalength/2 + 8
- */
-struct ica_rsa_modexpo_crt {
-        char __user *   inputdata;
-        unsigned int    inputdatalength;
-        char __user *   outputdata;
-        unsigned int    outputdatalength;
-        char __user *   bp_key;
-        char __user *   bq_key;
-        char __user *   np_prime;
-        char __user *   nq_prime;
-        char __user *   u_mult_inv;
-};
-
-/**
- * CPRBX
- *        Note that all shorts and ints are big-endian.
- *        All pointer fields are 16 bytes long, and mean nothing.
- *
- *        A request CPRB is followed by a request_parameter_block.
- *
- *        The request (or reply) parameter block is organized thus:
- *          function code
- *          VUD block
- *          key block
- */
-struct CPRBX {
-        unsigned short  cprb_len;       /* CPRB length        220        */
-        unsigned char   cprb_ver_id;    /* CPRB version id.   0x02       */
-        unsigned char   pad_000[3];     /* Alignment pad bytes           */
-        unsigned char   func_id[2];     /* function id        0x5432     */
-        unsigned char   cprb_flags[4];  /* Flags                         */
-        unsigned int    req_parml;      /* request parameter buffer len  */
-        unsigned int    req_datal;      /* request data buffer           */
-        unsigned int    rpl_msgbl;      /* reply  message block length   */
-        unsigned int    rpld_parml;     /* replied parameter block len   */
-        unsigned int    rpl_datal;      /* reply data block len          */
-        unsigned int    rpld_datal;     /* replied data block len        */
-        unsigned int    req_extbl;      /* request extension block len   */
-        unsigned char   pad_001[4];     /* reserved                      */
-        unsigned int    rpld_extbl;     /* replied extension block len   */
-        unsigned char   padx000[16 - sizeof (char *)];
-        unsigned char * req_parmb;      /* request parm block 'address'  */
-        unsigned char   padx001[16 - sizeof (char *)];
-        unsigned char * req_datab;      /* request data block 'address'  */
-        unsigned char   padx002[16 - sizeof (char *)];
-        unsigned char * rpl_parmb;      /* reply parm block 'address'    */
-        unsigned char   padx003[16 - sizeof (char *)];
-        unsigned char * rpl_datab;      /* reply data block 'address'    */
-        unsigned char   padx004[16 - sizeof (char *)];
-        unsigned char * req_extb;       /* request extension block 'addr'*/
-        unsigned char   padx005[16 - sizeof (char *)];
-        unsigned char * rpl_extb;       /* reply extension block 'address'*/
-        unsigned short  ccp_rtcode;     /* server return code            */
-        unsigned short  ccp_rscode;     /* server reason code            */
-        unsigned int    mac_data_len;   /* Mac Data Length               */
-        unsigned char   logon_id[8];    /* Logon Identifier              */
-        unsigned char   mac_value[8];   /* Mac Value                     */
-        unsigned char   mac_content_flgs;/* Mac content flag byte        */
-        unsigned char   pad_002;        /* Alignment                     */
-        unsigned short  domain;         /* Domain                        */
-        unsigned char   usage_domain[4];/* Usage domain                  */
-        unsigned char   cntrl_domain[4];/* Control domain                */
-        unsigned char   S390enf_mask[4];/* S/390 enforcement mask        */
-        unsigned char   pad_004[36];    /* reserved                      */
-} __attribute__((packed));
-
-/**
- * xcRB
- */
-struct ica_xcRB {
-        unsigned short  agent_ID;
-        unsigned int    user_defined;
-        unsigned short  request_ID;
-        unsigned int    request_control_blk_length;
-        unsigned char   padding1[16 - sizeof (char *)];
-        char __user *   request_control_blk_addr;
-        unsigned int    request_data_length;
-        char            padding2[16 - sizeof (char *)];
-        char __user *   request_data_address;
-        unsigned int    reply_control_blk_length;
-        char            padding3[16 - sizeof (char *)];
-        char __user *   reply_control_blk_addr;
-        unsigned int    reply_data_length;
-        char            padding4[16 - sizeof (char *)];
-        char __user *   reply_data_addr;
-        unsigned short  priority_window;
-        unsigned int    status;
-} __attribute__((packed));
-#define AUTOSELECT ((unsigned int)0xFFFFFFFF)
-
-#define ZCRYPT_IOCTL_MAGIC 'z'
-
-/**
- * Interface notes:
- *
- * The ioctl()s which are implemented (along with relevant details)
- * are:
- *
- *   ICARSAMODEXPO
- *     Perform an RSA operation using a Modulus-Exponent pair
- *     This takes an ica_rsa_modexpo struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   ICARSACRT
- *     Perform an RSA operation using a Chinese-Remainder Theorem key
- *     This takes an ica_rsa_modexpo_crt struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   ZSECSENDCPRB
- *     Send an arbitrary CPRB to a crypto card.
- *
- *   Z90STAT_STATUS_MASK
- *     Return an 64 element array of unsigned chars for the status of
- *     all devices.
- *       0x01: PCICA
- *       0x02: PCICC
- *       0x03: PCIXCC_MCL2
- *       0x04: PCIXCC_MCL3
- *       0x05: CEX2C
- *       0x06: CEX2A
- *       0x0d: device is disabled via the proc filesystem
- *
- *   Z90STAT_QDEPTH_MASK
- *     Return an 64 element array of unsigned chars for the queue
- *     depth of all devices.
- *
- *   Z90STAT_PERDEV_REQCNT
- *     Return an 64 element array of unsigned integers for the number
- *     of successfully completed requests per device since the device
- *     was detected and made available.
- *
- *   Z90STAT_REQUESTQ_COUNT
- *     Return an integer count of the number of entries waiting to be
- *     sent to a device.
- *
- *   Z90STAT_PENDINGQ_COUNT
- *     Return an integer count of the number of entries sent to all
- *     devices awaiting the reply.
- *
- *   Z90STAT_TOTALOPEN_COUNT
- *     Return an integer count of the number of open file handles.
- *
- *   Z90STAT_DOMAIN_INDEX
- *     Return the integer value of the Cryptographic Domain.
- *
- *   The following ioctls are deprecated and should be no longer used:
- *
- *   Z90STAT_TOTALCOUNT
- *     Return an integer count of all device types together.
- *
- *   Z90STAT_PCICACOUNT
- *     Return an integer count of all PCICAs.
- *
- *   Z90STAT_PCICCCOUNT
- *     Return an integer count of all PCICCs.
- *
- *   Z90STAT_PCIXCCMCL2COUNT
- *     Return an integer count of all MCL2 PCIXCCs.
- *
- *   Z90STAT_PCIXCCMCL3COUNT
- *     Return an integer count of all MCL3 PCIXCCs.
- *
- *   Z90STAT_CEX2CCOUNT
- *     Return an integer count of all CEX2Cs.
- *
- *   Z90STAT_CEX2ACOUNT
- *     Return an integer count of all CEX2As.
- *
- *   ICAZ90STATUS
- *     Return some device driver status in a ica_z90_status struct
- *     This takes an ica_z90_status struct as its arg.
- *
- *   Z90STAT_PCIXCCCOUNT
- *     Return an integer count of all PCIXCCs (MCL2 + MCL3).
- *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from
- *     MCL2 PCIXCCs.
- */
-
-/**
- * Supported ioctl calls
- */
-#define ICARSAMODEXPO   _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x05, 0)
-#define ICARSACRT       _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x06, 0)
-#define ZSECSENDCPRB    _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x81, 0)
-
-/* New status calls */
-#define Z90STAT_TOTALCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x40, int)
-#define Z90STAT_PCICACOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x41, int)
-#define Z90STAT_PCICCCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x42, int)
-#define Z90STAT_PCIXCCMCL2COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x4b, int)
-#define Z90STAT_PCIXCCMCL3COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x4c, int)
-#define Z90STAT_CEX2CCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x4d, int)
-#define Z90STAT_CEX2ACOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x4e, int)
-#define Z90STAT_REQUESTQ_COUNT  _IOR(ZCRYPT_IOCTL_MAGIC, 0x44, int)
-#define Z90STAT_PENDINGQ_COUNT  _IOR(ZCRYPT_IOCTL_MAGIC, 0x45, int)
-#define Z90STAT_TOTALOPEN_COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x46, int)
-#define Z90STAT_DOMAIN_INDEX    _IOR(ZCRYPT_IOCTL_MAGIC, 0x47, int)
-#define Z90STAT_STATUS_MASK     _IOR(ZCRYPT_IOCTL_MAGIC, 0x48, char[64])
-#define Z90STAT_QDEPTH_MASK     _IOR(ZCRYPT_IOCTL_MAGIC, 0x49, char[64])
-#define Z90STAT_PERDEV_REQCNT   _IOR(ZCRYPT_IOCTL_MAGIC, 0x4a, int[64])
-
-#endif /* __ASM_S390_ZCRYPT_H */