339 files changed, 3091 insertions, 19061 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index a2228511d4be..c34b11022908 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -270,7 +270,6 @@ struct acpi_device {
        struct list_head children;
        struct list_head node;
        struct list_head wakeup_list;
-        struct list_head g_list;
        struct acpi_device_status status;
        struct acpi_device_flags flags;
        struct acpi_device_pnp pnp;
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index aeaf7cd41dc7..4db89e98535d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -191,14 +191,12 @@ acpi_evaluate_object(acpi_handle object,
                     struct acpi_object_list *parameter_objects,
                     struct acpi_buffer *return_object_buffer);
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_evaluate_object_typed(acpi_handle object,
                           acpi_string pathname,
                           struct acpi_object_list *external_params,
                           struct acpi_buffer *return_buffer,
                           acpi_object_type return_type);
-#endif
 acpi_status
 acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
diff --git a/include/asm-frv/Kbuild b/include/asm-frv/Kbuild
deleted file mode 100644
index 0f8956def738..000000000000
--- a/include/asm-frv/Kbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-include include/asm-generic/Kbuild.asm
-header-y += registers.h
-unifdef-y += termios.h
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
deleted file mode 100644
index 296c35cfb207..000000000000
--- a/include/asm-frv/atomic.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* atomic.h: atomic operation emulation for FR-V
- *
- * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/frv/atomic-ops.txt
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_ATOMIC_H
-#define _ASM_ATOMIC_H
-#include <linux/types.h>
-#include <asm/spr-regs.h>
-#include <asm/system.h>
-#ifdef CONFIG_SMP
-#error not SMP safe
-#endif
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- *
- * We do not have SMP systems, so we don't have to deal with that.
- */
-/* Atomic operations are already serializing */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-#define ATOMIC_INIT(i)          { (i) }
-#define atomic_read(v)          ((v)->counter)
-#define atomic_set(v, i)        (((v)->counter) = (i))
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long val;
-        asm("0:                                         \n"
-            "   orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-            "   ckeq            icc3,cc7                \n"
-            "   ld.p            %M0,%1                  \n"     /* LD.P/ORCR must be atomic */
-            "   orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-            "   add%I2          %1,%2,%1                \n"
-            "   cst.p           %1,%M0          ,cc3,#1 \n"
-            "   corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* clear ICC3.Z if store happens */
-            "   beq             icc3,#0,0b              \n"
-            : "+U"(v->counter), "=&r"(val)
-            : "NPr"(i)
-            : "memory", "cc7", "cc3", "icc3"
-            );
-        return val;
-}
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long val;
-        asm("0:                                         \n"
-            "   orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-            "   ckeq            icc3,cc7                \n"
-            "   ld.p            %M0,%1                  \n"     /* LD.P/ORCR must be atomic */
-            "   orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-            "   sub%I2          %1,%2,%1                \n"
-            "   cst.p           %1,%M0          ,cc3,#1 \n"
-            "   corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* clear ICC3.Z if store happens */
-            "   beq             icc3,#0,0b              \n"
-            : "+U"(v->counter), "=&r"(val)
-            : "NPr"(i)
-            : "memory", "cc7", "cc3", "icc3"
-            );
-        return val;
-}
-#else
-extern int atomic_add_return(int i, atomic_t *v);
-extern int atomic_sub_return(int i, atomic_t *v);
-#endif
-static inline int atomic_add_negative(int i, atomic_t *v)
-{
-        return atomic_add_return(i, v) < 0;
-}
-static inline void atomic_add(int i, atomic_t *v)
-{
-        atomic_add_return(i, v);
-}
-static inline void atomic_sub(int i, atomic_t *v)
-{
-        atomic_sub_return(i, v);
-}
-static inline void atomic_inc(atomic_t *v)
-{
-        atomic_add_return(1, v);
-}
-static inline void atomic_dec(atomic_t *v)
-{
-        atomic_sub_return(1, v);
-}
-#define atomic_dec_return(v)            atomic_sub_return(1, (v))
-#define atomic_inc_return(v)            atomic_add_return(1, (v))
-#define atomic_sub_and_test(i,v)        (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v)          (atomic_sub_return(1, (v)) == 0)
-#define atomic_inc_and_test(v)          (atomic_add_return(1, (v)) == 0)
-/*****************************************************************************/
-/*
- * exchange value with memory
- */
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-#define xchg(ptr, x)                                                            \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig;                                           \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4:                                                                 \
-                asm volatile(                                                   \
-                        "swap%I0 %M0,%1"                                        \
-                        : "+m"(*__xg_ptr), "=r"(__xg_orig)                      \
-                        : "1"(x)                                                \
-                        : "memory"                                              \
-                        );                                                      \
-                break;                                                          \
-                                                                                \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-#else
-extern uint32_t __xchg_32(uint32_t i, volatile void *v);
-#define xchg(ptr, x)                                                                            \
-({                                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                                       \
-        __typeof__(*(ptr)) __xg_orig;                                                           \
-                                                                                                \
-        switch (sizeof(__xg_orig)) {                                                            \
-        case 4: __xg_orig = (__typeof__(*(ptr))) __xchg_32((uint32_t) x, __xg_ptr);     break;  \
-        default:                                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                                                                   \
-                asm volatile("break");                                                          \
-                break;                                                                          \
-        }                                                                                       \
-        __xg_orig;                                                                              \
-})
-#endif
-#define tas(ptr) (xchg((ptr), 1))
-#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), old, new))
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-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)
-#include <asm-generic/atomic.h>
-#endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-frv/auxvec.h b/include/asm-frv/auxvec.h
deleted file mode 100644
index 07710778fa10..000000000000
--- a/include/asm-frv/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __FRV_AUXVEC_H
-#define __FRV_AUXVEC_H
-#endif
diff --git a/include/asm-frv/ax88796.h b/include/asm-frv/ax88796.h
deleted file mode 100644
index 637e980393c5..000000000000
--- a/include/asm-frv/ax88796.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ax88796.h: access points to the driver for the AX88796 NE2000 clone
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_AX88796_H
-#define _ASM_AX88796_H
-#include <asm/mb-regs.h>
-#define AX88796_IOADDR          (__region_CS1 + 0x200)
-#define AX88796_IRQ             IRQ_CPU_EXTERNAL7
-#define AX88796_FULL_DUPLEX     0                       /* force full duplex */
-#define AX88796_BUS_INFO        "CS1#+0x200"            /* bus info for ethtool */
-#endif /* _ASM_AX88796_H */
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
deleted file mode 100644
index 287f6f697ce2..000000000000
--- a/include/asm-frv/bitops.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/* bitops.h: bit operations for the Fujitsu FR-V CPUs
- *
- * For an explanation of how atomic ops work in this arch, see:
- *   Documentation/frv/atomic-ops.txt
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_BITOPS_H
-#define _ASM_BITOPS_H
-#include <linux/compiler.h>
-#include <asm/byteorder.h>
-#ifdef __KERNEL__
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-#include <asm-generic/bitops/ffz.h>
-/*
- * clear_bit() doesn't provide any barrier for the compiler.
- */
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-static inline
-unsigned long atomic_test_and_ANDNOT_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       and%I3          %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(~mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-        return old;
-}
-static inline
-unsigned long atomic_test_and_OR_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       or%I3           %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-        return old;
-}
-static inline
-unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsigned long *v)
-{
-        unsigned long old, tmp;
-        asm volatile(
-                "0:                                             \n"
-                "       orcc            gr0,gr0,gr0,icc3        \n"     /* set ICC3.Z */
-                "       ckeq            icc3,cc7                \n"
-                "       ld.p            %M0,%1                  \n"     /* LD.P/ORCR are atomic */
-                "       orcr            cc7,cc7,cc3             \n"     /* set CC3 to true */
-                "       xor%I3          %1,%3,%2                \n"
-                "       cst.p           %2,%M0          ,cc3,#1 \n"     /* if store happens... */
-                "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     /* ... clear ICC3.Z */
-                "       beq             icc3,#0,0b              \n"
-                : "+U"(*v), "=&r"(old), "=r"(tmp)
-                : "NPr"(mask)
-                : "memory", "cc7", "cc3", "icc3"
-                );
-        return old;
-}
-#else
-extern unsigned long atomic_test_and_ANDNOT_mask(unsigned long mask, volatile unsigned long *v);
-extern unsigned long atomic_test_and_OR_mask(unsigned long mask, volatile unsigned long *v);
-extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsigned long *v);
-#endif
-#define atomic_clear_mask(mask, v)      atomic_test_and_ANDNOT_mask((mask), (v))
-#define atomic_set_mask(mask, v)        atomic_test_and_OR_mask((mask), (v))
-static inline int test_and_clear_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_ANDNOT_mask(mask, ptr) & mask) != 0;
-}
-static inline int test_and_set_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_OR_mask(mask, ptr) & mask) != 0;
-}
-static inline int test_and_change_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *ptr = addr;
-        unsigned long mask = 1UL << (nr & 31);
-        ptr += nr >> 5;
-        return (atomic_test_and_XOR_mask(mask, ptr) & mask) != 0;
-}
-static inline void clear_bit(int nr, volatile void *addr)
-{
-        test_and_clear_bit(nr, addr);
-}
-static inline void set_bit(int nr, volatile void *addr)
-{
-        test_and_set_bit(nr, addr);
-}
-static inline void change_bit(int nr, volatile void * addr)
-{
-        test_and_change_bit(nr, addr);
-}
-static inline void __clear_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a &= ~mask;
-}
-static inline void __set_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a |= mask;
-}
-static inline void __change_bit(int nr, volatile void *addr)
-{
-        volatile unsigned long *a = addr;
-        int mask;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        *a ^= mask;
-}
-static inline int __test_and_clear_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a &= ~mask;
-        return retval;
-}
-static inline int __test_and_set_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a |= mask;
-        return retval;
-}
-static inline int __test_and_change_bit(int nr, volatile void * addr)
-{
-        volatile unsigned long *a = addr;
-        int mask, retval;
-        a += nr >> 5;
-        mask = 1 << (nr & 31);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-        return retval;
-}
-/*
- * This routine doesn't need to be atomic.
- */
-static inline int __constant_test_bit(int nr, const volatile void * addr)
-{
-        return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
-}
-static inline int __test_bit(int nr, const volatile void * addr)
-{
-        int     * a = (int *) addr;
-        int     mask;
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        return ((mask & *a) != 0);
-}
-#define test_bit(nr,addr) \
-(__builtin_constant_p(nr) ? \
- __constant_test_bit((nr),(addr)) : \
- __test_bit((nr),(addr)))
-#include <asm-generic/bitops/find.h>
-/**
- * fls - find last bit set
- * @x: the word to search
- *
- * This is defined the same way as ffs:
- * - return 32..1 to indicate bit 31..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-#define fls(x)                                          \
-({                                                      \
-        int bit;                                        \
-                                                        \
-        asm("   subcc   %1,gr0,gr0,icc0         \n"     \
-            "   ckne    icc0,cc4                \n"     \
-            "   cscan.p %1,gr0,%0       ,cc4,#1 \n"     \
-            "   csub    %0,%0,%0        ,cc4,#0 \n"     \
-            "   csub    %2,%0,%0        ,cc4,#1 \n"     \
-            : "=&r"(bit)                                \
-            : "r"(x), "r"(32)                           \
-            : "icc0", "cc4"                             \
-            );                                          \
-                                                        \
-        bit;                                            \
-})
-/**
- * fls64 - find last bit set in a 64-bit value
- * @n: the value to search
- *
- * This is defined the same way as ffs:
- * - return 64..1 to indicate bit 63..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int fls64(u64 n)
-{
-        union {
-                u64 ll;
-                struct { u32 h, l; };
-        } _;
-        int bit, x, y;
-        _.ll = n;
-        asm("   subcc.p         %3,gr0,gr0,icc0         \n"
-            "   subcc           %4,gr0,gr0,icc1         \n"
-            "   ckne            icc0,cc4                \n"
-            "   ckne            icc1,cc5                \n"
-            "   norcr           cc4,cc5,cc6             \n"
-            "   csub.p          %0,%0,%0        ,cc6,1  \n"
-            "   orcr            cc5,cc4,cc4             \n"
-            "   andcr           cc4,cc5,cc4             \n"
-            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
-            "   setlos          #64,%1                  \n"
-            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
-            "   setlos          #32,%2                  \n"
-            "   csub.p          %1,%0,%0        ,cc4,0  \n"
-            "   csub            %2,%0,%0        ,cc4,1  \n"
-            : "=&r"(bit), "=r"(x), "=r"(y)
-            : "0r"(_.h), "r"(_.l)
-            : "icc0", "icc1", "cc4", "cc5", "cc6"
-            );
-        return bit;
-}
-/**
- * ffs - find first bit set
- * @x: the word to search
- *
- * - return 32..1 to indicate bit 31..0 most least significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int ffs(int x)
-{
-        /* Note: (x & -x) gives us a mask that is the least significant
-         * (rightmost) 1-bit of the value in x.
-         */
-        return fls(x & -x);
-}
-/**
- * __ffs - find first bit set
- * @x: the word to search
- *
- * - return 31..0 to indicate bit 31..0 most least significant bit set
- * - if no bits are set in x, the result is undefined
- */
-static inline __attribute__((const))
-int __ffs(unsigned long x)
-{
-        int bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(x & -x));
-        return 31 - bit;
-}
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __fls(unsigned long word)
-{
-        unsigned long bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(word));
-        return bit;
-}
-/*
- * special slimline version of fls() for calculating ilog2_u32()
- * - note: no protection against n == 0
- */
-#define ARCH_HAS_ILOG2_U32
-static inline __attribute__((const))
-int __ilog2_u32(u32 n)
-{
-        int bit;
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(n));
-        return 31 - bit;
-}
-/*
- * special slimline version of fls64() for calculating ilog2_u64()
- * - note: no protection against n == 0
- */
-#define ARCH_HAS_ILOG2_U64
-static inline __attribute__((const))
-int __ilog2_u64(u64 n)
-{
-        union {
-                u64 ll;
-                struct { u32 h, l; };
-        } _;
-        int bit, x, y;
-        _.ll = n;
-        asm("   subcc           %3,gr0,gr0,icc0         \n"
-            "   ckeq            icc0,cc4                \n"
-            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
-            "   setlos          #63,%1                  \n"
-            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
-            "   setlos          #31,%2                  \n"
-            "   csub.p          %1,%0,%0        ,cc4,0  \n"
-            "   csub            %2,%0,%0        ,cc4,1  \n"
-            : "=&r"(bit), "=r"(x), "=r"(y)
-            : "0r"(_.h), "r"(_.l)
-            : "icc0", "cc4"
-            );
-        return bit;
-}
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-#include <asm-generic/bitops/lock.h>
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#define ext2_set_bit_atomic(lock,nr,addr)       test_and_set_bit  ((nr) ^ 0x18, (addr))
-#define ext2_clear_bit_atomic(lock,nr,addr)     test_and_clear_bit((nr) ^ 0x18, (addr))
-#include <asm-generic/bitops/minix-le.h>
-#endif /* __KERNEL__ */
-#endif /* _ASM_BITOPS_H */
diff --git a/include/asm-frv/bug.h b/include/asm-frv/bug.h
deleted file mode 100644
index 6b1b44d71028..000000000000
--- a/include/asm-frv/bug.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* bug.h: FRV bug trapping
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_BUG_H
-#define _ASM_BUG_H
-#include <linux/linkage.h>
-#ifdef CONFIG_BUG
-/*
- * Tell the user there is some problem.
- */
-extern asmlinkage void __debug_bug_trap(int signr);
-#ifdef CONFIG_NO_KERNEL_MSG
-#define _debug_bug_printk()
-#else
-extern void __debug_bug_printk(const char *file, unsigned line);
-#define _debug_bug_printk() __debug_bug_printk(__FILE__, __LINE__)
-#endif
-#define _debug_bug_trap(signr)                  \
-do {                                            \
-        __debug_bug_trap(signr);                \
-        asm volatile("nop");                    \
-} while(0)
-#define HAVE_ARCH_BUG
-#define BUG()                                   \
-do {                                            \
-        _debug_bug_printk();                    \
-        _debug_bug_trap(6 /*SIGABRT*/);         \
-} while (0)
-#ifdef CONFIG_GDBSTUB
-#define HAVE_ARCH_KGDB_RAISE
-#define kgdb_raise(signr) do { _debug_bug_trap(signr); } while(0)
-#define HAVE_ARCH_KGDB_BAD_PAGE
-#define kgdb_bad_page(page) do { kgdb_raise(SIGABRT); } while(0)
-#endif
-#endif
-#include <asm-generic/bug.h>
-#endif
diff --git a/include/asm-frv/bugs.h b/include/asm-frv/bugs.h
deleted file mode 100644
index f2382be2b46c..000000000000
--- a/include/asm-frv/bugs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* bugs.h: arch bug checking entry
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-static inline void check_bugs(void)
-{
-}
diff --git a/include/asm-frv/busctl-regs.h b/include/asm-frv/busctl-regs.h
deleted file mode 100644
index bb0ff4816e27..000000000000
--- a/include/asm-frv/busctl-regs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* busctl-regs.h: FR400-series CPU bus controller registers
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_BUSCTL_REGS_H
-#define _ASM_BUSCTL_REGS_H
-/* bus controller registers */
-#define __get_LGCR()    ({ *(volatile unsigned long *)(0xfe000010); })
-#define __get_LMAICR()  ({ *(volatile unsigned long *)(0xfe000030); })
-#define __get_LEMBR()   ({ *(volatile unsigned long *)(0xfe000040); })
-#define __get_LEMAM()   ({ *(volatile unsigned long *)(0xfe000048); })
-#define __get_LCR(R)    ({ *(volatile unsigned long *)(0xfe000100 + 8*(R)); })
-#define __get_LSBR(R)   ({ *(volatile unsigned long *)(0xfe000c00 + 8*(R)); })
-#define __get_LSAM(R)   ({ *(volatile unsigned long *)(0xfe000d00 + 8*(R)); })
-#define __set_LGCR(V)   do { *(volatile unsigned long *)(0xfe000010) = (V); } while(0)
-#define __set_LMAICR(V) do { *(volatile unsigned long *)(0xfe000030) = (V); } while(0)
-#define __set_LEMBR(V)  do { *(volatile unsigned long *)(0xfe000040) = (V); } while(0)
-#define __set_LEMAM(V)  do { *(volatile unsigned long *)(0xfe000048) = (V); } while(0)
-#define __set_LCR(R,V)  do { *(volatile unsigned long *)(0xfe000100 + 8*(R)) = (V); } while(0)
-#define __set_LSBR(R,V) do { *(volatile unsigned long *)(0xfe000c00 + 8*(R)) = (V); } while(0)
-#define __set_LSAM(R,V) do { *(volatile unsigned long *)(0xfe000d00 + 8*(R)) = (V); } while(0)
-/* FR401 SDRAM controller registers */
-#define __get_DBR(R)    ({ *(volatile unsigned long *)(0xfe000e00 + 8*(R)); })
-#define __get_DAM(R)    ({ *(volatile unsigned long *)(0xfe000f00 + 8*(R)); })
-/* FR551 SDRAM controller registers */
-#define __get_DARS(R)   ({ *(volatile unsigned long *)(0xfeff0100 + 8*(R)); })
-#define __get_DAMK(R)   ({ *(volatile unsigned long *)(0xfeff0110 + 8*(R)); })
-#endif /* _ASM_BUSCTL_REGS_H */
diff --git a/include/asm-frv/byteorder.h b/include/asm-frv/byteorder.h
deleted file mode 100644
index f29b7593e088..000000000000
--- a/include/asm-frv/byteorder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_BYTEORDER_H
-#define _ASM_BYTEORDER_H
-#include <linux/byteorder/big_endian.h>
-#endif /* _ASM_BYTEORDER_H */
diff --git a/include/asm-frv/cache.h b/include/asm-frv/cache.h
deleted file mode 100644
index 2797163b8f4f..000000000000
--- a/include/asm-frv/cache.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* cache.h: FRV cache definitions
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef __ASM_CACHE_H
-#define __ASM_CACHE_H
-/* bytes per L1 cache line */
-#define L1_CACHE_SHIFT          (CONFIG_FRV_L1_CACHE_SHIFT)
-#define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)
-#define __cacheline_aligned     __attribute__((aligned(L1_CACHE_BYTES)))
-#define ____cacheline_aligned   __attribute__((aligned(L1_CACHE_BYTES)))
-#endif
diff --git a/include/asm-frv/cacheflush.h b/include/asm-frv/cacheflush.h
deleted file mode 100644
index 432a69e7f3d4..000000000000
--- a/include/asm-frv/cacheflush.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* cacheflush.h: FRV cache flushing routines
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_CACHEFLUSH_H
-#define _ASM_CACHEFLUSH_H
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-/*
- * virtually-indexed cache management (our cache is physically indexed)
- */
-#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(mm, start, end)       do {} while(0)
-#define flush_cache_page(vma, vmaddr, pfn)      do {} while(0)
-#define flush_cache_vmap(start, end)            do {} while(0)
-#define flush_cache_vunmap(start, end)          do {} while(0)
-#define flush_dcache_mmap_lock(mapping)         do {} while(0)
-#define flush_dcache_mmap_unlock(mapping)       do {} while(0)
-/*
- * physically-indexed cache management
- * - see arch/frv/lib/cache.S
- */
-extern void frv_dcache_writeback(unsigned long start, unsigned long size);
-extern void frv_cache_invalidate(unsigned long start, unsigned long size);
-extern void frv_icache_invalidate(unsigned long start, unsigned long size);
-extern void frv_cache_wback_inv(unsigned long start, unsigned long size);
-static inline void __flush_cache_all(void)
-{
-        asm volatile("  dcef    @(gr0,gr0),#1   \n"
-                     "  icei    @(gr0,gr0),#1   \n"
-                     "  membar                  \n"
-                     : : : "memory"
-                     );
-}
-/* dcache/icache coherency... */
-#ifdef CONFIG_MMU
-extern void flush_dcache_page(struct page *page);
-#else
-static inline void flush_dcache_page(struct page *page)
-{
-        unsigned long addr = page_to_phys(page);
-        frv_dcache_writeback(addr, addr + PAGE_SIZE);
-}
-#endif
-static inline void flush_page_to_ram(struct page *page)
-{
-        flush_dcache_page(page);
-}
-static inline void flush_icache(void)
-{
-        __flush_cache_all();
-}
-static inline void flush_icache_range(unsigned long start, unsigned long end)
-{
-        frv_cache_wback_inv(start, end);
-}
-#ifdef CONFIG_MMU
-extern void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                                    unsigned long start, unsigned long len);
-#else
-static inline void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                                           unsigned long start, unsigned long len)
-{
-        frv_cache_wback_inv(start, start + len);
-}
-#endif
-static inline void flush_icache_page(struct vm_area_struct *vma, struct page *page)
-{
-        flush_icache_user_range(vma, page, page_to_phys(page), PAGE_SIZE);
-}
-/*
- * permit ptrace to access another process's address space through the icache
- * and the dcache
- */
-#define copy_to_user_page(vma, page, vaddr, dst, src, len)      \
-do {                                                            \
-        memcpy((dst), (src), (len));                            \
-        flush_icache_user_range((vma), (page), (vaddr), (len)); \
-} while(0)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len)    \
-        memcpy((dst), (src), (len))
-#endif /* _ASM_CACHEFLUSH_H */
diff --git a/include/asm-frv/checksum.h b/include/asm-frv/checksum.h
deleted file mode 100644
index 269da09ff637..000000000000
--- a/include/asm-frv/checksum.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* checksum.h: FRV checksumming
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_CHECKSUM_H
-#define _ASM_CHECKSUM_H
-#include <linux/in6.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
- */
-__wsum csum_partial(const void *buff, int len, __wsum sum);
-/*
- * the same as csum_partial, but copies from src while it
- * checksums
- *
- * here even more important to align src and dst on a 32-bit (or even
- * better 64-bit) boundary
- */
-__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum 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
- */
-extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
-                                                int len, __wsum sum, int *csum_err);
-/*
- *      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)
-{
-        unsigned int tmp, inc, sum = 0;
-        asm("   addcc           gr0,gr0,gr0,icc0\n" /* clear icc0.C */
-            "   subi            %1,#4,%1        \n"
-            "0:                                 \n"
-            "   ldu.p           @(%1,%3),%4     \n"
-            "   subicc          %2,#1,%2,icc1   \n"
-            "   addxcc.p        %4,%0,%0,icc0   \n"
-            "   bhi             icc1,#2,0b      \n"
-            /* fold the 33-bit result into 16-bits */
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            "   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-            : "=r" (sum), "=r" (iph), "=r" (ihl), "=r" (inc), "=&r"(tmp)
-            : "0" (sum), "1" (iph), "2" (ihl), "3" (4),
-            "m"(*(volatile struct { int _[100]; } *)iph)
-            : "icc0", "icc1", "memory"
-            );
-        return (__force __sum16)~sum;
-}
-/*
- *      Fold a partial checksum
- */
-static inline __sum16 csum_fold(__wsum sum)
-{
-        unsigned int tmp;
-        asm("   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-            : "=r"(sum), "=&r"(tmp)
-            : "0"(sum)
-            );
-        return (__force __sum16)~sum;
-}
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __wsum
-csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
-                  unsigned short proto, __wsum sum)
-{
-        asm("   addcc           %1,%0,%0,icc0   \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   addxcc          %3,%0,%0,icc0   \n"
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            : "=r" (sum)
-            : "r" (daddr), "r" (saddr), "r" (len + proto), "0"(sum)
-            : "icc0"
-            );
-        return sum;
-}
-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
- */
-extern __sum16 ip_compute_csum(const void *buff, int len);
-#define _HAVE_ARCH_IPV6_CSUM
-static inline __sum16
-csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr,
-                __u32 len, unsigned short proto, __wsum sum)
-{
-        unsigned long tmp, tmp2;
-        asm("   addcc           %2,%0,%0,icc0   \n"
-            /* add up the source addr */
-            "   ldi             @(%3,0),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%3,4),%2      \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   ldi             @(%3,8),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%3,12),%2     \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            /* add up the dest addr */
-            "   ldi             @(%4,0),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%4,4),%2      \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            "   ldi             @(%4,8),%1      \n"
-            "   addxcc          %1,%0,%0,icc0   \n"
-            "   ldi             @(%4,12),%2     \n"
-            "   addxcc          %2,%0,%0,icc0   \n"
-            /* fold the 33-bit result into 16-bits */
-            "   addxcc          gr0,%0,%0,icc0  \n"
-            "   srli            %0,#16,%1       \n"
-            "   sethi           #0,%0           \n"
-            "   add             %1,%0,%0        \n"
-            "   srli            %0,#16,%1       \n"
-            "   add             %1,%0,%0        \n"
-            : "=r" (sum), "=&r" (tmp), "=r" (tmp2)
-            : "r" (saddr), "r" (daddr), "0" (sum), "2" (len + proto)
-            : "icc0"
-            );
-        return (__force __sum16)~sum;
-}
-#endif /* _ASM_CHECKSUM_H */
diff --git a/include/asm-frv/cpu-irqs.h b/include/asm-frv/cpu-irqs.h
deleted file mode 100644
index 478f3498fcfe..000000000000
--- a/include/asm-frv/cpu-irqs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* cpu-irqs.h: on-CPU peripheral irqs
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_CPU_IRQS_H
-#define _ASM_CPU_IRQS_H
-#ifndef __ASSEMBLY__
-/* IRQ to level mappings */
-#define IRQ_GDBSTUB_LEVEL       15
-#define IRQ_UART_LEVEL          13
-#ifdef CONFIG_GDBSTUB_UART0
-#define IRQ_UART0_LEVEL         IRQ_GDBSTUB_LEVEL
-#else
-#define IRQ_UART0_LEVEL         IRQ_UART_LEVEL
-#endif
-#ifdef CONFIG_GDBSTUB_UART1
-#define IRQ_UART1_LEVEL         IRQ_GDBSTUB_LEVEL
-#else
-#define IRQ_UART1_LEVEL         IRQ_UART_LEVEL
-#endif
-#define IRQ_DMA0_LEVEL          14
-#define IRQ_DMA1_LEVEL          14
-#define IRQ_DMA2_LEVEL          14
-#define IRQ_DMA3_LEVEL          14
-#define IRQ_DMA4_LEVEL          14
-#define IRQ_DMA5_LEVEL          14
-#define IRQ_DMA6_LEVEL          14
-#define IRQ_DMA7_LEVEL          14
-#define IRQ_TIMER0_LEVEL        12
-#define IRQ_TIMER1_LEVEL        11
-#define IRQ_TIMER2_LEVEL        10
-#define IRQ_XIRQ0_LEVEL         1
-#define IRQ_XIRQ1_LEVEL         2
-#define IRQ_XIRQ2_LEVEL         3
-#define IRQ_XIRQ3_LEVEL         4
-#define IRQ_XIRQ4_LEVEL         5
-#define IRQ_XIRQ5_LEVEL         6
-#define IRQ_XIRQ6_LEVEL         7
-#define IRQ_XIRQ7_LEVEL         8
-/* IRQ IDs presented to drivers */
-#define IRQ_CPU__UNUSED         IRQ_BASE_CPU
-#define IRQ_CPU_UART0           (IRQ_BASE_CPU + IRQ_UART0_LEVEL)
-#define IRQ_CPU_UART1           (IRQ_BASE_CPU + IRQ_UART1_LEVEL)
-#define IRQ_CPU_TIMER0          (IRQ_BASE_CPU + IRQ_TIMER0_LEVEL)
-#define IRQ_CPU_TIMER1          (IRQ_BASE_CPU + IRQ_TIMER1_LEVEL)
-#define IRQ_CPU_TIMER2          (IRQ_BASE_CPU + IRQ_TIMER2_LEVEL)
-#define IRQ_CPU_DMA0            (IRQ_BASE_CPU + IRQ_DMA0_LEVEL)
-#define IRQ_CPU_DMA1            (IRQ_BASE_CPU + IRQ_DMA1_LEVEL)
-#define IRQ_CPU_DMA2            (IRQ_BASE_CPU + IRQ_DMA2_LEVEL)
-#define IRQ_CPU_DMA3            (IRQ_BASE_CPU + IRQ_DMA3_LEVEL)
-#define IRQ_CPU_DMA4            (IRQ_BASE_CPU + IRQ_DMA4_LEVEL)
-#define IRQ_CPU_DMA5            (IRQ_BASE_CPU + IRQ_DMA5_LEVEL)
-#define IRQ_CPU_DMA6            (IRQ_BASE_CPU + IRQ_DMA6_LEVEL)
-#define IRQ_CPU_DMA7            (IRQ_BASE_CPU + IRQ_DMA7_LEVEL)
-#define IRQ_CPU_EXTERNAL0       (IRQ_BASE_CPU + IRQ_XIRQ0_LEVEL)
-#define IRQ_CPU_EXTERNAL1       (IRQ_BASE_CPU + IRQ_XIRQ1_LEVEL)
-#define IRQ_CPU_EXTERNAL2       (IRQ_BASE_CPU + IRQ_XIRQ2_LEVEL)
-#define IRQ_CPU_EXTERNAL3       (IRQ_BASE_CPU + IRQ_XIRQ3_LEVEL)
-#define IRQ_CPU_EXTERNAL4       (IRQ_BASE_CPU + IRQ_XIRQ4_LEVEL)
-#define IRQ_CPU_EXTERNAL5       (IRQ_BASE_CPU + IRQ_XIRQ5_LEVEL)
-#define IRQ_CPU_EXTERNAL6       (IRQ_BASE_CPU + IRQ_XIRQ6_LEVEL)
-#define IRQ_CPU_EXTERNAL7       (IRQ_BASE_CPU + IRQ_XIRQ7_LEVEL)
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_CPU_IRQS_H */
diff --git a/include/asm-frv/cpumask.h b/include/asm-frv/cpumask.h
deleted file mode 100644
index d999c20c84d2..000000000000
--- a/include/asm-frv/cpumask.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUMASK_H
-#define _ASM_CPUMASK_H
-#include <asm-generic/cpumask.h>
-#endif /* _ASM_CPUMASK_H */
diff --git a/include/asm-frv/cputime.h b/include/asm-frv/cputime.h
deleted file mode 100644
index f6c373ad2b80..000000000000
--- a/include/asm-frv/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_CPUTIME_H
-#define _ASM_CPUTIME_H
-#include <asm-generic/cputime.h>
-#endif /* _ASM_CPUTIME_H */
diff --git a/include/asm-frv/current.h b/include/asm-frv/current.h
deleted file mode 100644
index 86b027491b08..000000000000
--- a/include/asm-frv/current.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* current.h: FRV current task pointer
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_CURRENT_H
-#define _ASM_CURRENT_H
-#ifndef __ASSEMBLY__
-/*
- * dedicate GR29 to keeping the current task pointer
- */
-register struct task_struct *current asm("gr29");
-#define get_current() current
-#else
-#define CURRENT gr29
-#endif
-#endif /* _ASM_CURRENT_H */
diff --git a/include/asm-frv/delay.h b/include/asm-frv/delay.h
deleted file mode 100644
index 597b4ebf03b4..000000000000
--- a/include/asm-frv/delay.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* delay.h: FRV delay code
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_DELAY_H
-#define _ASM_DELAY_H
-#include <asm/param.h>
-#include <asm/timer-regs.h>
-/*
- * delay loop - runs at __core_clock_speed_HZ / 2 [there are 2 insns in the loop]
- */
-extern unsigned long __delay_loops_MHz;
-static inline void __delay(unsigned long loops)
-{
-        asm volatile("1:        subicc  %0,#1,%0,icc0   \n"
-                     "          bnc     icc0,#2,1b      \n"
-                     : "=r" (loops)
-                     : "0" (loops)
-                     : "icc0"
-                     );
-}
-/*
- * Use only for very small delays ( < 1 msec).  Should probably use a
- * lookup table, really, as the multiplications take much too long with
- * short delays.  This is a "reasonable" implementation, though (and the
- * first constant multiplications gets optimized away if the delay is
- * a constant)
- */
-extern unsigned long loops_per_jiffy;
-static inline void udelay(unsigned long usecs)
-{
-        __delay(usecs * __delay_loops_MHz);
-}
-#define ndelay(n)       udelay((n) * 5)
-#endif /* _ASM_DELAY_H */
diff --git a/include/asm-frv/device.h b/include/asm-frv/device.h
deleted file mode 100644
index d8f9872b0e2d..000000000000
--- a/include/asm-frv/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-frv/div64.h b/include/asm-frv/div64.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/include/asm-frv/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/include/asm-frv/dm9000.h b/include/asm-frv/dm9000.h
deleted file mode 100644
index f6f48fd9ec6e..000000000000
--- a/include/asm-frv/dm9000.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* dm9000.h: Davicom DM9000 adapter configuration
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_DM9000_H
-#define _ASM_DM9000_H
-#include <asm/mb-regs.h>
-#define DM9000_ARCH_IOBASE      (__region_CS6 + 0x300)
-#define DM9000_ARCH_IRQ         IRQ_CPU_EXTERNAL3       /* XIRQ #3 (shared with FPGA) */
-#undef DM9000_ARCH_IRQ_ACTLOW                           /* IRQ pin active high */
-#define DM9000_ARCH_BUS_INFO    "CS6#+0x300"            /* bus info for ethtool */
-#undef __is_PCI_IO
-#define __is_PCI_IO(addr)       0       /* not PCI */
-#undef inl
-#define inl(addr)                                                                               \
-({                                                                                              \
-        unsigned long __ioaddr = (unsigned long) addr;                                          \
-        uint32_t x = readl(__ioaddr);                                                           \
-        ((x & 0xff) << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff);    \
-})
-#undef insl
-#define insl(a,b,l)     __insl(a,b,l,0) /* don't byte-swap */
-#endif /* _ASM_DM9000_H */
diff --git a/include/asm-frv/dma-mapping.h b/include/asm-frv/dma-mapping.h
deleted file mode 100644
index b2898877c07b..000000000000
--- a/include/asm-frv/dma-mapping.h
+++ /dev/null
@@ -1,174 +0,0 @@
-#ifndef _ASM_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-#include <linux/device.h>
-#include <asm/cache.h>
-#include <asm/cacheflush.h>
-#include <asm/scatterlist.h>
-#include <asm/io.h>
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-extern unsigned long __nongprelbss dma_coherent_mem_start;
-extern unsigned long __nongprelbss dma_coherent_mem_end;
-void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp);
-void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);
-/*
- * Map a single buffer of the indicated size for DMA in streaming mode.
- * The 32-bit bus address to use is returned.
- *
- * Once the device is given the dma address, the device owns this memory
- * until either pci_unmap_single or pci_dma_sync_single is performed.
- */
-extern dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
-                                 enum dma_data_direction direction);
-/*
- * Unmap a single streaming mode DMA translation.  The dma_addr and size
- * must match what was provided for in a previous pci_map_single call.  All
- * other usages are undefined.
- *
- * After this call, reads by the cpu to the buffer are guarenteed to see
- * whatever the device wrote there.
- */
-static inline
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                      enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-/*
- * Map a set of buffers described by scatterlist in streaming
- * mode for DMA.  This is the scather-gather version of the
- * above pci_map_single interface.  Here the scatter gather list
- * elements are each tagged with the appropriate dma address
- * and length.  They are obtained via sg_dma_{address,length}(SG).
- *
- * NOTE: An implementation may be able to use a smaller number of
- *       DMA address/length pairs than there are SG table elements.
- *       (for example via virtual mapping capabilities)
- *       The routine returns the number of addr/length pairs actually
- *       used, at most nents.
- *
- * Device ownership issues as mentioned above for pci_map_single are
- * the same here.
- */
-extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-                      enum dma_data_direction direction);
-/*
- * Unmap a set of streaming mode DMA translations.
- * Again, cpu read rules concerning calls here are the same as for
- * pci_unmap_single() above.
- */
-static inline
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-             enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-extern
-dma_addr_t dma_map_page(struct device *dev, struct page *page, unsigned long offset,
-                        size_t size, enum dma_data_direction direction);
-static inline
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-                    enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-static inline
-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
-                             enum dma_data_direction direction)
-{
-}
-static inline
-void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
-                                enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-static inline
-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction direction)
-{
-}
-static inline
-void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                      unsigned long offset, size_t size,
-                                      enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-static inline
-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
-                         enum dma_data_direction direction)
-{
-}
-static inline
-void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
-                            enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-static inline
-int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-static inline
-int dma_supported(struct device *dev, u64 mask)
-{
-        /*
-         * we fall back to GFP_DMA when the mask isn't all 1s,
-         * so we can't guarantee allocations that must be
-         * within a tighter range than GFP_DMA..
-         */
-        if (mask < 0x00ffffff)
-                return 0;
-        return 1;
-}
-static inline
-int dma_set_mask(struct device *dev, u64 mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-        *dev->dma_mask = mask;
-        return 0;
-}
-static inline
-int dma_get_cache_alignment(void)
-{
-        return 1 << L1_CACHE_SHIFT;
-}
-#define dma_is_consistent(d, h) (1)
-static inline
-void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-                    enum dma_data_direction direction)
-{
-        flush_write_buffers();
-}
-#endif  /* _ASM_DMA_MAPPING_H */
diff --git a/include/asm-frv/dma.h b/include/asm-frv/dma.h
deleted file mode 100644
index 683c47d48a5b..000000000000
--- a/include/asm-frv/dma.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* dma.h: FRV DMA controller management
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_DMA_H
-#define _ASM_DMA_H
-//#define DMA_DEBUG 1
-#include <linux/interrupt.h>
-#undef MAX_DMA_CHANNELS         /* don't use kernel/dma.c */
-/* under 2.4 this is actually needed by the new bootmem allocator */
-#define MAX_DMA_ADDRESS         PAGE_OFFSET
-/*
- * FRV DMA controller management
- */
-typedef irqreturn_t (*dma_irq_handler_t)(int dmachan, unsigned long cstr, void *data);
-extern void frv_dma_init(void);
-extern int frv_dma_open(const char *devname,
-                        unsigned long dmamask,
-                        int dmacap,
-                        dma_irq_handler_t handler,
-                        unsigned long irq_flags,
-                        void *data);
-/* channels required */
-#define FRV_DMA_MASK_ANY        ULONG_MAX       /* any channel */
-/* capabilities required */
-#define FRV_DMA_CAP_DREQ        0x01            /* DMA request pin */
-#define FRV_DMA_CAP_DACK        0x02            /* DMA ACK pin */
-#define FRV_DMA_CAP_DONE        0x04            /* DMA done pin */
-extern void frv_dma_close(int dma);
-extern void frv_dma_config(int dma, unsigned long ccfr, unsigned long cctr, unsigned long apr);
-extern void frv_dma_start(int dma,
-                          unsigned long sba, unsigned long dba,
-                          unsigned long pix, unsigned long six, unsigned long bcl);
-extern void frv_dma_restart_circular(int dma, unsigned long six);
-extern void frv_dma_stop(int dma);
-extern int is_frv_dma_interrupting(int dma);
-extern void frv_dma_dump(int dma);
-extern void frv_dma_status_clear(int dma);
-#define FRV_DMA_NCHANS  8
-#define FRV_DMA_4CHANS  4
-#define FRV_DMA_8CHANS  8
-#define DMAC_CCFRx              0x00    /* channel configuration reg */
-#define DMAC_CCFRx_CM_SHIFT     16
-#define DMAC_CCFRx_CM_DA        0x00000000
-#define DMAC_CCFRx_CM_SCA       0x00010000
-#define DMAC_CCFRx_CM_DCA       0x00020000
-#define DMAC_CCFRx_CM_2D        0x00030000
-#define DMAC_CCFRx_ATS_SHIFT    8
-#define DMAC_CCFRx_RS_INTERN    0x00000000
-#define DMAC_CCFRx_RS_EXTERN    0x00000001
-#define DMAC_CCFRx_RS_SHIFT     0
-#define DMAC_CSTRx              0x08    /* channel status reg */
-#define DMAC_CSTRx_FS           0x0000003f
-#define DMAC_CSTRx_NE           0x00000100
-#define DMAC_CSTRx_FED          0x00000200
-#define DMAC_CSTRx_WER          0x00000800
-#define DMAC_CSTRx_RER          0x00001000
-#define DMAC_CSTRx_CE           0x00002000
-#define DMAC_CSTRx_INT          0x00800000
-#define DMAC_CSTRx_BUSY         0x80000000
-#define DMAC_CCTRx              0x10    /* channel control reg */
-#define DMAC_CCTRx_DSIZ_1       0x00000000
-#define DMAC_CCTRx_DSIZ_2       0x00000001
-#define DMAC_CCTRx_DSIZ_4       0x00000002
-#define DMAC_CCTRx_DSIZ_32      0x00000005
-#define DMAC_CCTRx_DAU_HOLD     0x00000000
-#define DMAC_CCTRx_DAU_INC      0x00000010
-#define DMAC_CCTRx_DAU_DEC      0x00000020
-#define DMAC_CCTRx_SSIZ_1       0x00000000
-#define DMAC_CCTRx_SSIZ_2       0x00000100
-#define DMAC_CCTRx_SSIZ_4       0x00000200
-#define DMAC_CCTRx_SSIZ_32      0x00000500
-#define DMAC_CCTRx_SAU_HOLD     0x00000000
-#define DMAC_CCTRx_SAU_INC      0x00001000
-#define DMAC_CCTRx_SAU_DEC      0x00002000
-#define DMAC_CCTRx_FC           0x08000000
-#define DMAC_CCTRx_ICE          0x10000000
-#define DMAC_CCTRx_IE           0x40000000
-#define DMAC_CCTRx_ACT          0x80000000
-#define DMAC_SBAx               0x18    /* source base address reg */
-#define DMAC_DBAx               0x20    /* data base address reg */
-#define DMAC_PIXx               0x28    /* primary index reg */
-#define DMAC_SIXx               0x30    /* secondary index reg */
-#define DMAC_BCLx               0x38    /* byte count limit reg */
-#define DMAC_APRx               0x40    /* alternate pointer reg */
-/*
- * required for PCI + MODULES
- */
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy    (0)
-#endif
-#endif /* _ASM_DMA_H */
diff --git a/include/asm-frv/elf.h b/include/asm-frv/elf.h
deleted file mode 100644
index 7279ec07d62e..000000000000
--- a/include/asm-frv/elf.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* elf.h: FR-V ELF definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m68knommu/elf.h
- *
- * 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.
- */
-#ifndef __ASM_ELF_H
-#define __ASM_ELF_H
-#include <asm/ptrace.h>
-#include <asm/user.h>
-struct elf32_hdr;
-/*
- * ELF header e_flags defines.
- */
-#define EF_FRV_GPR_MASK         0x00000003 /* mask for # of gprs */
-#define EF_FRV_GPR32            0x00000001 /* Only uses GR on 32-register */
-#define EF_FRV_GPR64            0x00000002 /* Only uses GR on 64-register */
-#define EF_FRV_FPR_MASK         0x0000000c /* mask for # of fprs */
-#define EF_FRV_FPR32            0x00000004 /* Only uses FR on 32-register */
-#define EF_FRV_FPR64            0x00000008 /* Only uses FR on 64-register */
-#define EF_FRV_FPR_NONE         0x0000000C /* Uses software floating-point */
-#define EF_FRV_DWORD_MASK       0x00000030 /* mask for dword support */
-#define EF_FRV_DWORD_YES        0x00000010 /* Assumes stack aligned to 8-byte boundaries. */
-#define EF_FRV_DWORD_NO         0x00000020 /* Assumes stack aligned to 4-byte boundaries. */
-#define EF_FRV_DOUBLE           0x00000040 /* Uses double instructions. */
-#define EF_FRV_MEDIA            0x00000080 /* Uses media instructions. */
-#define EF_FRV_PIC              0x00000100 /* Uses position independent code. */
-#define EF_FRV_NON_PIC_RELOCS   0x00000200 /* Does not use position Independent code. */
-#define EF_FRV_MULADD           0x00000400 /* -mmuladd */
-#define EF_FRV_BIGPIC           0x00000800 /* -fPIC */
-#define EF_FRV_LIBPIC           0x00001000 /* -mlibrary-pic */
-#define EF_FRV_G0               0x00002000 /* -G 0, no small data ptr */
-#define EF_FRV_NOPACK           0x00004000 /* -mnopack */
-#define EF_FRV_FDPIC            0x00008000 /* -mfdpic */
-#define EF_FRV_CPU_MASK         0xff000000 /* specific cpu bits */
-#define EF_FRV_CPU_GENERIC      0x00000000 /* Set CPU type is FR-V */
-#define EF_FRV_CPU_FR500        0x01000000 /* Set CPU type is FR500 */
-#define EF_FRV_CPU_FR300        0x02000000 /* Set CPU type is FR300 */
-#define EF_FRV_CPU_SIMPLE       0x03000000 /* SIMPLE */
-#define EF_FRV_CPU_TOMCAT       0x04000000 /* Tomcat, FR500 prototype */
-#define EF_FRV_CPU_FR400        0x05000000 /* Set CPU type is FR400 */
-#define EF_FRV_CPU_FR550        0x06000000 /* Set CPU type is FR550 */
-#define EF_FRV_CPU_FR405        0x07000000 /* Set CPU type is FR405 */
-#define EF_FRV_CPU_FR450        0x08000000 /* Set CPU type is FR450 */
-/*
- * FR-V ELF relocation types
- */
-/*
- * ELF register definitions..
- */
-typedef unsigned long elf_greg_t;
-#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-typedef struct user_fpmedia_regs elf_fpregset_t;
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-extern int elf_check_arch(const struct elf32_hdr *hdr);
-#define elf_check_fdpic(x) ((x)->e_flags & EF_FRV_FDPIC && !((x)->e_flags & EF_FRV_NON_PIC_RELOCS))
-#define elf_check_const_displacement(x) ((x)->e_flags & EF_FRV_PIC)
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#define ELF_ARCH        EM_FRV
-#define ELF_PLAT_INIT(_r)                       \
-do {                                            \
-        __kernel_frame0_ptr->gr16       = 0;    \
-        __kernel_frame0_ptr->gr17       = 0;    \
-        __kernel_frame0_ptr->gr18       = 0;    \
-        __kernel_frame0_ptr->gr19       = 0;    \
-        __kernel_frame0_ptr->gr20       = 0;    \
-        __kernel_frame0_ptr->gr21       = 0;    \
-        __kernel_frame0_ptr->gr22       = 0;    \
-        __kernel_frame0_ptr->gr23       = 0;    \
-        __kernel_frame0_ptr->gr24       = 0;    \
-        __kernel_frame0_ptr->gr25       = 0;    \
-        __kernel_frame0_ptr->gr26       = 0;    \
-        __kernel_frame0_ptr->gr27       = 0;    \
-        __kernel_frame0_ptr->gr29       = 0;    \
-} while(0)
-#define ELF_FDPIC_PLAT_INIT(_regs, _exec_map_addr, _interp_map_addr, _dynamic_addr)     \
-do {                                                                                    \
-        __kernel_frame0_ptr->gr16       = _exec_map_addr;                               \
-        __kernel_frame0_ptr->gr17       = _interp_map_addr;                             \
-        __kernel_frame0_ptr->gr18       = _dynamic_addr;                                \
-        __kernel_frame0_ptr->gr19       = 0;                                            \
-        __kernel_frame0_ptr->gr20       = 0;                                            \
-        __kernel_frame0_ptr->gr21       = 0;                                            \
-        __kernel_frame0_ptr->gr22       = 0;                                            \
-        __kernel_frame0_ptr->gr23       = 0;                                            \
-        __kernel_frame0_ptr->gr24       = 0;                                            \
-        __kernel_frame0_ptr->gr25       = 0;                                            \
-        __kernel_frame0_ptr->gr26       = 0;                                            \
-        __kernel_frame0_ptr->gr27       = 0;                                            \
-        __kernel_frame0_ptr->gr29       = 0;                                            \
-} while(0)
-#define USE_ELF_CORE_DUMP
-#define ELF_FDPIC_CORE_EFLAGS   EF_FRV_FDPIC
-#define ELF_EXEC_PAGESIZE       16384
-/* 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         0x08000000UL
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  */
-#define ELF_HWCAP       (0)
-/* 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.  */
-#define ELF_PLATFORM  (NULL)
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-#endif
diff --git a/include/asm-frv/emergency-restart.h b/include/asm-frv/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/include/asm-frv/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-frv/errno.h b/include/asm-frv/errno.h
deleted file mode 100644
index d010795ceefe..000000000000
--- a/include/asm-frv/errno.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_ERRNO_H
-#define _ASM_ERRNO_H
-#include <asm-generic/errno.h>
-#endif /* _ASM_ERRNO_H */
diff --git a/include/asm-frv/fb.h b/include/asm-frv/fb.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/include/asm-frv/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-frv/fcntl.h b/include/asm-frv/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-frv/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-frv/fpu.h b/include/asm-frv/fpu.h
deleted file mode 100644
index d73c60b56641..000000000000
--- a/include/asm-frv/fpu.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASM_FPU_H
-#define __ASM_FPU_H
-/*
- * MAX floating point unit state size (FSAVE/FRESTORE)
- */
-#define kernel_fpu_end() do { asm volatile("bar":::"memory"); preempt_enable(); } while(0)
-#endif /* __ASM_FPU_H */
diff --git a/include/asm-frv/ftrace.h b/include/asm-frv/ftrace.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/include/asm-frv/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/include/asm-frv/futex.h b/include/asm-frv/futex.h
deleted file mode 100644
index 08b3d1da3583..000000000000
--- a/include/asm-frv/futex.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-#ifdef __KERNEL__
-#include <linux/futex.h>
-#include <asm/errno.h>
-#include <asm/uaccess.h>
-extern int futex_atomic_op_inuser(int encoded_op, int __user *uaddr);
-static inline int
-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
-{
-        return -ENOSYS;
-}
-#endif
-#endif
diff --git a/include/asm-frv/gdb-stub.h b/include/asm-frv/gdb-stub.h
deleted file mode 100644
index 24f9738670bd..000000000000
--- a/include/asm-frv/gdb-stub.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* gdb-stub.h: FRV GDB stub
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from asm-mips/gdb-stub.h (c) 1995 Andreas Busse
- *
- * 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.
- */
-#ifndef __ASM_GDB_STUB_H
-#define __ASM_GDB_STUB_H
-#undef GDBSTUB_DEBUG_PROTOCOL
-#include <asm/ptrace.h>
-/*
- * important register numbers in GDB protocol
- * - GR0,  GR1,  GR2,  GR3,  GR4,  GR5,  GR6,  GR7,
- * - GR8,  GR9,  GR10, GR11, GR12, GR13, GR14, GR15,
- * - GR16, GR17, GR18, GR19, GR20, GR21, GR22, GR23,
- * - GR24, GR25, GR26, GR27, GR28, GR29, GR30, GR31,
- * - GR32, GR33, GR34, GR35, GR36, GR37, GR38, GR39,
- * - GR40, GR41, GR42, GR43, GR44, GR45, GR46, GR47,
- * - GR48, GR49, GR50, GR51, GR52, GR53, GR54, GR55,
- * - GR56, GR57, GR58, GR59, GR60, GR61, GR62, GR63,
- * - FR0,  FR1,  FR2,  FR3,  FR4,  FR5,  FR6,  FR7,
- * - FR8,  FR9,  FR10, FR11, FR12, FR13, FR14, FR15,
- * - FR16, FR17, FR18, FR19, FR20, FR21, FR22, FR23,
- * - FR24, FR25, FR26, FR27, FR28, FR29, FR30, FR31,
- * - FR32, FR33, FR34, FR35, FR36, FR37, FR38, FR39,
- * - FR40, FR41, FR42, FR43, FR44, FR45, FR46, FR47,
- * - FR48, FR49, FR50, FR51, FR52, FR53, FR54, FR55,
- * - FR56, FR57, FR58, FR59, FR60, FR61, FR62, FR63,
- * - PC, PSR, CCR, CCCR,
- * - _X132, _X133, _X134
- * - TBR, BRR, DBAR0, DBAR1, DBAR2, DBAR3,
- * - SCR0, SCR1, SCR2, SCR3,
- * - LR, LCR,
- * - IACC0H, IACC0L,
- * - FSR0,
- * - ACC0, ACC1, ACC2, ACC3, ACC4, ACC5, ACC6, ACC7,
- * - ACCG0123, ACCG4567,
- * - MSR0, MSR1,
- * - GNER0, GNER1,
- * - FNER0, FNER1,
- */
-#define GDB_REG_GR(N)   (N)
-#define GDB_REG_FR(N)   (64+(N))
-#define GDB_REG_PC      128
-#define GDB_REG_PSR     129
-#define GDB_REG_CCR     130
-#define GDB_REG_CCCR    131
-#define GDB_REG_TBR     135
-#define GDB_REG_BRR     136
-#define GDB_REG_DBAR(N) (137+(N))
-#define GDB_REG_SCR(N)  (141+(N))
-#define GDB_REG_LR      145
-#define GDB_REG_LCR     146
-#define GDB_REG_FSR0    149
-#define GDB_REG_ACC(N)  (150+(N))
-#define GDB_REG_ACCG(N) (158+(N)/4)
-#define GDB_REG_MSR(N)  (160+(N))
-#define GDB_REG_GNER(N) (162+(N))
-#define GDB_REG_FNER(N) (164+(N))
-#define GDB_REG_SP      GDB_REG_GR(1)
-#define GDB_REG_FP      GDB_REG_GR(2)
-#ifndef _LANGUAGE_ASSEMBLY
-/*
- * Prototypes
- */
-extern void show_registers_only(struct pt_regs *regs);
-extern void gdbstub_init(void);
-extern void gdbstub(int type);
-extern void gdbstub_exit(int status);
-extern void gdbstub_io_init(void);
-extern void gdbstub_set_baud(unsigned baud);
-extern int gdbstub_rx_char(unsigned char *_ch, int nonblock);
-extern void gdbstub_tx_char(unsigned char ch);
-extern void gdbstub_tx_flush(void);
-extern void gdbstub_do_rx(void);
-extern asmlinkage void __debug_stub_init_break(void);
-extern asmlinkage void __break_hijack_kernel_event(void);
-extern asmlinkage void __break_hijack_kernel_event_breaks_here(void);
-extern asmlinkage void start_kernel(void);
-extern asmlinkage void gdbstub_rx_handler(void);
-extern asmlinkage void gdbstub_rx_irq(void);
-extern asmlinkage void gdbstub_intercept(void);
-extern uint32_t __entry_usertrap_table[];
-extern uint32_t __entry_kerneltrap_table[];
-extern volatile u8      gdbstub_rx_buffer[PAGE_SIZE];
-extern volatile u32     gdbstub_rx_inp;
-extern volatile u32     gdbstub_rx_outp;
-extern volatile u8      gdbstub_rx_overflow;
-extern u8               gdbstub_rx_unget;
-extern void gdbstub_printk(const char *fmt, ...);
-extern void debug_to_serial(const char *p, int n);
-extern void console_set_baud(unsigned baud);
-#ifdef GDBSTUB_DEBUG_PROTOCOL
-#define gdbstub_proto(FMT,...) gdbstub_printk(FMT,##__VA_ARGS__)
-#else
-#define gdbstub_proto(FMT,...) ({ 0; })
-#endif
-/*
- * we dedicate GR31 to keeping a pointer to the gdbstub exception frame
- * - gr31 is destroyed on entry to the gdbstub if !MMU
- * - gr31 is saved in scr3 on entry to the gdbstub if in !MMU
- */
-register struct frv_frame0 *__debug_frame0 asm("gr31");
-#define __debug_frame           (&__debug_frame0->regs)
-#define __debug_user_context    (&__debug_frame0->uc)
-#define __debug_regs            (&__debug_frame0->debug)
-#define __debug_reg(X)          ((unsigned long *) ((unsigned long) &__debug_frame0 + (X)))
-struct frv_debug_status {
-        unsigned long           bpsr;
-        unsigned long           dcr;
-        unsigned long           brr;
-        unsigned long           nmar;
-};
-extern struct frv_debug_status __debug_status;
-#endif /* _LANGUAGE_ASSEMBLY */
-#endif /* __ASM_GDB_STUB_H */
diff --git a/include/asm-frv/gpio-regs.h b/include/asm-frv/gpio-regs.h
deleted file mode 100644
index 9edf5d5d4d3f..000000000000
--- a/include/asm-frv/gpio-regs.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* gpio-regs.h: on-chip general purpose I/O registers
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_GPIO_REGS
-#define _ASM_GPIO_REGS
-#define __reg(ADDR) (*(volatile unsigned long *)(ADDR))
-#define __get_PDR()     ({ __reg(0xfeff0400); })
-#define __set_PDR(V)    do { __reg(0xfeff0400) = (V); mb(); } while(0)
-#define __get_GPDR()    ({ __reg(0xfeff0408); })
-#define __set_GPDR(V)   do { __reg(0xfeff0408) = (V); mb(); } while(0)
-#define __get_SIR()     ({ __reg(0xfeff0410); })
-#define __set_SIR(V)    do { __reg(0xfeff0410) = (V); mb(); } while(0)
-#define __get_SOR()     ({ __reg(0xfeff0418); })
-#define __set_SOR(V)    do { __reg(0xfeff0418) = (V); mb(); } while(0)
-#define __set_PDSR(V)   do { __reg(0xfeff0420) = (V); mb(); } while(0)
-#define __set_PDCR(V)   do { __reg(0xfeff0428) = (V); mb(); } while(0)
-#define __get_RSTR()    ({ __reg(0xfeff0500); })
-#define __set_RSTR(V)   do { __reg(0xfeff0500) = (V); mb(); } while(0)
-/* PDR definitions */
-#define PDR_GPIO_DATA(X)        (1 << (X))
-/* GPDR definitions */
-#define GPDR_INPUT              0
-#define GPDR_OUTPUT             1
-#define GPDR_DREQ0_BIT          0x00001000
-#define GPDR_DREQ1_BIT          0x00008000
-#define GPDR_DREQ2_BIT          0x00040000
-#define GPDR_DREQ3_BIT          0x00080000
-#define GPDR_DREQ4_BIT          0x00004000
-#define GPDR_DREQ5_BIT          0x00020000
-#define GPDR_DREQ6_BIT          0x00100000
-#define GPDR_DREQ7_BIT          0x00200000
-#define GPDR_DACK0_BIT          0x00002000
-#define GPDR_DACK1_BIT          0x00010000
-#define GPDR_DACK2_BIT          0x00100000
-#define GPDR_DACK3_BIT          0x00200000
-#define GPDR_DONE0_BIT          0x00004000
-#define GPDR_DONE1_BIT          0x00020000
-#define GPDR_GPIO_DIR(X,D)      ((D) << (X))
-/* SIR definitions */
-#define SIR_GPIO_INPUT          0
-#define SIR_DREQ7_INPUT         0x00200000
-#define SIR_DREQ6_INPUT         0x00100000
-#define SIR_DREQ3_INPUT         0x00080000
-#define SIR_DREQ2_INPUT         0x00040000
-#define SIR_DREQ5_INPUT         0x00020000
-#define SIR_DREQ1_INPUT         0x00008000
-#define SIR_DREQ4_INPUT         0x00004000
-#define SIR_DREQ0_INPUT         0x00001000
-#define SIR_RXD1_INPUT          0x00000400
-#define SIR_CTS0_INPUT          0x00000100
-#define SIR_RXD0_INPUT          0x00000040
-#define SIR_GATE1_INPUT         0x00000020
-#define SIR_GATE0_INPUT         0x00000010
-#define SIR_IRQ3_INPUT          0x00000008
-#define SIR_IRQ2_INPUT          0x00000004
-#define SIR_IRQ1_INPUT          0x00000002
-#define SIR_IRQ0_INPUT          0x00000001
-#define SIR_DREQ_BITS           (SIR_DREQ0_INPUT | SIR_DREQ1_INPUT | \
-                                 SIR_DREQ2_INPUT | SIR_DREQ3_INPUT | \
-                                 SIR_DREQ4_INPUT | SIR_DREQ5_INPUT | \
-                                 SIR_DREQ6_INPUT | SIR_DREQ7_INPUT)
-/* SOR definitions */
-#define SOR_GPIO_OUTPUT         0
-#define SOR_DACK3_OUTPUT        0x00200000
-#define SOR_DACK2_OUTPUT        0x00100000
-#define SOR_DONE1_OUTPUT        0x00020000
-#define SOR_DACK1_OUTPUT        0x00010000
-#define SOR_DONE0_OUTPUT        0x00004000
-#define SOR_DACK0_OUTPUT        0x00002000
-#define SOR_TXD1_OUTPUT         0x00000800
-#define SOR_RTS0_OUTPUT         0x00000200
-#define SOR_TXD0_OUTPUT         0x00000080
-#define SOR_TOUT1_OUTPUT        0x00000020
-#define SOR_TOUT0_OUTPUT        0x00000010
-#define SOR_DONE_BITS           (SOR_DONE0_OUTPUT | SOR_DONE1_OUTPUT)
-#define SOR_DACK_BITS           (SOR_DACK0_OUTPUT | SOR_DACK1_OUTPUT | \
-                                 SOR_DACK2_OUTPUT | SOR_DACK3_OUTPUT)
-/* PDSR definitions */
-#define PDSR_UNCHANGED          0
-#define PDSR_SET_BIT(X)         (1 << (X))
-/* PDCR definitions */
-#define PDCR_UNCHANGED          0
-#define PDCR_CLEAR_BIT(X)       (1 << (X))
-/* RSTR definitions */
-/* Read Only */
-#define RSTR_POWERON            0x00000400
-#define RSTR_SOFTRESET_STATUS   0x00000100
-/* Write Only */
-#define RSTR_SOFTRESET          0x00000001
-#endif /* _ASM_GPIO_REGS */
diff --git a/include/asm-frv/hardirq.h b/include/asm-frv/hardirq.h
deleted file mode 100644
index fc47515822a2..000000000000
--- a/include/asm-frv/hardirq.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* hardirq.h: FRV hardware IRQ management
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-#include <linux/threads.h>
-#include <linux/irq.h>
-typedef struct {
-        unsigned int __softirq_pending;
-        unsigned long idle_timestamp;
-} ____cacheline_aligned irq_cpustat_t;
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-#ifdef CONFIG_SMP
-#error SMP not available on FR-V
-#endif /* CONFIG_SMP */
-extern atomic_t irq_err_count;
-static inline void ack_bad_irq(int irq)
-{
-        atomic_inc(&irq_err_count);
-}
-#endif
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
deleted file mode 100644
index 68e4677fb9e7..000000000000
--- a/include/asm-frv/highmem.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* highmem.h: virtual kernel memory mappings for high memory
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/highmem.h
- *
- * See Documentation/frv/mmu-layout.txt for more information.
- *
- * 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.
- */
-#ifndef _ASM_HIGHMEM_H
-#define _ASM_HIGHMEM_H
-#ifdef __KERNEL__
-#include <linux/init.h>
-#include <linux/highmem.h>
-#include <asm/mem-layout.h>
-#include <asm/spr-regs.h>
-#include <asm/mb-regs.h>
-#define NR_TLB_LINES            64      /* number of lines in the TLB */
-#ifndef __ASSEMBLY__
-#include <linux/interrupt.h>
-#include <asm/kmap_types.h>
-#include <asm/pgtable.h>
-#ifdef CONFIG_DEBUG_HIGHMEM
-#define HIGHMEM_DEBUG 1
-#else
-#define HIGHMEM_DEBUG 0
-#endif
-/* declarations for highmem.c */
-extern unsigned long highstart_pfn, highend_pfn;
-#define kmap_prot PAGE_KERNEL
-#define kmap_pte ______kmap_pte_in_TLB
-extern pte_t *pkmap_page_table;
-#define flush_cache_kmaps()  do { } while (0)
-/*
- * Right now we initialize only a single pte table. It can be extended
- * easily, subsequent pte tables have to be allocated in one physical
- * chunk of RAM.
- */
-#define LAST_PKMAP      PTRS_PER_PTE
-#define LAST_PKMAP_MASK (LAST_PKMAP - 1)
-#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)
-#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
-extern void *kmap_high(struct page *page);
-extern void kunmap_high(struct page *page);
-extern void *kmap(struct page *page);
-extern void kunmap(struct page *page);
-extern struct page *kmap_atomic_to_page(void *ptr);
-#endif /* !__ASSEMBLY__ */
-/*
- * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
- * gives a more generic (and caching) interface. But kmap_atomic can
- * be used in IRQ contexts, so in some (very limited) cases we need
- * it.
- */
-#define KMAP_ATOMIC_CACHE_DAMR          8
-#ifndef __ASSEMBLY__
-#define __kmap_atomic_primary(type, paddr, ampr)                                                \
-({                                                                                              \
-        unsigned long damlr, dampr;                                                             \
-                                                                                                \
-        dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V;             \
-                                                                                                \
-        if (type != __KM_CACHE)                                                                 \
-                asm volatile("movgs %0,dampr"#ampr :: "r"(dampr) : "memory");                   \
-        else                                                                                    \
-                asm volatile("movgs %0,iampr"#ampr"\n"                                          \
-                             "movgs %0,dampr"#ampr"\n"                                          \
-                             :: "r"(dampr) : "memory"                                           \
-                             );                                                                 \
-                                                                                                \
-        asm("movsg damlr"#ampr",%0" : "=r"(damlr));                                             \
-                                                                                                \
-        /*printk("DAMR"#ampr": PRIM sl=%d L=%08lx P=%08lx\n", type, damlr, dampr);*/            \
-                                                                                                \
-        (void *) damlr;                                                                         \
-})
-#define __kmap_atomic_secondary(slot, paddr)                                                      \
-({                                                                                                \
-        unsigned long damlr = KMAP_ATOMIC_SECONDARY_FRAME + (slot) * PAGE_SIZE;                   \
-        unsigned long dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V; \
-                                                                                                  \
-        asm volatile("movgs %0,tplr \n"                                                           \
-                     "movgs %1,tppr \n"                                                           \
-                     "tlbpr %0,gr0,#2,#1"                                                         \
-                     : : "r"(damlr), "r"(dampr) : "memory");                                      \
-                                                                                                  \
-        /*printk("TLB: SECN sl=%d L=%08lx P=%08lx\n", slot, damlr, dampr);*/                      \
-                                                                                                  \
-        (void *) damlr;                                                                           \
-})
-static inline void *kmap_atomic(struct page *page, enum km_type type)
-{
-        unsigned long paddr;
-        pagefault_disable();
-        debug_kmap_atomic(type);
-        paddr = page_to_phys(page);
-        switch (type) {
-        case 0:         return __kmap_atomic_primary(0, paddr, 2);
-        case 1:         return __kmap_atomic_primary(1, paddr, 3);
-        case 2:         return __kmap_atomic_primary(2, paddr, 4);
-        case 3:         return __kmap_atomic_primary(3, paddr, 5);
-        case 4:         return __kmap_atomic_primary(4, paddr, 6);
-        case 5:         return __kmap_atomic_primary(5, paddr, 7);
-        case 6:         return __kmap_atomic_primary(6, paddr, 8);
-        case 7:         return __kmap_atomic_primary(7, paddr, 9);
-        case 8:         return __kmap_atomic_primary(8, paddr, 10);
-        case 9 ... 9 + NR_TLB_LINES - 1:
-                return __kmap_atomic_secondary(type - 9, paddr);
-        default:
-                BUG();
-                return NULL;
-        }
-}
-#define __kunmap_atomic_primary(type, ampr)                             \
-do {                                                                    \
-        asm volatile("movgs gr0,dampr"#ampr"\n" ::: "memory");          \
-        if (type == __KM_CACHE)                                         \
-                asm volatile("movgs gr0,iampr"#ampr"\n" ::: "memory");  \
-} while(0)
-#define __kunmap_atomic_secondary(slot, vaddr)                          \
-do {                                                                    \
-        asm volatile("tlbpr %0,gr0,#4,#1" : : "r"(vaddr) : "memory");   \
-} while(0)
-static inline void kunmap_atomic(void *kvaddr, enum km_type type)
-{
-        switch (type) {
-        case 0:         __kunmap_atomic_primary(0, 2);  break;
-        case 1:         __kunmap_atomic_primary(1, 3);  break;
-        case 2:         __kunmap_atomic_primary(2, 4);  break;
-        case 3:         __kunmap_atomic_primary(3, 5);  break;
-        case 4:         __kunmap_atomic_primary(4, 6);  break;
-        case 5:         __kunmap_atomic_primary(5, 7);  break;
-        case 6:         __kunmap_atomic_primary(6, 8);  break;
-        case 7:         __kunmap_atomic_primary(7, 9);  break;
-        case 8:         __kunmap_atomic_primary(8, 10); break;
-        case 9 ... 9 + NR_TLB_LINES - 1:
-                __kunmap_atomic_secondary(type - 9, kvaddr);
-                break;
-        default:
-                BUG();
-        }
-        pagefault_enable();
-}
-#endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_HIGHMEM_H */
diff --git a/include/asm-frv/hw_irq.h b/include/asm-frv/hw_irq.h
deleted file mode 100644
index 522ad37923d8..000000000000
--- a/include/asm-frv/hw_irq.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* hw_irq.h: FR-V specific h/w IRQ stuff
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_HW_IRQ_H
-#define _ASM_HW_IRQ_H
-#endif /* _ASM_HW_IRQ_H */
diff --git a/include/asm-frv/init.h b/include/asm-frv/init.h
deleted file mode 100644
index 8b15838de216..000000000000
--- a/include/asm-frv/init.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_INIT_H
-#define _ASM_INIT_H
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-/* For assembly routines */
-#define __INIT          .section        ".text.init",#alloc,#execinstr
-#define __FINIT         .previous
-#define __INITDATA      .section        ".data.init",#alloc,#write
-#endif
diff --git a/include/asm-frv/io.h b/include/asm-frv/io.h
deleted file mode 100644
index ca7475e73b5e..000000000000
--- a/include/asm-frv/io.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/* io.h: FRV I/O operations
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- *
- * This gets interesting when talking to the PCI bus - the CPU is in big endian
- * mode, the PCI bus is little endian and the hardware in the middle can do
- * byte swapping
- */
-#ifndef _ASM_IO_H
-#define _ASM_IO_H
-#ifdef __KERNEL__
-#include <linux/types.h>
-#include <asm/virtconvert.h>
-#include <asm/string.h>
-#include <asm/mb-regs.h>
-#include <linux/delay.h>
-/*
- * swap functions are sometimes needed to interface little-endian hardware
- */
-static inline unsigned short _swapw(unsigned short v)
-{
-    return ((v << 8) | (v >> 8));
-}
-static inline unsigned long _swapl(unsigned long v)
-{
-    return ((v << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | (v >> 24));
-}
-//#define __iormb() asm volatile("membar")
-//#define __iowmb() asm volatile("membar")
-#define __raw_readb __builtin_read8
-#define __raw_readw __builtin_read16
-#define __raw_readl __builtin_read32
-#define __raw_writeb(datum, addr) __builtin_write8(addr, datum)
-#define __raw_writew(datum, addr) __builtin_write16(addr, datum)
-#define __raw_writel(datum, addr) __builtin_write32(addr, datum)
-static inline void io_outsb(unsigned int addr, const void *buf, int len)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-        const uint8_t *bp = buf;
-        while (len--)
-                __builtin_write8((volatile void __iomem *) __ioaddr, *bp++);
-}
-static inline void io_outsw(unsigned int addr, const void *buf, int len)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-        const uint16_t *bp = buf;
-        while (len--)
-                __builtin_write16((volatile void __iomem *) __ioaddr, (*bp++));
-}
-extern void __outsl_ns(unsigned int addr, const void *buf, int len);
-extern void __outsl_sw(unsigned int addr, const void *buf, int len);
-static inline void __outsl(unsigned int addr, const void *buf, int len, int swap)
-{
-        unsigned long __ioaddr = (unsigned long) addr;
-        if (!swap)
-                __outsl_ns(__ioaddr, buf, len);
-        else
-                __outsl_sw(__ioaddr, buf, len);
-}
-static inline void io_insb(unsigned long addr, void *buf, int len)
-{
-        uint8_t *bp = buf;
-        while (len--)
-                *bp++ = __builtin_read8((volatile void __iomem *) addr);
-}
-static inline void io_insw(unsigned long addr, void *buf, int len)
-{
-        uint16_t *bp = buf;
-        while (len--)
-                *bp++ = __builtin_read16((volatile void __iomem *) addr);
-}
-extern void __insl_ns(unsigned long addr, void *buf, int len);
-extern void __insl_sw(unsigned long addr, void *buf, int len);
-static inline void __insl(unsigned long addr, void *buf, int len, int swap)
-{
-        if (!swap)
-                __insl_ns(addr, buf, len);
-        else
-                __insl_sw(addr, buf, len);
-}
-#define mmiowb() mb()
-/*
- *      make the short names macros so specific devices
- *      can override them as required
- */
-static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)
-{
-        memset((void __force *) addr, val, count);
-}
-static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
-{
-        memcpy(dst, (void __force *) src, count);
-}
-static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)
-{
-        memcpy((void __force *) dst, src, count);
-}
-static inline uint8_t inb(unsigned long addr)
-{
-        return __builtin_read8((void __iomem *)addr);
-}
-static inline uint16_t inw(unsigned long addr)
-{
-        uint16_t ret = __builtin_read16((void __iomem *)addr);
-        if (__is_PCI_IO(addr))
-                ret = _swapw(ret);
-        return ret;
-}
-static inline uint32_t inl(unsigned long addr)
-{
-        uint32_t ret = __builtin_read32((void __iomem *)addr);
-        if (__is_PCI_IO(addr))
-                ret = _swapl(ret);
-        return ret;
-}
-static inline void outb(uint8_t datum, unsigned long addr)
-{
-        __builtin_write8((void __iomem *)addr, datum);
-}
-static inline void outw(uint16_t datum, unsigned long addr)
-{
-        if (__is_PCI_IO(addr))
-                datum = _swapw(datum);
-        __builtin_write16((void __iomem *)addr, datum);
-}
-static inline void outl(uint32_t datum, unsigned long addr)
-{
-        if (__is_PCI_IO(addr))
-                datum = _swapl(datum);
-        __builtin_write32((void __iomem *)addr, datum);
-}
-#define inb_p(addr)     inb(addr)
-#define inw_p(addr)     inw(addr)
-#define inl_p(addr)     inl(addr)
-#define outb_p(x,addr)  outb(x,addr)
-#define outw_p(x,addr)  outw(x,addr)
-#define outl_p(x,addr)  outl(x,addr)
-#define outsb(a,b,l)    io_outsb(a,b,l)
-#define outsw(a,b,l)    io_outsw(a,b,l)
-#define outsl(a,b,l)    __outsl(a,b,l,0)
-#define insb(a,b,l)     io_insb(a,b,l)
-#define insw(a,b,l)     io_insw(a,b,l)
-#define insl(a,b,l)     __insl(a,b,l,0)
-#define IO_SPACE_LIMIT  0xffffffff
-static inline uint8_t readb(const volatile void __iomem *addr)
-{
-        return __builtin_read8((__force void volatile __iomem *) addr);
-}
-static inline uint16_t readw(const volatile void __iomem *addr)
-{
-        uint16_t ret =  __builtin_read16((__force void volatile __iomem *)addr);
-        if (__is_PCI_MEM(addr))
-                ret = _swapw(ret);
-        return ret;
-}
-static inline uint32_t readl(const volatile void __iomem *addr)
-{
-        uint32_t ret =  __builtin_read32((__force void volatile __iomem *)addr);
-        if (__is_PCI_MEM(addr))
-                ret = _swapl(ret);
-        return ret;
-}
-#define readb_relaxed readb
-#define readw_relaxed readw
-#define readl_relaxed readl
-static inline void writeb(uint8_t datum, volatile void __iomem *addr)
-{
-        __builtin_write8(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-static inline void writew(uint16_t datum, volatile void __iomem *addr)
-{
-        if (__is_PCI_MEM(addr))
-                datum = _swapw(datum);
-        __builtin_write16(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-static inline void writel(uint32_t datum, volatile void __iomem *addr)
-{
-        if (__is_PCI_MEM(addr))
-                datum = _swapl(datum);
-        __builtin_write32(addr, datum);
-        if (__is_PCI_MEM(addr))
-                __flush_PCI_writes();
-}
-/* Values for nocacheflag and cmode */
-#define IOMAP_FULL_CACHING              0
-#define IOMAP_NOCACHE_SER               1
-#define IOMAP_NOCACHE_NONSER            2
-#define IOMAP_WRITETHROUGH              3
-extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
-}
-static inline void __iomem *ioremap_writethrough(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
-}
-static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size)
-{
-        return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
-}
-#define ioremap_wc ioremap_nocache
-extern void iounmap(void volatile __iomem *addr);
-static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-        return (void __iomem *) port;
-}
-static inline void ioport_unmap(void __iomem *p)
-{
-}
-static inline void flush_write_buffers(void)
-{
-        __asm__ __volatile__ ("membar" : : :"memory");
-}
-/*
- * do appropriate I/O accesses for token type
- */
-static inline unsigned int ioread8(void __iomem *p)
-{
-        return __builtin_read8(p);
-}
-static inline unsigned int ioread16(void __iomem *p)
-{
-        uint16_t ret = __builtin_read16(p);
-        if (__is_PCI_addr(p))
-                ret = _swapw(ret);
-        return ret;
-}
-static inline unsigned int ioread32(void __iomem *p)
-{
-        uint32_t ret = __builtin_read32(p);
-        if (__is_PCI_addr(p))
-                ret = _swapl(ret);
-        return ret;
-}
-static inline void iowrite8(u8 val, void __iomem *p)
-{
-        __builtin_write8(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-static inline void iowrite16(u16 val, void __iomem *p)
-{
-        if (__is_PCI_addr(p))
-                val = _swapw(val);
-        __builtin_write16(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-static inline void iowrite32(u32 val, void __iomem *p)
-{
-        if (__is_PCI_addr(p))
-                val = _swapl(val);
-        __builtin_write32(p, val);
-        if (__is_PCI_MEM(p))
-                __flush_PCI_writes();
-}
-static inline void ioread8_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        io_insb((unsigned long) p, dst, count);
-}
-static inline void ioread16_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        io_insw((unsigned long) p, dst, count);
-}
-static inline void ioread32_rep(void __iomem *p, void *dst, unsigned long count)
-{
-        __insl_ns((unsigned long) p, dst, count);
-}
-static inline void iowrite8_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        io_outsb((unsigned long) p, src, count);
-}
-static inline void iowrite16_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        io_outsw((unsigned long) p, src, count);
-}
-static inline void iowrite32_rep(void __iomem *p, const void *src, unsigned long count)
-{
-        __outsl_ns((unsigned long) p, src, count);
-}
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
-static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
-{
-}
-/*
- * 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 /* _ASM_IO_H */
diff --git a/include/asm-frv/ioctl.h b/include/asm-frv/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-frv/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-frv/ioctls.h b/include/asm-frv/ioctls.h
deleted file mode 100644
index d0c30e31fbda..000000000000
--- a/include/asm-frv/ioctls.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef __ASM_IOCTLS_H__
-#define __ASM_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 TIOCTTYGSTRUCT  0x5426  /* For debugging only */
-#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 /* __ASM_IOCTLS_H__ */
diff --git a/include/asm-frv/ipcbuf.h b/include/asm-frv/ipcbuf.h
deleted file mode 100644
index b546f67e455f..000000000000
--- a/include/asm-frv/ipcbuf.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __ASM_IPCBUF_H__
-#define __ASM_IPCBUF_H__
-/*
- * The user_ipc_perm structure for FR-V 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;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-#endif /* __ASM_IPCBUF_H__ */
diff --git a/include/asm-frv/irc-regs.h b/include/asm-frv/irc-regs.h
deleted file mode 100644
index afa30aeacc82..000000000000
--- a/include/asm-frv/irc-regs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* irc-regs.h: on-chip interrupt controller registers
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_IRC_REGS
-#define _ASM_IRC_REGS
-#define __reg(ADDR) (*(volatile unsigned long *)(ADDR))
-#define __get_TM0()     ({ __reg(0xfeff9800); })
-#define __get_TM1()     ({ __reg(0xfeff9808); })
-#define __set_TM1(V)    do { __reg(0xfeff9808) = (V); mb(); } while(0)
-#define __set_TM1x(XI,V)                        \
-do {                                            \
-        int shift = (XI) * 2 + 16;              \
-        unsigned long tm1 = __reg(0xfeff9808);  \
-        tm1 &= ~(0x3 << shift);                 \
-        tm1 |= (V) << shift;                    \
-        __reg(0xfeff9808) = tm1;                \
-        mb();                                   \
-} while(0)
-#define __get_RS(C)     ({ (__reg(0xfeff9810) >> ((C)+16)) & 1; })
-#define __clr_RC(C)     do { __reg(0xfeff9818) = 1 << ((C)+16); mb(); } while(0)
-#define __get_MASK(C)   ({ (__reg(0xfeff9820) >> ((C)+16)) & 1; })
-#define __set_MASK(C)   do { __reg(0xfeff9820) |=  1 << ((C)+16); mb(); } while(0)
-#define __clr_MASK(C)   do { __reg(0xfeff9820) &=  ~(1 << ((C)+16)); mb(); } while(0)
-#define __get_MASK_all() __get_MASK(0)
-#define __set_MASK_all() __set_MASK(0)
-#define __clr_MASK_all() __clr_MASK(0)
-#define __get_IRL()     ({ (__reg(0xfeff9828) >> 16) & 0xf; })
-#define __clr_IRL()     do { __reg(0xfeff9828) = 0x100000; mb(); } while(0)
-#define __get_IRR(N)    ({ __reg(0xfeff9840 + (N) * 8); })
-#define __set_IRR(N,V)  do { __reg(0xfeff9840 + (N) * 8) = (V); } while(0)
-#define __get_IITMR(N)  ({ __reg(0xfeff9880 + (N) * 8); })
-#define __set_IITMR(N,V) do { __reg(0xfeff9880 + (N) * 8) = (V); } while(0)
-#endif /* _ASM_IRC_REGS */
diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h
deleted file mode 100644
index 3a66ebd754bd..000000000000
--- a/include/asm-frv/irq.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* irq.h: FRV IRQ definitions
- *
- * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_IRQ_H_
-#define _ASM_IRQ_H_
-#define NR_IRQS                         48
-#define IRQ_BASE_CPU                    (0 * 16)
-#define IRQ_BASE_FPGA                   (1 * 16)
-#define IRQ_BASE_MB93493                (2 * 16)
-/* probe returns a 32-bit IRQ mask:-/ */
-#define MIN_PROBE_IRQ                   (NR_IRQS - 32)
-#ifndef __ASSEMBLY__
-static inline int irq_canonicalize(int irq)
-{
-        return irq;
-}
-#endif
-#endif /* _ASM_IRQ_H_ */
diff --git a/include/asm-frv/irq_regs.h b/include/asm-frv/irq_regs.h
deleted file mode 100644
index d22e83289ad1..000000000000
--- a/include/asm-frv/irq_regs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* FRV per-CPU frame pointer holder
- *
- * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_IRQ_REGS_H
-#define _ASM_IRQ_REGS_H
-/*
- * Per-cpu current frame pointer - the location of the last exception frame on
- * the stack
- * - on FRV, GR28 is dedicated to keeping a pointer to the current exception
- *   frame
- */
-#define ARCH_HAS_OWN_IRQ_REGS
-#ifndef __ASSEMBLY__
-#define get_irq_regs() (__frame)
-#endif
-#endif /* _ASM_IRQ_REGS_H */
diff --git a/include/asm-frv/kdebug.h b/include/asm-frv/kdebug.h
deleted file mode 100644
index 6ece1b037665..000000000000
--- a/include/asm-frv/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
diff --git a/include/asm-frv/kmap_types.h b/include/asm-frv/kmap_types.h
deleted file mode 100644
index f8e16b2a5804..000000000000
--- a/include/asm-frv/kmap_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-enum km_type {
-        /* arch specific kmaps - change the numbers attached to these at your peril */
-        __KM_CACHE,             /* cache flush page attachment point */
-        __KM_PGD,               /* current page directory */
-        __KM_ITLB_PTD,          /* current instruction TLB miss page table lookup */
-        __KM_DTLB_PTD,          /* current data TLB miss page table lookup */
-        /* general kmaps */
-        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
diff --git a/include/asm-frv/linkage.h b/include/asm-frv/linkage.h
deleted file mode 100644
index 636c1bced7d4..000000000000
--- a/include/asm-frv/linkage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_LINKAGE_H
-#define __ASM_LINKAGE_H
-#define __ALIGN         .align 4
-#define __ALIGN_STR     ".align 4"
-#endif
diff --git a/include/asm-frv/local.h b/include/asm-frv/local.h
deleted file mode 100644
index c27bdf04630e..000000000000
--- a/include/asm-frv/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_LOCAL_H
-#define _ASM_LOCAL_H
-#include <asm-generic/local.h>
-#endif /* _ASM_LOCAL_H */
diff --git a/include/asm-frv/math-emu.h b/include/asm-frv/math-emu.h
deleted file mode 100644
index 0c8f731b2180..000000000000
--- a/include/asm-frv/math-emu.h
+++ /dev/null
@@ -1,301 +0,0 @@
-#ifndef _ASM_MATH_EMU_H
-#define _ASM_MATH_EMU_H
-#include <asm/setup.h>
-#include <linux/linkage.h>
-/* Status Register bits */
-/* accrued exception bits */
-#define FPSR_AEXC_INEX  3
-#define FPSR_AEXC_DZ    4
-#define FPSR_AEXC_UNFL  5
-#define FPSR_AEXC_OVFL  6
-#define FPSR_AEXC_IOP   7
-/* exception status bits */
-#define FPSR_EXC_INEX1  8
-#define FPSR_EXC_INEX2  9
-#define FPSR_EXC_DZ     10
-#define FPSR_EXC_UNFL   11
-#define FPSR_EXC_OVFL   12
-#define FPSR_EXC_OPERR  13
-#define FPSR_EXC_SNAN   14
-#define FPSR_EXC_BSUN   15
-/* quotient byte, assumes big-endian, of course */
-#define FPSR_QUOTIENT(fpsr) (*((signed char *) &(fpsr) + 1))
-/* condition code bits */
-#define FPSR_CC_NAN     24
-#define FPSR_CC_INF     25
-#define FPSR_CC_Z       26
-#define FPSR_CC_NEG     27
-/* Control register bits */
-/* rounding mode */
-#define FPCR_ROUND_RN   0               /* round to nearest/even */
-#define FPCR_ROUND_RZ   1               /* round to zero */
-#define FPCR_ROUND_RM   2               /* minus infinity */
-#define FPCR_ROUND_RP   3               /* plus infinity */
-/* rounding precision */
-#define FPCR_PRECISION_X        0       /* long double */
-#define FPCR_PRECISION_S        1       /* double */
-#define FPCR_PRECISION_D        2       /* float */
-/* Flags to select the debugging output */
-#define PDECODE         0
-#define PEXECUTE        1
-#define PCONV           2
-#define PNORM           3
-#define PREGISTER       4
-#define PINSTR          5
-#define PUNIMPL         6
-#define PMOVEM          7
-#define PMDECODE        (1<<PDECODE)
-#define PMEXECUTE       (1<<PEXECUTE)
-#define PMCONV          (1<<PCONV)
-#define PMNORM          (1<<PNORM)
-#define PMREGISTER      (1<<PREGISTER)
-#define PMINSTR         (1<<PINSTR)
-#define PMUNIMPL        (1<<PUNIMPL)
-#define PMMOVEM         (1<<PMOVEM)
-#ifndef __ASSEMBLY__
-#include <linux/kernel.h>
-#include <linux/sched.h>
-union fp_mant64 {
-        unsigned long long m64;
-        unsigned long m32[2];
-};
-union fp_mant128 {
-        unsigned long long m64[2];
-        unsigned long m32[4];
-};
-/* internal representation of extended fp numbers */
-struct fp_ext {
-        unsigned char lowmant;
-        unsigned char sign;
-        unsigned short exp;
-        union fp_mant64 mant;
-};
-/* C representation of FPU registers */
-/* NOTE: if you change this, you have to change the assembler offsets
-   below and the size in <asm/fpu.h>, too */
-struct fp_data {
-        struct fp_ext fpreg[8];
-        unsigned int fpcr;
-        unsigned int fpsr;
-        unsigned int fpiar;
-        unsigned short prec;
-        unsigned short rnd;
-        struct fp_ext temp[2];
-};
-#if FPU_EMU_DEBUG
-extern unsigned int fp_debugprint;
-#define dprint(bit, fmt, args...) ({                    \
-        if (fp_debugprint & (1 << (bit)))               \
-                printk(fmt, ## args);                   \
-})
-#else
-#define dprint(bit, fmt, args...)
-#endif
-#define uprint(str) ({                                  \
-        static int __count = 3;                         \
-                                                        \
-        if (__count > 0) {                              \
-                printk("You just hit an unimplemented " \
-                       "fpu instruction (%s)\n", str);  \
-                printk("Please report this to ....\n"); \
-                __count--;                              \
-        }                                               \
-})
-#define FPDATA          ((struct fp_data *)current->thread.fp)
-#else   /* __ASSEMBLY__ */
-#define FPDATA          %a2
-/* offsets from the base register to the floating point data in the task struct */
-#define FPD_FPREG       (TASK_THREAD+THREAD_FPREG+0)
-#define FPD_FPCR        (TASK_THREAD+THREAD_FPREG+96)
-#define FPD_FPSR        (TASK_THREAD+THREAD_FPREG+100)
-#define FPD_FPIAR       (TASK_THREAD+THREAD_FPREG+104)
-#define FPD_PREC        (TASK_THREAD+THREAD_FPREG+108)
-#define FPD_RND         (TASK_THREAD+THREAD_FPREG+110)
-#define FPD_TEMPFP1     (TASK_THREAD+THREAD_FPREG+112)
-#define FPD_TEMPFP2     (TASK_THREAD+THREAD_FPREG+124)
-#define FPD_SIZEOF      (TASK_THREAD+THREAD_FPREG+136)
-/* offsets on the stack to access saved registers,
- * these are only used during instruction decoding
- * where we always know how deep we're on the stack.
- */
-#define FPS_DO          (PT_D0)
-#define FPS_D1          (PT_D1)
-#define FPS_D2          (PT_D2)
-#define FPS_A0          (PT_A0)
-#define FPS_A1          (PT_A1)
-#define FPS_A2          (PT_A2)
-#define FPS_SR          (PT_SR)
-#define FPS_PC          (PT_PC)
-#define FPS_EA          (PT_PC+6)
-#define FPS_PC2         (PT_PC+10)
-.macro  fp_get_fp_reg
-        lea     (FPD_FPREG,FPDATA,%d0.w*4),%a0
-        lea     (%a0,%d0.w*8),%a0
-.endm
-/* Macros used to get/put the current program counter.
- * 020/030 use a different stack frame then 040/060, for the
- * 040/060 the return pc points already to the next location,
- * so this only needs to be modified for jump instructions.
- */
-.macro  fp_get_pc dest
-        move.l  (FPS_PC+4,%sp),\dest
-.endm
-.macro  fp_put_pc src,jump=0
-        move.l  \src,(FPS_PC+4,%sp)
-.endm
-.macro  fp_get_instr_data       f,s,dest,label
-        getuser \f,%sp@(FPS_PC+4)@(0),\dest,\label,%sp@(FPS_PC+4)
-        addq.l  #\s,%sp@(FPS_PC+4)
-.endm
-.macro  fp_get_instr_word       dest,label,addr
-        fp_get_instr_data       w,2,\dest,\label,\addr
-.endm
-.macro  fp_get_instr_long       dest,label,addr
-        fp_get_instr_data       l,4,\dest,\label,\addr
-.endm
-/* These macros are used to read from/write to user space
- * on error we jump to the fixup section, load the fault
- * address into %a0 and jump to the exit.
- * (derived from <asm/uaccess.h>)
- */
-.macro  getuser size,src,dest,label,addr
-|       printf  ,"[\size<%08x]",1,\addr
-.Lu1\@: moves\size      \src,\dest
-        .section .fixup,"ax"
-        .even
-.Lu2\@: move.l  \addr,%a0
-        jra     \label
-        .previous
-        .section __ex_table,"a"
-        .align  4
-        .long   .Lu1\@,.Lu2\@
-        .previous
-.endm
-.macro  putuser size,src,dest,label,addr
-|       printf  ,"[\size>%08x]",1,\addr
-.Lu1\@: moves\size      \src,\dest
-.Lu2\@:
-        .section .fixup,"ax"
-        .even
-.Lu3\@: move.l  \addr,%a0
-        jra     \label
-        .previous
-        .section __ex_table,"a"
-        .align  4
-        .long   .Lu1\@,.Lu3\@
-        .long   .Lu2\@,.Lu3\@
-        .previous
-.endm
-.macro  movestack       nr,arg1,arg2,arg3,arg4,arg5
-        .if     \nr
-        movestack       (\nr-1),\arg2,\arg3,\arg4,\arg5
-        move.l  \arg1,-(%sp)
-        .endif
-.endm
-.macro  printf  bit=-1,string,nr=0,arg1,arg2,arg3,arg4,arg5
-#ifdef FPU_EMU_DEBUG
-        .data
-.Lpdata\@:
-        .string "\string"
-        .previous
-        movem.l %d0/%d1/%a0/%a1,-(%sp)
-        .if     \bit+1
-#if 0
-        moveq   #\bit,%d0
-        andw    #7,%d0
-        btst    %d0,fp_debugprint+((31-\bit)/8)
-#else
-        btst    #\bit,fp_debugprint+((31-\bit)/8)
-#endif
-        jeq     .Lpskip\@
-        .endif
-        movestack       \nr,\arg1,\arg2,\arg3,\arg4,\arg5
-        pea     .Lpdata\@
-        jsr     printk
-        lea     ((\nr+1)*4,%sp),%sp
-.Lpskip\@:
-        movem.l (%sp)+,%d0/%d1/%a0/%a1
-#endif
-.endm
-.macro  printx  bit,fp
-#ifdef FPU_EMU_DEBUG
-        movem.l %d0/%a0,-(%sp)
-        lea     \fp,%a0
-#if 0
-        moveq   #'+',%d0
-        tst.w   (%a0)
-        jeq     .Lx1\@
-        moveq   #'-',%d0
-.Lx1\@: printf  \bit," %c",1,%d0
-        move.l  (4,%a0),%d0
-        bclr    #31,%d0
-        jne     .Lx2\@
-        printf  \bit,"0."
-        jra     .Lx3\@
-.Lx2\@: printf  \bit,"1."
-.Lx3\@: printf  \bit,"%08x%08x",2,%d0,%a0@(8)
-        move.w  (2,%a0),%d0
-        ext.l   %d0
-        printf  \bit,"E%04x",1,%d0
-#else
-        printf  \bit," %08x%08x%08x",3,%a0@,%a0@(4),%a0@(8)
-#endif
-        movem.l (%sp)+,%d0/%a0
-#endif
-.endm
-.macro  debug   instr,args
-#ifdef FPU_EMU_DEBUG
-        \instr  \args
-#endif
-.endm
-#endif  /* __ASSEMBLY__ */
-#endif  /* _ASM_FRV_MATH_EMU_H */
diff --git a/include/asm-frv/mb-regs.h b/include/asm-frv/mb-regs.h
deleted file mode 100644
index 219e5f926f18..000000000000
--- a/include/asm-frv/mb-regs.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* mb-regs.h: motherboard registers
- *
- * Copyright (C) 2003, 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB_REGS_H
-#define _ASM_MB_REGS_H
-#include <asm/cpu-irqs.h>
-#include <asm/sections.h>
-#include <asm/mem-layout.h>
-#ifndef __ASSEMBLY__
-/* gcc builtins, annotated */
-unsigned long __builtin_read8(volatile void __iomem *);
-unsigned long __builtin_read16(volatile void __iomem *);
-unsigned long __builtin_read32(volatile void __iomem *);
-void __builtin_write8(volatile void __iomem *, unsigned char);
-void __builtin_write16(volatile void __iomem *, unsigned short);
-void __builtin_write32(volatile void __iomem *, unsigned long);
-#endif
-#define __region_IO     KERNEL_IO_START /* the region from 0xe0000000 to 0xffffffff has suitable
-                                         * protection laid over the top for use in memory-mapped
-                                         * I/O
-                                         */
-#define __region_CS0    0xff000000      /* Boot ROMs area */
-#ifdef CONFIG_MB93091_VDK
-/*
- * VDK motherboard and CPU card specific stuff
- */
-#include <asm/mb93091-fpga-irqs.h>
-#define IRQ_CPU_MB93493_0       IRQ_CPU_EXTERNAL0
-#define IRQ_CPU_MB93493_1       IRQ_CPU_EXTERNAL1
-#define __region_CS2    0xe0000000      /* SLBUS/PCI I/O space */
-#define __region_CS2_M          0x0fffffff /* mask */
-#define __region_CS2_C          0x00000000 /* control */
-#define __region_CS5    0xf0000000      /* MB93493 CSC area (DAV daughter board) */
-#define __region_CS5_M          0x00ffffff
-#define __region_CS5_C          0x00010000
-#define __region_CS7    0xf1000000      /* CB70 CPU-card PCMCIA port I/O space */
-#define __region_CS7_M          0x00ffffff
-#define __region_CS7_C          0x00410701
-#define __region_CS1    0xfc000000      /* SLBUS/PCI bridge control registers */
-#define __region_CS1_M          0x000fffff
-#define __region_CS1_C          0x00000000
-#define __region_CS6    0xfc100000      /* CB70 CPU-card DM9000 LAN I/O space */
-#define __region_CS6_M          0x000fffff
-#define __region_CS6_C          0x00400707
-#define __region_CS3    0xfc200000      /* MB93493 CSR area (DAV daughter board) */
-#define __region_CS3_M          0x000fffff
-#define __region_CS3_C          0xc8100000
-#define __region_CS4    0xfd000000      /* CB70 CPU-card extra flash space */
-#define __region_CS4_M          0x00ffffff
-#define __region_CS4_C          0x00000f07
-#define __region_PCI_IO         (__region_CS2 + 0x04000000UL)
-#define __region_PCI_MEM        (__region_CS2 + 0x08000000UL)
-#define __flush_PCI_writes()                                            \
-do {                                                                    \
-        __builtin_write8((volatile void __iomem *) __region_PCI_MEM, 0);        \
-} while(0)
-#define __is_PCI_IO(addr) \
-        (((unsigned long)(addr) >> 24) - (__region_PCI_IO >> 24)  < (0x04000000UL >> 24))
-#define __is_PCI_MEM(addr) \
-        ((unsigned long)(addr) - __region_PCI_MEM < 0x08000000UL)
-#define __is_PCI_addr(addr) \
-        ((unsigned long)(addr) - __region_PCI_IO < 0x0c000000UL)
-#define __get_CLKSW()   ({ *(volatile unsigned long *)(__region_CS2 + 0x0130000cUL) & 0xffUL; })
-#define __get_CLKIN()   (__get_CLKSW() * 125U * 100000U / 24U)
-#ifndef __ASSEMBLY__
-extern int __nongprelbss mb93090_mb00_detected;
-#endif
-#define __addr_LEDS()           (__region_CS2 + 0x01200004UL)
-#ifdef CONFIG_MB93090_MB00
-#define __set_LEDS(X)                                                   \
-do {                                                                    \
-        if (mb93090_mb00_detected)                                      \
-                __builtin_write32((void __iomem *) __addr_LEDS(), ~(X));        \
-} while (0)
-#else
-#define __set_LEDS(X)
-#endif
-#define __addr_LCD()            (__region_CS2 + 0x01200008UL)
-#define __get_LCD(B)            __builtin_read32((volatile void __iomem *) (B))
-#define __set_LCD(B,X)          __builtin_write32((volatile void __iomem *) (B), (X))
-#define LCD_D                   0x000000ff              /* LCD data bus */
-#define LCD_RW                  0x00000100              /* LCD R/W signal */
-#define LCD_RS                  0x00000200              /* LCD Register Select */
-#define LCD_E                   0x00000400              /* LCD Start Enable Signal */
-#define LCD_CMD_CLEAR           (LCD_E|0x001)
-#define LCD_CMD_HOME            (LCD_E|0x002)
-#define LCD_CMD_CURSOR_INC      (LCD_E|0x004)
-#define LCD_CMD_SCROLL_INC      (LCD_E|0x005)
-#define LCD_CMD_CURSOR_DEC      (LCD_E|0x006)
-#define LCD_CMD_SCROLL_DEC      (LCD_E|0x007)
-#define LCD_CMD_OFF             (LCD_E|0x008)
-#define LCD_CMD_ON(CRSR,BLINK)  (LCD_E|0x00c|(CRSR<<1)|BLINK)
-#define LCD_CMD_CURSOR_MOVE_L   (LCD_E|0x010)
-#define LCD_CMD_CURSOR_MOVE_R   (LCD_E|0x014)
-#define LCD_CMD_DISPLAY_SHIFT_L (LCD_E|0x018)
-#define LCD_CMD_DISPLAY_SHIFT_R (LCD_E|0x01c)
-#define LCD_CMD_FUNCSET(DL,N,F) (LCD_E|0x020|(DL<<4)|(N<<3)|(F<<2))
-#define LCD_CMD_SET_CG_ADDR(X)  (LCD_E|0x040|X)
-#define LCD_CMD_SET_DD_ADDR(X)  (LCD_E|0x080|X)
-#define LCD_CMD_READ_BUSY       (LCD_E|LCD_RW)
-#define LCD_DATA_WRITE(X)       (LCD_E|LCD_RS|(X))
-#define LCD_DATA_READ           (LCD_E|LCD_RS|LCD_RW)
-#else
-/*
- * PDK unit specific stuff
- */
-#include <asm/mb93093-fpga-irqs.h>
-#define IRQ_CPU_MB93493_0       IRQ_CPU_EXTERNAL0
-#define IRQ_CPU_MB93493_1       IRQ_CPU_EXTERNAL1
-#define __region_CS5    0xf0000000      /* MB93493 CSC area (DAV daughter board) */
-#define __region_CS5_M          0x00ffffff /* mask */
-#define __region_CS5_C          0x00010000 /* control */
-#define __region_CS2    0x20000000      /* FPGA registers */
-#define __region_CS2_M          0x000fffff
-#define __region_CS2_C          0x00000000
-#define __region_CS1    0xfc100000      /* LAN registers */
-#define __region_CS1_M          0x000fffff
-#define __region_CS1_C          0x00010404
-#define __region_CS3    0xfc200000      /* MB93493 CSR area (DAV daughter board) */
-#define __region_CS3_M          0x000fffff
-#define __region_CS3_C          0xc8000000
-#define __region_CS4    0xfd000000      /* extra ROMs area */
-#define __region_CS4_M          0x00ffffff
-#define __region_CS4_C          0x00000f07
-#define __region_CS6    0xfe000000      /* not used - hide behind CPU resource I/O regs */
-#define __region_CS6_M          0x000fffff
-#define __region_CS6_C          0x00000f07
-#define __region_CS7    0xfe000000      /* not used - hide behind CPU resource I/O regs */
-#define __region_CS7_M          0x000fffff
-#define __region_CS7_C          0x00000f07
-#define __is_PCI_IO(addr)       0       /* no PCI */
-#define __is_PCI_MEM(addr)      0
-#define __is_PCI_addr(addr)     0
-#define __region_PCI_IO         0
-#define __region_PCI_MEM        0
-#define __flush_PCI_writes()    do { } while(0)
-#define __get_CLKSW()           0UL
-#define __get_CLKIN()           66000000UL
-#define __addr_LEDS()           (__region_CS2 + 0x00000023UL)
-#define __set_LEDS(X)           __builtin_write8((volatile void __iomem *) __addr_LEDS(), (X))
-#define __addr_FPGATR()         (__region_CS2 + 0x00000030UL)
-#define __set_FPGATR(X)         __builtin_write32((volatile void __iomem *) __addr_FPGATR(), (X))
-#define __get_FPGATR()          __builtin_read32((volatile void __iomem *) __addr_FPGATR())
-#define MB93093_FPGA_FPGATR_AUDIO_CLK   0x00000003
-#define __set_FPGATR_AUDIO_CLK(V) \
-        __set_FPGATR((__get_FPGATR() & ~MB93093_FPGA_FPGATR_AUDIO_CLK) | (V))
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_OFF       0x0
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_11MHz     0x1
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_12MHz     0x2
-#define MB93093_FPGA_FPGATR_AUDIO_CLK_02MHz     0x3
-#define MB93093_FPGA_SWR_PUSHSWMASK     (0x1F<<26)
-#define MB93093_FPGA_SWR_PUSHSW4        (1<<29)
-#define __addr_FPGA_SWR         ((volatile void __iomem *)(__region_CS2 + 0x28UL))
-#define __get_FPGA_PUSHSW1_5()  (__builtin_read32(__addr_FPGA_SWR) & MB93093_FPGA_SWR_PUSHSWMASK)
-#endif
-#endif /* _ASM_MB_REGS_H */
diff --git a/include/asm-frv/mb86943a.h b/include/asm-frv/mb86943a.h
deleted file mode 100644
index e87ef924bfb4..000000000000
--- a/include/asm-frv/mb86943a.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* mb86943a.h: MB86943 SPARClite <-> PCI bridge registers
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB86943A_H
-#define _ASM_MB86943A_H
-#include <asm/mb-regs.h>
-#define __reg_MB86943_sl_ctl            *(volatile uint32_t *) (__region_CS1 + 0x00)
-#define MB86943_SL_CTL_BUS_WIDTH_64     0x00000001
-#define MB86943_SL_CTL_AS_HOST          0x00000002
-#define MB86943_SL_CTL_DRCT_MASTER_SWAP 0x00000004
-#define MB86943_SL_CTL_DRCT_SLAVE_SWAP  0x00000008
-#define MB86943_SL_CTL_PCI_CONFIG_SWAP  0x00000010
-#define MB86943_SL_CTL_ECS0_ENABLE      0x00000020
-#define MB86943_SL_CTL_ECS1_ENABLE      0x00000040
-#define MB86943_SL_CTL_ECS2_ENABLE      0x00000080
-#define __reg_MB86943_ecs_ctl(N)        *(volatile uint32_t *) (__region_CS1 + 0x08 + (0x08*(N)))
-#define __reg_MB86943_ecs_range(N)      *(volatile uint32_t *) (__region_CS1 + 0x20 + (0x10*(N)))
-#define __reg_MB86943_ecs_base(N)       *(volatile uint32_t *) (__region_CS1 + 0x28 + (0x10*(N)))
-#define __reg_MB86943_sl_pci_io_range   *(volatile uint32_t *) (__region_CS1 + 0x50)
-#define __reg_MB86943_sl_pci_io_base    *(volatile uint32_t *) (__region_CS1 + 0x58)
-#define __reg_MB86943_sl_pci_mem_range  *(volatile uint32_t *) (__region_CS1 + 0x60)
-#define __reg_MB86943_sl_pci_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x68)
-#define __reg_MB86943_pci_sl_io_base    *(volatile uint32_t *) (__region_CS1 + 0x70)
-#define __reg_MB86943_pci_sl_mem_base   *(volatile uint32_t *) (__region_CS1 + 0x78)
-#define __reg_MB86943_pci_arbiter       *(volatile uint32_t *) (__region_CS2 + 0x01300014)
-#define MB86943_PCIARB_EN               0x00000001
-#endif /* _ASM_MB86943A_H */
diff --git a/include/asm-frv/mb93091-fpga-irqs.h b/include/asm-frv/mb93091-fpga-irqs.h
deleted file mode 100644
index 19778c5ba9d6..000000000000
--- a/include/asm-frv/mb93091-fpga-irqs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* mb93091-fpga-irqs.h: MB93091 CPU board FPGA IRQs
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB93091_FPGA_IRQS_H
-#define _ASM_MB93091_FPGA_IRQS_H
-#include <asm/irq.h>
-#ifndef __ASSEMBLY__
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_FPGA__UNUSED                        = IRQ_BASE_FPGA,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_1,
-        IRQ_FPGA_SL_BUS_EXPANSION_2,
-        IRQ_FPGA_PCI_INTD,
-        IRQ_FPGA_PCI_INTC,
-        IRQ_FPGA_PCI_INTB,
-        IRQ_FPGA_PCI_INTA,
-        IRQ_FPGA_SL_BUS_EXPANSION_7,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_8,
-        IRQ_FPGA_SL_BUS_EXPANSION_9,
-        IRQ_FPGA_MB86943_PCI_INTA,
-        IRQ_FPGA_MB86943_SLBUS_SIDE,
-        IRQ_FPGA_RTL8029_INTA,
-        IRQ_FPGA_SYSINT_BUS_EXPANSION_13,
-        IRQ_FPGA_SL_BUS_EXPANSION_14,
-        IRQ_FPGA_NMI,
-};
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_MB93091_FPGA_IRQS_H */
diff --git a/include/asm-frv/mb93093-fpga-irqs.h b/include/asm-frv/mb93093-fpga-irqs.h
deleted file mode 100644
index 590266b1a6d3..000000000000
--- a/include/asm-frv/mb93093-fpga-irqs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* mb93093-fpga-irqs.h: MB93093 CPU board FPGA IRQs
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB93093_FPGA_IRQS_H
-#define _ASM_MB93093_FPGA_IRQS_H
-#include <asm/irq.h>
-#ifndef __ASSEMBLY__
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_FPGA_PUSH_BUTTON_SW1_5              = IRQ_BASE_FPGA + 8,
-        IRQ_FPGA_ROCKER_C_SW8                   = IRQ_BASE_FPGA + 9,
-        IRQ_FPGA_ROCKER_C_SW9                   = IRQ_BASE_FPGA + 10,
-};
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_MB93093_FPGA_IRQS_H */
diff --git a/include/asm-frv/mb93493-irqs.h b/include/asm-frv/mb93493-irqs.h
deleted file mode 100644
index 82c7aeddd333..000000000000
--- a/include/asm-frv/mb93493-irqs.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* mb93493-irqs.h: MB93493 companion chip IRQs
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB93493_IRQS_H
-#define _ASM_MB93493_IRQS_H
-#include <asm/irq.h>
-#ifndef __ASSEMBLY__
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_MB93493_VDC                 = IRQ_BASE_MB93493 + 0,
-        IRQ_MB93493_VCC                 = IRQ_BASE_MB93493 + 1,
-        IRQ_MB93493_AUDIO_OUT           = IRQ_BASE_MB93493 + 2,
-        IRQ_MB93493_I2C_0               = IRQ_BASE_MB93493 + 3,
-        IRQ_MB93493_I2C_1               = IRQ_BASE_MB93493 + 4,
-        IRQ_MB93493_USB                 = IRQ_BASE_MB93493 + 5,
-        IRQ_MB93493_LOCAL_BUS           = IRQ_BASE_MB93493 + 7,
-        IRQ_MB93493_PCMCIA              = IRQ_BASE_MB93493 + 8,
-        IRQ_MB93493_GPIO                = IRQ_BASE_MB93493 + 9,
-        IRQ_MB93493_AUDIO_IN            = IRQ_BASE_MB93493 + 10,
-};
-/* IRQ multiplexor mappings */
-#define ROUTE_VIA_IRQ0  0       /* route IRQ by way of CPU external IRQ 0 */
-#define ROUTE_VIA_IRQ1  1       /* route IRQ by way of CPU external IRQ 1 */
-#define IRQ_MB93493_VDC_ROUTE           ROUTE_VIA_IRQ0
-#define IRQ_MB93493_VCC_ROUTE           ROUTE_VIA_IRQ1
-#define IRQ_MB93493_AUDIO_OUT_ROUTE     ROUTE_VIA_IRQ1
-#define IRQ_MB93493_I2C_0_ROUTE         ROUTE_VIA_IRQ1
-#define IRQ_MB93493_I2C_1_ROUTE         ROUTE_VIA_IRQ1
-#define IRQ_MB93493_USB_ROUTE           ROUTE_VIA_IRQ1
-#define IRQ_MB93493_LOCAL_BUS_ROUTE     ROUTE_VIA_IRQ1
-#define IRQ_MB93493_PCMCIA_ROUTE        ROUTE_VIA_IRQ1
-#define IRQ_MB93493_GPIO_ROUTE          ROUTE_VIA_IRQ1
-#define IRQ_MB93493_AUDIO_IN_ROUTE      ROUTE_VIA_IRQ1
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_MB93493_IRQS_H */
diff --git a/include/asm-frv/mb93493-regs.h b/include/asm-frv/mb93493-regs.h
deleted file mode 100644
index 8a1f6aac8cf1..000000000000
--- a/include/asm-frv/mb93493-regs.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* mb93493-regs.h: MB93493 companion chip registers
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MB93493_REGS_H
-#define _ASM_MB93493_REGS_H
-#include <asm/mb-regs.h>
-#include <asm/mb93493-irqs.h>
-#define __addr_MB93493(X)       ((volatile unsigned long *)(__region_CS3 + (X)))
-#define __get_MB93493(X)        ({ *(volatile unsigned long *)(__region_CS3 + (X)); })
-#define __set_MB93493(X,V)                                              \
-do {                                                                    \
-        *(volatile unsigned long *)(__region_CS3 + (X)) = (V); mb();    \
-} while(0)
-#define __get_MB93493_STSR(X)   __get_MB93493(0x3c0 + (X) * 4)
-#define __set_MB93493_STSR(X,V) __set_MB93493(0x3c0 + (X) * 4, (V))
-#define MB93493_STSR_EN
-#define __addr_MB93493_IQSR(X)  __addr_MB93493(0x3d0 + (X) * 4)
-#define __get_MB93493_IQSR(X)   __get_MB93493(0x3d0 + (X) * 4)
-#define __set_MB93493_IQSR(X,V) __set_MB93493(0x3d0 + (X) * 4, (V))
-#define __get_MB93493_DQSR(X)   __get_MB93493(0x3e0 + (X) * 4)
-#define __set_MB93493_DQSR(X,V) __set_MB93493(0x3e0 + (X) * 4, (V))
-#define __get_MB93493_LBSER()   __get_MB93493(0x3f0)
-#define __set_MB93493_LBSER(V)  __set_MB93493(0x3f0, (V))
-#define MB93493_LBSER_VDC       0x00010000
-#define MB93493_LBSER_VCC       0x00020000
-#define MB93493_LBSER_AUDIO     0x00040000
-#define MB93493_LBSER_I2C_0     0x00080000
-#define MB93493_LBSER_I2C_1     0x00100000
-#define MB93493_LBSER_USB       0x00200000
-#define MB93493_LBSER_GPIO      0x00800000
-#define MB93493_LBSER_PCMCIA    0x01000000
-#define __get_MB93493_LBSR()    __get_MB93493(0x3fc)
-#define __set_MB93493_LBSR(V)   __set_MB93493(0x3fc, (V))
-/*
- * video display controller
- */
-#define __get_MB93493_VDC(X)    __get_MB93493(MB93493_VDC_##X)
-#define __set_MB93493_VDC(X,V)  __set_MB93493(MB93493_VDC_##X, (V))
-#define MB93493_VDC_RCURSOR     0x140   /* cursor position */
-#define MB93493_VDC_RCT1        0x144   /* cursor colour 1 */
-#define MB93493_VDC_RCT2        0x148   /* cursor colour 2 */
-#define MB93493_VDC_RHDC        0x150   /* horizontal display period */
-#define MB93493_VDC_RH_MARGINS  0x154   /* horizontal margin sizes */
-#define MB93493_VDC_RVDC        0x158   /* vertical display period */
-#define MB93493_VDC_RV_MARGINS  0x15c   /* vertical margin sizes */
-#define MB93493_VDC_RC          0x170   /* VDC control */
-#define MB93493_VDC_RCLOCK      0x174   /* clock divider, DMA req delay */
-#define MB93493_VDC_RBLACK      0x178   /* black insert sizes */
-#define MB93493_VDC_RS          0x17c   /* VDC status */
-#define __addr_MB93493_VDC_BCI(X)  ({ (volatile unsigned long *)(__region_CS3 + 0x000 + (X)); })
-#define __addr_MB93493_VDC_TPO(X)  (__region_CS3 + 0x1c0 + (X))
-#define VDC_TPO_WIDTH           32
-#define VDC_RC_DSR              0x00000080      /* VDC master reset */
-#define VDC_RS_IT               0x00060000      /* interrupt indicators */
-#define VDC_RS_IT_UNDERFLOW     0x00040000      /* - underflow event */
-#define VDC_RS_IT_VSYNC         0x00020000      /* - VSYNC event */
-#define VDC_RS_DFI              0x00010000      /* current interlace field number */
-#define VDC_RS_DFI_TOP          0x00000000      /* - top field */
-#define VDC_RS_DFI_BOTTOM       0x00010000      /* - bottom field */
-#define VDC_RS_DCSR             0x00000010      /* cursor state */
-#define VDC_RS_DCM              0x00000003      /* display mode */
-#define VDC_RS_DCM_DISABLED     0x00000000      /* - display disabled */
-#define VDC_RS_DCM_STOPPED      0x00000001      /* - VDC stopped */
-#define VDC_RS_DCM_FREERUNNING  0x00000002      /* - VDC free-running */
-#define VDC_RS_DCM_TRANSFERRING 0x00000003      /* - data being transferred to VDC */
-/*
- * video capture controller
- */
-#define __get_MB93493_VCC(X)    __get_MB93493(MB93493_VCC_##X)
-#define __set_MB93493_VCC(X,V)  __set_MB93493(MB93493_VCC_##X, (V))
-#define MB93493_VCC_RREDUCT     0x104   /* reduction rate */
-#define MB93493_VCC_RHY         0x108   /* horizontal brightness filter coefficients */
-#define MB93493_VCC_RHC         0x10c   /* horizontal colour-difference filter coefficients */
-#define MB93493_VCC_RHSIZE      0x110   /* horizontal cycle sizes */
-#define MB93493_VCC_RHBC        0x114   /* horizontal back porch size */
-#define MB93493_VCC_RVCC        0x118   /* vertical capture period */
-#define MB93493_VCC_RVBC        0x11c   /* vertical back porch period */
-#define MB93493_VCC_RV          0x120   /* vertical filter coefficients */
-#define MB93493_VCC_RDTS        0x128   /* DMA transfer size */
-#define MB93493_VCC_RDTS_4B     0x01000000      /* 4-byte transfer */
-#define MB93493_VCC_RDTS_32B    0x03000000      /* 32-byte transfer */
-#define MB93493_VCC_RDTS_SHIFT  24
-#define MB93493_VCC_RCC         0x130   /* VCC control */
-#define MB93493_VCC_RIS         0x134   /* VCC interrupt status */
-#define __addr_MB93493_VCC_TPI(X)  (__region_CS3 + 0x180 + (X))
-#define VCC_RHSIZE_RHCC         0x000007ff
-#define VCC_RHSIZE_RHCC_SHIFT   0
-#define VCC_RHSIZE_RHTCC        0x0fff0000
-#define VCC_RHSIZE_RHTCC_SHIFT  16
-#define VCC_RVBC_RVBC           0x00003f00
-#define VCC_RVBC_RVBC_SHIFT     8
-#define VCC_RREDUCT_RHR         0x07ff0000
-#define VCC_RREDUCT_RHR_SHIFT   16
-#define VCC_RREDUCT_RVR         0x000007ff
-#define VCC_RREDUCT_RVR_SHIFT   0
-#define VCC_RCC_CE              0x00000001      /* VCC enable */
-#define VCC_RCC_CS              0x00000002      /* request video capture start */
-#define VCC_RCC_CPF             0x0000000c      /* pixel format */
-#define VCC_RCC_CPF_YCBCR_16    0x00000000      /* - YCbCr 4:2:2 16-bit format */
-#define VCC_RCC_CPF_RGB         0x00000004      /* - RGB 4:4:4 format */
-#define VCC_RCC_CPF_YCBCR_24    0x00000008      /* - YCbCr 4:2:2 24-bit format */
-#define VCC_RCC_CPF_BT656       0x0000000c      /* - ITU R-BT.656 format */
-#define VCC_RCC_CPF_SHIFT       2
-#define VCC_RCC_CSR             0x00000080      /* request reset */
-#define VCC_RCC_HSIP            0x00000100      /* HSYNC polarity */
-#define VCC_RCC_HSIP_LOACT      0x00000000      /* - low active */
-#define VCC_RCC_HSIP_HIACT      0x00000100      /* - high active */
-#define VCC_RCC_VSIP            0x00000200      /* VSYNC polarity */
-#define VCC_RCC_VSIP_LOACT      0x00000000      /* - low active */
-#define VCC_RCC_VSIP_HIACT      0x00000200      /* - high active */
-#define VCC_RCC_CIE             0x00000800      /* interrupt enable */
-#define VCC_RCC_CFP             0x00001000      /* RGB pixel packing */
-#define VCC_RCC_CFP_4TO3        0x00000000      /* - pack 4 pixels into 3 words */
-#define VCC_RCC_CFP_1TO1        0x00001000      /* - pack 1 pixel into 1 words */
-#define VCC_RCC_CSM             0x00006000      /* interlace specification */
-#define VCC_RCC_CSM_ONEPASS     0x00002000      /* - non-interlaced */
-#define VCC_RCC_CSM_INTERLACE   0x00004000      /* - interlaced */
-#define VCC_RCC_CSM_SHIFT       13
-#define VCC_RCC_ES              0x00008000      /* capture start polarity */
-#define VCC_RCC_ES_NEG          0x00000000      /* - negative edge */
-#define VCC_RCC_ES_POS          0x00008000      /* - positive edge */
-#define VCC_RCC_IFI             0x00080000      /* inferlace field evaluation reverse */
-#define VCC_RCC_FDTS            0x00300000      /* interlace field start */
-#define VCC_RCC_FDTS_3_8        0x00000000      /* - 3/8 of horizontal entire cycle */
-#define VCC_RCC_FDTS_1_4        0x00100000      /* - 1/4 of horizontal entire cycle */
-#define VCC_RCC_FDTS_7_16       0x00200000      /* - 7/16 of horizontal entire cycle */
-#define VCC_RCC_FDTS_SHIFT      20
-#define VCC_RCC_MOV             0x00400000      /* test bit - always set to 1 */
-#define VCC_RCC_STP             0x00800000      /* request video capture stop */
-#define VCC_RCC_TO              0x01000000      /* input during top-field only */
-#define VCC_RIS_VSYNC           0x01000000      /* VSYNC interrupt */
-#define VCC_RIS_OV              0x02000000      /* overflow interrupt */
-#define VCC_RIS_BOTTOM          0x08000000      /* interlace bottom field */
-#define VCC_RIS_STARTED         0x10000000      /* capture started */
-/*
- * I2C
- */
-#define MB93493_I2C_BSR         0x340           /* bus status */
-#define MB93493_I2C_BCR         0x344           /* bus control */
-#define MB93493_I2C_CCR         0x348           /* clock control */
-#define MB93493_I2C_ADR         0x34c           /* address */
-#define MB93493_I2C_DTR         0x350           /* data */
-#define MB93493_I2C_BC2R        0x35c           /* bus control 2 */
-#define __addr_MB93493_I2C(port,X)   (__region_CS3 + MB93493_I2C_##X + ((port)*0x20))
-#define __get_MB93493_I2C(port,X)    __get_MB93493(MB93493_I2C_##X + ((port)*0x20))
-#define __set_MB93493_I2C(port,X,V)  __set_MB93493(MB93493_I2C_##X + ((port)*0x20), (V))
-#define I2C_BSR_BB      (1 << 7)
-/*
- * audio controller (I2S) registers
- */
-#define __get_MB93493_I2S(X)    __get_MB93493(MB93493_I2S_##X)
-#define __set_MB93493_I2S(X,V)  __set_MB93493(MB93493_I2S_##X, (V))
-#define MB93493_I2S_ALDR        0x300           /* L-channel data */
-#define MB93493_I2S_ARDR        0x304           /* R-channel data */
-#define MB93493_I2S_APDR        0x308           /* 16-bit packed data */
-#define MB93493_I2S_AISTR       0x310           /* status */
-#define MB93493_I2S_AICR        0x314           /* control */
-#define __addr_MB93493_I2S_ALDR(X)      (__region_CS3 + MB93493_I2S_ALDR + (X))
-#define __addr_MB93493_I2S_ARDR(X)      (__region_CS3 + MB93493_I2S_ARDR + (X))
-#define __addr_MB93493_I2S_APDR(X)      (__region_CS3 + MB93493_I2S_APDR + (X))
-#define __addr_MB93493_I2S_ADR(X)       (__region_CS3 + 0x320 + (X))
-#define I2S_AISTR_OTST          0x00000003      /* status of output data transfer */
-#define I2S_AISTR_OTR           0x00000010      /* output transfer request pending */
-#define I2S_AISTR_OUR           0x00000020      /* output FIFO underrun detected */
-#define I2S_AISTR_OOR           0x00000040      /* output FIFO overrun detected */
-#define I2S_AISTR_ODS           0x00000100      /* output DMA transfer size */
-#define I2S_AISTR_ODE           0x00000400      /* output DMA transfer request enable */
-#define I2S_AISTR_OTRIE         0x00001000      /* output transfer request interrupt enable */
-#define I2S_AISTR_OURIE         0x00002000      /* output FIFO underrun interrupt enable */
-#define I2S_AISTR_OORIE         0x00004000      /* output FIFO overrun interrupt enable */
-#define I2S_AISTR__OUT_MASK     0x00007570
-#define I2S_AISTR_ITST          0x00030000      /* status of input data transfer */
-#define I2S_AISTR_ITST_SHIFT    16
-#define I2S_AISTR_ITR           0x00100000      /* input transfer request pending */
-#define I2S_AISTR_IUR           0x00200000      /* input FIFO underrun detected */
-#define I2S_AISTR_IOR           0x00400000      /* input FIFO overrun detected */
-#define I2S_AISTR_IDS           0x01000000      /* input DMA transfer size */
-#define I2S_AISTR_IDE           0x04000000      /* input DMA transfer request enable */
-#define I2S_AISTR_ITRIE         0x10000000      /* input transfer request interrupt enable */
-#define I2S_AISTR_IURIE         0x20000000      /* input FIFO underrun interrupt enable */
-#define I2S_AISTR_IORIE         0x40000000      /* input FIFO overrun interrupt enable */
-#define I2S_AISTR__IN_MASK      0x75700000
-#define I2S_AICR_MI             0x00000001      /* mono input requested */
-#define I2S_AICR_AMI            0x00000002      /* relation between LRCKI/FS1 and SDI */
-#define I2S_AICR_LRI            0x00000004      /* function of LRCKI pin */
-#define I2S_AICR_SDMI           0x00000070      /* format of input audio data */
-#define I2S_AICR_SDMI_SHIFT     4
-#define I2S_AICR_CLI            0x00000080      /* input FIFO clearing control */
-#define I2S_AICR_IM             0x00000300      /* input state control */
-#define I2S_AICR_IM_SHIFT       8
-#define I2S_AICR__IN_MASK       0x000003f7
-#define I2S_AICR_MO             0x00001000      /* mono output requested */
-#define I2S_AICR_AMO            0x00002000      /* relation between LRCKO/FS0 and SDO */
-#define I2S_AICR_AMO_SHIFT      13
-#define I2S_AICR_LRO            0x00004000      /* function of LRCKO pin */
-#define I2S_AICR_SDMO           0x00070000      /* format of output audio data */
-#define I2S_AICR_SDMO_SHIFT     16
-#define I2S_AICR_CLO            0x00080000      /* output FIFO clearing control */
-#define I2S_AICR_OM             0x00100000      /* output state control */
-#define I2S_AICR__OUT_MASK      0x001f7000
-#define I2S_AICR_DIV            0x03000000      /* frequency division rate */
-#define I2S_AICR_DIV_SHIFT      24
-#define I2S_AICR_FL             0x20000000      /* frame length */
-#define I2S_AICR_FS             0x40000000      /* frame sync method */
-#define I2S_AICR_ME             0x80000000      /* master enable */
-/*
- * PCMCIA
- */
-#define __addr_MB93493_PCMCIA(X)  ((volatile unsigned long *)(__region_CS5 + (X)))
-/*
- * GPIO
- */
-#define __get_MB93493_GPIO_PDR(X)       __get_MB93493(0x380 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDR(X,V)     __set_MB93493(0x380 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_GPDR(X)      __get_MB93493(0x384 + (X) * 0xc0)
-#define __set_MB93493_GPIO_GPDR(X,V)    __set_MB93493(0x384 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_SIR(X)       __get_MB93493(0x388 + (X) * 0xc0)
-#define __set_MB93493_GPIO_SIR(X,V)     __set_MB93493(0x388 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_SOR(X)       __get_MB93493(0x38c + (X) * 0xc0)
-#define __set_MB93493_GPIO_SOR(X,V)     __set_MB93493(0x38c + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_PDSR(X)      __get_MB93493(0x390 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDSR(X,V)    __set_MB93493(0x390 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_PDCR(X)      __get_MB93493(0x394 + (X) * 0xc0)
-#define __set_MB93493_GPIO_PDCR(X,V)    __set_MB93493(0x394 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_INTST(X)     __get_MB93493(0x398 + (X) * 0xc0)
-#define __set_MB93493_GPIO_INTST(X,V)   __set_MB93493(0x398 + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_IEHL(X)      __get_MB93493(0x39c + (X) * 0xc0)
-#define __set_MB93493_GPIO_IEHL(X,V)    __set_MB93493(0x39c + (X) * 0xc0, (V))
-#define __get_MB93493_GPIO_IELH(X)      __get_MB93493(0x3a0 + (X) * 0xc0)
-#define __set_MB93493_GPIO_IELH(X,V)    __set_MB93493(0x3a0 + (X) * 0xc0, (V))
-#endif /* _ASM_MB93493_REGS_H */
diff --git a/include/asm-frv/mc146818rtc.h b/include/asm-frv/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/include/asm-frv/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-#endif /* _ASM_MC146818RTC_H */
diff --git a/include/asm-frv/mem-layout.h b/include/asm-frv/mem-layout.h
deleted file mode 100644
index 2947764fc0e0..000000000000
--- a/include/asm-frv/mem-layout.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* mem-layout.h: memory layout
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MEM_LAYOUT_H
-#define _ASM_MEM_LAYOUT_H
-#ifndef __ASSEMBLY__
-#define __UL(X) ((unsigned long) (X))
-#else
-#define __UL(X) (X)
-#endif
-/*
- * PAGE_SHIFT determines the page size
- */
-#define PAGE_SHIFT                      14
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE                       (1UL << PAGE_SHIFT)
-#else
-#define PAGE_SIZE                       (1 << PAGE_SHIFT)
-#endif
-#define PAGE_MASK                       (~(PAGE_SIZE-1))
-/*
- * the slab must be aligned such that load- and store-double instructions don't
- * fault if used
- */
-#define ARCH_KMALLOC_MINALIGN           8
-#define ARCH_SLAB_MINALIGN              8
-/*****************************************************************************/
-/*
- * virtual memory layout from kernel's point of view
- */
-#define PAGE_OFFSET                     ((unsigned long) &__page_offset)
-#ifdef CONFIG_MMU
-/* see Documentation/frv/mmu-layout.txt */
-#define KERNEL_LOWMEM_START             __UL(0xc0000000)
-#define KERNEL_LOWMEM_END               __UL(0xd0000000)
-#define VMALLOC_START                   __UL(0xd0000000)
-#define VMALLOC_END                     __UL(0xd8000000)
-#define PKMAP_BASE                      __UL(0xd8000000)
-#define PKMAP_END                       __UL(0xdc000000)
-#define KMAP_ATOMIC_SECONDARY_FRAME     __UL(0xdc000000)
-#define KMAP_ATOMIC_PRIMARY_FRAME       __UL(0xdd000000)
-#endif
-#define KERNEL_IO_START                 __UL(0xe0000000)
-/*****************************************************************************/
-/*
- * memory layout from userspace's point of view
- */
-#define BRK_BASE                        __UL(2 * 1024 * 1024 + PAGE_SIZE)
-#define STACK_TOP                       __UL(2 * 1024 * 1024)
-#define STACK_TOP_MAX                   __UL(0xc0000000)
-/* userspace process size */
-#ifdef CONFIG_MMU
-#define TASK_SIZE                       (PAGE_OFFSET)
-#else
-#define TASK_SIZE                       __UL(0xFFFFFFFFUL)
-#endif
-/* base of area at which unspecified mmaps will start */
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-#define TASK_UNMAPPED_BASE              __UL(16 * 1024 * 1024)
-#else
-#define TASK_UNMAPPED_BASE              __UL(TASK_SIZE / 3)
-#endif
-#endif /* _ASM_MEM_LAYOUT_H */
diff --git a/include/asm-frv/mman.h b/include/asm-frv/mman.h
deleted file mode 100644
index b4371e928683..000000000000
--- a/include/asm-frv/mman.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __ASM_MMAN_H__
-#define __ASM_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 /* __ASM_MMAN_H__ */
diff --git a/include/asm-frv/mmu.h b/include/asm-frv/mmu.h
deleted file mode 100644
index 86ca0e86e7d2..000000000000
--- a/include/asm-frv/mmu.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* mmu.h: memory management context for FR-V with or without MMU support
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MMU_H
-#define _ASM_MMU_H
-typedef struct {
-#ifdef CONFIG_MMU
-        struct list_head id_link;               /* link in list of context ID owners */
-        unsigned short  id;                     /* MMU context ID */
-        unsigned short  id_busy;                /* true if ID is in CXNR */
-        unsigned long   itlb_cached_pge;        /* [SCR0] PGE cached for insn TLB handler */
-        unsigned long   itlb_ptd_mapping;       /* [DAMR4] PTD mapping for itlb cached PGE */
-        unsigned long   dtlb_cached_pge;        /* [SCR1] PGE cached for data TLB handler */
-        unsigned long   dtlb_ptd_mapping;       /* [DAMR5] PTD mapping for dtlb cached PGE */
-#else
-        unsigned long           end_brk;
-#endif
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-        unsigned long   exec_fdpic_loadmap;
-        unsigned long   interp_fdpic_loadmap;
-#endif
-} mm_context_t;
-#ifdef CONFIG_MMU
-extern int __nongpreldata cxn_pinned;
-extern int cxn_pin_by_pid(pid_t pid);
-#endif
-#endif /* _ASM_MMU_H */
diff --git a/include/asm-frv/mmu_context.h b/include/asm-frv/mmu_context.h
deleted file mode 100644
index c7daa395156a..000000000000
--- a/include/asm-frv/mmu_context.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* mmu_context.h: MMU context management routines
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MMU_CONTEXT_H
-#define _ASM_MMU_CONTEXT_H
-#include <asm/setup.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm-generic/mm_hooks.h>
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-#ifdef CONFIG_MMU
-extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
-extern void change_mm_context(mm_context_t *old, mm_context_t *ctx, pgd_t *_pgd);
-extern void destroy_context(struct mm_struct *mm);
-#else
-#define init_new_context(tsk, mm)               ({ 0; })
-#define change_mm_context(old, ctx, _pml4)      do {} while(0)
-#define destroy_context(mm)                     do {} while(0)
-#endif
-#define switch_mm(prev, next, tsk)                                              \
-do {                                                                            \
-        if (prev != next)                                                       \
-                change_mm_context(&prev->context, &next->context, next->pgd);   \
-} while(0)
-#define activate_mm(prev, next)                                         \
-do {                                                                    \
-        change_mm_context(&prev->context, &next->context, next->pgd);   \
-} while(0)
-#define deactivate_mm(tsk, mm)                  \
-do {                                            \
-} while(0)
-#endif
diff --git a/include/asm-frv/module.h b/include/asm-frv/module.h
deleted file mode 100644
index 3d5c6360289a..000000000000
--- a/include/asm-frv/module.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* module.h: FRV module stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_MODULE_H
-#define _ASM_MODULE_H
-struct mod_arch_specific
-{
-};
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-/*
- * Include the architecture version.
- */
-#define MODULE_ARCH_VERMAGIC __stringify(PROCESSOR_MODEL_NAME) " "
-#endif /* _ASM_MODULE_H */
diff --git a/include/asm-frv/msgbuf.h b/include/asm-frv/msgbuf.h
deleted file mode 100644
index 97ceb55a06fb..000000000000
--- a/include/asm-frv/msgbuf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _ASM_MSGBUF_H
-#define _ASM_MSGBUF_H
-/*
- * The msqid64_ds structure for FR-V 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 */
-        unsigned long           __unused1;
-        __kernel_time_t         msg_rtime;      /* last msgrcv time */
-        unsigned long           __unused2;
-        __kernel_time_t         msg_ctime;      /* last change time */
-        unsigned long           __unused3;
-        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 /* _ASM_MSGBUF_H */
diff --git a/include/asm-frv/mutex.h b/include/asm-frv/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/include/asm-frv/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-frv/page.h b/include/asm-frv/page.h
deleted file mode 100644
index bd9c220094c7..000000000000
--- a/include/asm-frv/page.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _ASM_PAGE_H
-#define _ASM_PAGE_H
-#include <asm/virtconvert.h>
-#include <asm/mem-layout.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-#ifndef __ASSEMBLY__
-#define get_user_page(vaddr)                    __get_free_page(GFP_KERNEL)
-#define free_user_page(page, addr)              free_page(addr)
-#define clear_page(pgaddr)                      memset((pgaddr), 0, PAGE_SIZE)
-#define copy_page(to,from)                      memcpy((to), (from), PAGE_SIZE)
-#define clear_user_page(pgaddr, vaddr, page)    memset((pgaddr), 0, PAGE_SIZE)
-#define copy_user_page(vto, vfrom, vaddr, topg) memcpy((vto), (vfrom), PAGE_SIZE)
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long  pte;    } pte_t;
-typedef struct { unsigned long  ste[64];} pmd_t;
-typedef struct { pmd_t          pue[1]; } pud_t;
-typedef struct { pud_t          pge[1]; } pgd_t;
-typedef struct { unsigned long  pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-#define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).ste[0])
-#define pud_val(x)      ((x).pue[0])
-#define pgd_val(x)      ((x).pge[0])
-#define pgprot_val(x)   ((x).pgprot)
-#define __pte(x)        ((pte_t) { (x) } )
-#define __pmd(x)        ((pmd_t) { (x) } )
-#define __pud(x)        ((pud_t) { (x) } )
-#define __pgd(x)        ((pgd_t) { (x) } )
-#define __pgprot(x)     ((pgprot_t) { (x) } )
-#define PTE_MASK        PAGE_MASK
-#define devmem_is_allowed(pfn)  1
-#define __pa(vaddr)             virt_to_phys((void *) (unsigned long) (vaddr))
-#define __va(paddr)             phys_to_virt((unsigned long) (paddr))
-#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
-extern unsigned long max_low_pfn;
-extern unsigned long min_low_pfn;
-extern unsigned long max_pfn;
-#ifdef CONFIG_MMU
-#define pfn_valid(pfn)          ((pfn) < max_mapnr)
-#else
-#define ARCH_PFN_OFFSET         (PAGE_OFFSET >> PAGE_SHIFT)
-#define pfn_valid(pfn)          ((pfn) >= min_low_pfn && (pfn) < max_low_pfn)
-#endif
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-#ifdef CONFIG_MMU
-#define VM_DATA_DEFAULT_FLAGS \
-        (VM_READ | VM_WRITE | \
-        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
-                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif
-#endif /* __ASSEMBLY__ */
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-#endif /* _ASM_PAGE_H */
diff --git a/include/asm-frv/param.h b/include/asm-frv/param.h
deleted file mode 100644
index 6859dd503ed3..000000000000
--- a/include/asm-frv/param.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _ASM_PARAM_H
-#define _ASM_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   16384
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-#define MAXHOSTNAMELEN          64      /* max length of hostname */
-#endif /* _ASM_PARAM_H */
diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h
deleted file mode 100644
index 585d9b49949a..000000000000
--- a/include/asm-frv/pci.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* pci.h: FR-V specific PCI declarations
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m68k/pci.h
- *
- * 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.
- */
-#ifndef ASM_PCI_H
-#define ASM_PCI_H
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-#include <asm-generic/pci-dma-compat.h>
-#include <asm-generic/pci.h>
-struct pci_dev;
-#define pcibios_assign_all_busses()     0
-extern void pcibios_set_master(struct pci_dev *dev);
-extern void pcibios_penalize_isa_irq(int irq);
-#ifdef CONFIG_MMU
-extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);
-extern void consistent_free(void *vaddr);
-extern void consistent_sync(void *vaddr, size_t size, int direction);
-extern void consistent_sync_page(struct page *page, unsigned long offset,
-                                 size_t size, int direction);
-#endif
-extern void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                                  dma_addr_t *dma_handle);
-extern void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                                void *vaddr, dma_addr_t dma_handle);
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_controller_num(PDEV)        (0)
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-/* pci_unmap_{page,single} is a nop so... */
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
-#define pci_unmap_addr(PTR, ADDR_NAME)          (0)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
-#define pci_unmap_len(PTR, LEN_NAME)            (0)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)   do { } while (0)
-#ifdef CONFIG_PCI
-static inline void pci_dma_burst_advice(struct pci_dev *pdev,
-                                        enum pci_dma_burst_strategy *strat,
-                                        unsigned long *strategy_parameter)
-{
-        *strat = PCI_DMA_BURST_INFINITY;
-        *strategy_parameter = ~0UL;
-}
-#endif
-/*
- *      These are pretty much arbitary with the CoMEM implementation.
- *      We have the whole address space to ourselves.
- */
-#define PCIBIOS_MIN_IO          0x100
-#define PCIBIOS_MIN_MEM         0x00010000
-/* Make physical memory consistent for a single
- * streaming mode DMA translation after a transfer.
- *
- * If you perform a pci_map_single() but wish to interrogate the
- * buffer using the cpu, yet do not wish to teardown the PCI dma
- * mapping, you must call this function before doing so.  At the
- * next point you give the PCI dma address back to the card, the
- * device again owns the buffer.
- */
-static inline void pci_dma_sync_single(struct pci_dev *hwdev,
-                                       dma_addr_t dma_handle,
-                                       size_t size, int direction)
-{
-        if (direction == PCI_DMA_NONE)
-                BUG();
-        frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle),
-                            (unsigned long)bus_to_virt(dma_handle) + size);
-}
-/* Make physical memory consistent for a set of streaming
- * mode DMA translations after a transfer.
- *
- * The same as pci_dma_sync_single but for a scatter-gather list,
- * same rules and usage.
- */
-static inline void pci_dma_sync_sg(struct pci_dev *hwdev,
-                                   struct scatterlist *sg,
-                                   int nelems, int direction)
-{
-        int i;
-        if (direction == PCI_DMA_NONE)
-                BUG();
-        for (i = 0; i < nelems; i++)
-                frv_cache_wback_inv(sg_dma_address(&sg[i]),
-                                    sg_dma_address(&sg[i])+sg_dma_len(&sg[i]));
-}
-#endif
diff --git a/include/asm-frv/percpu.h b/include/asm-frv/percpu.h
deleted file mode 100644
index 2cad3f874ded..000000000000
--- a/include/asm-frv/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_PERCPU_H
-#define __ASM_PERCPU_H
-#include <asm-generic/percpu.h>
-#endif  /* __ASM_PERCPU_H */
diff --git a/include/asm-frv/pgalloc.h b/include/asm-frv/pgalloc.h
deleted file mode 100644
index 971e6addb009..000000000000
--- a/include/asm-frv/pgalloc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* pgalloc.h: Page allocation routines for FRV
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- *
- * Derived from:
- *      include/asm-m68knommu/pgalloc.h
- *      include/asm-i386/pgalloc.h
- */
-#ifndef _ASM_PGALLOC_H
-#define _ASM_PGALLOC_H
-#include <asm/setup.h>
-#include <asm/virtconvert.h>
-#ifdef CONFIG_MMU
-#define pmd_populate_kernel(mm, pmd, pte) __set_pmd(pmd, __pa(pte) | _PAGE_TABLE)
-#define pmd_populate(MM, PMD, PAGE)                                             \
-do {                                                                            \
-        __set_pmd((PMD), page_to_pfn(PAGE) << PAGE_SHIFT | _PAGE_TABLE);        \
-} while(0)
-#define pmd_pgtable(pmd) pmd_page(pmd)
-/*
- * Allocate and free page tables.
- */
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(struct mm_struct *mm, pgd_t *);
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
-extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);
-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
-{
-        free_page((unsigned long)pte);
-}
-static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
-{
-        pgtable_page_dtor(pte);
-        __free_page(pte);
-}
-#define __pte_free_tlb(tlb,pte)                         \
-do {                                                    \
-        pgtable_page_dtor(pte);                         \
-        tlb_remove_page((tlb),(pte));                   \
-} while (0)
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- * (In the PAE case we free the pmds as part of the pgd.)
- */
-#define pmd_alloc_one(mm, addr)         ({ BUG(); ((pmd_t *) 2); })
-#define pmd_free(mm, x)                 do { } while (0)
-#define __pmd_free_tlb(tlb,x)           do { } while (0)
-#endif /* CONFIG_MMU */
-#endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h
deleted file mode 100644
index e16fdb1f4f4f..000000000000
--- a/include/asm-frv/pgtable.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/* pgtable.h: FR-V page table mangling
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- *
- * Derived from:
- *      include/asm-m68knommu/pgtable.h
- *      include/asm-i386/pgtable.h
- */
-#ifndef _ASM_PGTABLE_H
-#define _ASM_PGTABLE_H
-#include <asm/mem-layout.h>
-#include <asm/setup.h>
-#include <asm/processor.h>
-#ifndef __ASSEMBLY__
-#include <linux/threads.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/sched.h>
-struct vm_area_struct;
-#endif
-#ifndef __ASSEMBLY__
-#if defined(CONFIG_HIGHPTE)
-typedef unsigned long pte_addr_t;
-#else
-typedef pte_t *pte_addr_t;
-#endif
-#endif
-/*****************************************************************************/
-/*
- * MMU-less operation case first
- */
-#ifndef CONFIG_MMU
-#define pgd_present(pgd)        (1)             /* pages are always present on NO_MM */
-#define pgd_none(pgd)           (0)
-#define pgd_bad(pgd)            (0)
-#define pgd_clear(pgdp)
-#define kern_addr_valid(addr)   (1)
-#define pmd_offset(a, b)        ((void *) 0)
-#define PAGE_NONE               __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_SHARED             __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_COPY               __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_READONLY           __pgprot(0)     /* these mean nothing to NO_MM */
-#define PAGE_KERNEL             __pgprot(0)     /* these mean nothing to NO_MM */
-#define __swp_type(x)           (0)
-#define __swp_offset(x)         (0)
-#define __swp_entry(typ,off)    ((swp_entry_t) { ((typ) | ((off) << 7)) })
-#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
-#ifndef __ASSEMBLY__
-static inline int pte_file(pte_t pte) { return 0; }
-#endif
-#define ZERO_PAGE(vaddr)        ({ BUG(); NULL; })
-#define swapper_pg_dir          ((pgd_t *) NULL)
-#define pgtable_cache_init()            do {} while (0)
-#define arch_enter_lazy_mmu_mode()      do {} while (0)
-#define arch_leave_lazy_mmu_mode()      do {} while (0)
-#define arch_enter_lazy_cpu_mode()      do {} while (0)
-#define arch_leave_lazy_cpu_mode()      do {} while (0)
-#else /* !CONFIG_MMU */
-/*****************************************************************************/
-/*
- * then MMU operation
- */
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#ifndef __ASSEMBLY__
-extern unsigned long empty_zero_page;
-#define ZERO_PAGE(vaddr)        virt_to_page(empty_zero_page)
-#endif
-/*
- * we use 2-level page tables, folding the PMD (mid-level table) into the PGE (top-level entry)
- * [see Documentation/frv/mmu-layout.txt]
- *
- * Page Directory:
- *  - Size: 16KB
- *  - 64 PGEs per PGD
- *  - Each PGE holds 1 PUD and covers 64MB
- *
- * Page Upper Directory:
- *  - Size: 256B
- *  - 1 PUE per PUD
- *  - Each PUE holds 1 PMD and covers 64MB
- *
- * Page Mid-Level Directory
- *  - Size: 256B
- *  - 1 PME per PMD
- *  - Each PME holds 64 STEs, all of which point to separate chunks of the same Page Table
- *  - All STEs are instantiated at the same time
- *
- * Page Table
- *  - Size: 16KB
- *  - 4096 PTEs per PT
- *  - Each Linux PT is subdivided into 64 FR451 PT's, each of which holds 64 entries
- *
- * Pages
- *  - Size: 4KB
- *
- * total PTEs
- *      = 1 PML4E * 64 PGEs * 1 PUEs * 1 PMEs * 4096 PTEs
- *      = 1 PML4E * 64 PGEs * 64 STEs * 64 PTEs/FR451-PT
- *      = 262144 (or 256 * 1024)
- */
-#define PGDIR_SHIFT             26
-#define PGDIR_SIZE              (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK              (~(PGDIR_SIZE - 1))
-#define PTRS_PER_PGD            64
-#define PUD_SHIFT               26
-#define PTRS_PER_PUD            1
-#define PUD_SIZE                (1UL << PUD_SHIFT)
-#define PUD_MASK                (~(PUD_SIZE - 1))
-#define PUE_SIZE                256
-#define PMD_SHIFT               26
-#define PMD_SIZE                (1UL << PMD_SHIFT)
-#define PMD_MASK                (~(PMD_SIZE - 1))
-#define PTRS_PER_PMD            1
-#define PME_SIZE                256
-#define __frv_PT_SIZE           256
-#define PTRS_PER_PTE            4096
-#define USER_PGDS_IN_LAST_PML4  (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-#define USER_PGD_PTRS           (PAGE_OFFSET >> PGDIR_SHIFT)
-#define KERNEL_PGD_PTRS         (PTRS_PER_PGD - USER_PGD_PTRS)
-#define TWOLEVEL_PGDIR_SHIFT    26
-#define BOOT_USER_PGD_PTRS      (__PAGE_OFFSET >> TWOLEVEL_PGDIR_SHIFT)
-#define BOOT_KERNEL_PGD_PTRS    (PTRS_PER_PGD - BOOT_USER_PGD_PTRS)
-#ifndef __ASSEMBLY__
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte)
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
-#define pud_ERROR(e) \
-        printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pmd_val(pud_val(e)))
-#define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pmd_val(pud_val(pgd_val(e))))
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#define set_pte(pteptr, pteval)                         \
-do {                                                    \
-        *(pteptr) = (pteval);                           \
-        asm volatile("dcf %M0" :: "U"(*pteptr));        \
-} while(0)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-/*
- * pgd_offset() returns a (pgd_t *)
- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
- */
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-/*
- * a shortcut which implies the use of the kernel's pgd, instead
- * of a process's
- */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
-/*
- * The "pgd_xxx()" functions here are trivial for a folded two-level
- * setup: the pud is never bad, and a pud always exists (as it's folded
- * into the pgd entry)
- */
-static inline int pgd_none(pgd_t pgd)           { return 0; }
-static inline int pgd_bad(pgd_t pgd)            { return 0; }
-static inline int pgd_present(pgd_t pgd)        { return 1; }
-static inline void pgd_clear(pgd_t *pgd)        { }
-#define pgd_populate(mm, pgd, pud)              do { } while (0)
-/*
- * (puds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pgd(pgdptr, pgdval)                         \
-do {                                                    \
-        memcpy((pgdptr), &(pgdval), sizeof(pgd_t));     \
-        asm volatile("dcf %M0" :: "U"(*(pgdptr)));      \
-} while(0)
-static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
-{
-        return (pud_t *) pgd;
-}
-#define pgd_page(pgd)                           (pud_page((pud_t){ pgd }))
-#define pgd_page_vaddr(pgd)                     (pud_page_vaddr((pud_t){ pgd }))
-/*
- * allocating and freeing a pud is trivial: the 1-entry pud is
- * inside the pgd, so has no extra memory associated with it.
- */
-#define pud_alloc_one(mm, address)              NULL
-#define pud_free(mm, x)                         do { } while (0)
-#define __pud_free_tlb(tlb, x)                  do { } while (0)
-/*
- * The "pud_xxx()" functions here are trivial for a folded two-level
- * setup: the pmd is never bad, and a pmd always exists (as it's folded
- * into the pud entry)
- */
-static inline int pud_none(pud_t pud)           { return 0; }
-static inline int pud_bad(pud_t pud)            { return 0; }
-static inline int pud_present(pud_t pud)        { return 1; }
-static inline void pud_clear(pud_t *pud)        { }
-#define pud_populate(mm, pmd, pte)              do { } while (0)
-/*
- * (pmds are folded into puds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pud(pudptr, pudval)                 set_pmd((pmd_t *)(pudptr), (pmd_t) { pudval })
-#define pud_page(pud)                           (pmd_page((pmd_t){ pud }))
-#define pud_page_vaddr(pud)                     (pmd_page_vaddr((pmd_t){ pud }))
-/*
- * (pmds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-extern void __set_pmd(pmd_t *pmdptr, unsigned long __pmd);
-#define set_pmd(pmdptr, pmdval)                 \
-do {                                            \
-        __set_pmd((pmdptr), (pmdval).ste[0]);   \
-} while(0)
-#define __pmd_index(address)                    0
-static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address)
-{
-        return (pmd_t *) dir + __pmd_index(address);
-}
-#define pte_same(a, b)          ((a).pte == (b).pte)
-#define pte_page(x)             (mem_map + ((unsigned long)(((x).pte >> PAGE_SHIFT))))
-#define pte_none(x)             (!(x).pte)
-#define pte_pfn(x)              ((unsigned long)(((x).pte >> PAGE_SHIFT)))
-#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
-#define VMALLOC_VMADDR(x)       ((unsigned long) (x))
-#endif /* !__ASSEMBLY__ */
-/*
- * control flags in AMPR registers and TLB entries
- */
-#define _PAGE_BIT_PRESENT       xAMPRx_V_BIT
-#define _PAGE_BIT_WP            DAMPRx_WP_BIT
-#define _PAGE_BIT_NOCACHE       xAMPRx_C_BIT
-#define _PAGE_BIT_SUPER         xAMPRx_S_BIT
-#define _PAGE_BIT_ACCESSED      xAMPRx_RESERVED8_BIT
-#define _PAGE_BIT_DIRTY         xAMPRx_M_BIT
-#define _PAGE_BIT_NOTGLOBAL     xAMPRx_NG_BIT
-#define _PAGE_PRESENT           xAMPRx_V
-#define _PAGE_WP                DAMPRx_WP
-#define _PAGE_NOCACHE           xAMPRx_C
-#define _PAGE_SUPER             xAMPRx_S
-#define _PAGE_ACCESSED          xAMPRx_RESERVED8        /* accessed if set */
-#define _PAGE_DIRTY             xAMPRx_M
-#define _PAGE_NOTGLOBAL         xAMPRx_NG
-#define _PAGE_RESERVED_MASK     (xAMPRx_RESERVED8 | xAMPRx_RESERVED13)
-#define _PAGE_FILE              0x002   /* set:pagecache unset:swap */
-#define _PAGE_PROTNONE          0x000   /* If not present */
-#define _PAGE_CHG_MASK          (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define __PGPROT_BASE \
-        (_PAGE_PRESENT | xAMPRx_SS_16Kb | xAMPRx_D | _PAGE_NOTGLOBAL | _PAGE_ACCESSED)
-#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)
-#define PAGE_SHARED     __pgprot(__PGPROT_BASE)
-#define PAGE_COPY       __pgprot(__PGPROT_BASE | _PAGE_WP)
-#define PAGE_READONLY   __pgprot(__PGPROT_BASE | _PAGE_WP)
-#define __PAGE_KERNEL           (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY)
-#define __PAGE_KERNEL_NOCACHE   (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY | _PAGE_NOCACHE)
-#define __PAGE_KERNEL_RO        (__PGPROT_BASE | _PAGE_SUPER | _PAGE_DIRTY | _PAGE_WP)
-#define MAKE_GLOBAL(x) __pgprot((x) & ~_PAGE_NOTGLOBAL)
-#define PAGE_KERNEL             MAKE_GLOBAL(__PAGE_KERNEL)
-#define PAGE_KERNEL_RO          MAKE_GLOBAL(__PAGE_KERNEL_RO)
-#define PAGE_KERNEL_NOCACHE     MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)
-#define _PAGE_TABLE             (_PAGE_PRESENT | xAMPRx_SS_16Kb)
-#ifndef __ASSEMBLY__
-/*
- * The FR451 can do execute protection by virtue of having separate TLB miss handlers for
- * instruction access and for data access. However, we don't have enough reserved bits to say
- * "execute only", so we don't bother. If you can read it, you can execute it and vice versa.
- */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY
-#define __P010  PAGE_COPY
-#define __P011  PAGE_COPY
-#define __P100  PAGE_READONLY
-#define __P101  PAGE_READONLY
-#define __P110  PAGE_COPY
-#define __P111  PAGE_COPY
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY
-#define __S010  PAGE_SHARED
-#define __S011  PAGE_SHARED
-#define __S100  PAGE_READONLY
-#define __S101  PAGE_READONLY
-#define __S110  PAGE_SHARED
-#define __S111  PAGE_SHARED
-/*
- * Define this to warn about kernel memory accesses that are
- * done without a 'access_ok(VERIFY_WRITE,..)'
- */
-#undef TEST_ACCESS_OK
-#define pte_present(x)  (pte_val(x) & _PAGE_PRESENT)
-#define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (pmd_val(x) & _PAGE_PRESENT)
-#define pmd_bad(x)      (pmd_val(x) & xAMPRx_SS)
-#define pmd_clear(xp)   do { __set_pmd(xp, 0); } while(0)
-#define pmd_page_vaddr(pmd) \
-        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
-#ifndef CONFIG_DISCONTIGMEM
-#define pmd_page(pmd)   (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
-#endif
-#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-static inline int pte_dirty(pte_t pte)          { return (pte).pte & _PAGE_DIRTY; }
-static inline int pte_young(pte_t pte)          { return (pte).pte & _PAGE_ACCESSED; }
-static inline int pte_write(pte_t pte)          { return !((pte).pte & _PAGE_WP); }
-static inline int pte_special(pte_t pte)        { return 0; }
-static inline pte_t pte_mkclean(pte_t pte)      { (pte).pte &= ~_PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { (pte).pte &= ~_PAGE_ACCESSED; return pte; }
-static inline pte_t pte_wrprotect(pte_t pte)    { (pte).pte |= _PAGE_WP; return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { (pte).pte |= _PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { (pte).pte |= _PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkwrite(pte_t pte)      { (pte).pte &= ~_PAGE_WP; return pte; }
-static inline pte_t pte_mkspecial(pte_t pte)    { return pte; }
-static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-{
-        int i = test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-        return i;
-}
-static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        unsigned long x = xchg(&ptep->pte, 0);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-        return __pte(x);
-}
-static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        set_bit(_PAGE_BIT_WP, ptep);
-        asm volatile("dcf %M0" :: "U"(*ptep));
-}
-/*
- * Macro to mark a page protection value as "uncacheable"
- */
-#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NOCACHE))
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-#define mk_pte_huge(entry)      ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
-/* This takes a physical page address that is used by the remapping functions */
-#define mk_pte_phys(physpage, pgprot)   pfn_pte((physpage) >> PAGE_SHIFT, pgprot)
-static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{
-        pte.pte &= _PAGE_CHG_MASK;
-        pte.pte |= pgprot_val(newprot);
-        return pte;
-}
-/* to find an entry in a page-table-directory. */
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-#define pgd_index_k(addr) pgd_index(addr)
-/* Find an entry in the bottom-level page table.. */
-#define __pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-/*
- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
- *
- * this macro returns the index of the entry in the pte page which would
- * control the given virtual address
- */
-#define pte_index(address) \
-                (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
-#if defined(CONFIG_HIGHPTE)
-#define pte_offset_map(dir, address) \
-        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
-#define pte_offset_map_nested(dir, address) \
-        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address))
-#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
-#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
-#else
-#define pte_offset_map(dir, address) \
-        ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
-#define pte_offset_map_nested(dir, address) pte_offset_map((dir), (address))
-#define pte_unmap(pte) do { } while (0)
-#define pte_unmap_nested(pte) do { } while (0)
-#endif
-/*
- * Handle swap and file entries
- * - the PTE is encoded in the following format:
- *      bit 0:          Must be 0 (!_PAGE_PRESENT)
- *      bit 1:          Type: 0 for swap, 1 for file (_PAGE_FILE)
- *      bits 2-7:       Swap type
- *      bits 8-31:      Swap offset
- *      bits 2-31:      File pgoff
- */
-#define __swp_type(x)                   (((x).val >> 2) & 0x1f)
-#define __swp_offset(x)                 ((x).val >> 8)
-#define __swp_entry(type, offset)       ((swp_entry_t) { ((type) << 2) | ((offset) << 8) })
-#define __pte_to_swp_entry(_pte)        ((swp_entry_t) { (_pte).pte })
-#define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
-static inline int pte_file(pte_t pte)
-{
-        return pte.pte & _PAGE_FILE;
-}
-#define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(PTE)       ((PTE).pte >> 2)
-#define pgoff_to_pte(off)       __pte((off) << 2 | _PAGE_FILE)
-/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
-#define PageSkip(page)          (0)
-#define kern_addr_valid(addr)   (1)
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
-                remap_pfn_range(vma, vaddr, pfn, size, prot)
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTE_SAME
-#include <asm-generic/pgtable.h>
-/*
- * preload information about a newly instantiated PTE into the SCR0/SCR1 PGE cache
- */
-static inline void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
-{
-        struct mm_struct *mm;
-        unsigned long ampr;
-        mm = current->mm;
-        if (mm) {
-                pgd_t *pge = pgd_offset(mm, address);
-                pud_t *pue = pud_offset(pge, address);
-                pmd_t *pme = pmd_offset(pue, address);
-                ampr = pme->ste[0] & 0xffffff00;
-                ampr |= xAMPRx_L | xAMPRx_SS_16Kb | xAMPRx_S | xAMPRx_C |
-                        xAMPRx_V;
-        } else {
-                address = ULONG_MAX;
-                ampr = 0;
-        }
-        asm volatile("movgs %0,scr0\n"
-                     "movgs %0,scr1\n"
-                     "movgs %1,dampr4\n"
-                     "movgs %1,dampr5\n"
-                     :
-                     : "r"(address), "r"(ampr)
-                     );
-}
-#ifdef CONFIG_PROC_FS
-extern char *proc_pid_status_frv_cxnr(struct mm_struct *mm, char *buffer);
-#endif
-extern void __init pgtable_cache_init(void);
-#endif /* !__ASSEMBLY__ */
-#endif /* !CONFIG_MMU */
-#ifndef __ASSEMBLY__
-extern void __init paging_init(void);
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-frv/poll.h b/include/asm-frv/poll.h
deleted file mode 100644
index 0d01479ccc56..000000000000
--- a/include/asm-frv/poll.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_POLL_H
-#define _ASM_POLL_H
-#define POLLWRNORM      POLLOUT
-#define POLLWRBAND      256
-#include <asm-generic/poll.h>
-#undef POLLREMOVE
-#endif
diff --git a/include/asm-frv/posix_types.h b/include/asm-frv/posix_types.h
deleted file mode 100644
index a9f1f5be0632..000000000000
--- a/include/asm-frv/posix_types.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _ASM_POSIX_TYPES_H
-#define _ASM_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 unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned int    __kernel_size_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_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;
-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;
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-typedef struct {
-        int     val[2];
-} __kernel_fsid_t;
-#if defined(__KERNEL__)
-#undef  __FD_SET
-#define __FD_SET(d, set)        ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-#undef  __FD_CLR
-#define __FD_CLR(d, set)        ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-#undef  __FD_ISSET
-#define __FD_ISSET(d, set)      (!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))
-#undef  __FD_ZERO
-#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
-#endif /* defined(__KERNEL__) */
-#endif
diff --git a/include/asm-frv/processor.h b/include/asm-frv/processor.h
deleted file mode 100644
index 3744f2e47f48..000000000000
--- a/include/asm-frv/processor.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* processor.h: FRV processor definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_PROCESSOR_H
-#define _ASM_PROCESSOR_H
-#include <asm/mem-layout.h>
-#ifndef __ASSEMBLY__
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ __label__ _l; _l: &&_l;})
-#include <linux/compiler.h>
-#include <linux/linkage.h>
-#include <asm/sections.h>
-#include <asm/segment.h>
-#include <asm/fpu.h>
-#include <asm/registers.h>
-#include <asm/ptrace.h>
-#include <asm/current.h>
-#include <asm/cache.h>
-/* Forward declaration, a strange C thing */
-struct task_struct;
-/*
- *  CPU type and hardware bug flags. Kept separately for each CPU.
- */
-struct cpuinfo_frv {
-#ifdef CONFIG_MMU
-        unsigned long   *pgd_quick;
-        unsigned long   *pte_quick;
-        unsigned long   pgtable_cache_sz;
-#endif
-} __cacheline_aligned;
-extern struct cpuinfo_frv __nongprelbss boot_cpu_data;
-#define cpu_data                (&boot_cpu_data)
-#define current_cpu_data        boot_cpu_data
-/*
- * Bus types
- */
-#define EISA_bus 0
-#define MCA_bus 0
-struct thread_struct {
-        struct pt_regs          *frame;         /* [GR28] exception frame ptr for this thread */
-        struct task_struct      *curr;          /* [GR29] current pointer for this thread */
-        unsigned long           sp;             /* [GR1 ] kernel stack pointer */
-        unsigned long           fp;             /* [GR2 ] kernel frame pointer */
-        unsigned long           lr;             /* link register */
-        unsigned long           pc;             /* program counter */
-        unsigned long           gr[12];         /* [GR16-GR27] */
-        unsigned long           sched_lr;       /* LR from schedule() */
-        union {
-                struct pt_regs          *frame0;        /* top (user) stack frame */
-                struct user_context     *user;          /* userspace context */
-        };
-} __attribute__((aligned(8)));
-extern struct pt_regs *__kernel_frame0_ptr;
-extern struct task_struct *__kernel_current_task;
-#endif
-#ifndef __ASSEMBLY__
-#define INIT_THREAD_FRAME0 \
-        ((struct pt_regs *) \
-        (sizeof(init_stack) + (unsigned long) init_stack - sizeof(struct user_context)))
-#define INIT_THREAD {                           \
-        NULL,                                   \
-        (struct task_struct *) init_stack,      \
-        0, 0, 0, 0,                             \
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, \
-        0,                                      \
-        { INIT_THREAD_FRAME0 },                 \
-}
-/*
- * do necessary setup to start up a newly executed thread.
- * - need to discard the frame stacked by init() invoking the execve syscall
- */
-#define start_thread(_regs, _pc, _usp)                  \
-do {                                                    \
-        set_fs(USER_DS); /* reads from user space */    \
-        __frame = __kernel_frame0_ptr;                  \
-        __frame->pc     = (_pc);                        \
-        __frame->psr    &= ~PSR_S;                      \
-        __frame->sp     = (_usp);                       \
-} while(0)
-extern void prepare_to_copy(struct task_struct *tsk);
-/* Free all resources held by a thread. */
-static inline void release_thread(struct task_struct *dead_task)
-{
-}
-extern asmlinkage int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-extern asmlinkage void save_user_regs(struct user_context *target);
-extern asmlinkage void *restore_user_regs(const struct user_context *target, ...);
-#define copy_segments(tsk, mm)          do { } while (0)
-#define release_segments(mm)            do { } while (0)
-#define forget_segments()               do { } while (0)
-/*
- * Free current thread data structures etc..
- */
-static inline void exit_thread(void)
-{
-}
-/*
- * Return saved PC of a blocked thread.
- */
-extern unsigned long thread_saved_pc(struct task_struct *tsk);
-unsigned long get_wchan(struct task_struct *p);
-#define KSTK_EIP(tsk)   ((tsk)->thread.frame0->pc)
-#define KSTK_ESP(tsk)   ((tsk)->thread.frame0->sp)
-/* Allocation and freeing of basic task resources. */
-extern struct task_struct *alloc_task_struct(void);
-extern void free_task_struct(struct task_struct *p);
-#define cpu_relax()    barrier()
-/* data cache prefetch */
-#define ARCH_HAS_PREFETCH
-static inline void prefetch(const void *x)
-{
-        asm volatile("dcpl %0,gr0,#0" : : "r"(x));
-}
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_PROCESSOR_H */
diff --git a/include/asm-frv/ptrace.h b/include/asm-frv/ptrace.h
deleted file mode 100644
index cf6934012b64..000000000000
--- a/include/asm-frv/ptrace.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ptrace.h: ptrace() relevant definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_PTRACE_H
-#define _ASM_PTRACE_H
-#include <asm/registers.h>
-#ifdef __KERNEL__
-#include <asm/irq_regs.h>
-#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
-#endif
-#define PT_PSR          0
-#define PT_ISR          1
-#define PT_CCR          2
-#define PT_CCCR         3
-#define PT_LR           4
-#define PT_LCR          5
-#define PT_PC           6
-#define PT__STATUS      7       /* exception status */
-#define PT_SYSCALLNO    8       /* syscall number or -1 */
-#define PT_ORIG_GR8     9       /* saved GR8 for signal handling */
-#define PT_GNER0        10
-#define PT_GNER1        11
-#define PT_IACC0H       12
-#define PT_IACC0L       13
-#define PT_GR(j)        ( 14 + (j))     /* GRj for 0<=j<=63 */
-#define PT_FR(j)        ( 78 + (j))     /* FRj for 0<=j<=63 */
-#define PT_FNER(j)      (142 + (j))     /* FNERj for 0<=j<=1 */
-#define PT_MSR(j)       (144 + (j))     /* MSRj for 0<=j<=2 */
-#define PT_ACC(j)       (146 + (j))     /* ACCj for 0<=j<=7 */
-#define PT_ACCG(jklm)   (154 + (jklm))  /* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */
-#define PT_FSR(j)       (156 + (j))     /* FSRj for 0<=j<=0 */
-#define PT__GPEND       78
-#define PT__END         157
-#define PT_TBR          PT_GR(0)
-#define PT_SP           PT_GR(1)
-#define PT_FP           PT_GR(2)
-#define PT_PREV_FRAME   PT_GR(28)       /* previous exception frame pointer (old gr28 value) */
-#define PT_CURR_TASK    PT_GR(29)       /* current task */
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
-#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
-#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-/*
- * we dedicate GR28 to keeping a pointer to the current exception frame
- * - gr28 is destroyed on entry to the kernel from userspace
- */
-register struct pt_regs *__frame asm("gr28");
-#define user_mode(regs)                 (!((regs)->psr & PSR_S))
-#define instruction_pointer(regs)       ((regs)->pc)
-extern unsigned long user_stack(const struct pt_regs *);
-extern void show_regs(struct pt_regs *);
-#define profile_pc(regs) ((regs)->pc)
-#endif
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_PTRACE_H */
diff --git a/include/asm-frv/registers.h b/include/asm-frv/registers.h
deleted file mode 100644
index 9666119fcf6e..000000000000
--- a/include/asm-frv/registers.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* registers.h: register frame declarations
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-/*
- * notes:
- *
- * (1) that the members of all these structures are carefully aligned to permit
- *     usage of STD/STDF instructions
- *
- * (2) if you change these structures, you must change the code in
- *     arch/frvnommu/kernel/{break.S,entry.S,switch_to.S,gdb-stub.c}
- *
- *
- * the kernel stack space block looks like this:
- *
- *      +0x2000 +----------------------
- *              | union {
- *              |       struct frv_frame0 {
- *              |               struct user_context {
- *              |                       struct user_int_regs
- *              |                       struct user_fpmedia_regs
- *              |               }
- *              |               struct frv_debug_regs
- *              |       }
- *              |       struct pt_regs [user exception]
- *              | }
- *              +---------------------- <-- __kernel_frame0_ptr (maybe GR28)
- *              |
- *              | kernel stack
- *              |
- *              |......................
- *              | struct pt_regs [kernel exception]
- *              |...................... <-- __kernel_frame0_ptr (maybe GR28)
- *              |
- *              | kernel stack
- *              |
- *              |...................... <-- stack pointer (GR1)
- *              |
- *              | unused stack space
- *              |
- *              +----------------------
- *              | struct thread_info
- *      +0x0000 +---------------------- <-- __current_thread_info (GR15);
- *
- * note that GR28 points to the current exception frame
- */
-#ifndef _ASM_REGISTERS_H
-#define _ASM_REGISTERS_H
-#ifndef __ASSEMBLY__
-#define __OFFSET(X,N)   ((X)+(N)*4)
-#define __OFFSETC(X,N)  xxxxxxxxxxxxxxxxxxxxxxxx
-#else
-#define __OFFSET(X,N)   ((X)+(N)*4)
-#define __OFFSETC(X,N)  ((X)+(N))
-#endif
-/*****************************************************************************/
-/*
- * Exception/Interrupt frame
- * - held on kernel stack
- * - 8-byte aligned on stack (old SP is saved in frame)
- * - GR0 is fixed 0, so we don't save it
- */
-#ifndef __ASSEMBLY__
-struct pt_regs {
-        unsigned long           psr;            /* Processor Status Register */
-        unsigned long           isr;            /* Integer Status Register */
-        unsigned long           ccr;            /* Condition Code Register */
-        unsigned long           cccr;           /* Condition Code for Conditional Insns Register */
-        unsigned long           lr;             /* Link Register */
-        unsigned long           lcr;            /* Loop Count Register */
-        unsigned long           pc;             /* Program Counter Register */
-        unsigned long           __status;       /* exception status */
-        unsigned long           syscallno;      /* syscall number or -1 */
-        unsigned long           orig_gr8;       /* original syscall arg #1 */
-        unsigned long           gner0;
-        unsigned long           gner1;
-        unsigned long long      iacc0;
-        unsigned long           tbr;            /* GR0 is fixed zero, so we use this for TBR */
-        unsigned long           sp;             /* GR1: USP/KSP */
-        unsigned long           fp;             /* GR2: FP */
-        unsigned long           gr3;
-        unsigned long           gr4;
-        unsigned long           gr5;
-        unsigned long           gr6;
-        unsigned long           gr7;            /* syscall number */
-        unsigned long           gr8;            /* 1st syscall param; syscall return */
-        unsigned long           gr9;            /* 2nd syscall param */
-        unsigned long           gr10;           /* 3rd syscall param */
-        unsigned long           gr11;           /* 4th syscall param */
-        unsigned long           gr12;           /* 5th syscall param */
-        unsigned long           gr13;           /* 6th syscall param */
-        unsigned long           gr14;
-        unsigned long           gr15;
-        unsigned long           gr16;           /* GP pointer */
-        unsigned long           gr17;           /* small data */
-        unsigned long           gr18;           /* PIC/PID */
-        unsigned long           gr19;
-        unsigned long           gr20;
-        unsigned long           gr21;
-        unsigned long           gr22;
-        unsigned long           gr23;
-        unsigned long           gr24;
-        unsigned long           gr25;
-        unsigned long           gr26;
-        unsigned long           gr27;
-        struct pt_regs          *next_frame;    /* GR28 - next exception frame */
-        unsigned long           gr29;           /* GR29 - OS reserved */
-        unsigned long           gr30;           /* GR30 - OS reserved */
-        unsigned long           gr31;           /* GR31 - OS reserved */
-} __attribute__((aligned(8)));
-#endif
-#define REG__STATUS_STEP        0x00000001      /* - reenable single stepping on return */
-#define REG__STATUS_STEPPED     0x00000002      /* - single step caused exception */
-#define REG__STATUS_BROKE       0x00000004      /* - BREAK insn caused exception */
-#define REG__STATUS_SYSC_ENTRY  0x40000000      /* - T on syscall entry (ptrace.c only) */
-#define REG__STATUS_SYSC_EXIT   0x80000000      /* - T on syscall exit (ptrace.c only) */
-#define REG_GR(R)       __OFFSET(REG_GR0, (R))
-#define REG_SP          REG_GR(1)
-#define REG_FP          REG_GR(2)
-#define REG_PREV_FRAME  REG_GR(28)      /* previous exception frame pointer (old gr28 value) */
-#define REG_CURR_TASK   REG_GR(29)      /* current task */
-/*****************************************************************************/
-/*
- * debugging registers
- */
-#ifndef __ASSEMBLY__
-struct frv_debug_regs
-{
-        unsigned long           dcr;
-        unsigned long           ibar[4] __attribute__((aligned(8)));
-        unsigned long           dbar[4] __attribute__((aligned(8)));
-        unsigned long           dbdr[4][4] __attribute__((aligned(8)));
-        unsigned long           dbmr[4][4] __attribute__((aligned(8)));
-} __attribute__((aligned(8)));
-#endif
-/*****************************************************************************/
-/*
- * userspace registers
- */
-#ifndef __ASSEMBLY__
-struct user_int_regs
-{
-        /* integer registers
-         * - up to gr[31] mirror pt_regs
-         * - total size must be multiple of 8 bytes
-         */
-        unsigned long           psr;            /* Processor Status Register */
-        unsigned long           isr;            /* Integer Status Register */
-        unsigned long           ccr;            /* Condition Code Register */
-        unsigned long           cccr;           /* Condition Code for Conditional Insns Register */
-        unsigned long           lr;             /* Link Register */
-        unsigned long           lcr;            /* Loop Count Register */
-        unsigned long           pc;             /* Program Counter Register */
-        unsigned long           __status;       /* exception status */
-        unsigned long           syscallno;      /* syscall number or -1 */
-        unsigned long           orig_gr8;       /* original syscall arg #1 */
-        unsigned long           gner[2];
-        unsigned long long      iacc[1];
-        union {
-                unsigned long   tbr;
-                unsigned long   gr[64];
-        };
-};
-struct user_fpmedia_regs
-{
-        /* FP/Media registers */
-        unsigned long   fr[64];
-        unsigned long   fner[2];
-        unsigned long   msr[2];
-        unsigned long   acc[8];
-        unsigned char   accg[8];
-        unsigned long   fsr[1];
-};
-struct user_context
-{
-        struct user_int_regs            i;
-        struct user_fpmedia_regs        f;
-        /* we provide a context extension so that we can save the regs for CPUs that
-         * implement many more of Fujitsu's lavish register spec
-         */
-        void *extension;
-} __attribute__((aligned(8)));
-struct frv_frame0 {
-        union {
-                struct pt_regs          regs;
-                struct user_context     uc;
-        };
-        struct frv_debug_regs           debug;
-} __attribute__((aligned(32)));
-#endif
-#define __INT_GR(R)             __OFFSET(__INT_GR0,             (R))
-#define __FPMEDIA_FR(R)         __OFFSET(__FPMEDIA_FR0,         (R))
-#define __FPMEDIA_FNER(R)       __OFFSET(__FPMEDIA_FNER0,       (R))
-#define __FPMEDIA_MSR(R)        __OFFSET(__FPMEDIA_MSR0,        (R))
-#define __FPMEDIA_ACC(R)        __OFFSET(__FPMEDIA_ACC0,        (R))
-#define __FPMEDIA_ACCG(R)       __OFFSETC(__FPMEDIA_ACCG0,      (R))
-#define __FPMEDIA_FSR(R)        __OFFSET(__FPMEDIA_FSR0,        (R))
-#define __THREAD_GR(R)          __OFFSET(__THREAD_GR16,         (R) - 16)
-#endif /* _ASM_REGISTERS_H */
diff --git a/include/asm-frv/resource.h b/include/asm-frv/resource.h
deleted file mode 100644
index 5fc60548fd02..000000000000
--- a/include/asm-frv/resource.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_RESOURCE_H
-#define _ASM_RESOURCE_H
-#include <asm-generic/resource.h>
-#endif /* _ASM_RESOURCE_H */
diff --git a/include/asm-frv/scatterlist.h b/include/asm-frv/scatterlist.h
deleted file mode 100644
index 4bca8a28546c..000000000000
--- a/include/asm-frv/scatterlist.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-#include <asm/types.h>
-/*
- * Drivers must set either ->address or (preferred) page and ->offset
- * to indicate where data must be transferred to/from.
- *
- * Using page is recommended since it handles highmem data as well as
- * low mem. ->address is restricted to data which has a virtual mapping, and
- * it will go away in the future. Updating to page can be automated very
- * easily -- something like
- *
- * sg->address = some_ptr;
- *
- * can be rewritten as
- *
- * sg_set_buf(sg, some_ptr, length);
- *
- * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
- */
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;         /* for highmem, page offset */
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-#define ISA_DMA_THRESHOLD (0xffffffffUL)
-#endif /* !_ASM_SCATTERLIST_H */
diff --git a/include/asm-frv/sections.h b/include/asm-frv/sections.h
deleted file mode 100644
index 17d0fb171bba..000000000000
--- a/include/asm-frv/sections.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* sections.h: linkage layout variables
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SECTIONS_H
-#define _ASM_SECTIONS_H
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-#include <asm-generic/sections.h>
-#ifdef __KERNEL__
-/*
- * we don't want to put variables in the GP-REL section if they're not used very much - that would
- * be waste since GP-REL addressing is limited to GP16+/-2048
- */
-#define __nongpreldata  __attribute__((section(".data")))
-#define __nongprelbss   __attribute__((section(".bss")))
-/*
- * linker symbols
- */
-extern const void __kernel_image_start, __kernel_image_end, __page_offset;
-extern unsigned long __nongprelbss memory_start;
-extern unsigned long __nongprelbss memory_end;
-extern unsigned long __nongprelbss rom_length;
-/* determine if we're running from ROM */
-static inline int is_in_rom(unsigned long addr)
-{
-        return 0; /* default case: not in ROM */
-}
-#endif
-#endif
-#endif /* _ASM_SECTIONS_H */
diff --git a/include/asm-frv/segment.h b/include/asm-frv/segment.h
deleted file mode 100644
index e3616a6f941d..000000000000
--- a/include/asm-frv/segment.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* segment.h: MMU segment settings
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-#ifndef __ASSEMBLY__
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-#define KERNEL_DS               MAKE_MM_SEG(0xdfffffffUL)
-#ifdef CONFIG_MMU
-#define USER_DS                 MAKE_MM_SEG(TASK_SIZE - 1)
-#else
-#define USER_DS                 KERNEL_DS
-#endif
-#define get_ds()                (KERNEL_DS)
-#define get_fs()                (__current_thread_info->addr_limit)
-#define segment_eq(a,b)         ((a).seg == (b).seg)
-#define __kernel_ds_p()         segment_eq(get_fs(), KERNEL_DS)
-#define get_addr_limit()        (get_fs().seg)
-#define set_fs(_x)                                      \
-do {                                                    \
-        __current_thread_info->addr_limit = (_x);       \
-} while(0)
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_SEGMENT_H */
diff --git a/include/asm-frv/sembuf.h b/include/asm-frv/sembuf.h
deleted file mode 100644
index 164b12786d6d..000000000000
--- a/include/asm-frv/sembuf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _ASM_SEMBUF_H
-#define _ASM_SEMBUF_H
-/*
- * The semid64_ds structure for FR-V 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 semid64_ds {
-        struct ipc64_perm       sem_perm;       /* permissions .. see ipc.h */
-        __kernel_time_t         sem_otime;      /* last semop time */
-        unsigned long           __unused1;
-        __kernel_time_t         sem_ctime;      /* last change time */
-        unsigned long           __unused2;
-        unsigned long           sem_nsems;      /* no. of semaphores in array */
-        unsigned long           __unused3;
-        unsigned long           __unused4;
-};
-#endif /* _ASM_SEMBUF_H */
diff --git a/include/asm-frv/serial-regs.h b/include/asm-frv/serial-regs.h
deleted file mode 100644
index e1286bda00eb..000000000000
--- a/include/asm-frv/serial-regs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* serial-regs.h: serial port registers
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SERIAL_REGS_H
-#define _ASM_SERIAL_REGS_H
-#include <linux/serial_reg.h>
-#include <asm/irc-regs.h>
-#define SERIAL_ICLK     33333333        /* the target serial input clock */
-#define UART0_BASE      0xfeff9c00
-#define UART1_BASE      0xfeff9c40
-#define __get_UART0(R) ({ __reg(UART0_BASE + (R) * 8) >> 24; })
-#define __get_UART1(R) ({ __reg(UART1_BASE + (R) * 8) >> 24; })
-#define __set_UART0(R,V) do { __reg(UART0_BASE + (R) * 8) = (V) << 24; } while(0)
-#define __set_UART1(R,V) do { __reg(UART1_BASE + (R) * 8) = (V) << 24; } while(0)
-#define __get_UART0_LSR() ({ __get_UART0(UART_LSR); })
-#define __get_UART1_LSR() ({ __get_UART1(UART_LSR); })
-#define __set_UART0_IER(V) __set_UART0(UART_IER,(V))
-#define __set_UART1_IER(V) __set_UART1(UART_IER,(V))
-/* serial prescaler select register */
-#define __get_UCPSR()   ({ *(volatile unsigned long *)(0xfeff9c90); })
-#define __set_UCPSR(V)  do { *(volatile unsigned long *)(0xfeff9c90) = (V); } while(0)
-#define UCPSR_SELECT0   0x07000000
-#define UCPSR_SELECT1   0x38000000
-/* serial prescaler base value register */
-#define __get_UCPVR()   ({ *(volatile unsigned long *)(0xfeff9c98); mb(); })
-#define __set_UCPVR(V)  do { *(volatile unsigned long *)(0xfeff9c98) = (V) << 24; mb(); } while(0)
-#endif /* _ASM_SERIAL_REGS_H */
diff --git a/include/asm-frv/serial.h b/include/asm-frv/serial.h
deleted file mode 100644
index dbb825998689..000000000000
--- a/include/asm-frv/serial.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * serial.h
- *
- * Copyright (C) 2003 Develer S.r.l. (http://www.develer.com/)
- * Author: Bernardo Innocenti <bernie@codewiz.org>
- *
- * Based on linux/include/asm-i386/serial.h
- */
-#include <asm/serial-regs.h>
-/*
- * the base baud is derived from the clock speed and so is variable
- */
-#define BASE_BAUD 0
-#define STD_COM_FLAGS           ASYNC_BOOT_AUTOCONF
-#define SERIAL_PORT_DFNS
diff --git a/include/asm-frv/setup.h b/include/asm-frv/setup.h
deleted file mode 100644
index afd787ceede6..000000000000
--- a/include/asm-frv/setup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* setup.h: setup stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SETUP_H
-#define _ASM_SETUP_H
-#define COMMAND_LINE_SIZE       512
-#ifdef __KERNEL__
-#include <linux/init.h>
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_MMU
-extern unsigned long __initdata num_mappedpages;
-#endif
-#endif /* !__ASSEMBLY__ */
-#endif  /*  __KERNEL__  */
-#endif /* _ASM_SETUP_H */
diff --git a/include/asm-frv/shmbuf.h b/include/asm-frv/shmbuf.h
deleted file mode 100644
index 4c6e711a4779..000000000000
--- a/include/asm-frv/shmbuf.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _ASM_SHMBUF_H
-#define _ASM_SHMBUF_H
-/*
- * The shmid64_ds structure for FR-V 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 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 */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __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 /* _ASM_SHMBUF_H */
diff --git a/include/asm-frv/shmparam.h b/include/asm-frv/shmparam.h
deleted file mode 100644
index ab711009cfaa..000000000000
--- a/include/asm-frv/shmparam.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_SHMPARAM_H
-#define _ASM_SHMPARAM_H
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-#endif /* _ASM_SHMPARAM_H */
diff --git a/include/asm-frv/sigcontext.h b/include/asm-frv/sigcontext.h
deleted file mode 100644
index 3b263f3cc96f..000000000000
--- a/include/asm-frv/sigcontext.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* sigcontext.h: FRV signal context
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SIGCONTEXT_H
-#define _ASM_SIGCONTEXT_H
-#include <asm/registers.h>
-/*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.  Note: only add new entries
- * to the end of the structure.
- */
-struct sigcontext {
-        struct user_context     sc_context;
-        unsigned long           sc_oldmask;     /* old sigmask */
-} __attribute__((aligned(8)));
-#endif
diff --git a/include/asm-frv/siginfo.h b/include/asm-frv/siginfo.h
deleted file mode 100644
index d3fd1ca45653..000000000000
--- a/include/asm-frv/siginfo.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_SIGINFO_H
-#define _ASM_SIGINFO_H
-#include <linux/types.h>
-#include <asm-generic/siginfo.h>
-#define FPE_MDAOVF      (__SI_FAULT|9)  /* media overflow */
-#undef NSIGFPE
-#define NSIGFPE         9
-#endif
diff --git a/include/asm-frv/signal.h b/include/asm-frv/signal.h
deleted file mode 100644
index 2079197d483d..000000000000
--- a/include/asm-frv/signal.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef _ASM_SIGNAL_H
-#define _ASM_SIGNAL_H
-#include <linux/types.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-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-1)
-/*
- * 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 /* not supported yet */
-#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;
-        __sigrestore_t sa_restorer;
-};
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-struct k_sigaction {
-        struct sigaction sa;
-};
-#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;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#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;
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-#undef __HAVE_ARCH_SIG_BITOPS
-#endif /* __KERNEL__ */
-#endif /* _ASM_SIGNAL_H */
diff --git a/include/asm-frv/smp.h b/include/asm-frv/smp.h
deleted file mode 100644
index 38349ec8b61b..000000000000
--- a/include/asm-frv/smp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_SMP_H
-#define __ASM_SMP_H
-#ifdef CONFIG_SMP
-#error SMP not supported
-#endif
-#endif
diff --git a/include/asm-frv/socket.h b/include/asm-frv/socket.h
deleted file mode 100644
index 57c3d4054e8b..000000000000
--- a/include/asm-frv/socket.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#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
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-frv/sockios.h b/include/asm-frv/sockios.h
deleted file mode 100644
index 5dbdd13e6de3..000000000000
--- a/include/asm-frv/sockios.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _ASM_SOCKIOS__
-#define _ASM_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 /* _ASM_SOCKIOS__ */
diff --git a/include/asm-frv/spinlock.h b/include/asm-frv/spinlock.h
deleted file mode 100644
index fe385f45d1fd..000000000000
--- a/include/asm-frv/spinlock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* spinlock.h: spinlocks for FR-V
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SPINLOCK_H
-#define _ASM_SPINLOCK_H
-#error no spinlocks for FR-V yet
-#endif /* _ASM_SPINLOCK_H */
diff --git a/include/asm-frv/spr-regs.h b/include/asm-frv/spr-regs.h
deleted file mode 100644
index 01e6af5e99b8..000000000000
--- a/include/asm-frv/spr-regs.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/* spr-regs.h: special-purpose registers on the FRV
- *
- * Copyright (C) 2003, 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SPR_REGS_H
-#define _ASM_SPR_REGS_H
-/*
- * PSR - Processor Status Register
- */
-#define PSR_ET                  0x00000001      /* enable interrupts/exceptions flag */
-#define PSR_PS                  0x00000002      /* previous supervisor mode flag */
-#define PSR_S                   0x00000004      /* supervisor mode flag */
-#define PSR_PIL                 0x00000078      /* processor external interrupt level */
-#define PSR_PIL_0               0x00000000      /* - no interrupt in progress */
-#define PSR_PIL_13              0x00000068      /* - debugging only */
-#define PSR_PIL_14              0x00000070      /* - debugging in progress */
-#define PSR_PIL_15              0x00000078      /* - NMI in progress */
-#define PSR_EM                  0x00000080      /* enable media operation */
-#define PSR_EF                  0x00000100      /* enable FPU operation */
-#define PSR_BE                  0x00001000      /* endianness mode */
-#define PSR_BE_LE               0x00000000      /* - little endian mode */
-#define PSR_BE_BE               0x00001000      /* - big endian mode */
-#define PSR_CM                  0x00002000      /* conditional mode */
-#define PSR_NEM                 0x00004000      /* non-excepting mode */
-#define PSR_ICE                 0x00010000      /* in-circuit emulation mode */
-#define PSR_VERSION_SHIFT       24              /* CPU silicon ID */
-#define PSR_IMPLE_SHIFT         28              /* CPU core ID */
-#define PSR_VERSION(psr)        (((psr) >> PSR_VERSION_SHIFT) & 0xf)
-#define PSR_IMPLE(psr)          (((psr) >> PSR_IMPLE_SHIFT) & 0xf)
-#define PSR_IMPLE_FR401         0x2
-#define PSR_VERSION_FR401_MB93401       0x0
-#define PSR_VERSION_FR401_MB93401A      0x1
-#define PSR_VERSION_FR401_MB93403       0x2
-#define PSR_IMPLE_FR405         0x4
-#define PSR_VERSION_FR405_MB93405       0x0
-#define PSR_IMPLE_FR451         0x5
-#define PSR_VERSION_FR451_MB93451       0x0
-#define PSR_IMPLE_FR501         0x1
-#define PSR_VERSION_FR501_MB93501       0x1
-#define PSR_VERSION_FR501_MB93501A      0x2
-#define PSR_IMPLE_FR551         0x3
-#define PSR_VERSION_FR551_MB93555       0x1
-#define __get_PSR()     ({ unsigned long x; asm volatile("movsg psr,%0" : "=r"(x)); x; })
-#define __set_PSR(V)    do { asm volatile("movgs %0,psr" : : "r"(V)); } while(0)
-/*
- * TBR - Trap Base Register
- */
-#define TBR_TT                  0x00000ff0
-#define TBR_TT_INSTR_MMU_MISS   (0x01 << 4)
-#define TBR_TT_INSTR_ACC_ERROR  (0x02 << 4)
-#define TBR_TT_INSTR_ACC_EXCEP  (0x03 << 4)
-#define TBR_TT_PRIV_INSTR       (0x06 << 4)
-#define TBR_TT_ILLEGAL_INSTR    (0x07 << 4)
-#define TBR_TT_FP_EXCEPTION     (0x0d << 4)
-#define TBR_TT_MP_EXCEPTION     (0x0e << 4)
-#define TBR_TT_DATA_ACC_ERROR   (0x11 << 4)
-#define TBR_TT_DATA_MMU_MISS    (0x12 << 4)
-#define TBR_TT_DATA_ACC_EXCEP   (0x13 << 4)
-#define TBR_TT_DATA_STR_ERROR   (0x14 << 4)
-#define TBR_TT_DIVISION_EXCEP   (0x17 << 4)
-#define TBR_TT_COMMIT_EXCEP     (0x19 << 4)
-#define TBR_TT_INSTR_TLB_MISS   (0x1a << 4)
-#define TBR_TT_DATA_TLB_MISS    (0x1b << 4)
-#define TBR_TT_DATA_DAT_EXCEP   (0x1d << 4)
-#define TBR_TT_DECREMENT_TIMER  (0x1f << 4)
-#define TBR_TT_COMPOUND_EXCEP   (0x20 << 4)
-#define TBR_TT_INTERRUPT_1      (0x21 << 4)
-#define TBR_TT_INTERRUPT_2      (0x22 << 4)
-#define TBR_TT_INTERRUPT_3      (0x23 << 4)
-#define TBR_TT_INTERRUPT_4      (0x24 << 4)
-#define TBR_TT_INTERRUPT_5      (0x25 << 4)
-#define TBR_TT_INTERRUPT_6      (0x26 << 4)
-#define TBR_TT_INTERRUPT_7      (0x27 << 4)
-#define TBR_TT_INTERRUPT_8      (0x28 << 4)
-#define TBR_TT_INTERRUPT_9      (0x29 << 4)
-#define TBR_TT_INTERRUPT_10     (0x2a << 4)
-#define TBR_TT_INTERRUPT_11     (0x2b << 4)
-#define TBR_TT_INTERRUPT_12     (0x2c << 4)
-#define TBR_TT_INTERRUPT_13     (0x2d << 4)
-#define TBR_TT_INTERRUPT_14     (0x2e << 4)
-#define TBR_TT_INTERRUPT_15     (0x2f << 4)
-#define TBR_TT_TRAP0            (0x80 << 4)
-#define TBR_TT_TRAP1            (0x81 << 4)
-#define TBR_TT_TRAP2            (0x82 << 4)
-#define TBR_TT_TRAP3            (0x83 << 4)
-#define TBR_TT_TRAP120          (0xf8 << 4)
-#define TBR_TT_TRAP121          (0xf9 << 4)
-#define TBR_TT_TRAP122          (0xfa << 4)
-#define TBR_TT_TRAP123          (0xfb << 4)
-#define TBR_TT_TRAP124          (0xfc << 4)
-#define TBR_TT_TRAP125          (0xfd << 4)
-#define TBR_TT_TRAP126          (0xfe << 4)
-#define TBR_TT_BREAK            (0xff << 4)
-#define TBR_TT_ATOMIC_CMPXCHG32 TBR_TT_TRAP120
-#define TBR_TT_ATOMIC_XCHG32    TBR_TT_TRAP121
-#define TBR_TT_ATOMIC_XOR       TBR_TT_TRAP122
-#define TBR_TT_ATOMIC_OR        TBR_TT_TRAP123
-#define TBR_TT_ATOMIC_AND       TBR_TT_TRAP124
-#define TBR_TT_ATOMIC_SUB       TBR_TT_TRAP125
-#define TBR_TT_ATOMIC_ADD       TBR_TT_TRAP126
-#define __get_TBR()     ({ unsigned long x; asm volatile("movsg tbr,%0" : "=r"(x)); x; })
-/*
- * HSR0 - Hardware Status Register 0
- */
-#define HSR0_PDM                0x00000007      /* power down mode */
-#define HSR0_PDM_NORMAL         0x00000000      /* - normal mode */
-#define HSR0_PDM_CORE_SLEEP     0x00000001      /* - CPU core sleep mode */
-#define HSR0_PDM_BUS_SLEEP      0x00000003      /* - bus sleep mode */
-#define HSR0_PDM_PLL_RUN        0x00000005      /* - PLL run */
-#define HSR0_PDM_PLL_STOP       0x00000007      /* - PLL stop */
-#define HSR0_GRLE               0x00000040      /* GR lower register set enable */
-#define HSR0_GRHE               0x00000080      /* GR higher register set enable */
-#define HSR0_FRLE               0x00000100      /* FR lower register set enable */
-#define HSR0_FRHE               0x00000200      /* FR higher register set enable */
-#define HSR0_GRN                0x00000400      /* GR quantity */
-#define HSR0_GRN_64             0x00000000      /* - 64 GR registers */
-#define HSR0_GRN_32             0x00000400      /* - 32 GR registers */
-#define HSR0_FRN                0x00000800      /* FR quantity */
-#define HSR0_FRN_64             0x00000000      /* - 64 FR registers */
-#define HSR0_FRN_32             0x00000800      /* - 32 FR registers */
-#define HSR0_SA                 0x00001000      /* start address (RAMBOOT#) */
-#define HSR0_ETMI               0x00008000      /* enable TIMERI (64-bit up timer) */
-#define HSR0_ETMD               0x00004000      /* enable TIMERD (32-bit down timer) */
-#define HSR0_PEDAT              0x00010000      /* previous DAT mode */
-#define HSR0_XEDAT              0x00020000      /* exception DAT mode */
-#define HSR0_EDAT               0x00080000      /* enable DAT mode */
-#define HSR0_RME                0x00400000      /* enable RAM mode */
-#define HSR0_EMEM               0x00800000      /* enable MMU_Miss mask */
-#define HSR0_EXMMU              0x01000000      /* enable extended MMU mode */
-#define HSR0_EDMMU              0x02000000      /* enable data MMU */
-#define HSR0_EIMMU              0x04000000      /* enable instruction MMU */
-#define HSR0_CBM                0x08000000      /* copy back mode */
-#define HSR0_CBM_WRITE_THRU     0x00000000      /* - write through */
-#define HSR0_CBM_COPY_BACK      0x08000000      /* - copy back */
-#define HSR0_NWA                0x10000000      /* no write allocate */
-#define HSR0_DCE                0x40000000      /* data cache enable */
-#define HSR0_ICE                0x80000000      /* instruction cache enable */
-#define __get_HSR(R)    ({ unsigned long x; asm volatile("movsg hsr"#R",%0" : "=r"(x)); x; })
-#define __set_HSR(R,V)  do { asm volatile("movgs %0,hsr"#R : : "r"(V)); } while(0)
-/*
- * CCR - Condition Codes Register
- */
-#define CCR_FCC0                0x0000000f      /* FP/Media condition 0 (fcc0 reg) */
-#define CCR_FCC1                0x000000f0      /* FP/Media condition 1 (fcc1 reg) */
-#define CCR_FCC2                0x00000f00      /* FP/Media condition 2 (fcc2 reg) */
-#define CCR_FCC3                0x0000f000      /* FP/Media condition 3 (fcc3 reg) */
-#define CCR_ICC0                0x000f0000      /* Integer condition 0 (icc0 reg) */
-#define CCR_ICC0_C              0x00010000      /* - Carry flag */
-#define CCR_ICC0_V              0x00020000      /* - Overflow flag */
-#define CCR_ICC0_Z              0x00040000      /* - Zero flag */
-#define CCR_ICC0_N              0x00080000      /* - Negative flag */
-#define CCR_ICC1                0x00f00000      /* Integer condition 1 (icc1 reg) */
-#define CCR_ICC2                0x0f000000      /* Integer condition 2 (icc2 reg) */
-#define CCR_ICC3                0xf0000000      /* Integer condition 3 (icc3 reg) */
-/*
- * CCCR - Condition Codes for Conditional Instructions Register
- */
-#define CCCR_CC0                0x00000003      /* condition 0 (cc0 reg) */
-#define CCCR_CC0_FALSE          0x00000002      /* - condition is false */
-#define CCCR_CC0_TRUE           0x00000003      /* - condition is true */
-#define CCCR_CC1                0x0000000c      /* condition 1 (cc1 reg) */
-#define CCCR_CC2                0x00000030      /* condition 2 (cc2 reg) */
-#define CCCR_CC3                0x000000c0      /* condition 3 (cc3 reg) */
-#define CCCR_CC4                0x00000300      /* condition 4 (cc4 reg) */
-#define CCCR_CC5                0x00000c00      /* condition 5 (cc5 reg) */
-#define CCCR_CC6                0x00003000      /* condition 6 (cc6 reg) */
-#define CCCR_CC7                0x0000c000      /* condition 7 (cc7 reg) */
-/*
- * ISR - Integer Status Register
- */
-#define ISR_EMAM                0x00000001      /* memory misaligned access handling */
-#define ISR_EMAM_EXCEPTION      0x00000000      /* - generate exception */
-#define ISR_EMAM_FUDGE          0x00000001      /* - mask out invalid address bits */
-#define ISR_AEXC                0x00000004      /* accrued [overflow] exception */
-#define ISR_DTT                 0x00000018      /* division type trap */
-#define ISR_DTT_IGNORE          0x00000000      /* - ignore division error */
-#define ISR_DTT_DIVBYZERO       0x00000008      /* - generate exception */
-#define ISR_DTT_OVERFLOW        0x00000010      /* - record overflow */
-#define ISR_EDE                 0x00000020      /* enable division exception */
-#define ISR_PLI                 0x20000000      /* pre-load instruction information */
-#define ISR_QI                  0x80000000      /* quad data implementation information */
-/*
- * EPCR0 - Exception PC Register
- */
-#define EPCR0_V                 0x00000001      /* register content validity indicator */
-#define EPCR0_PC                0xfffffffc      /* faulting instruction address */
-/*
- * ESR0/14/15 - Exception Status Register
- */
-#define ESRx_VALID              0x00000001      /* register content validity indicator */
-#define ESRx_EC                 0x0000003e      /* exception type */
-#define ESRx_EC_DATA_STORE      0x00000000      /* - data_store_error */
-#define ESRx_EC_INSN_ACCESS     0x00000006      /* - instruction_access_error */
-#define ESRx_EC_PRIV_INSN       0x00000008      /* - privileged_instruction */
-#define ESRx_EC_ILL_INSN        0x0000000a      /* - illegal_instruction */
-#define ESRx_EC_MP_EXCEP        0x0000001c      /* - mp_exception */
-#define ESRx_EC_DATA_ACCESS     0x00000020      /* - data_access_error */
-#define ESRx_EC_DIVISION        0x00000026      /* - division_exception */
-#define ESRx_EC_ITLB_MISS       0x00000034      /* - instruction_access_TLB_miss */
-#define ESRx_EC_DTLB_MISS       0x00000036      /* - data_access_TLB_miss */
-#define ESRx_EC_DATA_ACCESS_DAT 0x0000003a      /* - data_access_DAT_exception */
-#define ESR0_IAEC               0x00000100      /* info for instruction-access-exception */
-#define ESR0_IAEC_RESV          0x00000000      /* - reserved */
-#define ESR0_IAEC_PROT_VIOL     0x00000100      /* - protection violation */
-#define ESR0_ATXC               0x00f00000      /* address translation exception code */
-#define ESR0_ATXC_MMU_MISS      0x00000000      /* - MMU miss exception and more (?) */
-#define ESR0_ATXC_MULTI_DAT     0x00800000      /* - multiple DAT entry hit */
-#define ESR0_ATXC_MULTI_SAT     0x00900000      /* - multiple SAT entry hit */
-#define ESR0_ATXC_AMRTLB_MISS   0x00a00000      /* - MMU/TLB miss exception */
-#define ESR0_ATXC_PRIV_EXCEP    0x00c00000      /* - privilege protection fault */
-#define ESR0_ATXC_WP_EXCEP      0x00d00000      /* - write protection fault */
-#define ESR0_EAV                0x00000800      /* true if EAR0 register valid */
-#define ESR15_EAV               0x00000800      /* true if EAR15 register valid */
-/*
- * ESFR1 - Exception Status Valid Flag Register
- */
-#define ESFR1_ESR0              0x00000001      /* true if ESR0 is valid */
-#define ESFR1_ESR14             0x00004000      /* true if ESR14 is valid */
-#define ESFR1_ESR15             0x00008000      /* true if ESR15 is valid */
-/*
- * MSR - Media Status Register
- */
-#define MSR0_AOVF               0x00000001      /* overflow exception accrued */
-#define MSRx_OVF                0x00000002      /* overflow exception detected */
-#define MSRx_SIE                0x0000003c      /* last SIMD instruction exception detected */
-#define MSRx_SIE_NONE           0x00000000      /* - none detected */
-#define MSRx_SIE_FRkHI_ACCk     0x00000020      /* - exception at FRkHI or ACCk */
-#define MSRx_SIE_FRkLO_ACCk1    0x00000010      /* - exception at FRkLO or ACCk+1 */
-#define MSRx_SIE_FRk1HI_ACCk2   0x00000008      /* - exception at FRk+1HI or ACCk+2 */
-#define MSRx_SIE_FRk1LO_ACCk3   0x00000004      /* - exception at FRk+1LO or ACCk+3 */
-#define MSR0_MTT                0x00007000      /* type of last media trap detected */
-#define MSR0_MTT_NONE           0x00000000      /* - none detected */
-#define MSR0_MTT_OVERFLOW       0x00001000      /* - overflow detected */
-#define MSR0_HI                 0x00c00000      /* hardware implementation */
-#define MSR0_HI_ROUNDING        0x00000000      /* - rounding mode */
-#define MSR0_HI_NONROUNDING     0x00c00000      /* - non-rounding mode */
-#define MSR0_EMCI               0x01000000      /* enable media custom instructions */
-#define MSR0_SRDAV              0x10000000      /* select rounding mode of MAVEH */
-#define MSR0_SRDAV_RDAV         0x00000000      /* - controlled by MSR.RDAV */
-#define MSR0_SRDAV_RD           0x10000000      /* - controlled by MSR.RD */
-#define MSR0_RDAV               0x20000000      /* rounding mode of MAVEH */
-#define MSR0_RDAV_NEAREST_MI    0x00000000      /* - round to nearest minus */
-#define MSR0_RDAV_NEAREST_PL    0x20000000      /* - round to nearest plus */
-#define MSR0_RD                 0xc0000000      /* rounding mode */
-#define MSR0_RD_NEAREST         0x00000000      /* - nearest */
-#define MSR0_RD_ZERO            0x40000000      /* - zero */
-#define MSR0_RD_POS_INF         0x80000000      /* - postive infinity */
-#define MSR0_RD_NEG_INF         0xc0000000      /* - negative infinity */
-/*
- * IAMPR0-7 - Instruction Address Mapping Register
- * DAMPR0-7 - Data Address Mapping Register
- */
-#define xAMPRx_V                0x00000001      /* register content validity indicator */
-#define DAMPRx_WP               0x00000002      /* write protect */
-#define DAMPRx_WP_RW            0x00000000      /* - read/write */
-#define DAMPRx_WP_RO            0x00000002      /* - read-only */
-#define xAMPRx_C                0x00000004      /* cached/uncached */
-#define xAMPRx_C_CACHED         0x00000000      /* - cached */
-#define xAMPRx_C_UNCACHED       0x00000004      /* - uncached */
-#define xAMPRx_S                0x00000008      /* supervisor only */
-#define xAMPRx_S_USER           0x00000000      /* - userspace can access */
-#define xAMPRx_S_KERNEL         0x00000008      /* - kernel only */
-#define xAMPRx_SS               0x000000f0      /* segment size */
-#define xAMPRx_SS_16Kb          0x00000000      /* - 16 kilobytes */
-#define xAMPRx_SS_64Kb          0x00000010      /* - 64 kilobytes */
-#define xAMPRx_SS_256Kb         0x00000020      /* - 256 kilobytes */
-#define xAMPRx_SS_1Mb           0x00000030      /* - 1 megabyte */
-#define xAMPRx_SS_2Mb           0x00000040      /* - 2 megabytes */
-#define xAMPRx_SS_4Mb           0x00000050      /* - 4 megabytes */
-#define xAMPRx_SS_8Mb           0x00000060      /* - 8 megabytes */
-#define xAMPRx_SS_16Mb          0x00000070      /* - 16 megabytes */
-#define xAMPRx_SS_32Mb          0x00000080      /* - 32 megabytes */
-#define xAMPRx_SS_64Mb          0x00000090      /* - 64 megabytes */
-#define xAMPRx_SS_128Mb         0x000000a0      /* - 128 megabytes */
-#define xAMPRx_SS_256Mb         0x000000b0      /* - 256 megabytes */
-#define xAMPRx_SS_512Mb         0x000000c0      /* - 512 megabytes */
-#define xAMPRx_RESERVED8        0x00000100      /* reserved bit */
-#define xAMPRx_NG               0x00000200      /* non-global */
-#define xAMPRx_L                0x00000400      /* locked */
-#define xAMPRx_M                0x00000800      /* modified */
-#define xAMPRx_D                0x00001000      /* DAT entry */
-#define xAMPRx_RESERVED13       0x00002000      /* reserved bit */
-#define xAMPRx_PPFN             0xfff00000      /* physical page frame number */
-#define xAMPRx_V_BIT            0
-#define DAMPRx_WP_BIT           1
-#define xAMPRx_C_BIT            2
-#define xAMPRx_S_BIT            3
-#define xAMPRx_RESERVED8_BIT    8
-#define xAMPRx_NG_BIT           9
-#define xAMPRx_L_BIT            10
-#define xAMPRx_M_BIT            11
-#define xAMPRx_D_BIT            12
-#define xAMPRx_RESERVED13_BIT   13
-#define __get_IAMPR(R) ({ unsigned long x; asm volatile("movsg iampr"#R",%0" : "=r"(x)); x; })
-#define __get_DAMPR(R) ({ unsigned long x; asm volatile("movsg dampr"#R",%0" : "=r"(x)); x; })
-#define __get_IAMLR(R) ({ unsigned long x; asm volatile("movsg iamlr"#R",%0" : "=r"(x)); x; })
-#define __get_DAMLR(R) ({ unsigned long x; asm volatile("movsg damlr"#R",%0" : "=r"(x)); x; })
-#define __set_IAMPR(R,V)        do { asm volatile("movgs %0,iampr"#R : : "r"(V)); } while(0)
-#define __set_DAMPR(R,V)        do { asm volatile("movgs %0,dampr"#R : : "r"(V)); } while(0)
-#define __set_IAMLR(R,V)        do { asm volatile("movgs %0,iamlr"#R : : "r"(V)); } while(0)
-#define __set_DAMLR(R,V)        do { asm volatile("movgs %0,damlr"#R : : "r"(V)); } while(0)
-#define save_dampr(R, _dampr)                                   \
-do {                                                            \
-        asm volatile("movsg dampr"R",%0" : "=r"(_dampr));       \
-} while(0)
-#define restore_dampr(R, _dampr)                        \
-do {                                                    \
-        asm volatile("movgs %0,dampr"R :: "r"(_dampr)); \
-} while(0)
-/*
- * AMCR - Address Mapping Control Register
- */
-#define AMCR_IAMRN              0x000000ff      /* quantity of IAMPR registers */
-#define AMCR_DAMRN              0x0000ff00      /* quantity of DAMPR registers */
-/*
- * TTBR - Address Translation Table Base Register
- */
-#define __get_TTBR()            ({ unsigned long x; asm volatile("movsg ttbr,%0" : "=r"(x)); x; })
-/*
- * TPXR - TLB Probe Extend Register
- */
-#define TPXR_E                  0x00000001
-#define TPXR_LMAX_SHIFT         20
-#define TPXR_LMAX_SMASK         0xf
-#define TPXR_WMAX_SHIFT         24
-#define TPXR_WMAX_SMASK         0xf
-#define TPXR_WAY_SHIFT          28
-#define TPXR_WAY_SMASK          0xf
-/*
- * DCR - Debug Control Register
- */
-#define DCR_IBCE3               0x00000001      /* break on conditional insn pointed to by IBAR3 */
-#define DCR_IBE3                0x00000002      /* break on insn pointed to by IBAR3 */
-#define DCR_IBCE1               0x00000004      /* break on conditional insn pointed to by IBAR2 */
-#define DCR_IBE1                0x00000008      /* break on insn pointed to by IBAR2 */
-#define DCR_IBCE2               0x00000010      /* break on conditional insn pointed to by IBAR1 */
-#define DCR_IBE2                0x00000020      /* break on insn pointed to by IBAR1 */
-#define DCR_IBCE0               0x00000040      /* break on conditional insn pointed to by IBAR0 */
-#define DCR_IBE0                0x00000080      /* break on insn pointed to by IBAR0 */
-#define DCR_DDBE1               0x00004000      /* use DBDR1x when checking DBAR1 */
-#define DCR_DWBE1               0x00008000      /* break on store to address in DBAR1/DBMR1x */
-#define DCR_DRBE1               0x00010000      /* break on load from address in DBAR1/DBMR1x */
-#define DCR_DDBE0               0x00020000      /* use DBDR0x when checking DBAR0 */
-#define DCR_DWBE0               0x00040000      /* break on store to address in DBAR0/DBMR0x */
-#define DCR_DRBE0               0x00080000      /* break on load from address in DBAR0/DBMR0x */
-#define DCR_EIM                 0x0c000000      /* external interrupt disable */
-#define DCR_IBM                 0x10000000      /* instruction break disable */
-#define DCR_SE                  0x20000000      /* single step enable */
-#define DCR_EBE                 0x40000000      /* exception break enable */
-/*
- * BRR - Break Interrupt Request Register
- */
-#define BRR_ST                  0x00000001      /* single-step detected */
-#define BRR_SB                  0x00000002      /* break instruction detected */
-#define BRR_BB                  0x00000004      /* branch with hint detected */
-#define BRR_CBB                 0x00000008      /* branch to LR detected */
-#define BRR_IBx                 0x000000f0      /* hardware breakpoint detected */
-#define BRR_DBx                 0x00000f00      /* hardware watchpoint detected */
-#define BRR_DBNEx               0x0000f000      /* ? */
-#define BRR_EBTT                0x00ff0000      /* trap type of exception break */
-#define BRR_TB                  0x10000000      /* external break request detected */
-#define BRR_CB                  0x20000000      /* ICE break command detected */
-#define BRR_EB                  0x40000000      /* exception break detected */
-/*
- * BPSR - Break PSR Save Register
- */
-#define BPSR_BET                0x00000001      /* former PSR.ET */
-#define BPSR_BS                 0x00001000      /* former PSR.S */
-#endif /* _ASM_SPR_REGS_H */
diff --git a/include/asm-frv/stat.h b/include/asm-frv/stat.h
deleted file mode 100644
index ce56de9b37ba..000000000000
--- a/include/asm-frv/stat.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _ASM_STAT_H
-#define _ASM_STAT_H
-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;
-};
-/* This matches struct stat in uClibc/glibc.  */
-struct stat {
-        unsigned char __pad1[6];
-        unsigned short st_dev;
-        unsigned long __pad2;
-        unsigned long st_ino;
-        unsigned short __pad3;
-        unsigned short st_mode;
-        unsigned short __pad4;
-        unsigned short st_nlink;
-        unsigned short __pad5;
-        unsigned short st_uid;
-        unsigned short __pad6;
-        unsigned short st_gid;
-        unsigned char __pad7[6];
-        unsigned short st_rdev;
-        unsigned long __pad8;
-        unsigned long st_size;
-        unsigned long __pad9;           /* align 64-bit st_blocks to 2-word */
-        unsigned long st_blksize;
-        unsigned long __pad10;  /* future possible st_blocks high bits */
-        unsigned long st_blocks;        /* Number 512-byte blocks allocated. */
-        unsigned long __unused1;
-        unsigned long st_atime;
-        unsigned long __unused2;
-        unsigned long st_mtime;
-        unsigned long __unused3;
-        unsigned long st_ctime;
-        unsigned long long __unused4;
-};
-/* This matches struct stat64 in uClibc/glibc.  The layout is exactly
-   the same as that of struct stat above, with 64-bit types taking up
-   space that was formerly used by padding.  stat syscalls are still
-   different from stat64, though, in that the former tests for
-   overflow.  */
-struct stat64 {
-        unsigned char __pad1[6];
-        unsigned short st_dev;
-        unsigned long long st_ino;
-        unsigned int st_mode;
-        unsigned int st_nlink;
-        unsigned long st_uid;
-        unsigned long st_gid;
-        unsigned char __pad2[6];
-        unsigned short st_rdev;
-        long long st_size;
-        unsigned long __pad3;           /* align 64-bit st_blocks to 2-word */
-        unsigned long st_blksize;
-        unsigned long __pad4;           /* future possible st_blocks high bits */
-        unsigned long st_blocks;        /* Number 512-byte blocks allocated. */
-        unsigned long st_atime_nsec;
-        unsigned long st_atime;
-        unsigned int st_mtime_nsec;
-        unsigned long st_mtime;
-        unsigned long st_ctime_nsec;
-        unsigned long st_ctime;
-        unsigned long long __unused4;
-};
-#endif /* _ASM_STAT_H */
diff --git a/include/asm-frv/statfs.h b/include/asm-frv/statfs.h
deleted file mode 100644
index 741f586045ba..000000000000
--- a/include/asm-frv/statfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_STATFS_H
-#define _ASM_STATFS_H
-#include <asm-generic/statfs.h>
-#endif /* _ASM_STATFS_H */
diff --git a/include/asm-frv/string.h b/include/asm-frv/string.h
deleted file mode 100644
index 5ed310f64b7e..000000000000
--- a/include/asm-frv/string.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* string.h: FRV string handling
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_STRING_H_
-#define _ASM_STRING_H_
-#ifdef __KERNEL__ /* only set these up for kernel code */
-#define __HAVE_ARCH_MEMSET 1
-#define __HAVE_ARCH_MEMCPY 1
-extern void *memset(void *, int, __kernel_size_t);
-extern void *memcpy(void *, const void *, __kernel_size_t);
-#else /* KERNEL */
-/*
- *      let user libraries deal with these,
- *      IMHO the kernel has no place defining these functions for user apps
- */
-#define __HAVE_ARCH_STRCPY 1
-#define __HAVE_ARCH_STRNCPY 1
-#define __HAVE_ARCH_STRCAT 1
-#define __HAVE_ARCH_STRNCAT 1
-#define __HAVE_ARCH_STRCMP 1
-#define __HAVE_ARCH_STRNCMP 1
-#define __HAVE_ARCH_STRNICMP 1
-#define __HAVE_ARCH_STRCHR 1
-#define __HAVE_ARCH_STRRCHR 1
-#define __HAVE_ARCH_STRSTR 1
-#define __HAVE_ARCH_STRLEN 1
-#define __HAVE_ARCH_STRNLEN 1
-#define __HAVE_ARCH_MEMSET 1
-#define __HAVE_ARCH_MEMCPY 1
-#define __HAVE_ARCH_MEMMOVE 1
-#define __HAVE_ARCH_MEMSCAN 1
-#define __HAVE_ARCH_MEMCMP 1
-#define __HAVE_ARCH_MEMCHR 1
-#define __HAVE_ARCH_STRTOK 1
-#endif /* KERNEL */
-#endif /* _ASM_STRING_H_ */
diff --git a/include/asm-frv/suspend.h b/include/asm-frv/suspend.h
deleted file mode 100644
index 5fa7b5a6ee40..000000000000
--- a/include/asm-frv/suspend.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* suspend.h: suspension stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SUSPEND_H
-#define _ASM_SUSPEND_H
-static inline int arch_prepare_suspend(void)
-{
-        return 0;
-}
-#endif /* _ASM_SUSPEND_H */
diff --git a/include/asm-frv/swab.h b/include/asm-frv/swab.h
deleted file mode 100644
index f305834b4799..000000000000
--- a/include/asm-frv/swab.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_SWAB_H
-#define _ASM_SWAB_H
-#include <linux/types.h>
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-#endif /* _ASM_SWAB_H */
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
deleted file mode 100644
index 7742ec000cc4..000000000000
--- a/include/asm-frv/system.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* system.h: FR-V CPU control definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_SYSTEM_H
-#define _ASM_SYSTEM_H
-#include <linux/types.h>
-#include <linux/linkage.h>
-#include <linux/kernel.h>
-struct thread_struct;
-/*
- * switch_to(prev, next) should switch from task `prev' to `next'
- * `prev' will never be the same as `next'.
- * The `mb' is to tell GCC not to cache `current' across this call.
- */
-extern asmlinkage
-struct task_struct *__switch_to(struct thread_struct *prev_thread,
-                                struct thread_struct *next_thread,
-                                struct task_struct *prev);
-#define switch_to(prev, next, last)                                     \
-do {                                                                    \
-        (prev)->thread.sched_lr =                                       \
-                (unsigned long) __builtin_return_address(0);            \
-        (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
-        mb();                                                           \
-} while(0)
-/*
- * interrupt flag manipulation
- * - use virtual interrupt management since touching the PSR is slow
- *   - ICC2.Z: T if interrupts virtually disabled
- *   - ICC2.C: F if interrupts really disabled
- * - if Z==1 upon interrupt:
- *   - C is set to 0
- *   - interrupts are really disabled
- *   - entry.S returns immediately
- * - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
- *   - if taken, the trap:
- *     - sets ICC2.C
- *     - enables interrupts
- */
-#define local_irq_disable()                                     \
-do {                                                            \
-        /* set Z flag, but don't change the C flag */           \
-        asm volatile("  andcc   gr0,gr0,gr0,icc2        \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-#define local_irq_enable()                                      \
-do {                                                            \
-        /* clear Z flag and then test the C flag */             \
-        asm volatile("  oricc   gr0,#1,gr0,icc2         \n"     \
-                     "  tihi    icc2,gr0,#2             \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-#define local_save_flags(flags)                                 \
-do {                                                            \
-        typecheck(unsigned long, flags);                        \
-        asm volatile("movsg ccr,%0"                             \
-                     : "=r"(flags)                              \
-                     :                                          \
-                     : "memory");                               \
-                                                                \
-        /* shift ICC2.Z to bit 0 */                             \
-        flags >>= 26;                                           \
-                                                                \
-        /* make flags 1 if interrupts disabled, 0 otherwise */  \
-        flags &= 1UL;                                           \
-} while(0)
-#define irqs_disabled() \
-        ({unsigned long flags; local_save_flags(flags); !!flags; })
-#define local_irq_save(flags)                   \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        local_save_flags(flags);                \
-        local_irq_disable();                    \
-} while(0)
-#define local_irq_restore(flags)                                        \
-do {                                                                    \
-        typecheck(unsigned long, flags);                                \
-                                                                        \
-        /* load the Z flag by turning 1 if disabled into 0 if disabled  \
-         * and thus setting the Z flag but not the C flag */            \
-        asm volatile("  xoricc  %0,#1,gr0,icc2          \n"             \
-                     /* then test Z=0 and C=0 */                        \
-                     "  tihi    icc2,gr0,#2             \n"             \
-                     :                                                  \
-                     : "r"(flags)                                       \
-                     : "memory", "icc2"                                 \
-                     );                                                 \
-                                                                        \
-} while(0)
-/*
- * real interrupt flag manipulation
- */
-#define __local_irq_disable()                           \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%2,%0        \n"     \
-                     "  ori     %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-#define __local_irq_enable()                            \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (~PSR_PIL)                   \
-                     : "memory");                       \
-} while(0)
-#define __local_save_flags(flags)               \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        asm("movsg psr,%0"                      \
-            : "=r"(flags)                       \
-            :                                   \
-            : "memory");                        \
-} while(0)
-#define __local_irq_save(flags)                         \
-do {                                                    \
-        unsigned long npsr;                             \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%3,%1        \n"     \
-                     "  ori     %1,%2,%1        \n"     \
-                     "  movgs   %1,psr          \n"     \
-                     : "=r"(flags), "=r"(npsr)          \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-#define __local_irq_restore(flags)                      \
-do {                                                    \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movgs   %0,psr          \n"     \
-                     :                                  \
-                     : "r" (flags)                      \
-                     : "memory");                       \
-} while(0)
-#define __irqs_disabled() \
-        ((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
-/*
- * Force strict CPU ordering.
- */
-#define nop()                   asm volatile ("nop"::)
-#define mb()                    asm volatile ("membar" : : :"memory")
-#define rmb()                   asm volatile ("membar" : : :"memory")
-#define wmb()                   asm volatile ("membar" : : :"memory")
-#define read_barrier_depends()  do { } while (0)
-#ifdef CONFIG_SMP
-#define smp_mb()                        mb()
-#define smp_rmb()                       rmb()
-#define smp_wmb()                       wmb()
-#define smp_read_barrier_depends()      read_barrier_depends()
-#define set_mb(var, value) \
-        do { xchg(&var, (value)); } while (0)
-#else
-#define smp_mb()                        barrier()
-#define smp_rmb()                       barrier()
-#define smp_wmb()                       barrier()
-#define smp_read_barrier_depends()      do {} while(0)
-#define set_mb(var, value) \
-        do { var = (value); barrier(); } while (0)
-#endif
-extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));
-extern void free_initmem(void);
-#define arch_align_stack(x) (x)
-/*****************************************************************************/
-/*
- * compare and conditionally exchange value with memory
- * - if (*ptr == test) then orig = *ptr; *ptr = test;
- * - if (*ptr != test) then orig = *ptr;
- */
-#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
-#define cmpxchg(ptr, test, new)                                                 \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig, __xg_tmp;                                 \
-        __typeof__(*(ptr)) __xg_test = (test);                                  \
-        __typeof__(*(ptr)) __xg_new = (new);                                    \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4:                                                                 \
-                asm volatile(                                                   \
-                        "0:                                             \n"     \
-                        "       orcc            gr0,gr0,gr0,icc3        \n"     \
-                        "       ckeq            icc3,cc7                \n"     \
-                        "       ld.p            %M0,%1                  \n"     \
-                        "       orcr            cc7,cc7,cc3             \n"     \
-                        "       sub%I4cc        %1,%4,%2,icc0           \n"     \
-                        "       bne             icc0,#0,1f              \n"     \
-                        "       cst.p           %3,%M0          ,cc3,#1 \n"     \
-                        "       corcc           gr29,gr29,gr0   ,cc3,#1 \n"     \
-                        "       beq             icc3,#0,0b              \n"     \
-                        "1:                                             \n"     \
-                        : "+U"(*__xg_ptr), "=&r"(__xg_orig), "=&r"(__xg_tmp)    \
-                        : "r"(__xg_new), "NPr"(__xg_test)                       \
-                        : "memory", "cc7", "cc3", "icc3", "icc0"                \
-                        );                                                      \
-                break;                                                          \
-                                                                                \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-#else
-extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
-#define cmpxchg(ptr, test, new)                                                 \
-({                                                                              \
-        __typeof__(ptr) __xg_ptr = (ptr);                                       \
-        __typeof__(*(ptr)) __xg_orig;                                           \
-        __typeof__(*(ptr)) __xg_test = (test);                                  \
-        __typeof__(*(ptr)) __xg_new = (new);                                    \
-                                                                                \
-        switch (sizeof(__xg_orig)) {                                            \
-        case 4: __xg_orig = (__force __typeof__(*ptr))                          \
-                        __cmpxchg_32((__force uint32_t *)__xg_ptr,              \
-                                         (__force uint32_t)__xg_test,           \
-                                         (__force uint32_t)__xg_new); break;    \
-        default:                                                                \
-                __xg_orig = (__typeof__(__xg_orig))0;                           \
-                asm volatile("break");                                          \
-                break;                                                          \
-        }                                                                       \
-                                                                                \
-        __xg_orig;                                                              \
-})
-#endif
-#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 4:
-                return cmpxchg((unsigned long *)ptr, old, new);
-        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))))
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#endif /* _ASM_SYSTEM_H */
diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h
deleted file mode 100644
index 5568492b5086..000000000000
--- a/include/asm-frv/termbits.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef _ASM_TERMBITS_H__
-#define _ASM_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 CTVB      004000000000          /* VisioBraille Terminal flow control */
-#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 /* _ASM_TERMBITS_H__ */
diff --git a/include/asm-frv/termios.h b/include/asm-frv/termios.h
deleted file mode 100644
index a62fb5872375..000000000000
--- a/include/asm-frv/termios.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _ASM_TERMIOS_H
-#define _ASM_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 */
-};
-#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"
-#endif
-/* 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
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-#ifdef __KERNEL__
-#include <asm-generic/termios.h>
-#endif
-#endif /* _ASM_TERMIOS_H */
diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h
deleted file mode 100644
index b7ac6bf2844c..000000000000
--- a/include/asm-frv/thread_info.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* thread_info.h: description
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * Derived from include/asm-i386/thread_info.h
- *
- * 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.
- */
-#ifndef _ASM_THREAD_INFO_H
-#define _ASM_THREAD_INFO_H
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#endif
-#define THREAD_SIZE             8192
-/*
- * 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
- */
-#ifndef __ASSEMBLY__
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        unsigned long           status;         /* thread-synchronous flags */
-        __u32                   cpu;            /* current CPU */
-        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-        mm_segment_t            addr_limit;     /* thread address space:
-                                                   0-0xBFFFFFFF for user-thead
-                                                   0-0xFFFFFFFF for kernel-thread
-                                                */
-        struct restart_block    restart_block;
-        __u8                    supervisor_stack[0];
-};
-#else /* !__ASSEMBLY__ */
-#include <asm/asm-offsets.h>
-#endif
-#define PREEMPT_ACTIVE          0x10000000
-/*
- * macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
- */
-#ifndef __ASSEMBLY__
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .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 */
-register struct thread_info *__current_thread_info asm("gr15");
-#define current_thread_info() ({ __current_thread_info; })
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk)                                  \
-        ({                                                      \
-                struct thread_info *ret;                        \
-                                                                \
-                ret = kzalloc(THREAD_SIZE, GFP_KERNEL);         \
-                                                                \
-                ret;                                            \
-        })
-#else
-#define alloc_thread_info(tsk)  kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-#define free_thread_info(info)  kfree(info)
-#endif /* __ASSEMBLY__ */
-/*
- * thread information flags
- * - these are process state flags that various assembly files may need to access
- * - pending work-to-be-done flags are in LSW
- * - other flags in MSW
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_SIGPENDING          1       /* signal pending */
-#define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
-#define TIF_IRET                4       /* return with iret */
-#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_MEMDIE              17      /* OOM killer killed process */
-#define TIF_FREEZE              18      /* freezing for suspend */
-#define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
-#define _TIF_IRET               (1 << TIF_IRET)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
-#define _TIF_FREEZE             (1 << TIF_FREEZE)
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
-/*
- * Thread-synchronous status.
- *
- * This is different from the flags in that nobody else
- * ever touches our thread-synchronous status, so we don't
- * have to worry about atomic accesses.
- */
-#define TS_USEDFPM              0x0001  /* FPU/Media was used by this task this quantum (SMP) */
-#endif /* __KERNEL__ */
-#endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-frv/timer-regs.h b/include/asm-frv/timer-regs.h
deleted file mode 100644
index 6c5a871ce5e9..000000000000
--- a/include/asm-frv/timer-regs.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* timer-regs.h: hardware timer register definitions
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_TIMER_REGS_H
-#define _ASM_TIMER_REGS_H
-#include <asm/sections.h>
-extern unsigned long __nongprelbss __clkin_clock_speed_HZ;
-extern unsigned long __nongprelbss __ext_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __res_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __sdram_clock_speed_HZ;
-extern unsigned long __nongprelbss __core_bus_clock_speed_HZ;
-extern unsigned long __nongprelbss __core_clock_speed_HZ;
-extern unsigned long __nongprelbss __dsu_clock_speed_HZ;
-extern unsigned long __nongprelbss __serial_clock_speed_HZ;
-#define __get_CLKC()    ({ *(volatile unsigned long *)(0xfeff9a00); })
-static inline void __set_CLKC(unsigned long v)
-{
-        int tmp;
-        asm volatile("  st%I0.p %2,%M0          \n"
-                     "  setlos  %3,%1           \n"
-                     "  membar                  \n"
-                     "0:                        \n"
-                     "  subicc  %1,#1,%1,icc0   \n"
-                     "  bnc     icc0,#1,0b      \n"
-                     : "=m"(*(volatile unsigned long *) 0xfeff9a00), "=r"(tmp)
-                     : "r"(v), "i"(256)
-                     : "icc0");
-}
-#define __get_TCTR()    ({ *(volatile unsigned long *)(0xfeff9418); })
-#define __get_TPRV()    ({ *(volatile unsigned long *)(0xfeff9420); })
-#define __get_TPRCKSL() ({ *(volatile unsigned long *)(0xfeff9428); })
-#define __get_TCSR(T)   ({ *(volatile unsigned long *)(0xfeff9400 + 8 * (T)); })
-#define __get_TxCKSL(T) ({ *(volatile unsigned long *)(0xfeff9430 + 8 * (T)); })
-#define __get_TCSR_DATA(T) ({ __get_TCSR(T) >> 24; })
-#define __set_TCTR(V)   do { *(volatile unsigned long *)(0xfeff9418) = (V); mb(); } while(0)
-#define __set_TPRV(V)   do { *(volatile unsigned long *)(0xfeff9420) = (V) << 24; mb(); } while(0)
-#define __set_TPRCKSL(V) do { *(volatile unsigned long *)(0xfeff9428) = (V); mb(); } while(0)
-#define __set_TCSR(T,V) \
-do { *(volatile unsigned long *)(0xfeff9400 + 8 * (T)) = (V); mb(); } while(0)
-#define __set_TxCKSL(T,V) \
-do { *(volatile unsigned long *)(0xfeff9430 + 8 * (T)) = (V); mb(); } while(0)
-#define __set_TCSR_DATA(T,V) __set_TCSR(T, (V) << 24)
-#define __set_TxCKSL_DATA(T,V) __set_TxCKSL(T, TxCKSL_EIGHT | __TxCKSL_SELECT((V)))
-/* clock control register */
-#define CLKC_CMODE              0x0f000000
-#define CLKC_SLPL               0x000f0000
-#define CLKC_P0                 0x00000100
-#define CLKC_CM                 0x00000003
-#define CLKC_CMODE_s            24
-/* timer control register - non-readback mode */
-#define TCTR_MODE_0             0x00000000
-#define TCTR_MODE_2             0x04000000
-#define TCTR_MODE_4             0x08000000
-#define TCTR_MODE_5             0x0a000000
-#define TCTR_RL_LATCH           0x00000000
-#define TCTR_RL_RW_LOW8         0x10000000
-#define TCTR_RL_RW_HIGH8        0x20000000
-#define TCTR_RL_RW_LH8          0x30000000
-#define TCTR_SC_CTR0            0x00000000
-#define TCTR_SC_CTR1            0x40000000
-#define TCTR_SC_CTR2            0x80000000
-/* timer control register - readback mode */
-#define TCTR_CNT0               0x02000000
-#define TCTR_CNT1               0x04000000
-#define TCTR_CNT2               0x08000000
-#define TCTR_NSTATUS            0x10000000
-#define TCTR_NCOUNT             0x20000000
-#define TCTR_SC_READBACK        0xc0000000
-/* timer control status registers - non-readback mode */
-#define TCSRx_DATA              0xff000000
-/* timer control status registers - readback mode */
-#define TCSRx_OUTPUT            0x80000000
-#define TCSRx_NULLCOUNT         0x40000000
-#define TCSRx_RL                0x30000000
-#define TCSRx_MODE              0x07000000
-/* timer clock select registers */
-#define TxCKSL_SELECT           0x0f000000
-#define __TxCKSL_SELECT(X)      ((X) << 24)
-#define TxCKSL_EIGHT            0xf0000000
-#endif /* _ASM_TIMER_REGS_H */
diff --git a/include/asm-frv/timex.h b/include/asm-frv/timex.h
deleted file mode 100644
index a89bddefdacf..000000000000
--- a/include/asm-frv/timex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* timex.h: FR-V architecture timex specifications
- */
-#ifndef _ASM_TIMEX_H
-#define _ASM_TIMEX_H
-#define CLOCK_TICK_RATE         1193180 /* Underlying HZ */
-#define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-typedef unsigned long cycles_t;
-static inline cycles_t get_cycles(void)
-{
-        return 0;
-}
-#define vxtime_lock()           do {} while (0)
-#define vxtime_unlock()         do {} while (0)
-#endif
diff --git a/include/asm-frv/tlb.h b/include/asm-frv/tlb.h
deleted file mode 100644
index cd458eb6d75e..000000000000
--- a/include/asm-frv/tlb.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ASM_TLB_H
-#define _ASM_TLB_H
-#include <asm/tlbflush.h>
-#ifdef CONFIG_MMU
-extern void check_pgt_cache(void);
-#else
-#define check_pgt_cache() do {} while(0)
-#endif
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#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, address)      do { } while (0)
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)          flush_tlb_mm((tlb)->mm)
-#include <asm-generic/tlb.h>
-#endif /* _ASM_TLB_H */
diff --git a/include/asm-frv/tlbflush.h b/include/asm-frv/tlbflush.h
deleted file mode 100644
index 7ac5eafc5d98..000000000000
--- a/include/asm-frv/tlbflush.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tlbflush.h: TLB flushing functions
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_TLBFLUSH_H
-#define _ASM_TLBFLUSH_H
-#include <linux/mm.h>
-#include <asm/processor.h>
-#ifdef CONFIG_MMU
-#ifndef __ASSEMBLY__
-extern void asmlinkage __flush_tlb_all(void);
-extern void asmlinkage __flush_tlb_mm(unsigned long contextid);
-extern void asmlinkage __flush_tlb_page(unsigned long contextid, unsigned long start);
-extern void asmlinkage __flush_tlb_range(unsigned long contextid,
-                                         unsigned long start, unsigned long end);
-#endif /* !__ASSEMBLY__ */
-#define flush_tlb_all()                         \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while(0)
-#define flush_tlb_mm(mm)                        \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_mm((mm)->context.id);       \
-        preempt_enable();                       \
-} while(0)
-#define flush_tlb_range(vma,start,end)                                  \
-do {                                                                    \
-        preempt_disable();                                              \
-        __flush_tlb_range((vma)->vm_mm->context.id, start, end);        \
-        preempt_enable();                                               \
-} while(0)
-#define flush_tlb_page(vma,addr)                                \
-do {                                                            \
-        preempt_disable();                                      \
-        __flush_tlb_page((vma)->vm_mm->context.id, addr);       \
-        preempt_enable();                                       \
-} while(0)
-#define __flush_tlb_global()                    flush_tlb_all()
-#define flush_tlb()                             flush_tlb_all()
-#define flush_tlb_kernel_range(start, end)      flush_tlb_all()
-#else
-#define flush_tlb()                             BUG()
-#define flush_tlb_all()                         BUG()
-#define flush_tlb_mm(mm)                        BUG()
-#define flush_tlb_page(vma,addr)                BUG()
-#define flush_tlb_range(mm,start,end)           BUG()
-#define flush_tlb_kernel_range(start, end)      BUG()
-#endif
-#endif /* _ASM_TLBFLUSH_H */
diff --git a/include/asm-frv/topology.h b/include/asm-frv/topology.h
deleted file mode 100644
index 942724352705..000000000000
--- a/include/asm-frv/topology.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_TOPOLOGY_H
-#define _ASM_TOPOLOGY_H
-#ifdef CONFIG_NUMA
-#error NUMA not supported yet
-#endif /* CONFIG_NUMA */
-#include <asm-generic/topology.h>
-#endif /* _ASM_TOPOLOGY_H */
diff --git a/include/asm-frv/types.h b/include/asm-frv/types.h
deleted file mode 100644
index 613bf1e962f0..000000000000
--- a/include/asm-frv/types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* types.h: FRV types
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_TYPES_H
-#define _ASM_TYPES_H
-#include <asm-generic/int-ll64.h>
-#ifndef __ASSEMBLY__
-typedef unsigned short umode_t;
-#endif /* __ASSEMBLY__ */
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-/* Dma addresses are 32-bits wide.  */
-typedef u32 dma_addr_t;
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_TYPES_H */
diff --git a/include/asm-frv/uaccess.h b/include/asm-frv/uaccess.h
deleted file mode 100644
index 53650c958f41..000000000000
--- a/include/asm-frv/uaccess.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/* uaccess.h: userspace accessor functions
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_UACCESS_H
-#define _ASM_UACCESS_H
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/segment.h>
-#include <asm/sections.h>
-#define HAVE_ARCH_UNMAPPED_AREA /* we decide where to put mmaps */
-#define __ptr(x) ((unsigned long __force *)(x))
-#define VERIFY_READ     0
-#define VERIFY_WRITE    1
-#define __addr_ok(addr) ((unsigned long)(addr) < get_addr_limit())
-/*
- * check that a range of addresses falls within the current address limit
- */
-static inline int ___range_ok(unsigned long addr, unsigned long size)
-{
-#ifdef CONFIG_MMU
-        int flag = -EFAULT, tmp;
-        asm volatile (
-                "       addcc   %3,%2,%1,icc0   \n"     /* set C-flag if addr+size>4GB */
-                "       subcc.p %1,%4,gr0,icc1  \n"     /* jump if addr+size>limit */
-                "       bc      icc0,#0,0f      \n"
-                "       bhi     icc1,#0,0f      \n"
-                "       setlos  #0,%0           \n"     /* mark okay */
-                "0:                             \n"
-                : "=r"(flag), "=&r"(tmp)
-                : "r"(addr), "r"(size), "r"(get_addr_limit()), "0"(flag)
-                );
-        return flag;
-#else
-        if (addr < memory_start ||
-            addr > memory_end ||
-            size > memory_end - memory_start ||
-            addr + size > memory_end)
-                return -EFAULT;
-        return 0;
-#endif
-}
-#define __range_ok(addr,size) ___range_ok((unsigned long) (addr), (unsigned long) (size))
-#define access_ok(type,addr,size) (__range_ok((void __user *)(addr), (size)) == 0)
-#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
-/*
- * 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;
-};
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern unsigned long search_exception_table(unsigned long);
-/*
- * 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)                                              \
-({                                                                      \
-        int __pu_err = 0;                                               \
-                                                                        \
-        typeof(*(ptr)) __pu_val = (x);                                  \
-        __chk_user_ptr(ptr);                                            \
-                                                                        \
-        switch (sizeof (*(ptr))) {                                      \
-        case 1:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "b", "r");      \
-                break;                                                  \
-        case 2:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "h", "r");      \
-                break;                                                  \
-        case 4:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "",  "r");      \
-                break;                                                  \
-        case 8:                                                         \
-                __put_user_asm(__pu_err, __pu_val, ptr, "d", "e");      \
-                break;                                                  \
-        default:                                                        \
-                __pu_err = __put_user_bad();                            \
-                break;                                                  \
-        }                                                               \
-        __pu_err;                                                       \
-})
-#define put_user(x, ptr)                        \
-({                                              \
-        typeof(*(ptr)) __user *_p = (ptr);      \
-        int _e;                                 \
-                                                \
-        _e = __range_ok(_p, sizeof(*_p));       \
-        if (_e == 0)                            \
-                _e = __put_user((x), _p);       \
-        _e;                                     \
-})
-extern int __put_user_bad(void);
-/*
- * Tell gcc we read from memory instead of writing: this is because
- * we do not write to any memory gcc knows about, so there are no
- * aliasing issues.
- */
-#ifdef CONFIG_MMU
-#define __put_user_asm(err,x,ptr,dsize,constraint)                                      \
-do {                                                                                    \
-        asm volatile("1:        st"dsize"%I1    %2,%M1  \n"                             \
-                     "2:                                \n"                             \
-                     ".subsection 2                     \n"                             \
-                     "3:        setlos          %3,%0   \n"                             \
-                     "          bra             2b      \n"                             \
-                     ".previous                         \n"                             \
-                     ".section __ex_table,\"a\"         \n"                             \
-                     "          .balign         8       \n"                             \
-                     "          .long           1b,3b   \n"                             \
-                     ".previous"                                                        \
-                     : "=r" (err)                                                       \
-                     : "m" (*__ptr(ptr)), constraint (x), "i"(-EFAULT), "0"(err)        \
-                     : "memory");                                                       \
-} while (0)
-#else
-#define __put_user_asm(err,x,ptr,bwl,con)       \
-do {                                            \
-        asm("   st"bwl"%I0      %1,%M0  \n"     \
-            "   membar                  \n"     \
-            :                                   \
-            : "m" (*__ptr(ptr)), con (x)        \
-            : "memory");                        \
-} while (0)
-#endif
-/*****************************************************************************/
-/*
- *
- */
-#define __get_user(x, ptr)                                              \
-({                                                                      \
-        int __gu_err = 0;                                               \
-        __chk_user_ptr(ptr);                                            \
-                                                                        \
-        switch (sizeof(*(ptr))) {                                       \
-        case 1: {                                                       \
-                unsigned char __gu_val;                                 \
-                __get_user_asm(__gu_err, __gu_val, ptr, "ub", "=r");    \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 2: {                                                       \
-                unsigned short __gu_val;                                \
-                __get_user_asm(__gu_err, __gu_val, ptr, "uh", "=r");    \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 4: {                                                       \
-                unsigned int __gu_val;                                  \
-                __get_user_asm(__gu_err, __gu_val, ptr, "", "=r");      \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        case 8: {                                                       \
-                unsigned long long __gu_val;                            \
-                __get_user_asm(__gu_err, __gu_val, ptr, "d", "=e");     \
-                (x) = *(__force __typeof__(*(ptr)) *) &__gu_val;        \
-                break;                                                  \
-        }                                                               \
-        default:                                                        \
-                __gu_err = __get_user_bad();                            \
-                break;                                                  \
-        }                                                               \
-        __gu_err;                                                       \
-})
-#define get_user(x, ptr)                        \
-({                                              \
-        const typeof(*(ptr)) __user *_p = (ptr);\
-        int _e;                                 \
-                                                \
-        _e = __range_ok(_p, sizeof(*_p));       \
-        if (likely(_e == 0))                    \
-                _e = __get_user((x), _p);       \
-        else                                    \
-                (x) = (typeof(x)) 0;            \
-        _e;                                     \
-})
-extern int __get_user_bad(void);
-#ifdef CONFIG_MMU
-#define __get_user_asm(err,x,ptr,dtype,constraint)      \
-do {                                                    \
-        asm("1:         ld"dtype"%I2    %M2,%1  \n"     \
-            "2:                                 \n"     \
-            ".subsection 2                      \n"     \
-            "3:         setlos          %3,%0   \n"     \
-            "           setlos          #0,%1   \n"     \
-            "           bra             2b      \n"     \
-            ".previous                          \n"     \
-            ".section __ex_table,\"a\"          \n"     \
-            "           .balign         8       \n"     \
-            "           .long           1b,3b   \n"     \
-            ".previous"                                 \
-            : "=r" (err), constraint (x)                \
-            : "m" (*__ptr(ptr)), "i"(-EFAULT), "0"(err) \
-            );                                          \
-} while(0)
-#else
-#define __get_user_asm(err,x,ptr,bwl,con)       \
-        asm("   ld"bwl"%I1      %M1,%0  \n"     \
-            "   membar                  \n"     \
-            : con(x)                            \
-            : "m" (*__ptr(ptr)))
-#endif
-/*****************************************************************************/
-/*
- *
- */
-#define ____force(x) (__force void *)(void __user *)(x)
-#ifdef CONFIG_MMU
-extern long __memset_user(void *dst, unsigned long count);
-extern long __memcpy_user(void *dst, const void *src, unsigned long count);
-#define clear_user(dst,count)                   __memset_user(____force(dst), (count))
-#define __copy_from_user_inatomic(to, from, n)  __memcpy_user((to), ____force(from), (n))
-#define __copy_to_user_inatomic(to, from, n)    __memcpy_user(____force(to), (from), (n))
-#else
-#define clear_user(dst,count)                   (memset(____force(dst), 0, (count)), 0)
-#define __copy_from_user_inatomic(to, from, n)  (memcpy((to), ____force(from), (n)), 0)
-#define __copy_to_user_inatomic(to, from, n)    (memcpy(____force(to), (from), (n)), 0)
-#endif
-#define __clear_user clear_user
-static inline unsigned long __must_check
-__copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-       might_sleep();
-       return __copy_to_user_inatomic(to, from, n);
-}
-static inline unsigned long
-__copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-       might_sleep();
-       return __copy_from_user_inatomic(to, from, n);
-}
-static inline long copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        unsigned long ret = n;
-        if (likely(__access_ok(from, n)))
-                ret = __copy_from_user(to, from, n);
-        if (unlikely(ret != 0))
-                memset(to + (n - ret), 0, ret);
-        return ret;
-}
-static inline long copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        return likely(__access_ok(to, n)) ? __copy_to_user(to, from, n) : n;
-}
-extern long strncpy_from_user(char *dst, const char __user *src, long count);
-extern long strnlen_user(const char __user *src, long count);
-#define strlen_user(str) strnlen_user(str, 32767)
-extern unsigned long search_exception_table(unsigned long addr);
-#endif /* _ASM_UACCESS_H */
diff --git a/include/asm-frv/ucontext.h b/include/asm-frv/ucontext.h
deleted file mode 100644
index 8d8c0c948007..000000000000
--- a/include/asm-frv/ucontext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_UCONTEXT_H
-#define _ASM_UCONTEXT_H
-struct ucontext {
-        unsigned long           uc_flags;
-        struct ucontext         *uc_link;
-        stack_t                 uc_stack;
-        struct sigcontext       uc_mcontext;
-        sigset_t                uc_sigmask;     /* mask last for extensibility */
-};
-#endif
diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h
deleted file mode 100644
index 6c61c05b2e0c..000000000000
--- a/include/asm-frv/unaligned.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* unaligned.h: unaligned access handler
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_UNALIGNED_H
-#define _ASM_UNALIGNED_H
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-#endif /* _ASM_UNALIGNED_H */
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
deleted file mode 100644
index edcfaf5f0414..000000000000
--- a/include/asm-frv/unistd.h
+++ /dev/null
@@ -1,382 +0,0 @@
-#ifndef _ASM_UNISTD_H_
-#define _ASM_UNISTD_H_
-/*
- * This file contains the system call numbers.
- */
-#define __NR_restart_syscall      0
-#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_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#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_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-// #define __NR_oldolduname      /* 59 */ obsolete
-#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_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-// #define __NR_mmap             90     /* obsolete - not implemented */
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-// #define __NR_profil           /* 98 */ obsolete
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-// #define __NR_ioperm          /* 101 */ not supported
-#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_olduname                /* 109 */ obsolete
-// #define __NR_iopl            /* 110 */ not supported
-#define __NR_vhangup            111
-// #define __NR_idle            /* 112 */ Obsolete
-// #define __NR_vm86old         /* 113 */ not supported
-#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_modify_ldt      /* 123 */ not supported
-#define __NR_cacheflush         123
-#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_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#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_setresuid          164
-#define __NR_getresuid          165
-// #define __NR_vm86            /* 166 */ not supported
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#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_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#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_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-#define __NR_security           223     /* syscall for security modules */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#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)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-/* #define __NR_sys_setaltroot  285 */
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_ioprio_set         289
-#define __NR_ioprio_get         290
-#define __NR_inotify_init       291
-#define __NR_inotify_add_watch  292
-#define __NR_inotify_rm_watch   293
-#define __NR_migrate_pages      294
-#define __NR_openat             295
-#define __NR_mkdirat            296
-#define __NR_mknodat            297
-#define __NR_fchownat           298
-#define __NR_futimesat          299
-#define __NR_fstatat64          300
-#define __NR_unlinkat           301
-#define __NR_renameat           302
-#define __NR_linkat             303
-#define __NR_symlinkat          304
-#define __NR_readlinkat         305
-#define __NR_fchmodat           306
-#define __NR_faccessat          307
-#define __NR_pselect6           308
-#define __NR_ppoll              309
-#define __NR_unshare            310
-#define __NR_set_robust_list    311
-#define __NR_get_robust_list    312
-#define __NR_splice             313
-#define __NR_sync_file_range    314
-#define __NR_tee                315
-#define __NR_vmsplice           316
-#define __NR_move_pages         317
-#define __NR_getcpu             318
-#define __NR_epoll_pwait        319
-#define __NR_utimensat          320
-#define __NR_signalfd           321
-#define __NR_timerfd_create     322
-#define __NR_eventfd            323
-#define __NR_fallocate          324
-#define __NR_timerfd_settime    325
-#define __NR_timerfd_gettime    326
-#define __NR_signalfd4          327
-#define __NR_eventfd2           328
-#define __NR_epoll_create1      329
-#define __NR_dup3               330
-#define __NR_pipe2              331
-#define __NR_inotify_init1      332
-#ifdef __KERNEL__
-#define NR_syscalls 333
-#define __ARCH_WANT_IPC_PARSE_VERSION
-/* #define __ARCH_WANT_OLD_READDIR */
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-/* #define __ARCH_WANT_SYS_GETHOSTNAME */
-#define __ARCH_WANT_SYS_PAUSE
-/* #define __ARCH_WANT_SYS_SGETMASK */
-/* #define __ARCH_WANT_SYS_SIGNAL */
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#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
-/*
- * "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
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif
-#endif /* __KERNEL__ */
-#endif /* _ASM_UNISTD_H_ */
diff --git a/include/asm-frv/user.h b/include/asm-frv/user.h
deleted file mode 100644
index 82fa8fab64ae..000000000000
--- a/include/asm-frv/user.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* user.h: FR-V core file format stuff
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_USER_H
-#define _ASM_USER_H
-#include <asm/page.h>
-#include <asm/registers.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.
- */
-/* 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_context     regs;
-        /* The rest of this junk is to help gdb figure out what goes where */
-        unsigned long           u_tsize;        /* Text segment size (pages). */
-        unsigned long           u_dsize;        /* Data segment size (pages). */
-        unsigned long           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           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
diff --git a/include/asm-frv/vga.h b/include/asm-frv/vga.h
deleted file mode 100644
index a702c800a229..000000000000
--- a/include/asm-frv/vga.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vga.h: VGA register stuff
- *
- * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_VGA_H
-#define _ASM_VGA_H
-#endif /* _ASM_VGA_H */
diff --git a/include/asm-frv/virtconvert.h b/include/asm-frv/virtconvert.h
deleted file mode 100644
index 59788fa2a813..000000000000
--- a/include/asm-frv/virtconvert.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* virtconvert.h: virtual/physical/page address convertion
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.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 of the License, or (at your option) any later version.
- */
-#ifndef _ASM_VIRTCONVERT_H
-#define _ASM_VIRTCONVERT_H
-/*
- * Macros used for converting between virtual and physical mappings.
- */
-#ifdef __KERNEL__
-#include <asm/setup.h>
-#ifdef CONFIG_MMU
-#define phys_to_virt(vaddr)     ((void *) ((unsigned long)(vaddr) + PAGE_OFFSET))
-#define virt_to_phys(vaddr)     ((unsigned long) (vaddr) - PAGE_OFFSET)
-#else
-#define phys_to_virt(vaddr)     ((void *) (vaddr))
-#define virt_to_phys(vaddr)     ((unsigned long) (vaddr))
-#endif
-#define virt_to_bus virt_to_phys
-#define bus_to_virt phys_to_virt
-#define __page_address(page)    (PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT))
-#define page_to_phys(page)      virt_to_phys((void *)__page_address(page))
-#endif
-#endif
diff --git a/include/asm-frv/xor.h b/include/asm-frv/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/include/asm-frv/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index 00f45ff081a6..b0e63c672ebd 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -80,56 +80,4 @@ extern void setup_per_cpu_areas(void);
 #define DECLARE_PER_CPU(type, name) extern PER_CPU_ATTRIBUTES \
                                        __typeof__(type) per_cpu_var(name)
-/*
- * Optional methods for optimized non-lvalue per-cpu variable access.
- *
- * @var can be a percpu variable or a field of it and its size should
- * equal char, int or long.  percpu_read() evaluates to a lvalue and
- * all others to void.
- *
- * These operations are guaranteed to be atomic w.r.t. preemption.
- * The generic versions use plain get/put_cpu_var().  Archs are
- * encouraged to implement single-instruction alternatives which don't
- * require preemption protection.
- */
-#ifndef percpu_read
-# define percpu_read(var)                                               \
-  ({                                                                    \
-        typeof(per_cpu_var(var)) __tmp_var__;                           \
-        __tmp_var__ = get_cpu_var(var);                                 \
-        put_cpu_var(var);                                               \
-        __tmp_var__;                                                    \
-  })
-#endif
-#define __percpu_generic_to_op(var, val, op)                            \
-do {                                                                    \
-        get_cpu_var(var) op val;                                        \
-        put_cpu_var(var);                                               \
-} while (0)
-#ifndef percpu_write
-# define percpu_write(var, val)         __percpu_generic_to_op(var, (val), =)
-#endif
-#ifndef percpu_add
-# define percpu_add(var, val)           __percpu_generic_to_op(var, (val), +=)
-#endif
-#ifndef percpu_sub
-# define percpu_sub(var, val)           __percpu_generic_to_op(var, (val), -=)
-#endif
-#ifndef percpu_and
-# define percpu_and(var, val)           __percpu_generic_to_op(var, (val), &=)
-#endif
-#ifndef percpu_or
-# define percpu_or(var, val)            __percpu_generic_to_op(var, (val), |=)
-#endif
-#ifndef percpu_xor
-# define percpu_xor(var, val)           __percpu_generic_to_op(var, (val), ^=)
-#endif
 #endif /* _ASM_GENERIC_PERCPU_H_ */
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 35752dadd6df..c840719a8c59 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -201,7 +201,7 @@ typedef struct siginfo {
 #define TRAP_TRACE      (__SI_FAULT|2)  /* process trace trap */
 #define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
 #define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint/watchpoint */
-#define NSIGTRAP        2
+#define NSIGTRAP        4
 /*
 * SIGCHLD si_codes
diff --git a/include/asm-mn10300/.gitignore b/include/asm-mn10300/.gitignore
deleted file mode 100644
index 0f87ba790e26..000000000000
--- a/include/asm-mn10300/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-proc
-unit
diff --git a/include/asm-mn10300/Kbuild b/include/asm-mn10300/Kbuild
deleted file mode 100644
index c68e1680da01..000000000000
--- a/include/asm-mn10300/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/include/asm-mn10300/atomic.h b/include/asm-mn10300/atomic.h
deleted file mode 100644
index bc064825f9b1..000000000000
--- a/include/asm-mn10300/atomic.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* MN10300 Atomic counter operations
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_ATOMIC_H
-#define _ASM_ATOMIC_H
-#ifdef CONFIG_SMP
-#error not SMP safe
-#endif
-/*
- * Atomic operations that C can't guarantee us.  Useful for
- * resource counting etc..
- */
-#define ATOMIC_INIT(i)  { (i) }
-#ifdef __KERNEL__
-/**
- * atomic_read - read atomic variable
- * @v: pointer of type atomic_t
- *
- * Atomically reads the value of @v.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-#define atomic_read(v)  ((v)->counter)
-/**
- * atomic_set - set atomic variable
- * @v: pointer of type atomic_t
- * @i: required value
- *
- * Atomically sets the value of @v to @i.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-#define atomic_set(v, i) (((v)->counter) = (i))
-#include <asm/system.h>
-/**
- * atomic_add_return - add integer to atomic variable
- * @i: integer value to add
- * @v: pointer of type atomic_t
- *
- * Atomically adds @i to @v and returns the result
- * Note that the guaranteed useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_add_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int temp;
-        local_irq_save(flags);
-        temp = v->counter;
-        temp += i;
-        v->counter = temp;
-        local_irq_restore(flags);
-        return temp;
-}
-/**
- * atomic_sub_return - subtract integer from atomic variable
- * @i: integer value to subtract
- * @v: pointer of type atomic_t
- *
- * Atomically subtracts @i from @v and returns the result
- * Note that the guaranteed useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_sub_return(int i, atomic_t *v)
-{
-        unsigned long flags;
-        int temp;
-        local_irq_save(flags);
-        temp = v->counter;
-        temp -= i;
-        v->counter = temp;
-        local_irq_restore(flags);
-        return temp;
-}
-static inline int atomic_add_negative(int i, atomic_t *v)
-{
-        return atomic_add_return(i, v) < 0;
-}
-static inline void atomic_add(int i, atomic_t *v)
-{
-        atomic_add_return(i, v);
-}
-static inline void atomic_sub(int i, atomic_t *v)
-{
-        atomic_sub_return(i, v);
-}
-static inline void atomic_inc(atomic_t *v)
-{
-        atomic_add_return(1, v);
-}
-static inline void atomic_dec(atomic_t *v)
-{
-        atomic_sub_return(1, v);
-}
-#define atomic_dec_return(v)            atomic_sub_return(1, (v))
-#define atomic_inc_return(v)            atomic_add_return(1, (v))
-#define atomic_sub_and_test(i, v)       (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v)          (atomic_sub_return(1, (v)) == 0)
-#define atomic_inc_and_test(v)          (atomic_add_return(1, (v)) == 0)
-#define atomic_add_unless(v, a, u)                              \
-({                                                              \
-        int c, old;                                             \
-        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
-                c = old;                                        \
-        c != (u);                                               \
-})
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
-{
-        unsigned long flags;
-        mask = ~mask;
-        local_irq_save(flags);
-        *addr &= mask;
-        local_irq_restore(flags);
-}
-#define atomic_xchg(ptr, v)             (xchg(&(ptr)->counter, (v)))
-#define atomic_cmpxchg(v, old, new)     (cmpxchg(&((v)->counter), (old), (new)))
-/* Atomic operations are already serializing on MN10300??? */
-#define smp_mb__before_atomic_dec()     barrier()
-#define smp_mb__after_atomic_dec()      barrier()
-#define smp_mb__before_atomic_inc()     barrier()
-#define smp_mb__after_atomic_inc()      barrier()
-#include <asm-generic/atomic.h>
-#endif /* __KERNEL__ */
-#endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-mn10300/auxvec.h b/include/asm-mn10300/auxvec.h
deleted file mode 100644
index 4fdb60b2ae39..000000000000
--- a/include/asm-mn10300/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_AUXVEC_H
-#define _ASM_AUXVEC_H
-#endif
diff --git a/include/asm-mn10300/bitops.h b/include/asm-mn10300/bitops.h
deleted file mode 100644
index 0b610f482abb..000000000000
--- a/include/asm-mn10300/bitops.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* MN10300 bit operations
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- *
- * These have to be done with inline assembly: that way the bit-setting
- * is guaranteed to be atomic. All bit operations return 0 if the bit
- * was cleared before the operation and != 0 if it was not.
- *
- * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
- */
-#ifndef __ASM_BITOPS_H
-#define __ASM_BITOPS_H
-#include <asm/cpu-regs.h>
-#define smp_mb__before_clear_bit()      barrier()
-#define smp_mb__after_clear_bit()       barrier()
-/*
- * set bit
- */
-#define __set_bit(nr, addr)                                     \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bset %2,(%1) # set_bit reg"               \
-                     : "=m"(*_a)                                \
-                     : "a"(_a), "d"(1 << shift),  "m"(*_a)      \
-                     : "memory", "cc");                         \
-})
-#define set_bit(nr, addr) __set_bit((nr), (addr))
-/*
- * clear bit
- */
-#define ___clear_bit(nr, addr)                                  \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bclr %2,(%1) # clear_bit reg"             \
-                     : "=m"(*_a)                                \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-})
-#define clear_bit(nr, addr) ___clear_bit((nr), (addr))
-static inline void __clear_bit(int nr, volatile void *addr)
-{
-        unsigned int *a = (unsigned int *) addr;
-        int mask;
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        *a &= ~mask;
-}
-/*
- * test bit
- */
-static inline int test_bit(int nr, const volatile void *addr)
-{
-        return 1UL & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31));
-}
-/*
- * change bit
- */
-static inline void __change_bit(int nr, volatile void *addr)
-{
-        int     mask;
-        unsigned int *a = (unsigned int *) addr;
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        *a ^= mask;
-}
-extern void change_bit(int nr, volatile void *addr);
-/*
- * test and set bit
- */
-#define __test_and_set_bit(nr,addr)                             \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        unsigned epsw;                                          \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bset %3,(%2) # test_set_bit reg\n"        \
-                     "mov epsw,%1"                              \
-                     : "=m"(*_a), "=d"(epsw)                    \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-                                                                \
-        !(epsw & EPSW_FLAG_Z);                                  \
-})
-#define test_and_set_bit(nr, addr) __test_and_set_bit((nr), (addr))
-/*
- * test and clear bit
- */
-#define __test_and_clear_bit(nr, addr)                          \
-({                                                              \
-        volatile unsigned char *_a = (unsigned char *)(addr);   \
-        const unsigned shift = (nr) & 7;                        \
-        unsigned epsw;                                          \
-        _a += (nr) >> 3;                                        \
-                                                                \
-        asm volatile("bclr %3,(%2) # test_clear_bit reg\n"      \
-                     "mov epsw,%1"                              \
-                     : "=m"(*_a), "=d"(epsw)                    \
-                     : "a"(_a), "d"(1 << shift), "m"(*_a)       \
-                     : "memory", "cc");                         \
-                                                                \
-        !(epsw & EPSW_FLAG_Z);                                  \
-})
-#define test_and_clear_bit(nr, addr) __test_and_clear_bit((nr), (addr))
-/*
- * test and change bit
- */
-static inline int __test_and_change_bit(int nr, volatile void *addr)
-{
-        int     mask, retval;
-        unsigned int *a = (unsigned int *)addr;
-        a += nr >> 5;
-        mask = 1 << (nr & 0x1f);
-        retval = (mask & *a) != 0;
-        *a ^= mask;
-        return retval;
-}
-extern int test_and_change_bit(int nr, volatile void *addr);
-#include <asm-generic/bitops/lock.h>
-#ifdef __KERNEL__
-/**
- * __ffs - find first bit set
- * @x: the word to search
- *
- * - return 31..0 to indicate bit 31..0 most least significant bit set
- * - if no bits are set in x, the result is undefined
- */
-static inline __attribute__((const))
-unsigned long __ffs(unsigned long x)
-{
-        int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(x & -x));
-        return bit;
-}
-/*
- * special slimline version of fls() for calculating ilog2_u32()
- * - note: no protection against n == 0
- */
-static inline __attribute__((const))
-int __ilog2_u32(u32 n)
-{
-        int bit;
-        asm("bsch %2,%0" : "=r"(bit) : "0"(0), "r"(n));
-        return bit;
-}
-/**
- * fls - find last bit set
- * @x: the word to search
- *
- * This is defined the same way as ffs:
- * - return 32..1 to indicate bit 31..0 most significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int fls(int x)
-{
-        return (x != 0) ? __ilog2_u32(x) + 1 : 0;
-}
-/**
- * __fls - find last (most-significant) set bit in a long word
- * @word: the word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __fls(unsigned long word)
-{
-        return __ilog2_u32(word);
-}
-/**
- * ffs - find first bit set
- * @x: the word to search
- *
- * - return 32..1 to indicate bit 31..0 most least significant bit set
- * - return 0 to indicate no bits set
- */
-static inline __attribute__((const))
-int ffs(int x)
-{
-        /* Note: (x & -x) gives us a mask that is the least significant
-         * (rightmost) 1-bit of the value in x.
-         */
-        return fls(x & -x);
-}
-#include <asm-generic/bitops/ffz.h>
-#include <asm-generic/bitops/fls64.h>
-#include <asm-generic/bitops/find.h>
-#include <asm-generic/bitops/sched.h>
-#include <asm-generic/bitops/hweight.h>
-#define ext2_set_bit_atomic(lock, nr, addr) \
-        test_and_set_bit((nr) ^ 0x18, (addr))
-#define ext2_clear_bit_atomic(lock, nr, addr) \
-        test_and_clear_bit((nr) ^ 0x18, (addr))
-#include <asm-generic/bitops/ext2-non-atomic.h>
-#include <asm-generic/bitops/minix-le.h>
-#endif /* __KERNEL__ */
-#endif /* __ASM_BITOPS_H */
diff --git a/include/asm-mn10300/bug.h b/include/asm-mn10300/bug.h
deleted file mode 100644
index 4fcf3384e259..000000000000
--- a/include/asm-mn10300/bug.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* MN10300 Kernel bug reporting
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_BUG_H
-#define _ASM_BUG_H
-/*
- * Tell the user there is some problem.
- */
-#define _debug_bug_trap()                                       \
-do {                                                            \
-        asm volatile(                                           \
-                "       syscall 15                      \n"     \
-                "0:                                     \n"     \
-                "       .section __bug_table,\"a\"      \n"     \
-                "       .long 0b,%0,%1                  \n"     \
-                "       .previous                       \n"     \
-                :                                               \
-                : "i"(__FILE__), "i"(__LINE__)                  \
-                );                                              \
-} while (0)
-#define BUG() _debug_bug_trap()
-#define HAVE_ARCH_BUG
-#include <asm-generic/bug.h>
-#endif /* _ASM_BUG_H */
diff --git a/include/asm-mn10300/bugs.h b/include/asm-mn10300/bugs.h
deleted file mode 100644
index 31c8bc592b47..000000000000
--- a/include/asm-mn10300/bugs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Checks for architecture-dependent bugs
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_BUGS_H
-#define _ASM_BUGS_H
-#include <asm/processor.h>
-static inline void __init check_bugs(void)
-{
-}
-#endif /* _ASM_BUGS_H */
diff --git a/include/asm-mn10300/busctl-regs.h b/include/asm-mn10300/busctl-regs.h
deleted file mode 100644
index 1632aef73401..000000000000
--- a/include/asm-mn10300/busctl-regs.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* AM33v2 on-board bus controller registers
- *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_BUSCTL_REGS_H
-#define _ASM_BUSCTL_REGS_H
-#include <asm/cpu-regs.h>
-#ifdef __KERNEL__
-/* bus controller registers */
-#define BCCR                    __SYSREG(0xc0002000, u32)       /* bus controller control reg */
-#define BCCR_B0AD               0x00000003      /* block 0 (80000000-83ffffff) bus allocation */
-#define BCCR_B1AD               0x0000000c      /* block 1 (84000000-87ffffff) bus allocation */
-#define BCCR_B2AD               0x00000030      /* block 2 (88000000-8bffffff) bus allocation */
-#define BCCR_B3AD               0x000000c0      /* block 3 (8c000000-8fffffff) bus allocation */
-#define BCCR_B4AD               0x00000300      /* block 4 (90000000-93ffffff) bus allocation */
-#define BCCR_B5AD               0x00000c00      /* block 5 (94000000-97ffffff) bus allocation */
-#define BCCR_B6AD               0x00003000      /* block 6 (98000000-9bffffff) bus allocation */
-#define BCCR_B7AD               0x0000c000      /* block 7 (9c000000-9fffffff) bus allocation */
-#define BCCR_BxAD_EXBUS         0x0             /* - direct to system bus controller */
-#define BCCR_BxAD_OPEXBUS       0x1             /* - direct to memory bus controller */
-#define BCCR_BxAD_OCMBUS        0x2             /* - direct to on chip memory */
-#define BCCR_API                0x00070000      /* bus arbitration priority */
-#define BCCR_API_DMACICD        0x00000000      /* - DMA > CI > CD */
-#define BCCR_API_DMACDCI        0x00010000      /* - DMA > CD > CI */
-#define BCCR_API_CICDDMA        0x00020000      /* - CI > CD > DMA */
-#define BCCR_API_CDCIDMA        0x00030000      /* - CD > CI > DMA */
-#define BCCR_API_ROUNDROBIN     0x00040000      /* - round robin */
-#define BCCR_BEPRI_DMACICD      0x00c00000      /* bus error address priority */
-#define BCCR_BEPRI_DMACDCI      0x00000000      /* - DMA > CI > CD */
-#define BCCR_BEPRI_CICDDMA      0x00400000      /* - DMA > CD > CI */
-#define BCCR_BEPRI_CDCIDMA      0x00800000      /* - CI > CD > DMA */
-#define BCCR_BEPRI              0x00c00000      /* - CD > CI > DMA */
-#define BCCR_TMON               0x03000000      /* timeout value settings */
-#define BCCR_TMON_16IOCLK       0x00000000      /* - 16 IOCLK cycles */
-#define BCCR_TMON_256IOCLK      0x01000000      /* - 256 IOCLK cycles */
-#define BCCR_TMON_4096IOCLK     0x02000000      /* - 4096 IOCLK cycles */
-#define BCCR_TMON_65536IOCLK    0x03000000      /* - 65536 IOCLK cycles */
-#define BCCR_TMOE               0x10000000      /* timeout detection enable */
-#define BCBERR                  __SYSREG(0xc0002010, u32)       /* bus error source reg */
-#define BCBERR_BESB             0x0000001f      /* erroneous access destination space */
-#define BCBERR_BESB_MON         0x00000001      /* - monitor space */
-#define BCBERR_BESB_IO          0x00000002      /* - IO bus */
-#define BCBERR_BESB_EX          0x00000004      /* - EX bus */
-#define BCBERR_BESB_OPEX        0x00000008      /* - OpEX bus */
-#define BCBERR_BESB_OCM         0x00000010      /* - on chip memory */
-#define BCBERR_BERW             0x00000100      /* type of access */
-#define BCBERR_BERW_WRITE       0x00000000      /* - write */
-#define BCBERR_BERW_READ        0x00000100      /* - read */
-#define BCBERR_BESD             0x00000200      /* error detector */
-#define BCBERR_BESD_BCU         0x00000000      /* - BCU detected error */
-#define BCBERR_BESD_SLAVE_BUS   0x00000200      /* - slave bus detected error */
-#define BCBERR_BEBST            0x00000400      /* type of access */
-#define BCBERR_BEBST_SINGLE     0x00000000      /* - single */
-#define BCBERR_BEBST_BURST      0x00000400      /* - burst */
-#define BCBERR_BEME             0x00000800      /* multiple bus error flag */
-#define BCBERR_BEMR             0x00007000      /* master bus that caused the error */
-#define BCBERR_BEMR_NOERROR     0x00000000      /* - no error */
-#define BCBERR_BEMR_CI          0x00001000      /* - CPU instruction fetch bus caused error */
-#define BCBERR_BEMR_CD          0x00002000      /* - CPU data bus caused error */
-#define BCBERR_BEMR_DMA         0x00004000      /* - DMA bus caused error */
-#define BCBEAR                  __SYSREGC(0xc0002020, u32)      /* bus error address reg */
-/* system bus controller registers */
-#define SBBASE(X)               __SYSREG(0xd8c00100 + (X) * 0x10, u32)  /* SBC base addr regs */
-#define SBBASE_BE               0x00000001      /* bank enable */
-#define SBBASE_BAM              0x0000fffe      /* bank address mask [31:17] */
-#define SBBASE_BBA              0xfffe0000      /* bank base address [31:17] */
-#define SBCNTRL0(X)             __SYSREG(0xd8c00200 + (X) * 0x10, u32)  /* SBC bank ctrl0 regs */
-#define SBCNTRL0_WEH            0x00000f00      /* write enable hold */
-#define SBCNTRL0_REH            0x0000f000      /* read enable hold */
-#define SBCNTRL0_RWH            0x000f0000      /* SRW signal hold */
-#define SBCNTRL0_CSH            0x00f00000      /* chip select hold */
-#define SBCNTRL0_DAH            0x0f000000      /* data hold */
-#define SBCNTRL0_ADH            0xf0000000      /* address hold */
-#define SBCNTRL1(X)             __SYSREG(0xd8c00204 + (X) * 0x10, u32)  /* SBC bank ctrl1 regs */
-#define SBCNTRL1_WED            0x00000f00      /* write enable delay */
-#define SBCNTRL1_RED            0x0000f000      /* read enable delay */
-#define SBCNTRL1_RWD            0x000f0000      /* SRW signal delay */
-#define SBCNTRL1_ASW            0x00f00000      /* address strobe width */
-#define SBCNTRL1_CSD            0x0f000000      /* chip select delay */
-#define SBCNTRL1_ASD            0xf0000000      /* address strobe delay */
-#define SBCNTRL2(X)             __SYSREG(0xd8c00208 + (X) * 0x10, u32)  /* SBC bank ctrl2 regs */
-#define SBCNTRL2_WC             0x000000ff      /* wait count */
-#define SBCNTRL2_BWC            0x00000f00      /* burst wait count */
-#define SBCNTRL2_WM             0x01000000      /* wait mode setting */
-#define SBCNTRL2_WM_FIXEDWAIT   0x00000000      /* - fixed wait access */
-#define SBCNTRL2_WM_HANDSHAKE   0x01000000      /* - handshake access */
-#define SBCNTRL2_BM             0x02000000      /* bus synchronisation mode */
-#define SBCNTRL2_BM_SYNC        0x00000000      /* - synchronous mode */
-#define SBCNTRL2_BM_ASYNC       0x02000000      /* - asynchronous mode */
-#define SBCNTRL2_BW             0x04000000      /* bus width */
-#define SBCNTRL2_BW_32          0x00000000      /* - 32 bits */
-#define SBCNTRL2_BW_16          0x04000000      /* - 16 bits */
-#define SBCNTRL2_RWINV          0x08000000      /* R/W signal invert polarity */
-#define SBCNTRL2_RWINV_NORM     0x00000000      /* - normal (read high) */
-#define SBCNTRL2_RWINV_INV      0x08000000      /* - inverted (read low) */
-#define SBCNTRL2_BT             0x70000000      /* bus type setting */
-#define SBCNTRL2_BT_SRAM        0x00000000      /* - SRAM interface */
-#define SBCNTRL2_BT_ADMUX       0x00000000      /* - addr/data multiplexed interface */
-#define SBCNTRL2_BT_BROM        0x00000000      /* - burst ROM interface */
-#define SBCNTRL2_BTSE           0x80000000      /* burst enable */
-/* memory bus controller */
-#define SDBASE(X)               __SYSREG(0xda000008 + (X) * 0x4, u32)   /* MBC base addr regs */
-#define SDBASE_CE               0x00000001      /* chip enable */
-#define SDBASE_CBAM             0x0000fff0      /* chip base address mask [31:20] */
-#define SDBASE_CBAM_SHIFT       16
-#define SDBASE_CBA              0xfff00000      /* chip base address [31:20] */
-#define SDRAMBUS                __SYSREG(0xda000000, u32)       /* bus mode control reg */
-#define SDRAMBUS_REFEN          0x00000004      /* refresh enable */
-#define SDRAMBUS_TRC            0x00000018      /* refresh command delay time */
-#define SDRAMBUS_BSTPT          0x00000020      /* burst stop command enable */
-#define SDRAMBUS_PONSEQ         0x00000040      /* power on sequence */
-#define SDRAMBUS_SELFREQ        0x00000080      /* self-refresh mode request */
-#define SDRAMBUS_SELFON         0x00000100      /* self-refresh mode on */
-#define SDRAMBUS_SIZE           0x00030000      /* SDRAM size */
-#define SDRAMBUS_SIZE_64Mbit    0x00010000      /* 64Mbit SDRAM (x16) */
-#define SDRAMBUS_SIZE_128Mbit   0x00020000      /* 128Mbit SDRAM (x16) */
-#define SDRAMBUS_SIZE_256Mbit   0x00030000      /* 256Mbit SDRAM (x16) */
-#define SDRAMBUS_TRASWAIT       0x000c0000      /* row address precharge command cycle number */
-#define SDRAMBUS_REFNUM         0x00300000      /* refresh command number */
-#define SDRAMBUS_BSTWAIT        0x00c00000      /* burst stop command cycle */
-#define SDRAMBUS_SETWAIT        0x03000000      /* mode register setting command cycle */
-#define SDRAMBUS_PREWAIT        0x0c000000      /* precharge command cycle */
-#define SDRAMBUS_RASLATE        0x30000000      /* RAS latency */
-#define SDRAMBUS_CASLATE        0xc0000000      /* CAS latency */
-#define SDREFCNT                __SYSREG(0xda000004, u32)       /* refresh period reg */
-#define SDREFCNT_PERI           0x00000fff      /* refresh period */
-#define SDSHDW                  __SYSREG(0xda000010, u32)       /* test reg */
-#endif /* __KERNEL__ */
-#endif /* _ASM_BUSCTL_REGS_H */
diff --git a/include/asm-mn10300/byteorder.h b/include/asm-mn10300/byteorder.h
deleted file mode 100644
index 5dd0bdd9feee..000000000000
--- a/include/asm-mn10300/byteorder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_BYTEORDER_H
-#define _ASM_BYTEORDER_H
-#include <linux/byteorder/little_endian.h>
-#endif /* _ASM_BYTEORDER_H */
diff --git a/include/asm-mn10300/cache.h b/include/asm-mn10300/cache.h
deleted file mode 100644
index 9e01122208a9..000000000000
--- a/include/asm-mn10300/cache.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* MN10300 cache management registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_CACHE_H
-#define _ASM_CACHE_H
-#include <asm/cpu-regs.h>
-#include <asm/proc/cache.h>
-#ifndef __ASSEMBLY__
-#define L1_CACHE_DISPARITY      (L1_CACHE_NENTRIES * L1_CACHE_BYTES)
-#else
-#define L1_CACHE_DISPARITY      L1_CACHE_NENTRIES * L1_CACHE_BYTES
-#endif
-/* data cache purge registers
- * - read from the register to unconditionally purge that cache line
- * - write address & 0xffffff00 to conditionally purge that cache line
- *   - clear LSB to request invalidation as well
- */
-#define DCACHE_PURGE(WAY, ENTRY) \
-        __SYSREG(0xc8400000 + (WAY) * L1_CACHE_WAYDISP + \
-                 (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY0(ENTRY) \
-        __SYSREG(0xc8400000 + 0 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY1(ENTRY) \
-        __SYSREG(0xc8400000 + 1 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY2(ENTRY) \
-        __SYSREG(0xc8400000 + 2 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-#define DCACHE_PURGE_WAY3(ENTRY) \
-        __SYSREG(0xc8400000 + 3 * L1_CACHE_WAYDISP + (ENTRY) * L1_CACHE_BYTES, u32)
-/* instruction cache access registers */
-#define ICACHE_DATA(WAY, ENTRY, OFF) \
-        __SYSREG(0xc8000000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10 + (OFF) * 4, u32)
-#define ICACHE_TAG(WAY, ENTRY)   \
-        __SYSREG(0xc8100000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10, u32)
-/* instruction cache access registers */
-#define DCACHE_DATA(WAY, ENTRY, OFF) \
-        __SYSREG(0xc8200000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10 + (OFF) * 4, u32)
-#define DCACHE_TAG(WAY, ENTRY)   \
-        __SYSREG(0xc8300000 + (WAY) * L1_CACHE_WAYDISP + (ENTRY) * 0x10, u32)
-#endif /* _ASM_CACHE_H */
diff --git a/include/asm-mn10300/cacheflush.h b/include/asm-mn10300/cacheflush.h
deleted file mode 100644
index 2db746a251f8..000000000000
--- a/include/asm-mn10300/cacheflush.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* MN10300 Cache flushing
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_CACHEFLUSH_H
-#define _ASM_CACHEFLUSH_H
-#ifndef __ASSEMBLY__
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-/*
- * virtually-indexed cache managment (our cache is physically indexed)
- */
-#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(mm, start, end)       do {} while (0)
-#define flush_cache_page(vma, vmaddr, pfn)      do {} while (0)
-#define flush_cache_vmap(start, end)            do {} while (0)
-#define flush_cache_vunmap(start, end)          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)
-/*
- * physically-indexed cache managment
- */
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-extern void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg);
-#else
-#define flush_icache_range(start, end)          do {} while (0)
-#define flush_icache_page(vma, pg)              do {} while (0)
-#endif
-#define flush_icache_user_range(vma, pg, adr, len) \
-        flush_icache_range(adr, adr + len)
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-        do {                                    \
-                memcpy(dst, src, len);          \
-                flush_icache_page(vma, page);   \
-        } while (0)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-        memcpy(dst, src, len)
-/*
- * primitive routines
- */
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-extern void mn10300_icache_inv(void);
-extern void mn10300_dcache_inv(void);
-extern void mn10300_dcache_inv_page(unsigned start);
-extern void mn10300_dcache_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_inv_range2(unsigned start, unsigned size);
-#ifdef CONFIG_MN10300_CACHE_WBACK
-extern void mn10300_dcache_flush(void);
-extern void mn10300_dcache_flush_page(unsigned start);
-extern void mn10300_dcache_flush_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_range2(unsigned start, unsigned size);
-extern void mn10300_dcache_flush_inv(void);
-extern void mn10300_dcache_flush_inv_page(unsigned start);
-extern void mn10300_dcache_flush_inv_range(unsigned start, unsigned end);
-extern void mn10300_dcache_flush_inv_range2(unsigned start, unsigned size);
-#else
-#define mn10300_dcache_flush()                          do {} while (0)
-#define mn10300_dcache_flush_page(start)                do {} while (0)
-#define mn10300_dcache_flush_range(start, end)          do {} while (0)
-#define mn10300_dcache_flush_range2(start, size)        do {} while (0)
-#define mn10300_dcache_flush_inv()                      mn10300_dcache_inv()
-#define mn10300_dcache_flush_inv_page(start) \
-        mn10300_dcache_inv_page((start))
-#define mn10300_dcache_flush_inv_range(start, end) \
-        mn10300_dcache_inv_range((start), (end))
-#define mn10300_dcache_flush_inv_range2(start, size) \
-        mn10300_dcache_inv_range2((start), (size))
-#endif /* CONFIG_MN10300_CACHE_WBACK */
-#else
-#define mn10300_icache_inv()                            do {} while (0)
-#define mn10300_dcache_inv()                            do {} while (0)
-#define mn10300_dcache_inv_page(start)                  do {} while (0)
-#define mn10300_dcache_inv_range(start, end)            do {} while (0)
-#define mn10300_dcache_inv_range2(start, size)          do {} while (0)
-#define mn10300_dcache_flush()                          do {} while (0)
-#define mn10300_dcache_flush_inv_page(start)            do {} while (0)
-#define mn10300_dcache_flush_inv()                      do {} while (0)
-#define mn10300_dcache_flush_inv_range(start, end)      do {} while (0)
-#define mn10300_dcache_flush_inv_range2(start, size)    do {} while (0)
-#define mn10300_dcache_flush_page(start)                do {} while (0)
-#define mn10300_dcache_flush_range(start, end)          do {} while (0)
-#define mn10300_dcache_flush_range2(start, size)        do {} while (0)
-#endif /* CONFIG_MN10300_CACHE_DISABLED */
-/*
- * internal debugging function
- */
-#ifdef CONFIG_DEBUG_PAGEALLOC
-extern void kernel_map_pages(struct page *page, int numpages, int enable);
-#endif
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_CACHEFLUSH_H */
diff --git a/include/asm-mn10300/checksum.h b/include/asm-mn10300/checksum.h
deleted file mode 100644
index 9fb2a8d8826a..000000000000
--- a/include/asm-mn10300/checksum.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* MN10300 Optimised checksumming code
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_CHECKSUM_H
-#define _ASM_CHECKSUM_H
-extern __wsum csum_partial(const void *buff, int len, __wsum sum);
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                        int len, __wsum sum);
-extern __wsum csum_partial_copy_from_user(const void *src, void *dst,
-                                          int len, __wsum sum,
-                                          int *err_ptr);
-extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
-extern __wsum csum_partial(const void *buff, int len, __wsum sum);
-extern __sum16 ip_compute_csum(const void *buff, int len);
-#define csum_partial_copy_fromuser csum_partial_copy
-extern __wsum csum_partial_copy(const void *src, void *dst, int len,
-                                __wsum sum);
-static inline __sum16 csum_fold(__wsum sum)
-{
-        asm(
-                "       add     %1,%0           \n"
-                "       addc    0xffff,%0       \n"
-                : "=r" (sum)
-                : "r" (sum << 16), "0" (sum & 0xffff0000)
-                : "cc"
-            );
-        return (~sum) >> 16;
-}
-static inline __wsum csum_tcpudp_nofold(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-        __wsum tmp;
-        tmp = (__wsum) ntohs(len) << 16;
-        tmp += (__wsum) proto << 8;
-        asm(
-                "       add     %1,%0           \n"
-                "       addc    %2,%0           \n"
-                "       addc    %3,%0           \n"
-                "       addc    0,%0            \n"
-                : "=r" (sum)
-                : "r" (daddr), "r"(saddr), "r"(tmp), "0"(sum)
-                : "cc"
-            );
-        return sum;
-}
-/*
- * computes the checksum of the TCP/UDP pseudo-header
- * returns a 16-bit checksum, already complemented
- */
-static inline __sum16 csum_tcpudp_magic(unsigned long saddr,
-                                        unsigned long daddr,
-                                        unsigned short len,
-                                        unsigned short proto,
-                                        __wsum sum)
-{
-        return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
-}
-#undef _HAVE_ARCH_IPV6_CSUM
-/*
- *      Copy and checksum to user
- */
-#define HAVE_CSUM_COPY_USER
-extern __wsum csum_and_copy_to_user(const void *src, void *dst, int len,
-                                    __wsum sum, int *err_ptr);
-#endif /* _ASM_CHECKSUM_H */
diff --git a/include/asm-mn10300/cpu-regs.h b/include/asm-mn10300/cpu-regs.h
deleted file mode 100644
index 757e9b5388ea..000000000000
--- a/include/asm-mn10300/cpu-regs.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/* MN10300 Core system registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_CPU_REGS_H
-#define _ASM_CPU_REGS_H
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-#endif
-#ifdef CONFIG_MN10300_CPU_AM33V2
-/* we tell the compiler to pretend to be AM33 so that it doesn't try and use
- * the FP regs, but tell the assembler that we're actually allowed AM33v2
- * instructions */
-#ifndef __ASSEMBLY__
-asm(" .am33_2\n");
-#else
-.am33_2
-#endif
-#endif
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-#define __SYSREG(ADDR, TYPE) (*(volatile TYPE *)(ADDR))
-#define __SYSREGC(ADDR, TYPE) (*(const volatile TYPE *)(ADDR))
-#else
-#define __SYSREG(ADDR, TYPE) ADDR
-#define __SYSREGC(ADDR, TYPE) ADDR
-#endif
-/* CPU registers */
-#define EPSW_FLAG_Z             0x00000001      /* zero flag */
-#define EPSW_FLAG_N             0x00000002      /* negative flag */
-#define EPSW_FLAG_C             0x00000004      /* carry flag */
-#define EPSW_FLAG_V             0x00000008      /* overflow flag */
-#define EPSW_IM                 0x00000700      /* interrupt mode */
-#define EPSW_IM_0               0x00000000      /* interrupt mode 0 */
-#define EPSW_IM_1               0x00000100      /* interrupt mode 1 */
-#define EPSW_IM_2               0x00000200      /* interrupt mode 2 */
-#define EPSW_IM_3               0x00000300      /* interrupt mode 3 */
-#define EPSW_IM_4               0x00000400      /* interrupt mode 4 */
-#define EPSW_IM_5               0x00000500      /* interrupt mode 5 */
-#define EPSW_IM_6               0x00000600      /* interrupt mode 6 */
-#define EPSW_IM_7               0x00000700      /* interrupt mode 7 */
-#define EPSW_IE                 0x00000800      /* interrupt enable */
-#define EPSW_S                  0x00003000      /* software auxilliary bits */
-#define EPSW_T                  0x00008000      /* trace enable */
-#define EPSW_nSL                0x00010000      /* not supervisor level */
-#define EPSW_NMID               0x00020000      /* nonmaskable interrupt disable */
-#define EPSW_nAR                0x00040000      /* register bank control */
-#define EPSW_ML                 0x00080000      /* monitor level */
-#define EPSW_FE                 0x00100000      /* FPU enable */
-/* FPU registers */
-#define FPCR_EF_I               0x00000001      /* inexact result FPU exception flag */
-#define FPCR_EF_U               0x00000002      /* underflow FPU exception flag */
-#define FPCR_EF_O               0x00000004      /* overflow FPU exception flag */
-#define FPCR_EF_Z               0x00000008      /* zero divide FPU exception flag */
-#define FPCR_EF_V               0x00000010      /* invalid operand FPU exception flag */
-#define FPCR_EE_I               0x00000020      /* inexact result FPU exception enable */
-#define FPCR_EE_U               0x00000040      /* underflow FPU exception enable */
-#define FPCR_EE_O               0x00000080      /* overflow FPU exception enable */
-#define FPCR_EE_Z               0x00000100      /* zero divide FPU exception enable */
-#define FPCR_EE_V               0x00000200      /* invalid operand FPU exception enable */
-#define FPCR_EC_I               0x00000400      /* inexact result FPU exception cause */
-#define FPCR_EC_U               0x00000800      /* underflow FPU exception cause */
-#define FPCR_EC_O               0x00001000      /* overflow FPU exception cause */
-#define FPCR_EC_Z               0x00002000      /* zero divide FPU exception cause */
-#define FPCR_EC_V               0x00004000      /* invalid operand FPU exception cause */
-#define FPCR_RM                 0x00030000      /* rounding mode */
-#define FPCR_RM_NEAREST         0x00000000      /* - round to nearest value */
-#define FPCR_FCC_U              0x00040000      /* FPU unordered condition code */
-#define FPCR_FCC_E              0x00080000      /* FPU equal condition code */
-#define FPCR_FCC_G              0x00100000      /* FPU greater than condition code */
-#define FPCR_FCC_L              0x00200000      /* FPU less than condition code */
-#define FPCR_INIT               0x00000000      /* no exceptions, rounding to nearest */
-/* CPU control registers */
-#define CPUP                    __SYSREG(0xc0000020, u16)       /* CPU pipeline register */
-#define CPUP_DWBD               0x0020          /* write buffer disable flag */
-#define CPUP_IPFD               0x0040          /* instruction prefetch disable flag */
-#define CPUP_EXM                0x0080          /* exception operation mode */
-#define CPUP_EXM_AM33V1         0x0000          /* - AM33 v1 exception mode */
-#define CPUP_EXM_AM33V2         0x0080          /* - AM33 v2 exception mode */
-#define CPUM                    __SYSREG(0xc0000040, u16)       /* CPU mode register */
-#define CPUM_SLEEP              0x0004          /* set to enter sleep state */
-#define CPUM_HALT               0x0008          /* set to enter halt state */
-#define CPUM_STOP               0x0010          /* set to enter stop state */
-#define CPUREV                  __SYSREGC(0xc0000050, u32)      /* CPU revision register */
-#define CPUREV_TYPE             0x0000000f      /* CPU type */
-#define CPUREV_TYPE_S           0
-#define CPUREV_TYPE_AM33V1      0x00000000      /* - AM33 V1 core, AM33/1.00 arch */
-#define CPUREV_TYPE_AM33V2      0x00000001      /* - AM33 V2 core, AM33/2.00 arch */
-#define CPUREV_TYPE_AM34V1      0x00000002      /* - AM34 V1 core, AM33/2.00 arch */
-#define CPUREV_REVISION         0x000000f0      /* CPU revision */
-#define CPUREV_REVISION_S       4
-#define CPUREV_ICWAY            0x00000f00      /* number of instruction cache ways */
-#define CPUREV_ICWAY_S          8
-#define CPUREV_ICSIZE           0x0000f000      /* instruction cache way size */
-#define CPUREV_ICSIZE_S         12
-#define CPUREV_DCWAY            0x000f0000      /* number of data cache ways */
-#define CPUREV_DCWAY_S          16
-#define CPUREV_DCSIZE           0x00f00000      /* data cache way size */
-#define CPUREV_DCSIZE_S         20
-#define CPUREV_FPUTYPE          0x0f000000      /* FPU core type */
-#define CPUREV_FPUTYPE_NONE     0x00000000      /* - no FPU core implemented */
-#define CPUREV_OCDCTG           0xf0000000      /* on-chip debug function category */
-#define DCR                     __SYSREG(0xc0000030, u16)       /* Debug control register */
-/* interrupt/exception control registers */
-#define IVAR0                   __SYSREG(0xc0000000, u16)       /* interrupt vector 0 */
-#define IVAR1                   __SYSREG(0xc0000004, u16)       /* interrupt vector 1 */
-#define IVAR2                   __SYSREG(0xc0000008, u16)       /* interrupt vector 2 */
-#define IVAR3                   __SYSREG(0xc000000c, u16)       /* interrupt vector 3 */
-#define IVAR4                   __SYSREG(0xc0000010, u16)       /* interrupt vector 4 */
-#define IVAR5                   __SYSREG(0xc0000014, u16)       /* interrupt vector 5 */
-#define IVAR6                   __SYSREG(0xc0000018, u16)       /* interrupt vector 6 */
-#define TBR                     __SYSREG(0xc0000024, u32)       /* Trap table base */
-#define TBR_TB                  0xff000000      /* table base address bits 31-24 */
-#define TBR_INT_CODE            0x00ffffff      /* interrupt code */
-#define DEAR                    __SYSREG(0xc0000038, u32)       /* Data access exception address */
-#define sISR                    __SYSREG(0xc0000044, u32)       /* Supervisor interrupt status */
-#define sISR_IRQICE             0x00000001      /* ICE interrupt */
-#define sISR_ISTEP              0x00000002      /* single step interrupt */
-#define sISR_MISSA              0x00000004      /* memory access address misalignment fault */
-#define sISR_UNIMP              0x00000008      /* unimplemented instruction execution fault */
-#define sISR_PIEXE              0x00000010      /* program interrupt */
-#define sISR_MEMERR             0x00000020      /* illegal memory access fault */
-#define sISR_IBREAK             0x00000040      /* instraction break interrupt */
-#define sISR_DBSRL              0x00000080      /* debug serial interrupt */
-#define sISR_PERIDB             0x00000100      /* peripheral debug interrupt */
-#define sISR_EXUNIMP            0x00000200      /* unimplemented ex-instruction execution fault */
-#define sISR_OBREAK             0x00000400      /* operand break interrupt */
-#define sISR_PRIV               0x00000800      /* privileged instruction execution fault */
-#define sISR_BUSERR             0x00001000      /* bus error fault */
-#define sISR_DBLFT              0x00002000      /* double fault */
-#define sISR_DBG                0x00008000      /* debug reserved interrupt */
-#define sISR_ITMISS             0x00010000      /* instruction TLB miss */
-#define sISR_DTMISS             0x00020000      /* data TLB miss */
-#define sISR_ITEX               0x00040000      /* instruction TLB access exception */
-#define sISR_DTEX               0x00080000      /* data TLB access exception */
-#define sISR_ILGIA              0x00100000      /* illegal instruction access exception */
-#define sISR_ILGDA              0x00200000      /* illegal data access exception */
-#define sISR_IOIA               0x00400000      /* internal I/O space instruction access excep */
-#define sISR_PRIVA              0x00800000      /* privileged space instruction access excep */
-#define sISR_PRIDA              0x01000000      /* privileged space data access excep */
-#define sISR_DISA               0x02000000      /* data space instruction access excep */
-#define sISR_SYSC               0x04000000      /* system call instruction excep */
-#define sISR_FPUD               0x08000000      /* FPU disabled excep */
-#define sISR_FPUUI              0x10000000      /* FPU unimplemented instruction excep */
-#define sISR_FPUOP              0x20000000      /* FPU operation excep */
-#define sISR_NE                 0x80000000      /* multiple synchronous exceptions excep */
-/* cache control registers */
-#define CHCTR                   __SYSREG(0xc0000070, u16)       /* cache control */
-#define CHCTR_ICEN              0x0001          /* instruction cache enable */
-#define CHCTR_DCEN              0x0002          /* data cache enable */
-#define CHCTR_ICBUSY            0x0004          /* instruction cache busy */
-#define CHCTR_DCBUSY            0x0008          /* data cache busy */
-#define CHCTR_ICINV             0x0010          /* instruction cache invalidate */
-#define CHCTR_DCINV             0x0020          /* data cache invalidate */
-#define CHCTR_DCWTMD            0x0040          /* data cache writing mode */
-#define CHCTR_DCWTMD_WRBACK     0x0000          /* - write back mode */
-#define CHCTR_DCWTMD_WRTHROUGH  0x0040          /* - write through mode */
-#define CHCTR_DCALMD            0x0080          /* data cache allocation mode */
-#define CHCTR_ICWMD             0x0f00          /* instruction cache way mode */
-#define CHCTR_DCWMD             0xf000          /* data cache way mode */
-/* MMU control registers */
-#define MMUCTR                  __SYSREG(0xc0000090, u32)       /* MMU control register */
-#define MMUCTR_IRP              0x0000003f      /* instruction TLB replace pointer */
-#define MMUCTR_ITE              0x00000040      /* instruction TLB enable */
-#define MMUCTR_IIV              0x00000080      /* instruction TLB invalidate */
-#define MMUCTR_ITL              0x00000700      /* instruction TLB lock pointer */
-#define MMUCTR_ITL_NOLOCK       0x00000000      /* - no lock */
-#define MMUCTR_ITL_LOCK0        0x00000100      /* - entry 0 locked */
-#define MMUCTR_ITL_LOCK0_1      0x00000200      /* - entry 0-1 locked */
-#define MMUCTR_ITL_LOCK0_3      0x00000300      /* - entry 0-3 locked */
-#define MMUCTR_ITL_LOCK0_7      0x00000400      /* - entry 0-7 locked */
-#define MMUCTR_ITL_LOCK0_15     0x00000500      /* - entry 0-15 locked */
-#define MMUCTR_CE               0x00008000      /* cacheable bit enable */
-#define MMUCTR_DRP              0x003f0000      /* data TLB replace pointer */
-#define MMUCTR_DTE              0x00400000      /* data TLB enable */
-#define MMUCTR_DIV              0x00800000      /* data TLB invalidate */
-#define MMUCTR_DTL              0x07000000      /* data TLB lock pointer */
-#define MMUCTR_DTL_NOLOCK       0x00000000      /* - no lock */
-#define MMUCTR_DTL_LOCK0        0x01000000      /* - entry 0 locked */
-#define MMUCTR_DTL_LOCK0_1      0x02000000      /* - entry 0-1 locked */
-#define MMUCTR_DTL_LOCK0_3      0x03000000      /* - entry 0-3 locked */
-#define MMUCTR_DTL_LOCK0_7      0x04000000      /* - entry 0-7 locked */
-#define MMUCTR_DTL_LOCK0_15     0x05000000      /* - entry 0-15 locked */
-#define PIDR                    __SYSREG(0xc0000094, u16)       /* PID register */
-#define PIDR_PID                0x00ff          /* process identifier */
-#define PTBR                    __SYSREG(0xc0000098, unsigned long) /* Page table base register */
-#define IPTEL                   __SYSREG(0xc00000a0, u32)       /* instruction TLB entry */
-#define DPTEL                   __SYSREG(0xc00000b0, u32)       /* data TLB entry */
-#define xPTEL_V                 0x00000001      /* TLB entry valid */
-#define xPTEL_UNUSED1           0x00000002      /* unused bit */
-#define xPTEL_UNUSED2           0x00000004      /* unused bit */
-#define xPTEL_C                 0x00000008      /* cached if set */
-#define xPTEL_PV                0x00000010      /* page valid */
-#define xPTEL_D                 0x00000020      /* dirty */
-#define xPTEL_PR                0x000001c0      /* page protection */
-#define xPTEL_PR_ROK            0x00000000      /* - R/O kernel */
-#define xPTEL_PR_RWK            0x00000100      /* - R/W kernel */
-#define xPTEL_PR_ROK_ROU        0x00000080      /* - R/O kernel and R/O user */
-#define xPTEL_PR_RWK_ROU        0x00000180      /* - R/W kernel and R/O user */
-#define xPTEL_PR_RWK_RWU        0x000001c0      /* - R/W kernel and R/W user */
-#define xPTEL_G                 0x00000200      /* global (use PID if 0) */
-#define xPTEL_PS                0x00000c00      /* page size */
-#define xPTEL_PS_4Kb            0x00000000      /* - 4Kb page */
-#define xPTEL_PS_128Kb          0x00000400      /* - 128Kb page */
-#define xPTEL_PS_1Kb            0x00000800      /* - 1Kb page */
-#define xPTEL_PS_4Mb            0x00000c00      /* - 4Mb page */
-#define xPTEL_PPN               0xfffff006      /* physical page number */
-#define xPTEL_V_BIT             0       /* bit numbers corresponding to above masks */
-#define xPTEL_UNUSED1_BIT       1
-#define xPTEL_UNUSED2_BIT       2
-#define xPTEL_C_BIT             3
-#define xPTEL_PV_BIT            4
-#define xPTEL_D_BIT             5
-#define xPTEL_G_BIT             9
-#define IPTEU                   __SYSREG(0xc00000a4, u32)       /* instruction TLB virtual addr */
-#define DPTEU                   __SYSREG(0xc00000b4, u32)       /* data TLB virtual addr */
-#define xPTEU_VPN               0xfffffc00      /* virtual page number */
-#define xPTEU_PID               0x000000ff      /* process identifier to which applicable */
-#define IPTEL2                  __SYSREG(0xc00000a8, u32)       /* instruction TLB entry */
-#define DPTEL2                  __SYSREG(0xc00000b8, u32)       /* data TLB entry */
-#define xPTEL2_V                0x00000001      /* TLB entry valid */
-#define xPTEL2_C                0x00000002      /* cacheable */
-#define xPTEL2_PV               0x00000004      /* page valid */
-#define xPTEL2_D                0x00000008      /* dirty */
-#define xPTEL2_PR               0x00000070      /* page protection */
-#define xPTEL2_PR_ROK           0x00000000      /* - R/O kernel */
-#define xPTEL2_PR_RWK           0x00000040      /* - R/W kernel */
-#define xPTEL2_PR_ROK_ROU       0x00000020      /* - R/O kernel and R/O user */
-#define xPTEL2_PR_RWK_ROU       0x00000060      /* - R/W kernel and R/O user */
-#define xPTEL2_PR_RWK_RWU       0x00000070      /* - R/W kernel and R/W user */
-#define xPTEL2_G                0x00000080      /* global (use PID if 0) */
-#define xPTEL2_PS               0x00000300      /* page size */
-#define xPTEL2_PS_4Kb           0x00000000      /* - 4Kb page */
-#define xPTEL2_PS_128Kb         0x00000100      /* - 128Kb page */
-#define xPTEL2_PS_1Kb           0x00000200      /* - 1Kb page */
-#define xPTEL2_PS_4Mb           0x00000300      /* - 4Mb page */
-#define xPTEL2_PPN              0xfffffc00      /* physical page number */
-#define MMUFCR                  __SYSREGC(0xc000009c, u32)      /* MMU exception cause */
-#define MMUFCR_IFC              __SYSREGC(0xc000009c, u16)      /* MMU instruction excep cause */
-#define MMUFCR_DFC              __SYSREGC(0xc000009e, u16)      /* MMU data exception cause */
-#define MMUFCR_xFC_TLBMISS      0x0001          /* TLB miss flag */
-#define MMUFCR_xFC_INITWR       0x0002          /* initial write excep flag */
-#define MMUFCR_xFC_PGINVAL      0x0004          /* page invalid excep flag */
-#define MMUFCR_xFC_PROTVIOL     0x0008          /* protection violation excep flag */
-#define MMUFCR_xFC_ACCESS       0x0010          /* access level flag */
-#define MMUFCR_xFC_ACCESS_USR   0x0000          /* - user mode */
-#define MMUFCR_xFC_ACCESS_SR    0x0010          /* - supervisor mode */
-#define MMUFCR_xFC_TYPE         0x0020          /* access type flag */
-#define MMUFCR_xFC_TYPE_READ    0x0000          /* - read */
-#define MMUFCR_xFC_TYPE_WRITE   0x0020          /* - write */
-#define MMUFCR_xFC_PR           0x01c0          /* page protection flag */
-#define MMUFCR_xFC_PR_ROK       0x0000          /* - R/O kernel */
-#define MMUFCR_xFC_PR_RWK       0x0100          /* - R/W kernel */
-#define MMUFCR_xFC_PR_ROK_ROU   0x0080          /* - R/O kernel and R/O user */
-#define MMUFCR_xFC_PR_RWK_ROU   0x0180          /* - R/W kernel and R/O user */
-#define MMUFCR_xFC_PR_RWK_RWU   0x01c0          /* - R/W kernel and R/W user */
-#define MMUFCR_xFC_ILLADDR      0x0200          /* illegal address excep flag */
-#endif /* __KERNEL__ */
-#endif /* _ASM_CPU_REGS_H */
diff --git a/include/asm-mn10300/cputime.h b/include/asm-mn10300/cputime.h
deleted file mode 100644
index 6d68ad7e0ea3..000000000000
--- a/include/asm-mn10300/cputime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
diff --git a/include/asm-mn10300/current.h b/include/asm-mn10300/current.h
deleted file mode 100644
index ca6027d83743..000000000000
--- a/include/asm-mn10300/current.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* MN10300 Current task structure accessor
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_CURRENT_H
-#define _ASM_CURRENT_H
-#include <linux/thread_info.h>
-/*
- * dedicate E2 to keeping the current task pointer
- */
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-register struct task_struct *const current asm("e2") __attribute__((used));
-#define get_current() current
-extern struct task_struct *__current;
-#else
-static inline __attribute__((const))
-struct task_struct *get_current(void)
-{
-        return current_thread_info()->task;
-}
-#define current get_current()
-#endif
-#endif /* _ASM_CURRENT_H */
diff --git a/include/asm-mn10300/delay.h b/include/asm-mn10300/delay.h
deleted file mode 100644
index 34517b359399..000000000000
--- a/include/asm-mn10300/delay.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MN10300 Uninterruptible delay routines
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_DELAY_H
-#define _ASM_DELAY_H
-extern void __udelay(unsigned long usecs);
-extern void __delay(unsigned long loops);
-#define udelay(n) __udelay(n)
-#endif /* _ASM_DELAY_H */
diff --git a/include/asm-mn10300/device.h b/include/asm-mn10300/device.h
deleted file mode 100644
index f0a4c256403b..000000000000
--- a/include/asm-mn10300/device.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/device.h>
diff --git a/include/asm-mn10300/div64.h b/include/asm-mn10300/div64.h
deleted file mode 100644
index 3a8329b3e869..000000000000
--- a/include/asm-mn10300/div64.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* MN10300 64-bit division
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_DIV64
-#define _ASM_DIV64
-#include <linux/types.h>
-extern void ____unhandled_size_in_do_div___(void);
-/*
- * divide n by base, leaving the result in n and returning the remainder
- * - we can do this quite efficiently on the MN10300 by cascading the divides
- *   through the MDR register
- */
-#define do_div(n, base)                                                 \
-({                                                                      \
-        unsigned __rem = 0;                                             \
-        if (sizeof(n) <= 4) {                                           \
-                asm("mov        %1,mdr  \n"                             \
-                    "divu       %2,%0   \n"                             \
-                    "mov        mdr,%1  \n"                             \
-                    : "+r"(n), "=d"(__rem)                              \
-                    : "r"(base), "1"(__rem)                             \
-                    : "cc"                                              \
-                    );                                                  \
-        } else if (sizeof(n) <= 8) {                                    \
-                union {                                                 \
-                        unsigned long long l;                           \
-                        u32 w[2];                                       \
-                } __quot;                                               \
-                __quot.l = n;                                           \
-                asm("mov        %0,mdr  \n"     /* MDR = 0 */           \
-                    "divu       %3,%1   \n"                             \
-                    /* __quot.MSL = __div.MSL / base, */                \
-                    /* MDR = MDR:__div.MSL % base */                    \
-                    "divu       %3,%2   \n"                             \
-                    /* __quot.LSL = MDR:__div.LSL / base, */            \
-                    /* MDR = MDR:__div.LSL % base */                    \
-                    "mov        mdr,%0  \n"                             \
-                    : "=d"(__rem), "=r"(__quot.w[1]), "=r"(__quot.w[0]) \
-                    : "r"(base), "0"(__rem), "1"(__quot.w[1]),          \
-                      "2"(__quot.w[0])                                  \
-                    : "cc"                                              \
-                    );                                                  \
-                n = __quot.l;                                           \
-        } else {                                                        \
-                ____unhandled_size_in_do_div___();                      \
-        }                                                               \
-        __rem;                                                          \
-})
-/*
- * do an unsigned 32-bit multiply and divide with intermediate 64-bit product
- * so as not to lose accuracy
- * - we use the MDR register to hold the MSW of the product
- */
-static inline __attribute__((const))
-unsigned __muldiv64u(unsigned val, unsigned mult, unsigned div)
-{
-        unsigned result;
-        asm("mulu       %2,%0   \n"     /* MDR:val = val*mult */
-            "divu       %3,%0   \n"     /* val = MDR:val/div;
-                                         * MDR = MDR:val%div */
-            : "=r"(result)
-            : "0"(val), "ir"(mult), "r"(div)
-            );
-        return result;
-}
-/*
- * do a signed 32-bit multiply and divide with intermediate 64-bit product so
- * as not to lose accuracy
- * - we use the MDR register to hold the MSW of the product
- */
-static inline __attribute__((const))
-signed __muldiv64s(signed val, signed mult, signed div)
-{
-        signed result;
-        asm("mul        %2,%0   \n"     /* MDR:val = val*mult */
-            "div        %3,%0   \n"     /* val = MDR:val/div;
-                                         * MDR = MDR:val%div */
-            : "=r"(result)
-            : "0"(val), "ir"(mult), "r"(div)
-            );
-        return result;
-}
-#endif /* _ASM_DIV64 */
diff --git a/include/asm-mn10300/dma-mapping.h b/include/asm-mn10300/dma-mapping.h
deleted file mode 100644
index ccae8f6c6326..000000000000
--- a/include/asm-mn10300/dma-mapping.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/* DMA mapping routines for the MN10300 arch
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_DMA_MAPPING_H
-#define _ASM_DMA_MAPPING_H
-#include <linux/mm.h>
-#include <linux/scatterlist.h>
-#include <asm/cache.h>
-#include <asm/io.h>
-extern void *dma_alloc_coherent(struct device *dev, size_t size,
-                                dma_addr_t *dma_handle, int flag);
-extern void dma_free_coherent(struct device *dev, size_t size,
-                              void *vaddr, dma_addr_t dma_handle);
-#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent((d), (s), (h), (f))
-#define dma_free_noncoherent(d, s, v, h)  dma_free_coherent((d), (s), (v), (h))
-/*
- * Map a single buffer of the indicated size for DMA in streaming mode.  The
- * 32-bit bus address to use is returned.
- *
- * Once the device is given the dma address, the device owns this memory until
- * either pci_unmap_single or pci_dma_sync_single is performed.
- */
-static inline
-dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
-                          enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-        mn10300_dcache_flush_inv();
-        return virt_to_bus(ptr);
-}
-/*
- * Unmap a single streaming mode DMA translation.  The dma_addr and size must
- * match what was provided for in a previous pci_map_single call.  All other
- * usages are undefined.
- *
- * After this call, reads by the cpu to the buffer are guarenteed to see
- * whatever the device wrote there.
- */
-static inline
-void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                      enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-/*
- * Map a set of buffers described by scatterlist in streaming mode for DMA.
- * This is the scather-gather version of the above pci_map_single interface.
- * Here the scatter gather list elements are each tagged with the appropriate
- * dma address and length.  They are obtained via sg_dma_{address,length}(SG).
- *
- * NOTE: An implementation may be able to use a smaller number of DMA
- *       address/length pairs than there are SG table elements.  (for example
- *       via virtual mapping capabilities) The routine returns the number of
- *       addr/length pairs actually used, at most nents.
- *
- * Device ownership issues as mentioned above for pci_map_single are the same
- * here.
- */
-static inline
-int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
-               enum dma_data_direction direction)
-{
-        struct scatterlist *sg;
-        int i;
-        BUG_ON(!valid_dma_direction(direction));
-        WARN_ON(nents == 0 || sglist[0].length == 0);
-        for_each_sg(sglist, sg, nents, i) {
-                BUG_ON(!sg_page(sg));
-                sg->dma_address = sg_phys(sg);
-        }
-        mn10300_dcache_flush_inv();
-        return nents;
-}
-/*
- * Unmap a set of streaming mode DMA translations.
- * Again, cpu read rules concerning calls here are the same as for
- * pci_unmap_single() above.
- */
-static inline
-void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
-                  enum dma_data_direction direction)
-{
-        BUG_ON(!valid_dma_direction(direction));
-}
-/*
- * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical
- * to pci_map_single, but takes a struct page instead of a virtual address
- */
-static inline
-dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                        unsigned long offset, size_t size,
-                        enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-        return page_to_bus(page) + offset;
-}
-static inline
-void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
-                    enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-}
-/*
- * Make physical memory consistent for a single streaming mode DMA translation
- * after a transfer.
- *
- * If you perform a pci_map_single() but wish to interrogate the buffer using
- * the cpu, yet do not wish to teardown the PCI dma mapping, you must call this
- * function before doing so.  At the next point you give the PCI dma address
- * back to the card, the device again owns the buffer.
- */
-static inline
-void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                             size_t size, enum dma_data_direction direction)
-{
-}
-static inline
-void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
-                                size_t size, enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-static inline
-void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction direction)
-{
-}
-static inline void
-dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
-                                 unsigned long offset, size_t size,
-                                 enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-/*
- * Make physical memory consistent for a set of streaming mode DMA translations
- * after a transfer.
- *
- * The same as pci_dma_sync_single but for a scatter-gather list, same rules
- * and usage.
- */
-static inline
-void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                         int nelems, enum dma_data_direction direction)
-{
-}
-static inline
-void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
-                            int nelems, enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-static inline
-int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-/*
- * Return whether the given PCI device DMA address mask can be supported
- * properly.  For example, if your device can only drive the low 24-bits during
- * PCI bus mastering, then you would pass 0x00ffffff as the mask to this
- * function.
- */
-static inline
-int dma_supported(struct device *dev, u64 mask)
-{
-        /*
-         * we fall back to GFP_DMA when the mask isn't all 1s, so we can't
-         * guarantee allocations that must be within a tighter range than
-         * GFP_DMA
-         */
-        if (mask < 0x00ffffff)
-                return 0;
-        return 1;
-}
-static inline
-int dma_set_mask(struct device *dev, u64 mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-        *dev->dma_mask = mask;
-        return 0;
-}
-static inline
-int dma_get_cache_alignment(void)
-{
-        return 1 << L1_CACHE_SHIFT;
-}
-#define dma_is_consistent(d)    (1)
-static inline
-void dma_cache_sync(void *vaddr, size_t size,
-                    enum dma_data_direction direction)
-{
-        mn10300_dcache_flush_inv();
-}
-#endif
diff --git a/include/asm-mn10300/dma.h b/include/asm-mn10300/dma.h
deleted file mode 100644
index 098df2e617ab..000000000000
--- a/include/asm-mn10300/dma.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* MN10300 ISA DMA handlers and definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_DMA_H
-#define _ASM_DMA_H
-#include <asm/system.h>
-#include <linux/spinlock.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#undef MAX_DMA_CHANNELS         /* switch off linux/kernel/dma.c */
-#define MAX_DMA_ADDRESS         0xbfffffff
-extern spinlock_t dma_spin_lock;
-static inline unsigned long claim_dma_lock(void)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&dma_spin_lock, flags);
-        return flags;
-}
-static inline void release_dma_lock(unsigned long flags)
-{
-        spin_unlock_irqrestore(&dma_spin_lock, flags);
-}
-/* enable/disable a specific DMA channel */
-static inline void enable_dma(unsigned int dmanr)
-{
-}
-static inline void disable_dma(unsigned int dmanr)
-{
-}
-/* Clear the 'DMA Pointer Flip Flop'.
- * Write 0 for LSB/MSB, 1 for MSB/LSB access.
- * Use this once to initialize the FF to a known state.
- * After that, keep track of it. :-)
- * --- In order to do that, the DMA routines below should ---
- * --- only be used while holding the DMA lock ! ---
- */
-static inline void clear_dma_ff(unsigned int dmanr)
-{
-}
-/* set mode (above) for a specific DMA channel */
-static inline void set_dma_mode(unsigned int dmanr, char mode)
-{
-}
-/* Set only the page register bits of the transfer address.
- * This is used for successive transfers when we know the contents of
- * the lower 16 bits of the DMA current address register, but a 64k boundary
- * may have been crossed.
- */
-static inline void set_dma_page(unsigned int dmanr, char pagenr)
-{
-}
-/* Set transfer address & page bits for specific DMA channel.
- * Assumes dma flipflop is clear.
- */
-static inline void set_dma_addr(unsigned int dmanr, unsigned int a)
-{
-}
-/* Set transfer size (max 64k for DMA1..3, 128k for DMA5..7) for
- * a specific DMA channel.
- * You must ensure the parameters are valid.
- * NOTE: from a manual: "the number of transfers is one more
- * than the initial word count"! This is taken into account.
- * Assumes dma flip-flop is clear.
- * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7.
- */
-static inline void set_dma_count(unsigned int dmanr, unsigned int count)
-{
-}
-/* Get DMA residue count. After a DMA transfer, this
- * should return zero. Reading this while a DMA transfer is
- * still in progress will return unpredictable results.
- * If called before the channel has been used, it may return 1.
- * Otherwise, it returns the number of _bytes_ left to transfer.
- *
- * Assumes DMA flip-flop is clear.
- */
-static inline int get_dma_residue(unsigned int dmanr)
-{
-        return 0;
-}
-/* These are in kernel/dma.c: */
-extern int request_dma(unsigned int dmanr, const char *device_id);
-extern void free_dma(unsigned int dmanr);
-/* From PCI */
-#ifdef CONFIG_PCI
-extern int isa_dma_bridge_buggy;
-#else
-#define isa_dma_bridge_buggy    (0)
-#endif
-#endif /* _ASM_DMA_H */
diff --git a/include/asm-mn10300/dmactl-regs.h b/include/asm-mn10300/dmactl-regs.h
deleted file mode 100644
index 58a199da0f4a..000000000000
--- a/include/asm-mn10300/dmactl-regs.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* MN10300 on-board DMA controller registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_DMACTL_REGS_H
-#define _ASM_DMACTL_REGS_H
-#include <asm/cpu-regs.h>
-#ifdef __KERNEL__
-/* DMA registers */
-#define DMxCTR(N)               __SYSREG(0xd2000000 + ((N) * 0x100), u32)       /* control reg */
-#define DMxCTR_BG               0x0000001f      /* transfer request source */
-#define DMxCTR_BG_SOFT          0x00000000      /* - software source */
-#define DMxCTR_BG_SC0TX         0x00000002      /* - serial port 0 transmission */
-#define DMxCTR_BG_SC0RX         0x00000003      /* - serial port 0 reception */
-#define DMxCTR_BG_SC1TX         0x00000004      /* - serial port 1 transmission */
-#define DMxCTR_BG_SC1RX         0x00000005      /* - serial port 1 reception */
-#define DMxCTR_BG_SC2TX         0x00000006      /* - serial port 2 transmission */
-#define DMxCTR_BG_SC2RX         0x00000007      /* - serial port 2 reception */
-#define DMxCTR_BG_TM0UFLOW      0x00000008      /* - timer 0 underflow */
-#define DMxCTR_BG_TM1UFLOW      0x00000009      /* - timer 1 underflow */
-#define DMxCTR_BG_TM2UFLOW      0x0000000a      /* - timer 2 underflow */
-#define DMxCTR_BG_TM3UFLOW      0x0000000b      /* - timer 3 underflow */
-#define DMxCTR_BG_TM6ACMPCAP    0x0000000c      /* - timer 6A compare/capture */
-#define DMxCTR_BG_AFE           0x0000000d      /* - analogue front-end interrupt source */
-#define DMxCTR_BG_ADC           0x0000000e      /* - A/D conversion end interrupt source */
-#define DMxCTR_BG_IRDA          0x0000000f      /* - IrDA interrupt source */
-#define DMxCTR_BG_RTC           0x00000010      /* - RTC interrupt source */
-#define DMxCTR_BG_XIRQ0         0x00000011      /* - XIRQ0 pin interrupt source */
-#define DMxCTR_BG_XIRQ1         0x00000012      /* - XIRQ1 pin interrupt source */
-#define DMxCTR_BG_XDMR0         0x00000013      /* - external request 0 source (XDMR0 pin) */
-#define DMxCTR_BG_XDMR1         0x00000014      /* - external request 1 source (XDMR1 pin) */
-#define DMxCTR_SAM              0x000000e0      /* DMA transfer src addr mode */
-#define DMxCTR_SAM_INCR         0x00000000      /* - increment */
-#define DMxCTR_SAM_DECR         0x00000020      /* - decrement */
-#define DMxCTR_SAM_FIXED        0x00000040      /* - fixed */
-#define DMxCTR_DAM              0x00000000      /* DMA transfer dest addr mode */
-#define DMxCTR_DAM_INCR         0x00000000      /* - increment */
-#define DMxCTR_DAM_DECR         0x00000100      /* - decrement */
-#define DMxCTR_DAM_FIXED        0x00000200      /* - fixed */
-#define DMxCTR_TM               0x00001800      /* DMA transfer mode */
-#define DMxCTR_TM_BATCH         0x00000000      /* - batch transfer */
-#define DMxCTR_TM_INTERM        0x00001000      /* - intermittent transfer */
-#define DMxCTR_UT               0x00006000      /* DMA transfer unit */
-#define DMxCTR_UT_1             0x00000000      /* - 1 byte */
-#define DMxCTR_UT_2             0x00002000      /* - 2 byte */
-#define DMxCTR_UT_4             0x00004000      /* - 4 byte */
-#define DMxCTR_UT_16            0x00006000      /* - 16 byte */
-#define DMxCTR_TEN              0x00010000      /* DMA channel transfer enable */
-#define DMxCTR_RQM              0x00060000      /* external request input source mode */
-#define DMxCTR_RQM_FALLEDGE     0x00000000      /* - falling edge */
-#define DMxCTR_RQM_RISEEDGE     0x00020000      /* - rising edge */
-#define DMxCTR_RQM_LOLEVEL      0x00040000      /* - low level */
-#define DMxCTR_RQM_HILEVEL      0x00060000      /* - high level */
-#define DMxCTR_RQF              0x01000000      /* DMA transfer request flag */
-#define DMxCTR_XEND             0x80000000      /* DMA transfer end flag */
-#define DMxSRC(N)               __SYSREG(0xd2000004 + ((N) * 0x100), u32)       /* control reg */
-#define DMxDST(N)               __SYSREG(0xd2000008 + ((N) * 0x100), u32)       /* src addr reg */
-#define DMxSIZ(N)               __SYSREG(0xd200000c + ((N) * 0x100), u32)       /* dest addr reg */
-#define DMxSIZ_CT               0x000fffff      /* number of bytes to transfer */
-#define DMxCYC(N)               __SYSREG(0xd2000010 + ((N) * 0x100), u32)       /* intermittent
-                                                                                 * size reg */
-#define DMxCYC_CYC              0x000000ff      /* number of interrmittent transfers -1 */
-#define DM0IRQ                  16              /* DMA channel 0 complete IRQ */
-#define DM1IRQ                  17              /* DMA channel 1 complete IRQ */
-#define DM2IRQ                  18              /* DMA channel 2 complete IRQ */
-#define DM3IRQ                  19              /* DMA channel 3 complete IRQ */
-#define DM0ICR                  GxICR(DM0IRQ)   /* DMA channel 0 complete intr ctrl reg */
-#define DM1ICR                  GxICR(DM0IR1)   /* DMA channel 1 complete intr ctrl reg */
-#define DM2ICR                  GxICR(DM0IR2)   /* DMA channel 2 complete intr ctrl reg */
-#define DM3ICR                  GxICR(DM0IR3)   /* DMA channel 3 complete intr ctrl reg */
-#ifndef __ASSEMBLY__
-struct mn10300_dmactl_regs {
-        u32             ctr;
-        const void      *src;
-        void            *dst;
-        u32             siz;
-        u32             cyc;
-} __attribute__((aligned(0x100)));
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_DMACTL_REGS_H */
diff --git a/include/asm-mn10300/elf.h b/include/asm-mn10300/elf.h
deleted file mode 100644
index bf09f8bb392e..000000000000
--- a/include/asm-mn10300/elf.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* MN10300 ELF constant and register definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_ELF_H
-#define _ASM_ELF_H
-#include <linux/utsname.h>
-#include <asm/ptrace.h>
-#include <asm/user.h>
-/*
- * AM33 relocations
- */
-#define R_MN10300_NONE          0       /* No reloc.  */
-#define R_MN10300_32            1       /* Direct 32 bit.  */
-#define R_MN10300_16            2       /* Direct 16 bit.  */
-#define R_MN10300_8             3       /* Direct 8 bit.  */
-#define R_MN10300_PCREL32       4       /* PC-relative 32-bit.  */
-#define R_MN10300_PCREL16       5       /* PC-relative 16-bit signed.  */
-#define R_MN10300_PCREL8        6       /* PC-relative 8-bit signed.  */
-#define R_MN10300_24            9       /* Direct 24 bit.  */
-#define R_MN10300_RELATIVE      23      /* Adjust by program base.  */
-/*
- * ELF register definitions..
- */
-typedef unsigned long elf_greg_t;
-#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-#define ELF_NFPREG 32
-typedef float elf_fpreg_t;
-typedef struct {
-        elf_fpreg_t     fpregs[ELF_NFPREG];
-        u_int32_t       fpcr;
-} elf_fpregset_t;
-extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
-/*
- * This is used to ensure we don't load something for the wrong architecture
- */
-#define elf_check_arch(x) \
-        (((x)->e_machine == EM_CYGNUS_MN10300) ||       \
-         ((x)->e_machine == EM_MN10300))
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2LSB
-#define ELF_ARCH        EM_MN10300
-/*
- * ELF process initialiser
- */
-#define ELF_PLAT_INIT(_r, load_addr)                                    \
-do {                                                                    \
-        struct pt_regs *_ur = current->thread.uregs;                    \
-        _ur->a3   = 0;  _ur->a2   = 0;  _ur->d3   = 0;  _ur->d2   = 0;  \
-        _ur->mcvf = 0;  _ur->mcrl = 0;  _ur->mcrh = 0;  _ur->mdrq = 0;  \
-        _ur->e1   = 0;  _ur->e0   = 0;  _ur->e7   = 0;  _ur->e6   = 0;  \
-        _ur->e5   = 0;  _ur->e4   = 0;  _ur->e3   = 0;  _ur->e2   = 0;  \
-        _ur->lar  = 0;  _ur->lir  = 0;  _ur->mdr  = 0;                  \
-        _ur->a1   = 0;  _ur->a0   = 0;  _ur->d1   = 0;  _ur->d0   = 0;  \
-} while (0)
-#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.
- * - must clear the VMALLOC area
- */
-#define ELF_ET_DYN_BASE         0x04000000
-/*
- * regs is struct pt_regs, pr_reg is elf_gregset_t (which is
- * now struct user_regs, they are different)
- * - ELF_CORE_COPY_REGS has been guessed, and may be wrong
- */
-#define ELF_CORE_COPY_REGS(pr_reg, regs)        \
-do {                                            \
-        pr_reg[0]       = regs->a3;             \
-        pr_reg[1]       = regs->a2;             \
-        pr_reg[2]       = regs->d3;             \
-        pr_reg[3]       = regs->d2;             \
-        pr_reg[4]       = regs->mcvf;           \
-        pr_reg[5]       = regs->mcrl;           \
-        pr_reg[6]       = regs->mcrh;           \
-        pr_reg[7]       = regs->mdrq;           \
-        pr_reg[8]       = regs->e1;             \
-        pr_reg[9]       = regs->e0;             \
-        pr_reg[10]      = regs->e7;             \
-        pr_reg[11]      = regs->e6;             \
-        pr_reg[12]      = regs->e5;             \
-        pr_reg[13]      = regs->e4;             \
-        pr_reg[14]      = regs->e3;             \
-        pr_reg[15]      = regs->e2;             \
-        pr_reg[16]      = regs->sp;             \
-        pr_reg[17]      = regs->lar;            \
-        pr_reg[18]      = regs->lir;            \
-        pr_reg[19]      = regs->mdr;            \
-        pr_reg[20]      = regs->a1;             \
-        pr_reg[21]      = regs->a0;             \
-        pr_reg[22]      = regs->d1;             \
-        pr_reg[23]      = regs->d0;             \
-        pr_reg[24]      = regs->orig_d0;        \
-        pr_reg[25]      = regs->epsw;           \
-        pr_reg[26]      = regs->pc;             \
-} while (0);
-/*
- * This yields a mask that user programs can use to figure out what
- * instruction set this CPU supports.  This could be done in user space,
- * but it's not easy, and we've already done it here.
- */
-#define ELF_HWCAP       (0)
-/*
- * 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  (NULL)
-#ifdef __KERNEL__
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-#endif
-#endif /* _ASM_ELF_H */
diff --git a/include/asm-mn10300/emergency-restart.h b/include/asm-mn10300/emergency-restart.h
deleted file mode 100644
index 3711bd9d50bd..000000000000
--- a/include/asm-mn10300/emergency-restart.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
diff --git a/include/asm-mn10300/errno.h b/include/asm-mn10300/errno.h
deleted file mode 100644
index 4c82b503d92f..000000000000
--- a/include/asm-mn10300/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
diff --git a/include/asm-mn10300/exceptions.h b/include/asm-mn10300/exceptions.h
deleted file mode 100644
index fa16466ef3f9..000000000000
--- a/include/asm-mn10300/exceptions.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* MN10300 Microcontroller core exceptions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_EXCEPTIONS_H
-#define _ASM_EXCEPTIONS_H
-#include <linux/linkage.h>
-/*
- * define the breakpoint instruction opcode to use
- * - note that the JTAG unit steals 0xFF, so we want to avoid that if we can
- *   (can use 0xF7)
- */
-#define GDBSTUB_BKPT            0xFF
-#ifndef __ASSEMBLY__
-/*
- * enumeration of exception codes (as extracted from TBR MSW)
- */
-enum exception_code {
-        EXCEP_RESET             = 0x000000,     /* reset */
-        /* MMU exceptions */
-        EXCEP_ITLBMISS          = 0x000100,     /* instruction TLB miss */
-        EXCEP_DTLBMISS          = 0x000108,     /* data TLB miss */
-        EXCEP_IAERROR           = 0x000110,     /* instruction address */
-        EXCEP_DAERROR           = 0x000118,     /* data address */
-        /* system exceptions */
-        EXCEP_TRAP              = 0x000128,     /* program interrupt (PI instruction) */
-        EXCEP_ISTEP             = 0x000130,     /* single step */
-        EXCEP_IBREAK            = 0x000150,     /* instruction breakpoint */
-        EXCEP_OBREAK            = 0x000158,     /* operand breakpoint */
-        EXCEP_PRIVINS           = 0x000160,     /* privileged instruction execution */
-        EXCEP_UNIMPINS          = 0x000168,     /* unimplemented instruction execution */
-        EXCEP_UNIMPEXINS        = 0x000170,     /* unimplemented extended instruction execution */
-        EXCEP_MEMERR            = 0x000178,     /* illegal memory access */
-        EXCEP_MISALIGN          = 0x000180,     /* misalignment */
-        EXCEP_BUSERROR          = 0x000188,     /* bus error */
-        EXCEP_ILLINSACC         = 0x000190,     /* illegal instruction access */
-        EXCEP_ILLDATACC         = 0x000198,     /* illegal data access */
-        EXCEP_IOINSACC          = 0x0001a0,     /* I/O space instruction access */
-        EXCEP_PRIVINSACC        = 0x0001a8,     /* privileged space instruction access */
-        EXCEP_PRIVDATACC        = 0x0001b0,     /* privileged space data access */
-        EXCEP_DATINSACC         = 0x0001b8,     /* data space instruction access */
-        EXCEP_DOUBLE_FAULT      = 0x000200,     /* double fault */
-        /* FPU exceptions */
-        EXCEP_FPU_DISABLED      = 0x0001c0,     /* FPU disabled */
-        EXCEP_FPU_UNIMPINS      = 0x0001c8,     /* FPU unimplemented operation */
-        EXCEP_FPU_OPERATION     = 0x0001d0,     /* FPU operation */
-        /* interrupts */
-        EXCEP_WDT               = 0x000240,     /* watchdog timer overflow */
-        EXCEP_NMI               = 0x000248,     /* non-maskable interrupt */
-        EXCEP_IRQ_LEVEL0        = 0x000280,     /* level 0 maskable interrupt */
-        EXCEP_IRQ_LEVEL1        = 0x000288,     /* level 1 maskable interrupt */
-        EXCEP_IRQ_LEVEL2        = 0x000290,     /* level 2 maskable interrupt */
-        EXCEP_IRQ_LEVEL3        = 0x000298,     /* level 3 maskable interrupt */
-        EXCEP_IRQ_LEVEL4        = 0x0002a0,     /* level 4 maskable interrupt */
-        EXCEP_IRQ_LEVEL5        = 0x0002a8,     /* level 5 maskable interrupt */
-        EXCEP_IRQ_LEVEL6        = 0x0002b0,     /* level 6 maskable interrupt */
-        /* system calls */
-        EXCEP_SYSCALL0          = 0x000300,     /* system call 0 */
-        EXCEP_SYSCALL1          = 0x000308,     /* system call 1 */
-        EXCEP_SYSCALL2          = 0x000310,     /* system call 2 */
-        EXCEP_SYSCALL3          = 0x000318,     /* system call 3 */
-        EXCEP_SYSCALL4          = 0x000320,     /* system call 4 */
-        EXCEP_SYSCALL5          = 0x000328,     /* system call 5 */
-        EXCEP_SYSCALL6          = 0x000330,     /* system call 6 */
-        EXCEP_SYSCALL7          = 0x000338,     /* system call 7 */
-        EXCEP_SYSCALL8          = 0x000340,     /* system call 8 */
-        EXCEP_SYSCALL9          = 0x000348,     /* system call 9 */
-        EXCEP_SYSCALL10         = 0x000350,     /* system call 10 */
-        EXCEP_SYSCALL11         = 0x000358,     /* system call 11 */
-        EXCEP_SYSCALL12         = 0x000360,     /* system call 12 */
-        EXCEP_SYSCALL13         = 0x000368,     /* system call 13 */
-        EXCEP_SYSCALL14         = 0x000370,     /* system call 14 */
-        EXCEP_SYSCALL15         = 0x000378,     /* system call 15 */
-};
-extern void __set_intr_stub(enum exception_code code, void *handler);
-extern void set_intr_stub(enum exception_code code, void *handler);
-extern void set_jtag_stub(enum exception_code code, void *handler);
-struct pt_regs;
-extern asmlinkage void __common_exception(void);
-extern asmlinkage void itlb_miss(void);
-extern asmlinkage void dtlb_miss(void);
-extern asmlinkage void itlb_aerror(void);
-extern asmlinkage void dtlb_aerror(void);
-extern asmlinkage void raw_bus_error(void);
-extern asmlinkage void double_fault(void);
-extern asmlinkage int  system_call(struct pt_regs *);
-extern asmlinkage void fpu_exception(struct pt_regs *, enum exception_code);
-extern asmlinkage void nmi(struct pt_regs *, enum exception_code);
-extern asmlinkage void uninitialised_exception(struct pt_regs *,
-                                               enum exception_code);
-extern asmlinkage void irq_handler(void);
-extern asmlinkage void profile_handler(void);
-extern asmlinkage void nmi_handler(void);
-extern asmlinkage void misalignment(struct pt_regs *, enum exception_code);
-extern void die(const char *, struct pt_regs *, enum exception_code)
-        ATTRIB_NORET;
-extern int die_if_no_fixup(const char *, struct pt_regs *, enum exception_code);
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_EXCEPTIONS_H */
diff --git a/include/asm-mn10300/fb.h b/include/asm-mn10300/fb.h
deleted file mode 100644
index 697b24a91e1a..000000000000
--- a/include/asm-mn10300/fb.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* MN10300 Frame buffer stuff
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#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-mn10300/fcntl.h b/include/asm-mn10300/fcntl.h
deleted file mode 100644
index 46ab12db5739..000000000000
--- a/include/asm-mn10300/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-mn10300/fpu.h b/include/asm-mn10300/fpu.h
deleted file mode 100644
index 64a2b83a7a6a..000000000000
--- a/include/asm-mn10300/fpu.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* MN10300 FPU definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * Derived from include/asm-i386/i387.h: Copyright (C) 1994 Linus Torvalds
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_FPU_H
-#define _ASM_FPU_H
-#include <asm/processor.h>
-#include <asm/sigcontext.h>
-#include <asm/user.h>
-#ifdef __KERNEL__
-/* the task that owns the FPU state */
-extern struct task_struct *fpu_state_owner;
-#define set_using_fpu(tsk)                              \
-do {                                                    \
-        (tsk)->thread.fpu_flags |= THREAD_USING_FPU;    \
-} while (0)
-#define clear_using_fpu(tsk)                            \
-do {                                                    \
-        (tsk)->thread.fpu_flags &= ~THREAD_USING_FPU;   \
-} while (0)
-#define is_using_fpu(tsk) ((tsk)->thread.fpu_flags & THREAD_USING_FPU)
-#define unlazy_fpu(tsk)                                 \
-do {                                                    \
-        preempt_disable();                              \
-        if (fpu_state_owner == (tsk))                   \
-                fpu_save(&tsk->thread.fpu_state);       \
-        preempt_enable();                               \
-} while (0)
-#define exit_fpu()                              \
-do {                                            \
-        struct task_struct *__tsk = current;    \
-        preempt_disable();                      \
-        if (fpu_state_owner == __tsk)           \
-                fpu_state_owner = NULL;         \
-        preempt_enable();                       \
-} while (0)
-#define flush_fpu()                                     \
-do {                                                    \
-        struct task_struct *__tsk = current;            \
-        preempt_disable();                              \
-        if (fpu_state_owner == __tsk) {                 \
-                fpu_state_owner = NULL;                 \
-                __tsk->thread.uregs->epsw &= ~EPSW_FE;  \
-        }                                               \
-        preempt_enable();                               \
-        clear_using_fpu(__tsk);                         \
-} while (0)
-extern asmlinkage void fpu_init_state(void);
-extern asmlinkage void fpu_kill_state(struct task_struct *);
-extern asmlinkage void fpu_disabled(struct pt_regs *, enum exception_code);
-extern asmlinkage void fpu_exception(struct pt_regs *, enum exception_code);
-#ifdef CONFIG_FPU
-extern asmlinkage void fpu_save(struct fpu_state_struct *);
-extern asmlinkage void fpu_restore(struct fpu_state_struct *);
-#else
-#define fpu_save(a)
-#define fpu_restore(a)
-#endif /* CONFIG_FPU  */
-/*
- * signal frame handlers
- */
-extern int fpu_setup_sigcontext(struct fpucontext *buf);
-extern int fpu_restore_sigcontext(struct fpucontext *buf);
-#endif /* __KERNEL__ */
-#endif /* _ASM_FPU_H */
diff --git a/include/asm-mn10300/frame.inc b/include/asm-mn10300/frame.inc
deleted file mode 100644
index 5b1949bdf039..000000000000
--- a/include/asm-mn10300/frame.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-/* MN10300 Microcontroller core system register definitions -*- asm -*-
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_FRAME_INC
-#define _ASM_FRAME_INC
-#ifndef __ASSEMBLY__
-#error not for use in C files
-#endif
-#ifndef __ASM_OFFSETS_H__
-#include <asm/asm-offsets.h>
-#endif
-#define pi break
-#define fp a3
-###############################################################################
-#
-# build a stack frame from the registers
-# - the caller has subtracted 4 from SP before coming here
-#
-###############################################################################
-.macro SAVE_ALL
-        add     -4,sp                           # next exception frame ptr save area
-        movm    [other],(sp)
-        mov     usp,a1
-        mov     a1,(sp)                         # USP in MOVM[other] dummy slot
-        movm    [d2,d3,a2,a3,exreg0,exreg1,exother],(sp)
-        mov     sp,fp                           # FRAME pointer in A3
-        add     -12,sp                          # allow for calls to be made
-        mov     (__frame),a1
-        mov     a1,(REG_NEXT,fp)
-        mov     fp,(__frame)
-        and     ~EPSW_FE,epsw                   # disable the FPU inside the kernel
-        # we may be holding current in E2
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-        mov     (__current),e2
-#endif
-.endm
-###############################################################################
-#
-# restore the registers from a stack frame
-#
-###############################################################################
-.macro RESTORE_ALL
-        # peel back the stack to the calling frame
-        # - this permits execve() to discard extra frames due to kernel syscalls
-        mov     (__frame),fp
-        mov     fp,sp
-        mov     (REG_NEXT,fp),d0                # userspace has regs->next == 0
-        mov     d0,(__frame)
-#ifndef CONFIG_MN10300_USING_JTAG
-        mov     (REG_EPSW,fp),d0
-        btst    EPSW_T,d0
-        beq     99f
-        or      EPSW_NMID,epsw
-        movhu   (DCR),d1
-        or      0x0001, d1
-        movhu   d1,(DCR)
-99:
-#endif
-        movm    (sp),[d2,d3,a2,a3,exreg0,exreg1,exother]
-        # must restore usp even if returning to kernel space,
-        # when CONFIG_PREEMPT is enabled.
-        mov     (sp),a1                         # USP in MOVM[other] dummy slot
-        mov     a1,usp
-        movm    (sp),[other]
-        add     8,sp
-        rti
-.endm
-#endif /* _ASM_FRAME_INC */
diff --git a/include/asm-mn10300/ftrace.h b/include/asm-mn10300/ftrace.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/include/asm-mn10300/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/include/asm-mn10300/futex.h b/include/asm-mn10300/futex.h
deleted file mode 100644
index 0b745828f42b..000000000000
--- a/include/asm-mn10300/futex.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/futex.h>
diff --git a/include/asm-mn10300/gdb-stub.h b/include/asm-mn10300/gdb-stub.h
deleted file mode 100644
index e5a6368559af..000000000000
--- a/include/asm-mn10300/gdb-stub.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* MN10300 Kernel GDB stub definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from asm-mips/gdb-stub.h (c) 1995 Andreas Busse
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_GDB_STUB_H
-#define _ASM_GDB_STUB_H
-#include <asm/exceptions.h>
-/*
- * register ID numbers in GDB remote protocol
- */
-#define GDB_REGID_PC            9
-#define GDB_REGID_FP            7
-#define GDB_REGID_SP            8
-/*
- * virtual stack layout for the GDB exception handler
- */
-#define NUMREGS                 64
-#define GDB_FR_D0               (0 * 4)
-#define GDB_FR_D1               (1 * 4)
-#define GDB_FR_D2               (2 * 4)
-#define GDB_FR_D3               (3 * 4)
-#define GDB_FR_A0               (4 * 4)
-#define GDB_FR_A1               (5 * 4)
-#define GDB_FR_A2               (6 * 4)
-#define GDB_FR_A3               (7 * 4)
-#define GDB_FR_SP               (8 * 4)
-#define GDB_FR_PC               (9 * 4)
-#define GDB_FR_MDR              (10 * 4)
-#define GDB_FR_EPSW             (11 * 4)
-#define GDB_FR_LIR              (12 * 4)
-#define GDB_FR_LAR              (13 * 4)
-#define GDB_FR_MDRQ             (14 * 4)
-#define GDB_FR_E0               (15 * 4)
-#define GDB_FR_E1               (16 * 4)
-#define GDB_FR_E2               (17 * 4)
-#define GDB_FR_E3               (18 * 4)
-#define GDB_FR_E4               (19 * 4)
-#define GDB_FR_E5               (20 * 4)
-#define GDB_FR_E6               (21 * 4)
-#define GDB_FR_E7               (22 * 4)
-#define GDB_FR_SSP              (23 * 4)
-#define GDB_FR_MSP              (24 * 4)
-#define GDB_FR_USP              (25 * 4)
-#define GDB_FR_MCRH             (26 * 4)
-#define GDB_FR_MCRL             (27 * 4)
-#define GDB_FR_MCVF             (28 * 4)
-#define GDB_FR_FPCR             (29 * 4)
-#define GDB_FR_DUMMY0           (30 * 4)
-#define GDB_FR_DUMMY1           (31 * 4)
-#define GDB_FR_FS0              (32 * 4)
-#define GDB_FR_SIZE             (NUMREGS * 4)
-#ifndef __ASSEMBLY__
-/*
- * This is the same as above, but for the high-level
- * part of the GDB stub.
- */
-struct gdb_regs {
-        /* saved main processor registers */
-        u32     d0, d1, d2, d3, a0, a1, a2, a3;
-        u32     sp, pc, mdr, epsw, lir, lar, mdrq;
-        u32     e0, e1, e2, e3, e4, e5, e6, e7;
-        u32     ssp, msp, usp, mcrh, mcrl, mcvf;
-        /* saved floating point registers */
-        u32     fpcr, _dummy0, _dummy1;
-        u32     fs0,  fs1,  fs2,  fs3,  fs4,  fs5,  fs6,  fs7;
-        u32     fs8,  fs9,  fs10, fs11, fs12, fs13, fs14, fs15;
-        u32     fs16, fs17, fs18, fs19, fs20, fs21, fs22, fs23;
-        u32     fs24, fs25, fs26, fs27, fs28, fs29, fs30, fs31;
-};
-/*
- * Prototypes
- */
-extern void show_registers_only(struct pt_regs *regs);
-extern asmlinkage void gdbstub_init(void);
-extern asmlinkage void gdbstub_exit(int status);
-extern asmlinkage void gdbstub_io_init(void);
-extern asmlinkage void gdbstub_io_set_baud(unsigned baud);
-extern asmlinkage int  gdbstub_io_rx_char(unsigned char *_ch, int nonblock);
-extern asmlinkage void gdbstub_io_tx_char(unsigned char ch);
-extern asmlinkage void gdbstub_io_tx_flush(void);
-extern asmlinkage void gdbstub_io_rx_handler(void);
-extern asmlinkage void gdbstub_rx_irq(struct pt_regs *, enum exception_code);
-extern asmlinkage int  gdbstub_intercept(struct pt_regs *, enum exception_code);
-extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code);
-extern asmlinkage void __gdbstub_bug_trap(void);
-extern asmlinkage void __gdbstub_pause(void);
-extern asmlinkage void start_kernel(void);
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-extern asmlinkage void gdbstub_purge_cache(void);
-#else
-#define gdbstub_purge_cache()   do {} while (0)
-#endif
-/* Used to prevent crashes in memory access */
-extern asmlinkage int  gdbstub_read_byte(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_read_word(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_read_dword(const u8 *, u8 *);
-extern asmlinkage int  gdbstub_write_byte(u32, u8 *);
-extern asmlinkage int  gdbstub_write_word(u32, u8 *);
-extern asmlinkage int  gdbstub_write_dword(u32, u8 *);
-extern asmlinkage void gdbstub_read_byte_guard(void);
-extern asmlinkage void gdbstub_read_byte_cont(void);
-extern asmlinkage void gdbstub_read_word_guard(void);
-extern asmlinkage void gdbstub_read_word_cont(void);
-extern asmlinkage void gdbstub_read_dword_guard(void);
-extern asmlinkage void gdbstub_read_dword_cont(void);
-extern asmlinkage void gdbstub_write_byte_guard(void);
-extern asmlinkage void gdbstub_write_byte_cont(void);
-extern asmlinkage void gdbstub_write_word_guard(void);
-extern asmlinkage void gdbstub_write_word_cont(void);
-extern asmlinkage void gdbstub_write_dword_guard(void);
-extern asmlinkage void gdbstub_write_dword_cont(void);
-extern u8       gdbstub_rx_buffer[PAGE_SIZE];
-extern u32      gdbstub_rx_inp;
-extern u32      gdbstub_rx_outp;
-extern u8       gdbstub_rx_overflow;
-extern u8       gdbstub_busy;
-extern u8       gdbstub_rx_unget;
-#ifdef CONFIG_GDBSTUB_DEBUGGING
-extern void gdbstub_printk(const char *fmt, ...)
-        __attribute__((format(printf, 1, 2)));
-#else
-static inline __attribute__((format(printf, 1, 2)))
-void gdbstub_printk(const char *fmt, ...)
-{
-}
-#endif
-#ifdef CONFIG_GDBSTUB_DEBUG_ENTRY
-#define gdbstub_entry(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_entry(FMT, ...) ({ 0; })
-#endif
-#ifdef CONFIG_GDBSTUB_DEBUG_PROTOCOL
-#define gdbstub_proto(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_proto(FMT, ...) ({ 0; })
-#endif
-#ifdef CONFIG_GDBSTUB_DEBUG_IO
-#define gdbstub_io(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_io(FMT, ...) ({ 0; })
-#endif
-#ifdef CONFIG_GDBSTUB_DEBUG_BREAKPOINT
-#define gdbstub_bkpt(FMT, ...) gdbstub_printk(FMT, ##__VA_ARGS__)
-#else
-#define gdbstub_bkpt(FMT, ...) ({ 0; })
-#endif
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_GDB_STUB_H */
diff --git a/include/asm-mn10300/hardirq.h b/include/asm-mn10300/hardirq.h
deleted file mode 100644
index 54d950117674..000000000000
--- a/include/asm-mn10300/hardirq.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* MN10300 Hardware IRQ statistics and management
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_HARDIRQ_H
-#define _ASM_HARDIRQ_H
-#include <linux/threads.h>
-#include <linux/irq.h>
-#include <asm/exceptions.h>
-/* assembly code in softirq.h is sensitive to the offsets of these fields */
-typedef struct {
-        unsigned int    __softirq_pending;
-        unsigned long   idle_timestamp;
-        unsigned int    __nmi_count;    /* arch dependent */
-        unsigned int    __irq_count;    /* arch dependent */
-} ____cacheline_aligned irq_cpustat_t;
-#include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
-extern void ack_bad_irq(int irq);
-/*
- * manipulate stubs in the MN10300 CPU Trap/Interrupt Vector table
- * - these should jump to __common_exception in entry.S unless there's a good
- *   reason to do otherwise (see trap_preinit() in traps.c)
- */
-typedef void (*intr_stub_fnx)(struct pt_regs *regs,
-                              enum exception_code intcode);
-/*
- * manipulate pointers in the Exception table (see entry.S)
- * - these are indexed by decoding the lower 24 bits of the TBR register
- * - note that the MN103E010 doesn't always trap through the correct vector,
- *   but does always set the TBR correctly
- */
-extern asmlinkage void set_excp_vector(enum exception_code code,
-                                       intr_stub_fnx handler);
-#endif /* _ASM_HARDIRQ_H */
diff --git a/include/asm-mn10300/highmem.h b/include/asm-mn10300/highmem.h
deleted file mode 100644
index 90f2abb04bfd..000000000000
--- a/include/asm-mn10300/highmem.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* MN10300 Virtual kernel memory mappings for high memory
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/highmem.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_HIGHMEM_H
-#define _ASM_HIGHMEM_H
-#ifdef __KERNEL__
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/highmem.h>
-#include <asm/kmap_types.h>
-#include <asm/pgtable.h>
-/* undef for production */
-#undef HIGHMEM_DEBUG
-/* declarations for highmem.c */
-extern unsigned long highstart_pfn, highend_pfn;
-extern pte_t *kmap_pte;
-extern pgprot_t kmap_prot;
-extern pte_t *pkmap_page_table;
-extern void __init kmap_init(void);
-/*
- * Right now we initialize only a single pte table. It can be extended
- * easily, subsequent pte tables have to be allocated in one physical
- * chunk of RAM.
- */
-#define PKMAP_BASE      0xfe000000UL
-#define LAST_PKMAP      1024
-#define LAST_PKMAP_MASK (LAST_PKMAP - 1)
-#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)
-#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))
-extern unsigned long kmap_high(struct page *page);
-extern void kunmap_high(struct page *page);
-static inline unsigned long kmap(struct page *page)
-{
-        if (in_interrupt())
-                BUG();
-        if (page < highmem_start_page)
-                return page_address(page);
-        return kmap_high(page);
-}
-static inline void kunmap(struct page *page)
-{
-        if (in_interrupt())
-                BUG();
-        if (page < highmem_start_page)
-                return;
-        kunmap_high(page);
-}
-/*
- * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
- * gives a more generic (and caching) interface. But kmap_atomic can
- * be used in IRQ contexts, so in some (very limited) cases we need
- * it.
- */
-static inline unsigned long kmap_atomic(struct page *page, enum km_type type)
-{
-        enum fixed_addresses idx;
-        unsigned long vaddr;
-        if (page < highmem_start_page)
-                return page_address(page);
-        debug_kmap_atomic(type);
-        idx = type + KM_TYPE_NR * smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-#if HIGHMEM_DEBUG
-        if (!pte_none(*(kmap_pte - idx)))
-                BUG();
-#endif
-        set_pte(kmap_pte - idx, mk_pte(page, kmap_prot));
-        __flush_tlb_one(vaddr);
-        return vaddr;
-}
-static inline void kunmap_atomic(unsigned long vaddr, enum km_type type)
-{
-#if HIGHMEM_DEBUG
-        enum fixed_addresses idx = type + KM_TYPE_NR * smp_processor_id();
-        if (vaddr < FIXADDR_START) /* FIXME */
-                return;
-        if (vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx))
-                BUG();
-        /*
-         * force other mappings to Oops if they'll try to access
-         * this pte without first remap it
-         */
-        pte_clear(kmap_pte - idx);
-        __flush_tlb_one(vaddr);
-#endif
-}
-#endif /* __KERNEL__ */
-#endif /* _ASM_HIGHMEM_H */
diff --git a/include/asm-mn10300/hw_irq.h b/include/asm-mn10300/hw_irq.h
deleted file mode 100644
index 70619901098e..000000000000
--- a/include/asm-mn10300/hw_irq.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MN10300 Hardware interrupt definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_HW_IRQ_H
-#define _ASM_HW_IRQ_H
-#endif /* _ASM_HW_IRQ_H */
diff --git a/include/asm-mn10300/intctl-regs.h b/include/asm-mn10300/intctl-regs.h
deleted file mode 100644
index ba544c796c5a..000000000000
--- a/include/asm-mn10300/intctl-regs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* MN10300 On-board interrupt controller registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_INTCTL_REGS_H
-#define _ASM_INTCTL_REGS_H
-#include <asm/cpu-regs.h>
-#ifdef __KERNEL__
-/* interrupt controller registers */
-#define GxICR(X)                __SYSREG(0xd4000000 + (X) * 4, u16)     /* group irq ctrl regs */
-#define IAGR                    __SYSREG(0xd4000100, u16)       /* intr acceptance group reg */
-#define IAGR_GN                 0x00fc          /* group number register
-                                                 * (documentation _has_ to be wrong)
-                                                 */
-#define EXTMD                   __SYSREG(0xd4000200, u16)       /* external pin intr spec reg */
-#define GET_XIRQ_TRIGGER(X) ((EXTMD >> ((X) * 2)) & 3)
-#define SET_XIRQ_TRIGGER(X,Y)                   \
-do {                                            \
-        u16 x = EXTMD;                          \
-        x &= ~(3 << ((X) * 2));                 \
-        x |= ((Y) & 3) << ((X) * 2);            \
-        EXTMD = x;                              \
-} while (0)
-#define XIRQ_TRIGGER_LOWLEVEL   0
-#define XIRQ_TRIGGER_HILEVEL    1
-#define XIRQ_TRIGGER_NEGEDGE    2
-#define XIRQ_TRIGGER_POSEDGE    3
-/* non-maskable interrupt control */
-#define NMIIRQ                  0
-#define NMICR                   GxICR(NMIIRQ)   /* NMI control register */
-#define NMICR_NMIF              0x0001          /* NMI pin interrupt flag */
-#define NMICR_WDIF              0x0002          /* watchdog timer overflow flag */
-#define NMICR_ABUSERR           0x0008          /* async bus error flag */
-/* maskable interrupt control */
-#define GxICR_DETECT            0x0001          /* interrupt detect flag */
-#define GxICR_REQUEST           0x0010          /* interrupt request flag */
-#define GxICR_ENABLE            0x0100          /* interrupt enable flag */
-#define GxICR_LEVEL             0x7000          /* interrupt priority level */
-#define GxICR_LEVEL_0           0x0000          /* - level 0 */
-#define GxICR_LEVEL_1           0x1000          /* - level 1 */
-#define GxICR_LEVEL_2           0x2000          /* - level 2 */
-#define GxICR_LEVEL_3           0x3000          /* - level 3 */
-#define GxICR_LEVEL_4           0x4000          /* - level 4 */
-#define GxICR_LEVEL_5           0x5000          /* - level 5 */
-#define GxICR_LEVEL_6           0x6000          /* - level 6 */
-#define GxICR_LEVEL_SHIFT       12
-#ifndef __ASSEMBLY__
-extern void set_intr_level(int irq, u16 level);
-extern void set_intr_postackable(int irq);
-#endif
-/* external interrupts */
-#define XIRQxICR(X)             GxICR((X))      /* external interrupt control regs */
-#endif /* __KERNEL__ */
-#endif /* _ASM_INTCTL_REGS_H */
diff --git a/include/asm-mn10300/io.h b/include/asm-mn10300/io.h
deleted file mode 100644
index c1a4119e6497..000000000000
--- a/include/asm-mn10300/io.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* MN10300 I/O port emulation and memory-mapped I/O
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_IO_H
-#define _ASM_IO_H
-#include <asm/page.h> /* I/O is all done through memory accesses */
-#include <asm/cpu-regs.h>
-#include <asm/cacheflush.h>
-#define mmiowb() do {} while (0)
-/*****************************************************************************/
-/*
- * readX/writeX() are used to access memory mapped devices. On some
- * architectures the memory mapped IO stuff needs to be accessed
- * differently. On the x86 architecture, we just read/write the
- * memory location directly.
- */
-static inline u8 readb(const volatile void __iomem *addr)
-{
-        return *(const volatile u8 *) addr;
-}
-static inline u16 readw(const volatile void __iomem *addr)
-{
-        return *(const volatile u16 *) addr;
-}
-static inline u32 readl(const volatile void __iomem *addr)
-{
-        return *(const volatile u32 *) addr;
-}
-#define __raw_readb readb
-#define __raw_readw readw
-#define __raw_readl readl
-#define readb_relaxed readb
-#define readw_relaxed readw
-#define readl_relaxed readl
-static inline void writeb(u8 b, volatile void __iomem *addr)
-{
-        *(volatile u8 *) addr = b;
-}
-static inline void writew(u16 b, volatile void __iomem *addr)
-{
-        *(volatile u16 *) addr = b;
-}
-static inline void writel(u32 b, volatile void __iomem *addr)
-{
-        *(volatile u32 *) addr = b;
-}
-#define __raw_writeb writeb
-#define __raw_writew writew
-#define __raw_writel writel
-/*****************************************************************************/
-/*
- * traditional input/output functions
- */
-static inline u8 inb_local(unsigned long addr)
-{
-        return readb((volatile void __iomem *) addr);
-}
-static inline void outb_local(u8 b, unsigned long addr)
-{
-        return writeb(b, (volatile void __iomem *) addr);
-}
-static inline u8 inb(unsigned long addr)
-{
-        return readb((volatile void __iomem *) addr);
-}
-static inline u16 inw(unsigned long addr)
-{
-        return readw((volatile void __iomem *) addr);
-}
-static inline u32 inl(unsigned long addr)
-{
-        return readl((volatile void __iomem *) addr);
-}
-static inline void outb(u8 b, unsigned long addr)
-{
-        return writeb(b, (volatile void __iomem *) addr);
-}
-static inline void outw(u16 b, unsigned long addr)
-{
-        return writew(b, (volatile void __iomem *) addr);
-}
-static inline void outl(u32 b, unsigned long addr)
-{
-        return writel(b, (volatile void __iomem *) addr);
-}
-#define inb_p(addr)     inb(addr)
-#define inw_p(addr)     inw(addr)
-#define inl_p(addr)     inl(addr)
-#define outb_p(x, addr) outb((x), (addr))
-#define outw_p(x, addr) outw((x), (addr))
-#define outl_p(x, addr) outl((x), (addr))
-static inline void insb(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u8 *buf = buffer;
-                do {
-                        u8 x = inb(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-static inline void insw(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u16 *buf = buffer;
-                do {
-                        u16 x = inw(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-static inline void insl(unsigned long addr, void *buffer, int count)
-{
-        if (count) {
-                u32 *buf = buffer;
-                do {
-                        u32 x = inl(addr);
-                        *buf++ = x;
-                } while (--count);
-        }
-}
-static inline void outsb(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u8 *buf = buffer;
-                do {
-                        outb(*buf++, addr);
-                } while (--count);
-        }
-}
-static inline void outsw(unsigned long addr, const void *buffer, int count)
-{
-        if (count) {
-                const u16 *buf = buffer;
-                do {
-                        outw(*buf++, addr);
-                } while (--count);
-        }
-}
-extern void __outsl(unsigned long addr, const void *buffer, int count);
-static inline void outsl(unsigned long addr, const void *buffer, int count)
-{
-        if ((unsigned long) buffer & 0x3)
-                return __outsl(addr, buffer, count);
-        if (count) {
-                const u32 *buf = buffer;
-                do {
-                        outl(*buf++, addr);
-                } while (--count);
-        }
-}
-#define ioread8(addr)           readb(addr)
-#define ioread16(addr)          readw(addr)
-#define ioread32(addr)          readl(addr)
-#define iowrite8(v, addr)       writeb((v), (addr))
-#define iowrite16(v, addr)      writew((v), (addr))
-#define iowrite32(v, addr)      writel((v), (addr))
-#define ioread8_rep(p, dst, count) \
-        insb((unsigned long) (p), (dst), (count))
-#define ioread16_rep(p, dst, count) \
-        insw((unsigned long) (p), (dst), (count))
-#define ioread32_rep(p, dst, count) \
-        insl((unsigned long) (p), (dst), (count))
-#define iowrite8_rep(p, src, count) \
-        outsb((unsigned long) (p), (src), (count))
-#define iowrite16_rep(p, src, count) \
-        outsw((unsigned long) (p), (src), (count))
-#define iowrite32_rep(p, src, count) \
-        outsl((unsigned long) (p), (src), (count))
-#define IO_SPACE_LIMIT 0xffffffff
-#ifdef __KERNEL__
-#include <linux/vmalloc.h>
-#define __io_virt(x) ((void *) (x))
-/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-struct pci_dev;
-extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
-static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
-{
-}
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are pretty trivial
- */
-static inline unsigned long virt_to_phys(volatile void *address)
-{
-        return __pa(address);
-}
-static inline void *phys_to_virt(unsigned long address)
-{
-        return __va(address);
-}
-/*
- * Change "struct page" to physical address.
- */
-static inline void *__ioremap(unsigned long offset, unsigned long size,
-                              unsigned long flags)
-{
-        return (void *) offset;
-}
-static inline void *ioremap(unsigned long offset, unsigned long size)
-{
-        return (void *) offset;
-}
-/*
- * This one maps high address device memory and turns off caching for that
- * area.  it's useful if some control registers are in such an area and write
- * combining or read caching is not desirable:
- */
-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
-{
-        return (void *) (offset | 0x20000000);
-}
-#define ioremap_wc ioremap_nocache
-static inline void iounmap(void *addr)
-{
-}
-static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
-        return (void __iomem *) port;
-}
-static inline void ioport_unmap(void __iomem *p)
-{
-}
-#define xlate_dev_kmem_ptr(p)   ((void *) (p))
-#define xlate_dev_mem_ptr(p)    ((void *) (p))
-/*
- * PCI bus iomem addresses must be in the region 0x80000000-0x9fffffff
- */
-static inline unsigned long virt_to_bus(volatile void *address)
-{
-        return ((unsigned long) address) & ~0x20000000;
-}
-static inline void *bus_to_virt(unsigned long address)
-{
-        return (void *) address;
-}
-#define page_to_bus page_to_phys
-#define memset_io(a, b, c)      memset(__io_virt(a), (b), (c))
-#define memcpy_fromio(a, b, c)  memcpy((a), __io_virt(b), (c))
-#define memcpy_toio(a, b, c)    memcpy(__io_virt(a), (b), (c))
-#endif /* __KERNEL__ */
-#endif /* _ASM_IO_H */
diff --git a/include/asm-mn10300/ioctl.h b/include/asm-mn10300/ioctl.h
deleted file mode 100644
index b279fe06dfe5..000000000000
--- a/include/asm-mn10300/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-mn10300/ioctls.h b/include/asm-mn10300/ioctls.h
deleted file mode 100644
index dcbfb452974f..000000000000
--- a/include/asm-mn10300/ioctls.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _ASM_IOCTLS_H
-#define _ASM_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 TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
-#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
-#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 TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
-#define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
-#define FIOQSIZE        0x5460
-/* 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 /* _ASM_IOCTLS_H */
diff --git a/include/asm-mn10300/ipc.h b/include/asm-mn10300/ipc.h
deleted file mode 100644
index a46e3d9c2a3f..000000000000
--- a/include/asm-mn10300/ipc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
diff --git a/include/asm-mn10300/ipcbuf.h b/include/asm-mn10300/ipcbuf.h
deleted file mode 100644
index f6f63d448272..000000000000
--- a/include/asm-mn10300/ipcbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _ASM_IPCBUF_H
-#define _ASM_IPCBUF_H
-/*
- * The ipc64_perm structure for MN10300 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;
-        unsigned short          __pad2;
-        unsigned long           __unused1;
-        unsigned long           __unused2;
-};
-#endif /* _ASM_IPCBUF_H */
diff --git a/include/asm-mn10300/irq.h b/include/asm-mn10300/irq.h
deleted file mode 100644
index 53b380116901..000000000000
--- a/include/asm-mn10300/irq.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MN10300 Hardware interrupt definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-i386/irq.h:
- *   - (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_IRQ_H
-#define _ASM_IRQ_H
-#include <asm/intctl-regs.h>
-#include <asm/reset-regs.h>
-#include <asm/proc/irq.h>
-/* this number is used when no interrupt has been assigned */
-#define NO_IRQ          INT_MAX
-/* hardware irq numbers */
-#define NR_IRQS         GxICR_NUM_IRQS
-/* external hardware irq numbers */
-#define NR_XIRQS        GxICR_NUM_XIRQS
-#define irq_canonicalize(IRQ) (IRQ)
-#endif /* _ASM_IRQ_H */
diff --git a/include/asm-mn10300/irq_regs.h b/include/asm-mn10300/irq_regs.h
deleted file mode 100644
index a848cd232eb4..000000000000
--- a/include/asm-mn10300/irq_regs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* MN10300 IRQ registers pointer definition
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_IRQ_REGS_H
-#define _ASM_IRQ_REGS_H
-/*
- * Per-cpu current frame pointer - the location of the last exception frame on
- * the stack
- */
-#define ARCH_HAS_OWN_IRQ_REGS
-#ifndef __ASSEMBLY__
-#define get_irq_regs() (__frame)
-#endif
-#endif /* _ASM_IRQ_REGS_H */
diff --git a/include/asm-mn10300/kdebug.h b/include/asm-mn10300/kdebug.h
deleted file mode 100644
index 0f47e112190c..000000000000
--- a/include/asm-mn10300/kdebug.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MN10300 In-kernel death knells
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_KDEBUG_H
-#define _ASM_KDEBUG_H
-/* Grossly misnamed. */
-enum die_val {
-        DIE_OOPS = 1,
-        DIE_BREAKPOINT,
-        DIE_GPF,
-};
-#endif /* _ASM_KDEBUG_H */
diff --git a/include/asm-mn10300/kmap_types.h b/include/asm-mn10300/kmap_types.h
deleted file mode 100644
index 3398f9f35603..000000000000
--- a/include/asm-mn10300/kmap_types.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* MN10300 kmap_atomic() slot IDs
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#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 /* _ASM_KMAP_TYPES_H */
diff --git a/include/asm-mn10300/kprobes.h b/include/asm-mn10300/kprobes.h
deleted file mode 100644
index c800b590183a..000000000000
--- a/include/asm-mn10300/kprobes.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* MN10300 Kernel Probes support
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by Mark Salter (msalter@redhat.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public Licence as published by
- * the Free Software Foundation; either version 2 of the Licence, 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 Licence for more details.
- *
- * You should have received a copy of the GNU General Public Licence
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-#ifndef _ASM_KPROBES_H
-#define _ASM_KPROBES_H
-#include <linux/types.h>
-#include <linux/ptrace.h>
-struct kprobe;
-typedef unsigned char kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xff
-#define MAX_INSN_SIZE 8
-#define MAX_STACK_SIZE 128
-/* Architecture specific copy of original instruction */
-struct arch_specific_insn {
-        /*  copy of original instruction
-         */
-        kprobe_opcode_t insn[MAX_INSN_SIZE];
-};
-extern const int kretprobe_blacklist_size;
-extern int kprobe_exceptions_notify(struct notifier_block *self,
-                                    unsigned long val, void *data);
-#define flush_insn_slot(p)  do {} while (0)
-extern void arch_remove_kprobe(struct kprobe *p);
-#endif /* _ASM_KPROBES_H */
diff --git a/include/asm-mn10300/linkage.h b/include/asm-mn10300/linkage.h
deleted file mode 100644
index dda3002a5dfa..000000000000
--- a/include/asm-mn10300/linkage.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Linkage and calling-convention overrides
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_LINKAGE_H
-#define _ASM_LINKAGE_H
-/* don't override anything */
-#define asmlinkage
-#define __ALIGN         .align 4,0xcb
-#define __ALIGN_STR     ".align 4,0xcb"
-#endif
diff --git a/include/asm-mn10300/local.h b/include/asm-mn10300/local.h
deleted file mode 100644
index c11c530f74d0..000000000000
--- a/include/asm-mn10300/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
diff --git a/include/asm-mn10300/mc146818rtc.h b/include/asm-mn10300/mc146818rtc.h
deleted file mode 100644
index df6bc6e0e8c6..000000000000
--- a/include/asm-mn10300/mc146818rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm/rtc-regs.h>
diff --git a/include/asm-mn10300/mman.h b/include/asm-mn10300/mman.h
deleted file mode 100644
index b7986b65addf..000000000000
--- a/include/asm-mn10300/mman.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* MN10300 Constants for mmap and co.
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * - Derived from asm-x86/mman.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_MMAN_H
-#define _ASM_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 /* _ASM_MMAN_H */
diff --git a/include/asm-mn10300/mmu.h b/include/asm-mn10300/mmu.h
deleted file mode 100644
index 2d2d097e7309..000000000000
--- a/include/asm-mn10300/mmu.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* MN10300 Memory management context
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-frv/mmu.h
- */
-#ifndef _ASM_MMU_H
-#define _ASM_MMU_H
-/*
- * MMU context
- */
-typedef struct {
-        unsigned long   tlbpid[NR_CPUS];        /* TLB PID for this process on
-                                                 * each CPU */
-} mm_context_t;
-#endif /* _ASM_MMU_H */
diff --git a/include/asm-mn10300/mmu_context.h b/include/asm-mn10300/mmu_context.h
deleted file mode 100644
index a9e2e34f69b0..000000000000
--- a/include/asm-mn10300/mmu_context.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* MN10300 MMU context management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- * - Derived from include/asm-m32r/mmu_context.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- *
- *
- * This implements an algorithm to provide TLB PID mappings to provide
- * selective access to the TLB for processes, thus reducing the number of TLB
- * flushes required.
- *
- * Note, however, that the M32R algorithm is technically broken as it does not
- * handle version wrap-around, and could, theoretically, have a problem with a
- * very long lived program that sleeps long enough for the version number to
- * wrap all the way around so that its TLB mappings appear valid once again.
- */
-#ifndef _ASM_MMU_CONTEXT_H
-#define _ASM_MMU_CONTEXT_H
-#include <asm/atomic.h>
-#include <asm/pgalloc.h>
-#include <asm/tlbflush.h>
-#include <asm-generic/mm_hooks.h>
-#define MMU_CONTEXT_TLBPID_MASK         0x000000ffUL
-#define MMU_CONTEXT_VERSION_MASK        0xffffff00UL
-#define MMU_CONTEXT_FIRST_VERSION       0x00000100UL
-#define MMU_NO_CONTEXT                  0x00000000UL
-extern unsigned long mmu_context_cache[NR_CPUS];
-#define mm_context(mm)  (mm->context.tlbpid[smp_processor_id()])
-#define enter_lazy_tlb(mm, tsk) do {} while (0)
-#ifdef CONFIG_SMP
-#define cpu_ran_vm(cpu, task) \
-        cpu_set((cpu), (task)->cpu_vm_mask)
-#define cpu_maybe_ran_vm(cpu, task) \
-        cpu_test_and_set((cpu), (task)->cpu_vm_mask)
-#else
-#define cpu_ran_vm(cpu, task)           do {} while (0)
-#define cpu_maybe_ran_vm(cpu, task)     true
-#endif /* CONFIG_SMP */
-/*
- * allocate an MMU context
- */
-static inline unsigned long allocate_mmu_context(struct mm_struct *mm)
-{
-        unsigned long *pmc = &mmu_context_cache[smp_processor_id()];
-        unsigned long mc = ++(*pmc);
-        if (!(mc & MMU_CONTEXT_TLBPID_MASK)) {
-                /* we exhausted the TLB PIDs of this version on this CPU, so we
-                 * flush this CPU's TLB in its entirety and start new cycle */
-                flush_tlb_all();
-                /* fix the TLB version if needed (we avoid version #0 so as to
-                 * distingush MMU_NO_CONTEXT) */
-                if (!mc)
-                        *pmc = mc = MMU_CONTEXT_FIRST_VERSION;
-        }
-        mm_context(mm) = mc;
-        return mc;
-}
-/*
- * get an MMU context if one is needed
- */
-static inline unsigned long get_mmu_context(struct mm_struct *mm)
-{
-        unsigned long mc = MMU_NO_CONTEXT, cache;
-        if (mm) {
-                cache = mmu_context_cache[smp_processor_id()];
-                mc = mm_context(mm);
-                /* if we have an old version of the context, replace it */
-                if ((mc ^ cache) & MMU_CONTEXT_VERSION_MASK)
-                        mc = allocate_mmu_context(mm);
-        }
-        return mc;
-}
-/*
- * initialise the context related info for a new mm_struct instance
- */
-static inline int init_new_context(struct task_struct *tsk,
-                                   struct mm_struct *mm)
-{
-        int num_cpus = NR_CPUS, i;
-        for (i = 0; i < num_cpus; i++)
-                mm->context.tlbpid[i] = MMU_NO_CONTEXT;
-        return 0;
-}
-/*
- * destroy context related info for an mm_struct that is about to be put to
- * rest
- */
-#define destroy_context(mm)     do { } while (0)
-/*
- * after we have set current->mm to a new value, this activates the context for
- * the new mm so we see the new mappings.
- */
-static inline void activate_context(struct mm_struct *mm, int cpu)
-{
-        PIDR = get_mmu_context(mm) & MMU_CONTEXT_TLBPID_MASK;
-}
-/*
- * change between virtual memory sets
- */
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
-                             struct task_struct *tsk)
-{
-        int cpu = smp_processor_id();
-        if (prev != next) {
-                cpu_ran_vm(cpu, next);
-                activate_context(next, cpu);
-                PTBR = (unsigned long) next->pgd;
-        } else if (!cpu_maybe_ran_vm(cpu, next)) {
-                activate_context(next, cpu);
-        }
-}
-#define deactivate_mm(tsk, mm)  do {} while (0)
-#define activate_mm(prev, next) switch_mm((prev), (next), NULL)
-#endif /* _ASM_MMU_CONTEXT_H */
diff --git a/include/asm-mn10300/module.h b/include/asm-mn10300/module.h
deleted file mode 100644
index 5d7057d01494..000000000000
--- a/include/asm-mn10300/module.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* MN10300 Arch-specific module definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by Mark Salter (msalter@redhat.com)
- * Derived from include/asm-i386/module.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_MODULE_H
-#define _ASM_MODULE_H
-struct mod_arch_specific {
-};
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-/*
- * Include the MN10300 architecture version.
- */
-#define MODULE_ARCH_VERMAGIC __stringify(PROCESSOR_MODEL_NAME) " "
-#endif /* _ASM_MODULE_H */
diff --git a/include/asm-mn10300/msgbuf.h b/include/asm-mn10300/msgbuf.h
deleted file mode 100644
index 8b602450cc4a..000000000000
--- a/include/asm-mn10300/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _ASM_MSGBUF_H
-#define _ASM_MSGBUF_H
-/*
- * The msqid64_ds structure for MN10300 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 */
-        unsigned long           __unused1;
-        __kernel_time_t         msg_rtime;      /* last msgrcv time */
-        unsigned long           __unused2;
-        __kernel_time_t         msg_ctime;      /* last change time */
-        unsigned long           __unused3;
-        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 /* _ASM_MSGBUF_H */
diff --git a/include/asm-mn10300/mutex.h b/include/asm-mn10300/mutex.h
deleted file mode 100644
index 84f5490c6fb4..000000000000
--- a/include/asm-mn10300/mutex.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 Mutex fastpath
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- *
- *
- * 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-null.h>
diff --git a/include/asm-mn10300/nmi.h b/include/asm-mn10300/nmi.h
deleted file mode 100644
index f3671cbbc117..000000000000
--- a/include/asm-mn10300/nmi.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* MN10300 NMI handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_NMI_H
-#define _ASM_NMI_H
-#endif /* _ASM_NMI_H */
diff --git a/include/asm-mn10300/page.h b/include/asm-mn10300/page.h
deleted file mode 100644
index 8288e124165b..000000000000
--- a/include/asm-mn10300/page.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* MN10300 Page table definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PAGE_H
-#define _ASM_PAGE_H
-/* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-#define PAGE_MASK       (~(PAGE_SIZE - 1))
-#else
-#define PAGE_SIZE       +(1 << PAGE_SHIFT)      /* unary plus marks an
-                                                 * immediate val not an addr */
-#define PAGE_MASK       +(~(PAGE_SIZE - 1))
-#endif
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-#define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
-#define copy_page(to, from)     memcpy((void *)(to), (void *)(from), PAGE_SIZE)
-#define clear_user_page(addr, vaddr, page)      clear_page(addr)
-#define copy_user_page(vto, vfrom, vaddr, to)   copy_page(vto, vfrom)
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pgd; } pgd_t;
-typedef struct { unsigned long pgprot; } pgprot_t;
-typedef struct page *pgtable_t;
-#define PTE_MASK        PAGE_MASK
-#define HPAGE_SHIFT     22
-#ifdef CONFIG_HUGETLB_PAGE
-#define HPAGE_SIZE              ((1UL) << HPAGE_SHIFT)
-#define HPAGE_MASK              (~(HPAGE_SIZE - 1))
-#define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT - PAGE_SHIFT)
-#endif
-#define pte_val(x)      ((x).pte)
-#define pgd_val(x)      ((x).pgd)
-#define pgprot_val(x)   ((x).pgprot)
-#define __pte(x)        ((pte_t) { (x) })
-#define __pgd(x)        ((pgd_t) { (x) })
-#define __pgprot(x)     ((pgprot_t) { (x) })
-#include <asm-generic/pgtable-nopmd.h>
-#endif /* !__ASSEMBLY__ */
-/*
- * This handles the memory map.. We could make this a config
- * option, but too many people screw it up, and too few need
- * it.
- *
- * A __PAGE_OFFSET of 0xC0000000 means that the kernel has
- * a virtual address space of one gigabyte, which limits the
- * amount of physical memory you can use to about 950MB.
- */
-#ifndef __ASSEMBLY__
-/* Pure 2^n version of get_order */
-static inline int get_order(unsigned long size) __attribute__((const));
-static inline int get_order(unsigned long size)
-{
-        int order;
-        size = (size - 1) >> (PAGE_SHIFT - 1);
-        order = -1;
-        do {
-                size >>= 1;
-                order++;
-        } while (size);
-        return order;
-}
-#endif /* __ASSEMBLY__ */
-#include <asm/page_offset.h>
-#define __PAGE_OFFSET           (PAGE_OFFSET_RAW)
-#define PAGE_OFFSET             ((unsigned long) __PAGE_OFFSET)
-/*
- * main RAM and kernel working space are coincident at 0x90000000, but to make
- * life more interesting, there's also an uncached virtual shadow at 0xb0000000
- * - these mappings are fixed in the MMU
- */
-#define __pfn_disp              (CONFIG_KERNEL_RAM_BASE_ADDRESS >> PAGE_SHIFT)
-#define __pa(x)                 ((unsigned long)(x))
-#define __va(x)                 ((void *)(unsigned long)(x))
-#define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
-#define pfn_to_page(pfn)        (mem_map + ((pfn) - __pfn_disp))
-#define page_to_pfn(page)       ((unsigned long)((page) - mem_map) + __pfn_disp)
-#define pfn_valid(pfn)                                  \
-({                                                      \
-        unsigned long __pfn = (pfn) - __pfn_disp;       \
-        __pfn < max_mapnr;                              \
-})
-#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-#define VM_DATA_DEFAULT_FLAGS \
-        (VM_READ | VM_WRITE | \
-        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
-#endif /* _ASM_PAGE_H */
diff --git a/include/asm-mn10300/page_offset.h b/include/asm-mn10300/page_offset.h
deleted file mode 100644
index 8eb5b16ad86b..000000000000
--- a/include/asm-mn10300/page_offset.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* MN10300 Kernel base address
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- */
-#ifndef _ASM_PAGE_OFFSET_H
-#define _ASM_PAGE_OFFSET_H
-#define PAGE_OFFSET_RAW CONFIG_KERNEL_RAM_BASE_ADDRESS
-#endif
diff --git a/include/asm-mn10300/param.h b/include/asm-mn10300/param.h
deleted file mode 100644
index 789b1df41fcb..000000000000
--- a/include/asm-mn10300/param.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN10300 Kernel parameters
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PARAM_H
-#define _ASM_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 */
-#define COMMAND_LINE_SIZE 256
-#endif /* _ASM_PARAM_H */
diff --git a/include/asm-mn10300/pci.h b/include/asm-mn10300/pci.h
deleted file mode 100644
index 0517b45313d8..000000000000
--- a/include/asm-mn10300/pci.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* MN10300 PCI definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PCI_H
-#define _ASM_PCI_H
-#ifdef __KERNEL__
-#include <linux/mm.h>           /* for struct page */
-#if 0
-#define __pcbdebug(FMT, ADDR, ...) \
-        printk(KERN_DEBUG "PCIBRIDGE[%08x]: "FMT"\n", \
-               (u32)(ADDR), ##__VA_ARGS__)
-#define __pcidebug(FMT, BUS, DEVFN, WHERE,...)          \
-do {                                                    \
-        printk(KERN_DEBUG "PCI[%02x:%02x.%x + %02x]: "FMT"\n",  \
-               (BUS)->number,                                   \
-               PCI_SLOT(DEVFN),                                 \
-               PCI_FUNC(DEVFN),                                 \
-               (u32)(WHERE), ##__VA_ARGS__);                    \
-} while (0)
-#else
-#define __pcbdebug(FMT, ADDR, ...)              do {} while (0)
-#define __pcidebug(FMT, BUS, DEVFN, WHERE, ...) do {} while (0)
-#endif
-/* Can be used to override the logic in pci_scan_bus for skipping
- * already-configured bus numbers - to be used for buggy BIOSes or
- * architectures with incomplete PCI setup by the loader */
-#ifdef CONFIG_PCI
-#define pcibios_assign_all_busses()     1
-extern void unit_pci_init(void);
-#else
-#define pcibios_assign_all_busses()     0
-#endif
-extern unsigned long pci_mem_start;
-#define PCIBIOS_MIN_IO          0xBE000004
-#define PCIBIOS_MIN_MEM         0xB8000000
-void pcibios_set_master(struct pci_dev *dev);
-void pcibios_penalize_isa_irq(int irq);
-/* Dynamic DMA mapping stuff.
- * i386 has everything mapped statically.
- */
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <asm/scatterlist.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-struct pci_dev;
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-/* This is always fine. */
-#define pci_dac_dma_supported(pci_dev, mask)    (0)
-/* Return the index of the PCI controller for device. */
-static inline int pci_controller_num(struct pci_dev *dev)
-{
-        return 0;
-}
-#define HAVE_PCI_MMAP
-extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                               enum pci_mmap_state mmap_state,
-                               int write_combine);
-#endif /* __KERNEL__ */
-/* implement the pci_ DMA API in terms of the generic device dma_ one */
-#include <asm-generic/pci-dma-compat.h>
-/**
- * pcibios_resource_to_bus - convert resource to PCI bus address
- * @dev: device which owns this resource
- * @region: converted bus-centric region (start,end)
- * @res: resource to convert
- *
- * Convert a resource to a PCI device bus address or bus window.
- */
-extern void pcibios_resource_to_bus(struct pci_dev *dev,
-                                    struct pci_bus_region *region,
-                                    struct resource *res);
-extern void pcibios_bus_to_resource(struct pci_dev *dev,
-                                    struct resource *res,
-                                    struct pci_bus_region *region);
-static inline struct resource *
-pcibios_select_root(struct pci_dev *pdev, struct resource *res)
-{
-        struct resource *root = NULL;
-        if (res->flags & IORESOURCE_IO)
-                root = &ioport_resource;
-        if (res->flags & IORESOURCE_MEM)
-                root = &iomem_resource;
-        return root;
-}
-#define pcibios_scan_all_fns(a, b)      0
-static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
-{
-        return channel ? 15 : 14;
-}
-#endif /* _ASM_PCI_H */
diff --git a/include/asm-mn10300/percpu.h b/include/asm-mn10300/percpu.h
deleted file mode 100644
index 06a959d67234..000000000000
--- a/include/asm-mn10300/percpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/percpu.h>
diff --git a/include/asm-mn10300/pgalloc.h b/include/asm-mn10300/pgalloc.h
deleted file mode 100644
index ec057e1bd4cf..000000000000
--- a/include/asm-mn10300/pgalloc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* MN10300 Page and page table/directory allocation
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PGALLOC_H
-#define _ASM_PGALLOC_H
-#include <asm/processor.h>
-#include <asm/page.h>
-#include <linux/threads.h>
-#include <linux/mm.h>           /* for struct page */
-struct mm_struct;
-struct page;
-/* attach a page table to a PMD entry */
-#define pmd_populate_kernel(mm, pmd, pte) \
-        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE))
-static inline
-void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)
-{
-        set_pmd(pmd, __pmd((page_to_pfn(pte) << PAGE_SHIFT) | _PAGE_TABLE));
-}
-#define pmd_pgtable(pmd) pmd_page(pmd)
-/*
- * Allocate and free page tables.
- */
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(struct mm_struct *, pgd_t *);
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
-extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
-static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
-{
-        free_page((unsigned long) pte);
-}
-static inline void pte_free(struct mm_struct *mm, struct page *pte)
-{
-        __free_page(pte);
-}
-#define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte))
-#endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-mn10300/pgtable.h b/include/asm-mn10300/pgtable.h
deleted file mode 100644
index 6dc30fc827c4..000000000000
--- a/include/asm-mn10300/pgtable.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/* MN10300 Page table manipulators and constants
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- *
- *
- * The Linux memory management assumes a three-level page table setup. On
- * the i386, we use that, but "fold" the mid level into the top-level page
- * table, so that we physically have the same two-level page table as the
- * i386 mmu expects.
- *
- * This file contains the functions and defines necessary to modify and use
- * the i386 page table tree for the purposes of the MN10300 TLB handler
- * functions.
- */
-#ifndef _ASM_PGTABLE_H
-#define _ASM_PGTABLE_H
-#include <asm/cpu-regs.h>
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <linux/threads.h>
-#include <asm/bitops.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-extern unsigned long empty_zero_page[1024];
-extern spinlock_t pgd_lock;
-extern struct page *pgd_list;
-extern void pmd_ctor(void *, struct kmem_cache *, unsigned long);
-extern void pgtable_cache_init(void);
-extern void paging_init(void);
-#endif /* !__ASSEMBLY__ */
-/*
- * The Linux mn10300 paging architecture only implements both the traditional
- * 2-level page tables
- */
-#define PGDIR_SHIFT     22
-#define PTRS_PER_PGD    1024
-#define PTRS_PER_PUD    1       /* we don't really have any PUD physically */
-#define PTRS_PER_PMD    1       /* we don't really have any PMD physically */
-#define PTRS_PER_PTE    1024
-#define PGD_SIZE        PAGE_SIZE
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
-#define PGDIR_MASK      (~(PGDIR_SIZE - 1))
-#define USER_PTRS_PER_PGD       (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
-#define USER_PGD_PTRS           (PAGE_OFFSET >> PGDIR_SHIFT)
-#define KERNEL_PGD_PTRS         (PTRS_PER_PGD - USER_PGD_PTRS)
-#define TWOLEVEL_PGDIR_SHIFT    22
-#define BOOT_USER_PGD_PTRS      (__PAGE_OFFSET >> TWOLEVEL_PGDIR_SHIFT)
-#define BOOT_KERNEL_PGD_PTRS    (1024 - BOOT_USER_PGD_PTRS)
-#ifndef __ASSEMBLY__
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-#endif
-/*
- * Unfortunately, due to the way the MMU works on the MN10300, the vmalloc VM
- * area has to be in the lower half of the virtual address range (the upper
- * half is not translated through the TLB).
- *
- * So in this case, the vmalloc area goes at the bottom of the address map
- * (leaving a hole at the very bottom to catch addressing errors), and
- * userspace starts immediately above.
- *
- * The vmalloc() routines also leaves a hole of 4kB between each vmalloced
- * area to catch addressing errors.
- */
-#define VMALLOC_OFFSET  (8 * 1024 * 1024)
-#define VMALLOC_START   (0x70000000)
-#define VMALLOC_END     (0x7C000000)
-#ifndef __ASSEMBLY__
-extern pte_t kernel_vmalloc_ptes[(VMALLOC_END - VMALLOC_START) / PAGE_SIZE];
-#endif
-/* IPTEL/DPTEL bit assignments */
-#define _PAGE_BIT_VALID         xPTEL_V_BIT
-#define _PAGE_BIT_ACCESSED      xPTEL_UNUSED1_BIT       /* mustn't be loaded into IPTEL/DPTEL */
-#define _PAGE_BIT_NX            xPTEL_UNUSED2_BIT       /* mustn't be loaded into IPTEL/DPTEL */
-#define _PAGE_BIT_CACHE         xPTEL_C_BIT
-#define _PAGE_BIT_PRESENT       xPTEL_PV_BIT
-#define _PAGE_BIT_DIRTY         xPTEL_D_BIT
-#define _PAGE_BIT_GLOBAL        xPTEL_G_BIT
-#define _PAGE_VALID             xPTEL_V
-#define _PAGE_ACCESSED          xPTEL_UNUSED1
-#define _PAGE_NX                xPTEL_UNUSED2           /* no-execute bit */
-#define _PAGE_CACHE             xPTEL_C
-#define _PAGE_PRESENT           xPTEL_PV
-#define _PAGE_DIRTY             xPTEL_D
-#define _PAGE_PROT              xPTEL_PR
-#define _PAGE_PROT_RKNU         xPTEL_PR_ROK
-#define _PAGE_PROT_WKNU         xPTEL_PR_RWK
-#define _PAGE_PROT_RKRU         xPTEL_PR_ROK_ROU
-#define _PAGE_PROT_WKRU         xPTEL_PR_RWK_ROU
-#define _PAGE_PROT_WKWU         xPTEL_PR_RWK_RWU
-#define _PAGE_GLOBAL            xPTEL_G
-#define _PAGE_PSE               xPTEL_PS_4Mb            /* 4MB page */
-#define _PAGE_FILE              xPTEL_UNUSED1_BIT       /* set:pagecache unset:swap */
-#define __PAGE_PROT_UWAUX       0x040
-#define __PAGE_PROT_USER        0x080
-#define __PAGE_PROT_WRITE       0x100
-#define _PAGE_PRESENTV          (_PAGE_PRESENT|_PAGE_VALID)
-#define _PAGE_PROTNONE          0x000   /* If not present */
-#ifndef __ASSEMBLY__
-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
-#define _PAGE_TABLE     (_PAGE_PRESENTV | _PAGE_PROT_WKNU | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define __PAGE_NONE     (_PAGE_PRESENTV | _PAGE_PROT_RKNU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_SHARED   (_PAGE_PRESENTV | _PAGE_PROT_WKWU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_COPY     (_PAGE_PRESENTV | _PAGE_PROT_RKRU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define __PAGE_READONLY (_PAGE_PRESENTV | _PAGE_PROT_RKRU | _PAGE_ACCESSED | _PAGE_CACHE)
-#define PAGE_NONE               __pgprot(__PAGE_NONE     | _PAGE_NX)
-#define PAGE_SHARED_NOEXEC      __pgprot(__PAGE_SHARED   | _PAGE_NX)
-#define PAGE_COPY_NOEXEC        __pgprot(__PAGE_COPY     | _PAGE_NX)
-#define PAGE_READONLY_NOEXEC    __pgprot(__PAGE_READONLY | _PAGE_NX)
-#define PAGE_SHARED_EXEC        __pgprot(__PAGE_SHARED)
-#define PAGE_COPY_EXEC          __pgprot(__PAGE_COPY)
-#define PAGE_READONLY_EXEC      __pgprot(__PAGE_READONLY)
-#define PAGE_COPY               PAGE_COPY_NOEXEC
-#define PAGE_READONLY           PAGE_READONLY_NOEXEC
-#define PAGE_SHARED             PAGE_SHARED_EXEC
-#define __PAGE_KERNEL_BASE (_PAGE_PRESENTV | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
-#define __PAGE_KERNEL           (__PAGE_KERNEL_BASE | _PAGE_PROT_WKNU | _PAGE_CACHE | _PAGE_NX)
-#define __PAGE_KERNEL_NOCACHE   (__PAGE_KERNEL_BASE | _PAGE_PROT_WKNU | _PAGE_NX)
-#define __PAGE_KERNEL_EXEC      (__PAGE_KERNEL & ~_PAGE_NX)
-#define __PAGE_KERNEL_RO        (__PAGE_KERNEL_BASE | _PAGE_PROT_RKNU | _PAGE_CACHE | _PAGE_NX)
-#define __PAGE_KERNEL_LARGE     (__PAGE_KERNEL | _PAGE_PSE)
-#define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
-#define PAGE_KERNEL             __pgprot(__PAGE_KERNEL)
-#define PAGE_KERNEL_RO          __pgprot(__PAGE_KERNEL_RO)
-#define PAGE_KERNEL_EXEC        __pgprot(__PAGE_KERNEL_EXEC)
-#define PAGE_KERNEL_NOCACHE     __pgprot(__PAGE_KERNEL_NOCACHE)
-#define PAGE_KERNEL_LARGE       __pgprot(__PAGE_KERNEL_LARGE)
-#define PAGE_KERNEL_LARGE_EXEC  __pgprot(__PAGE_KERNEL_LARGE_EXEC)
-/*
- * Whilst the MN10300 can do page protection for execute (given separate data
- * and insn TLBs), we are not supporting it at the moment. Write permission,
- * however, always implies read permission (but not execute permission).
- */
-#define __P000  PAGE_NONE
-#define __P001  PAGE_READONLY_NOEXEC
-#define __P010  PAGE_COPY_NOEXEC
-#define __P011  PAGE_COPY_NOEXEC
-#define __P100  PAGE_READONLY_EXEC
-#define __P101  PAGE_READONLY_EXEC
-#define __P110  PAGE_COPY_EXEC
-#define __P111  PAGE_COPY_EXEC
-#define __S000  PAGE_NONE
-#define __S001  PAGE_READONLY_NOEXEC
-#define __S010  PAGE_SHARED_NOEXEC
-#define __S011  PAGE_SHARED_NOEXEC
-#define __S100  PAGE_READONLY_EXEC
-#define __S101  PAGE_READONLY_EXEC
-#define __S110  PAGE_SHARED_EXEC
-#define __S111  PAGE_SHARED_EXEC
-/*
- * Define this to warn about kernel memory accesses that are
- * done without a 'verify_area(VERIFY_WRITE,..)'
- */
-#undef TEST_VERIFY_AREA
-#define pte_present(x)  (pte_val(x) & _PAGE_VALID)
-#define pte_clear(mm, addr, xp)                         \
-do {                                                    \
-        set_pte_at((mm), (addr), (xp), __pte(0));       \
-} while (0)
-#define pmd_none(x)     (!pmd_val(x))
-#define pmd_present(x)  (!pmd_none(x))
-#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
-#define pmd_bad(x)      0
-#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT))
-#ifndef __ASSEMBLY__
-/*
- * The following only work if pte_present() is true.
- * Undefined behaviour if not..
- */
-static inline int pte_user(pte_t pte)   { return pte_val(pte) & __PAGE_PROT_USER; }
-static inline int pte_read(pte_t pte)   { return pte_val(pte) & __PAGE_PROT_USER; }
-static inline int pte_dirty(pte_t pte)  { return pte_val(pte) & _PAGE_DIRTY; }
-static inline int pte_young(pte_t pte)  { return pte_val(pte) & _PAGE_ACCESSED; }
-static inline int pte_write(pte_t pte)  { return pte_val(pte) & __PAGE_PROT_WRITE; }
-static inline int pte_special(pte_t pte){ return 0; }
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)   { return pte_val(pte) & _PAGE_FILE; }
-static inline pte_t pte_rdprotect(pte_t pte)
-{
-        pte_val(pte) &= ~(__PAGE_PROT_USER|__PAGE_PROT_UWAUX); return pte;
-}
-static inline pte_t pte_exprotect(pte_t pte)
-{
-        pte_val(pte) |= _PAGE_NX; return pte;
-}
-static inline pte_t pte_wrprotect(pte_t pte)
-{
-        pte_val(pte) &= ~(__PAGE_PROT_WRITE|__PAGE_PROT_UWAUX); return pte;
-}
-static inline pte_t pte_mkclean(pte_t pte)      { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { pte_val(pte) |= _PAGE_DIRTY; return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
-static inline pte_t pte_mkexec(pte_t pte)       { pte_val(pte) &= ~_PAGE_NX; return pte; }
-static inline pte_t pte_mkread(pte_t pte)
-{
-        pte_val(pte) |= __PAGE_PROT_USER;
-        if (pte_write(pte))
-                pte_val(pte) |= __PAGE_PROT_UWAUX;
-        return pte;
-}
-static inline pte_t pte_mkwrite(pte_t pte)
-{
-        pte_val(pte) |= __PAGE_PROT_WRITE;
-        if (pte_val(pte) & __PAGE_PROT_USER)
-                pte_val(pte) |= __PAGE_PROT_UWAUX;
-        return pte;
-}
-static inline pte_t pte_mkspecial(pte_t pte)    { return pte; }
-#define pte_ERROR(e) \
-        printk(KERN_ERR "%s:%d: bad pte %08lx.\n", \
-               __FILE__, __LINE__, pte_val(e))
-#define pgd_ERROR(e) \
-        printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \
-               __FILE__, __LINE__, pgd_val(e))
-/*
- * The "pgd_xxx()" functions here 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)
- */
-#define pgd_clear(xp)                           do { } while (0)
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-#define set_pte(pteptr, pteval)                 (*(pteptr) = pteval)
-#define set_pte_at(mm, addr, ptep, pteval)      set_pte((ptep), (pteval))
-#define set_pte_atomic(pteptr, pteval)          set_pte((pteptr), (pteval))
-/*
- * (pmds are folded into pgds so this doesn't get actually called,
- * but the define is needed for a generic inline function.)
- */
-#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
-#define ptep_get_and_clear(mm, addr, ptep) \
-        __pte(xchg(&(ptep)->pte, 0))
-#define pte_same(a, b)          (pte_val(a) == pte_val(b))
-#define pte_page(x)             pfn_to_page(pte_pfn(x))
-#define pte_none(x)             (!pte_val(x))
-#define pte_pfn(x)              ((unsigned long) (pte_val(x) >> PAGE_SHIFT))
-#define __pfn_addr(pfn)         ((pfn) << PAGE_SHIFT)
-#define pfn_pte(pfn, prot)      __pte(__pfn_addr(pfn) | pgprot_val(prot))
-#define pfn_pmd(pfn, prot)      __pmd(__pfn_addr(pfn) | pgprot_val(prot))
-/*
- * All present user pages are user-executable:
- */
-static inline int pte_exec(pte_t pte)
-{
-        return pte_user(pte);
-}
-/*
- * All present pages are kernel-executable:
- */
-static inline int pte_exec_kernel(pte_t pte)
-{
-        return 1;
-}
-/*
- * Bits 0 and 1 are taken, split up the 29 bits of offset
- * into this range:
- */
-#define PTE_FILE_MAX_BITS       29
-#define pte_to_pgoff(pte)       (pte_val(pte) >> 2)
-#define pgoff_to_pte(off)       __pte((off) << 2 | _PAGE_FILE)
-/* Encode and de-code a swap entry */
-#define __swp_type(x)                   (((x).val >> 2) & 0x3f)
-#define __swp_offset(x)                 ((x).val >> 8)
-#define __swp_entry(type, offset) \
-        ((swp_entry_t) { ((type) << 2) | ((offset) << 8) })
-#define __pte_to_swp_entry(pte)         ((swp_entry_t) { pte_val(pte) })
-#define __swp_entry_to_pte(x)           __pte((x).val)
-static inline
-int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr,
-                              pte_t *ptep)
-{
-        if (!pte_dirty(*ptep))
-                return 0;
-        return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-}
-static inline
-int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr,
-                              pte_t *ptep)
-{
-        if (!pte_young(*ptep))
-                return 0;
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte);
-}
-static inline
-void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
-{
-        pte_val(*ptep) &= ~(__PAGE_PROT_WRITE|__PAGE_PROT_UWAUX);
-}
-static inline void ptep_mkdirty(pte_t *ptep)
-{
-        set_bit(_PAGE_BIT_DIRTY, &ptep->pte);
-}
-/*
- * Macro to mark a page protection value as "uncacheable".  On processors which
- * do not support it, this is a no-op.
- */
-#define pgprot_noncached(prot)  __pgprot(pgprot_val(prot) | _PAGE_CACHE)
-/*
- * Conversion functions: convert a page and protection to a page entry,
- * and a page entry and page directory to the page they refer to.
- */
-#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
-#define mk_pte_huge(entry) \
-        ((entry).pte |= _PAGE_PRESENT | _PAGE_PSE | _PAGE_VALID)
-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;
-}
-#define page_pte(page)  page_pte_prot((page), __pgprot(0))
-#define pmd_page_kernel(pmd) \
-        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
-#define pmd_page(pmd)   pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
-#define pmd_large(pmd) \
-        ((pmd_val(pmd) & (_PAGE_PSE | _PAGE_PRESENT)) == \
-         (_PAGE_PSE | _PAGE_PRESENT))
-/*
- * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
- *
- * this macro returns the index of the entry in the pgd page which would
- * control the given virtual address
- */
-#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
-/*
- * pgd_offset() returns a (pgd_t *)
- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
- */
-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
-/*
- * a shortcut which implies the use of the kernel's pgd, instead
- * of a process's
- */
-#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
-/*
- * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
- *
- * this macro returns the index of the entry in the pmd page which would
- * control the given virtual address
- */
-#define pmd_index(address) \
-        (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
-/*
- * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
- *
- * this macro returns the index of the entry in the pte page which would
- * control the given virtual address
- */
-#define pte_index(address) \
-        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
-/*
- * Make a given kernel text page executable/non-executable.
- * Returns the previous executability setting of that page (which
- * is used to restore the previous state). Used by the SMP bootup code.
- * NOTE: this is an __init function for security reasons.
- */
-static inline int set_kernel_exec(unsigned long vaddr, int enable)
-{
-        return 0;
-}
-#define pte_offset_map(dir, address) \
-        ((pte_t *) page_address(pmd_page(*(dir))) + pte_index(address))
-#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
-#define pte_unmap(pte)          do {} while (0)
-#define pte_unmap_nested(pte)   do {} while (0)
-/*
- * The MN10300 has external MMU info in the form of a TLB: this is adapted from
- * the kernel page tables containing the necessary information by tlb-mn10300.S
- */
-extern void update_mmu_cache(struct vm_area_struct *vma,
-                             unsigned long address, pte_t pte);
-#endif /* !__ASSEMBLY__ */
-#define kern_addr_valid(addr)   (1)
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
-        remap_pfn_range((vma), (vaddr), (pfn), (size), (prot))
-#define MK_IOSPACE_PFN(space, pfn)      (pfn)
-#define GET_IOSPACE(pfn)                0
-#define GET_PFN(pfn)                    (pfn)
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTEP_MKDIRTY
-#define __HAVE_ARCH_PTE_SAME
-#include <asm-generic/pgtable.h>
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_PGTABLE_H */
diff --git a/include/asm-mn10300/pio-regs.h b/include/asm-mn10300/pio-regs.h
deleted file mode 100644
index 96bc8182d0ba..000000000000
--- a/include/asm-mn10300/pio-regs.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* MN10300 On-board I/O port module registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PIO_REGS_H
-#define _ASM_PIO_REGS_H
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-#ifdef __KERNEL__
-/* I/O port 0 */
-#define P0MD                    __SYSREG(0xdb000000, u16)       /* mode reg */
-#define P0MD_0                  0x0003  /* mask */
-#define P0MD_0_IN               0x0000  /* input mode */
-#define P0MD_0_OUT              0x0001  /* output mode */
-#define P0MD_0_TM0IO            0x0002  /* timer 0 I/O mode */
-#define P0MD_0_EYECLK           0x0003  /* test signal output (clock) */
-#define P0MD_1                  0x000c
-#define P0MD_1_IN               0x0000
-#define P0MD_1_OUT              0x0004
-#define P0MD_1_TM1IO            0x0008  /* timer 1 I/O mode */
-#define P0MD_1_EYED             0x000c  /* test signal output (data) */
-#define P0MD_2                  0x0030
-#define P0MD_2_IN               0x0000
-#define P0MD_2_OUT              0x0010
-#define P0MD_2_TM2IO            0x0020  /* timer 2 I/O mode */
-#define P0MD_3                  0x00c0
-#define P0MD_3_IN               0x0000
-#define P0MD_3_OUT              0x0040
-#define P0MD_3_TM3IO            0x0080  /* timer 3 I/O mode */
-#define P0MD_4                  0x0300
-#define P0MD_4_IN               0x0000
-#define P0MD_4_OUT              0x0100
-#define P0MD_4_TM4IO            0x0200  /* timer 4 I/O mode */
-#define P0MD_4_XCTS             0x0300  /* XCTS input for serial port 2 */
-#define P0MD_5                  0x0c00
-#define P0MD_5_IN               0x0000
-#define P0MD_5_OUT              0x0400
-#define P0MD_5_TM5IO            0x0800  /* timer 5 I/O mode */
-#define P0MD_6                  0x3000
-#define P0MD_6_IN               0x0000
-#define P0MD_6_OUT              0x1000
-#define P0MD_6_TM6IOA           0x2000  /* timer 6 I/O mode A */
-#define P0MD_7                  0xc000
-#define P0MD_7_IN               0x0000
-#define P0MD_7_OUT              0x4000
-#define P0MD_7_TM6IOB           0x8000  /* timer 6 I/O mode B */
-#define P0IN                    __SYSREG(0xdb000004, u8)        /* in reg */
-#define P0OUT                   __SYSREG(0xdb000008, u8)        /* out reg */
-#define P0TMIO                  __SYSREG(0xdb00000c, u8)        /* TM pin I/O control reg */
-#define P0TMIO_TM0_IN           0x00
-#define P0TMIO_TM0_OUT          0x01
-#define P0TMIO_TM1_IN           0x00
-#define P0TMIO_TM1_OUT          0x02
-#define P0TMIO_TM2_IN           0x00
-#define P0TMIO_TM2_OUT          0x04
-#define P0TMIO_TM3_IN           0x00
-#define P0TMIO_TM3_OUT          0x08
-#define P0TMIO_TM4_IN           0x00
-#define P0TMIO_TM4_OUT          0x10
-#define P0TMIO_TM5_IN           0x00
-#define P0TMIO_TM5_OUT          0x20
-#define P0TMIO_TM6A_IN          0x00
-#define P0TMIO_TM6A_OUT         0x40
-#define P0TMIO_TM6B_IN          0x00
-#define P0TMIO_TM6B_OUT         0x80
-/* I/O port 1 */
-#define P1MD                    __SYSREG(0xdb000100, u16)       /* mode reg */
-#define P1MD_0                  0x0003  /* mask */
-#define P1MD_0_IN               0x0000  /* input mode */
-#define P1MD_0_OUT              0x0001  /* output mode */
-#define P1MD_0_TM7IO            0x0002  /* timer 7 I/O mode */
-#define P1MD_0_ADTRG            0x0003  /* A/D converter trigger mode */
-#define P1MD_1                  0x000c
-#define P1MD_1_IN               0x0000
-#define P1MD_1_OUT              0x0004
-#define P1MD_1_TM8IO            0x0008  /* timer 8 I/O mode */
-#define P1MD_1_XDMR0            0x000c  /* DMA request input 0 mode */
-#define P1MD_2                  0x0030
-#define P1MD_2_IN               0x0000
-#define P1MD_2_OUT              0x0010
-#define P1MD_2_TM9IO            0x0020  /* timer 9 I/O mode */
-#define P1MD_2_XDMR1            0x0030  /* DMA request input 1 mode */
-#define P1MD_3                  0x00c0
-#define P1MD_3_IN               0x0000
-#define P1MD_3_OUT              0x0040
-#define P1MD_3_TM10IO           0x0080  /* timer 10 I/O mode */
-#define P1MD_3_FRQS0            0x00c0  /* CPU clock multiplier setting input 0 mode */
-#define P1MD_4                  0x0300
-#define P1MD_4_IN               0x0000
-#define P1MD_4_OUT              0x0100
-#define P1MD_4_TM11IO           0x0200  /* timer 11 I/O mode */
-#define P1MD_4_FRQS1            0x0300  /* CPU clock multiplier setting input 1 mode */
-#define P1IN                    __SYSREG(0xdb000104, u8)        /* in reg */
-#define P1OUT                   __SYSREG(0xdb000108, u8)        /* out reg */
-#define P1TMIO                  __SYSREG(0xdb00010c, u8)        /* TM pin I/O control reg */
-#define P1TMIO_TM11_IN          0x00
-#define P1TMIO_TM11_OUT         0x01
-#define P1TMIO_TM10_IN          0x00
-#define P1TMIO_TM10_OUT         0x02
-#define P1TMIO_TM9_IN           0x00
-#define P1TMIO_TM9_OUT          0x04
-#define P1TMIO_TM8_IN           0x00
-#define P1TMIO_TM8_OUT          0x08
-#define P1TMIO_TM7_IN           0x00
-#define P1TMIO_TM7_OUT          0x10
-/* I/O port 2 */
-#define P2MD                    __SYSREG(0xdb000200, u16)       /* mode reg */
-#define P2MD_0                  0x0003  /* mask */
-#define P2MD_0_IN               0x0000  /* input mode */
-#define P2MD_0_OUT              0x0001  /* output mode */
-#define P2MD_0_BOOTBW           0x0003  /* boot bus width selector mode */
-#define P2MD_1                  0x000c
-#define P2MD_1_IN               0x0000
-#define P2MD_1_OUT              0x0004
-#define P2MD_1_BOOTSEL          0x000c  /* boot device selector mode */
-#define P2MD_2                  0x0030
-#define P2MD_2_IN               0x0000
-#define P2MD_2_OUT              0x0010
-#define P2MD_3                  0x00c0
-#define P2MD_3_IN               0x0000
-#define P2MD_3_OUT              0x0040
-#define P2MD_3_CKIO             0x00c0  /* mode */
-#define P2MD_4                  0x0300
-#define P2MD_4_IN               0x0000
-#define P2MD_4_OUT              0x0100
-#define P2MD_4_CMOD             0x0300  /* mode */
-#define P2IN                    __SYSREG(0xdb000204, u8)        /* in reg */
-#define P2OUT                   __SYSREG(0xdb000208, u8)        /* out reg */
-#define P2TMIO                  __SYSREG(0xdb00020c, u8)        /* TM pin I/O control reg */
-/* I/O port 3 */
-#define P3MD                    __SYSREG(0xdb000300, u16)       /* mode reg */
-#define P3MD_0                  0x0003  /* mask */
-#define P3MD_0_IN               0x0000  /* input mode */
-#define P3MD_0_OUT              0x0001  /* output mode */
-#define P3MD_0_AFRXD            0x0002  /* AFR interface mode */
-#define P3MD_1                  0x000c
-#define P3MD_1_IN               0x0000
-#define P3MD_1_OUT              0x0004
-#define P3MD_1_AFTXD            0x0008  /* AFR interface mode */
-#define P3MD_2                  0x0030
-#define P3MD_2_IN               0x0000
-#define P3MD_2_OUT              0x0010
-#define P3MD_2_AFSCLK           0x0020  /* AFR interface mode */
-#define P3MD_3                  0x00c0
-#define P3MD_3_IN               0x0000
-#define P3MD_3_OUT              0x0040
-#define P3MD_3_AFFS             0x0080  /* AFR interface mode */
-#define P3MD_4                  0x0300
-#define P3MD_4_IN               0x0000
-#define P3MD_4_OUT              0x0100
-#define P3MD_4_AFEHC            0x0200  /* AFR interface mode */
-#define P3IN                    __SYSREG(0xdb000304, u8)        /* in reg */
-#define P3OUT                   __SYSREG(0xdb000308, u8)        /* out reg */
-/* I/O port 4 */
-#define P4MD                    __SYSREG(0xdb000400, u16)       /* mode reg */
-#define P4MD_0                  0x0003  /* mask */
-#define P4MD_0_IN               0x0000  /* input mode */
-#define P4MD_0_OUT              0x0001  /* output mode */
-#define P4MD_0_SCL0             0x0002  /* I2C/serial mode */
-#define P4MD_1                  0x000c
-#define P4MD_1_IN               0x0000
-#define P4MD_1_OUT              0x0004
-#define P4MD_1_SDA0             0x0008
-#define P4MD_2                  0x0030
-#define P4MD_2_IN               0x0000
-#define P4MD_2_OUT              0x0010
-#define P4MD_2_SCL1             0x0020
-#define P4MD_3                  0x00c0
-#define P4MD_3_IN               0x0000
-#define P4MD_3_OUT              0x0040
-#define P4MD_3_SDA1             0x0080
-#define P4MD_4                  0x0300
-#define P4MD_4_IN               0x0000
-#define P4MD_4_OUT              0x0100
-#define P4MD_4_SBO0             0x0200
-#define P4MD_5                  0x0c00
-#define P4MD_5_IN               0x0000
-#define P4MD_5_OUT              0x0400
-#define P4MD_5_SBO1             0x0800
-#define P4MD_6                  0x3000
-#define P4MD_6_IN               0x0000
-#define P4MD_6_OUT              0x1000
-#define P4MD_6_SBT0             0x2000
-#define P4MD_7                  0xc000
-#define P4MD_7_IN               0x0000
-#define P4MD_7_OUT              0x4000
-#define P4MD_7_SBT1             0x8000
-#define P4IN                    __SYSREG(0xdb000404, u8)        /* in reg */
-#define P4OUT                   __SYSREG(0xdb000408, u8)        /* out reg */
-/* I/O port 5 */
-#define P5MD                    __SYSREG(0xdb000500, u16)       /* mode reg */
-#define P5MD_0                  0x0003  /* mask */
-#define P5MD_0_IN               0x0000  /* input mode */
-#define P5MD_0_OUT              0x0001  /* output mode */
-#define P5MD_0_IRTXD            0x0002  /* IrDA mode */
-#define P5MD_0_SOUT             0x0004  /* serial mode */
-#define P5MD_1                  0x000c
-#define P5MD_1_IN               0x0000
-#define P5MD_1_OUT              0x0004
-#define P5MD_1_IRRXDS           0x0008  /* IrDA mode */
-#define P5MD_1_SIN              0x000c  /* serial mode */
-#define P5MD_2                  0x0030
-#define P5MD_2_IN               0x0000
-#define P5MD_2_OUT              0x0010
-#define P5MD_2_IRRXDF           0x0020  /* IrDA mode */
-#define P5IN                    __SYSREG(0xdb000504, u8)        /* in reg */
-#define P5OUT                   __SYSREG(0xdb000508, u8)        /* out reg */
-#endif /* __KERNEL__ */
-#endif /* _ASM_PIO_REGS_H */
diff --git a/include/asm-mn10300/poll.h b/include/asm-mn10300/poll.h
deleted file mode 100644
index c98509d3149e..000000000000
--- a/include/asm-mn10300/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/include/asm-mn10300/posix_types.h b/include/asm-mn10300/posix_types.h
deleted file mode 100644
index 077567c37798..000000000000
--- a/include/asm-mn10300/posix_types.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* MN10300 POSIX types
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_POSIX_TYPES_H
-#define _ASM_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 unsigned long   __kernel_ino_t;
-typedef unsigned short  __kernel_mode_t;
-typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef unsigned short  __kernel_ipc_pid_t;
-typedef unsigned short  __kernel_uid_t;
-typedef unsigned short  __kernel_gid_t;
-typedef unsigned long   __kernel_size_t;
-typedef long            __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_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;
-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;
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-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;
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-#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 *__p)
-{
-        unsigned long __tmp = __fd / __NFDBITS;
-        unsigned long __rem = __fd % __NFDBITS;
-        return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
-}
-/*
- * This will unroll the loop for the normal constant case (8 ints,
- * for a 256-bit fd_set)
- */
-#undef  __FD_ZERO
-static inline void __FD_ZERO(__kernel_fd_set *__p)
-{
-        unsigned long *__tmp = __p->fds_bits;
-        int __i;
-        if (__builtin_constant_p(__FDSET_LONGS)) {
-                switch (__FDSET_LONGS) {
-                case 16:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        __tmp[ 8] = 0; __tmp[ 9] = 0;
-                        __tmp[10] = 0; __tmp[11] = 0;
-                        __tmp[12] = 0; __tmp[13] = 0;
-                        __tmp[14] = 0; __tmp[15] = 0;
-                        return;
-                case 8:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        __tmp[ 4] = 0; __tmp[ 5] = 0;
-                        __tmp[ 6] = 0; __tmp[ 7] = 0;
-                        return;
-                case 4:
-                        __tmp[ 0] = 0; __tmp[ 1] = 0;
-                        __tmp[ 2] = 0; __tmp[ 3] = 0;
-                        return;
-                }
-        }
-        __i = __FDSET_LONGS;
-        while (__i) {
-                __i--;
-                *__tmp = 0;
-                __tmp++;
-        }
-}
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-#endif /* _ASM_POSIX_TYPES_H */
diff --git a/include/asm-mn10300/proc-mn103e010/cache.h b/include/asm-mn10300/proc-mn103e010/cache.h
deleted file mode 100644
index bdc1f9a59b4c..000000000000
--- a/include/asm-mn10300/proc-mn103e010/cache.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* MN103E010 Cache specification
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PROC_CACHE_H
-#define _ASM_PROC_CACHE_H
-/* L1 cache */
-#define L1_CACHE_NWAYS          4       /* number of ways in caches */
-#define L1_CACHE_NENTRIES       256     /* number of entries in each way */
-#define L1_CACHE_BYTES          16      /* bytes per entry */
-#define L1_CACHE_SHIFT          4       /* shift for bytes per entry */
-#define L1_CACHE_WAYDISP        0x1000  /* displacement of one way from the next */
-#define L1_CACHE_TAG_VALID      0x00000001      /* cache tag valid bit */
-#define L1_CACHE_TAG_DIRTY      0x00000008      /* data cache tag dirty bit */
-#define L1_CACHE_TAG_ENTRY      0x00000ff0      /* cache tag entry address mask */
-#define L1_CACHE_TAG_ADDRESS    0xfffff000      /* cache tag line address mask */
-/*
- * specification of the interval between interrupt checking intervals whilst
- * managing the cache with the interrupts disabled
- */
-#define MN10300_DCACHE_INV_RANGE_INTR_LOG2_INTERVAL     4
-#endif /* _ASM_PROC_CACHE_H */
diff --git a/include/asm-mn10300/proc-mn103e010/clock.h b/include/asm-mn10300/proc-mn103e010/clock.h
deleted file mode 100644
index caf998350633..000000000000
--- a/include/asm-mn10300/proc-mn103e010/clock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN103E010-specific clocks
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PROC_CLOCK_H
-#define _ASM_PROC_CLOCK_H
-#include <asm/unit/clock.h>
-#define MN10300_WDCLK           MN10300_IOCLK
-#endif /* _ASM_PROC_CLOCK_H */
diff --git a/include/asm-mn10300/proc-mn103e010/irq.h b/include/asm-mn10300/proc-mn103e010/irq.h
deleted file mode 100644
index aa6ee8f98b1b..000000000000
--- a/include/asm-mn10300/proc-mn103e010/irq.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN103E010 On-board interrupt controller numbers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PROC_IRQ_H
-#define _ASM_PROC_IRQ_H
-#ifdef __KERNEL__
-#define GxICR_NUM_IRQS          42
-#define GxICR_NUM_XIRQS         8
-#define XIRQ0           34
-#define XIRQ1           35
-#define XIRQ2           36
-#define XIRQ3           37
-#define XIRQ4           38
-#define XIRQ5           39
-#define XIRQ6           40
-#define XIRQ7           41
-#define XIRQ2IRQ(num)   (XIRQ0 + num)
-#endif /* __KERNEL__ */
-#endif /* _ASM_PROC_IRQ_H */
diff --git a/include/asm-mn10300/proc-mn103e010/proc.h b/include/asm-mn10300/proc-mn103e010/proc.h
deleted file mode 100644
index 22a2b93f70b7..000000000000
--- a/include/asm-mn10300/proc-mn103e010/proc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN103E010 Processor description
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PROC_PROC_H
-#define _ASM_PROC_PROC_H
-#define PROCESSOR_VENDOR_NAME   "Matsushita"
-#define PROCESSOR_MODEL_NAME    "mn103e010"
-#endif /* _ASM_PROC_PROC_H */
diff --git a/include/asm-mn10300/processor.h b/include/asm-mn10300/processor.h
deleted file mode 100644
index 73239271873d..000000000000
--- a/include/asm-mn10300/processor.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* MN10300 Processor specifics
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PROCESSOR_H
-#define _ASM_PROCESSOR_H
-#include <asm/page.h>
-#include <asm/ptrace.h>
-#include <asm/cpu-regs.h>
-#include <linux/threads.h>
-/* Forward declaration, a strange C thing */
-struct task_struct;
-struct mm_struct;
-/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr()                     \
-({                                              \
-        void *__pc;                             \
-        asm("mov pc,%0" : "=a"(__pc));          \
-        __pc;                                   \
-})
-extern void show_registers(struct pt_regs *regs);
-/*
- *  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]
- */
-struct mn10300_cpuinfo {
-        int             type;
-        unsigned long   loops_per_sec;
-        char            hard_math;
-        unsigned long   *pgd_quick;
-        unsigned long   *pte_quick;
-        unsigned long   pgtable_cache_sz;
-};
-extern struct mn10300_cpuinfo boot_cpu_data;
-#define cpu_data &boot_cpu_data
-#define current_cpu_data boot_cpu_data
-extern void identify_cpu(struct mn10300_cpuinfo *);
-extern void print_cpu_info(struct mn10300_cpuinfo *);
-extern void dodgy_tsc(void);
-#define cpu_relax() barrier()
-/*
- * User space process size: 1.75GB (default).
- */
-#define TASK_SIZE               0x70000000
-/*
- * Where to put the userspace stack by default
- */
-#define STACK_TOP               0x70000000
-#define STACK_TOP_MAX           STACK_TOP
-/* This decides where the kernel will search for a free chunk of vm
- * space during mmap's.
- */
-#define TASK_UNMAPPED_BASE      0x30000000
-typedef struct {
-        unsigned long   seg;
-} mm_segment_t;
-struct fpu_state_struct {
-        unsigned long   fs[32];         /* fpu registers */
-        unsigned long   fpcr;           /* fpu control register */
-};
-struct thread_struct {
-        struct pt_regs          *uregs;         /* userspace register frame */
-        unsigned long           pc;             /* kernel PC */
-        unsigned long           sp;             /* kernel SP */
-        unsigned long           a3;             /* kernel FP */
-        unsigned long           wchan;
-        unsigned long           usp;
-        struct pt_regs          *__frame;
-        unsigned long           fpu_flags;
-#define THREAD_USING_FPU        0x00000001      /* T if this task is using the FPU */
-        struct fpu_state_struct fpu_state;
-};
-#define INIT_THREAD                             \
-{                                               \
-        .uregs          = init_uregs,           \
-        .pc             = 0,                    \
-        .sp             = 0,                    \
-        .a3             = 0,                    \
-        .wchan          = 0,                    \
-        .__frame        = NULL,                 \
-}
-#define INIT_MMAP \
-{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, \
-  NULL, NULL }
-/*
- * do necessary setup to start up a newly executed thread
- * - need to discard the frame stacked by the kernel thread invoking the execve
- *   syscall (see RESTORE_ALL macro)
- */
-#define start_thread(regs, new_pc, new_sp) do {         \
-        set_fs(USER_DS);                                \
-        __frame = current->thread.uregs;                \
-        __frame->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;   \
-        __frame->pc = new_pc;                           \
-        __frame->sp = new_sp;                           \
-} while (0)
-/* Free all resources held by a thread. */
-extern void release_thread(struct task_struct *);
-/* Prepare to copy thread state - unlazy all lazy status */
-extern void prepare_to_copy(struct task_struct *tsk);
-/*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
-/*
- * Return saved PC of a blocked thread.
- */
-extern unsigned long thread_saved_pc(struct task_struct *tsk);
-unsigned long get_wchan(struct task_struct *p);
-#define task_pt_regs(task)                                              \
-({                                                                      \
-       struct pt_regs *__regs__;                                        \
-       __regs__ = (struct pt_regs *) (KSTK_TOP(task_stack_page(task)) - 8); \
-       __regs__ - 1;                                                    \
-})
-#define KSTK_EIP(task) (task_pt_regs(task)->pc)
-#define KSTK_ESP(task) (task_pt_regs(task)->sp)
-#define KSTK_TOP(info)                          \
-({                                              \
-        (unsigned long)(info) + THREAD_SIZE;    \
-})
-#define ARCH_HAS_PREFETCH
-#define ARCH_HAS_PREFETCHW
-static inline void prefetch(const void *x)
-{
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-#ifdef CONFIG_MN10300_PROC_MN103E010
-        asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));
-#else
-        asm volatile ("dcpf (%0)" : : "r"(x));
-#endif
-#endif
-}
-static inline void prefetchw(const void *x)
-{
-#ifndef CONFIG_MN10300_CACHE_DISABLED
-#ifdef CONFIG_MN10300_PROC_MN103E010
-        asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));
-#else
-        asm volatile ("dcpf (%0)" : : "r"(x));
-#endif
-#endif
-}
-#endif /* _ASM_PROCESSOR_H */
diff --git a/include/asm-mn10300/ptrace.h b/include/asm-mn10300/ptrace.h
deleted file mode 100644
index 7b06cc623d8b..000000000000
--- a/include/asm-mn10300/ptrace.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* MN10300 Exception frame layout and ptrace constants
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_PTRACE_H
-#define _ASM_PTRACE_H
-#define PT_A3           0
-#define PT_A2           1
-#define PT_D3           2
-#define PT_D2           3
-#define PT_MCVF         4
-#define PT_MCRL         5
-#define PT_MCRH         6
-#define PT_MDRQ         7
-#define PT_E1           8
-#define PT_E0           9
-#define PT_E7           10
-#define PT_E6           11
-#define PT_E5           12
-#define PT_E4           13
-#define PT_E3           14
-#define PT_E2           15
-#define PT_SP           16
-#define PT_LAR          17
-#define PT_LIR          18
-#define PT_MDR          19
-#define PT_A1           20
-#define PT_A0           21
-#define PT_D1           22
-#define PT_D0           23
-#define PT_ORIG_D0      24
-#define PT_EPSW         25
-#define PT_PC           26
-#define NR_PTREGS       27
-#ifndef __ASSEMBLY__
-/*
- * This defines the way registers are stored in the event of an exception
- * - the strange order is due to the MOVM instruction
- */
-struct pt_regs {
-        unsigned long           a3;             /* syscall arg 3 */
-        unsigned long           a2;             /* syscall arg 4 */
-        unsigned long           d3;             /* syscall arg 5 */
-        unsigned long           d2;             /* syscall arg 6 */
-        unsigned long           mcvf;
-        unsigned long           mcrl;
-        unsigned long           mcrh;
-        unsigned long           mdrq;
-        unsigned long           e1;
-        unsigned long           e0;
-        unsigned long           e7;
-        unsigned long           e6;
-        unsigned long           e5;
-        unsigned long           e4;
-        unsigned long           e3;
-        unsigned long           e2;
-        unsigned long           sp;
-        unsigned long           lar;
-        unsigned long           lir;
-        unsigned long           mdr;
-        unsigned long           a1;
-        unsigned long           a0;             /* syscall arg 1 */
-        unsigned long           d1;             /* syscall arg 2 */
-        unsigned long           d0;             /* syscall ret */
-        struct pt_regs          *next;          /* next frame pointer */
-        unsigned long           orig_d0;        /* syscall number */
-        unsigned long           epsw;
-        unsigned long           pc;
-};
-#endif
-extern struct pt_regs *__frame; /* current frame pointer */
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD     0x00000001
-#if defined(__KERNEL__)
-#if !defined(__ASSEMBLY__)
-#define user_mode(regs)                 (((regs)->epsw & EPSW_nSL) == EPSW_nSL)
-#define instruction_pointer(regs)       ((regs)->pc)
-extern void show_regs(struct pt_regs *);
-#endif  /*  !__ASSEMBLY  */
-#define profile_pc(regs) ((regs)->pc)
-#endif  /*  __KERNEL__  */
-#endif /* _ASM_PTRACE_H */
diff --git a/include/asm-mn10300/reset-regs.h b/include/asm-mn10300/reset-regs.h
deleted file mode 100644
index 174523d50132..000000000000
--- a/include/asm-mn10300/reset-regs.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* MN10300 Reset controller and watchdog timer definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_RESET_REGS_H
-#define _ASM_RESET_REGS_H
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-#ifdef __KERNEL__
-#ifdef CONFIG_MN10300_WD_TIMER
-#define ARCH_HAS_NMI_WATCHDOG           /* See include/linux/nmi.h */
-#endif
-/*
- * watchdog timer registers
- */
-#define WDBC                    __SYSREGC(0xc0001000, u8) /* watchdog binary counter reg */
-#define WDCTR                   __SYSREG(0xc0001002, u8)  /* watchdog timer control reg */
-#define WDCTR_WDCK              0x07    /* clock source selection */
-#define WDCTR_WDCK_256th        0x00    /* - OSCI/256 */
-#define WDCTR_WDCK_1024th       0x01    /* - OSCI/1024 */
-#define WDCTR_WDCK_2048th       0x02    /* - OSCI/2048 */
-#define WDCTR_WDCK_16384th      0x03    /* - OSCI/16384 */
-#define WDCTR_WDCK_65536th      0x04    /* - OSCI/65536 */
-#define WDCTR_WDRST             0x40    /* binary counter reset */
-#define WDCTR_WDCNE             0x80    /* watchdog timer enable */
-#define RSTCTR                  __SYSREG(0xc0001004, u8) /* reset control reg */
-#define RSTCTR_CHIPRST          0x01    /* chip reset */
-#define RSTCTR_DBFRST           0x02    /* double fault reset flag */
-#define RSTCTR_WDTRST           0x04    /* watchdog timer reset flag */
-#define RSTCTR_WDREN            0x08    /* watchdog timer reset enable */
-#ifndef __ASSEMBLY__
-static inline void mn10300_proc_hard_reset(void)
-{
-        RSTCTR &= ~RSTCTR_CHIPRST;
-        RSTCTR |= RSTCTR_CHIPRST;
-}
-extern unsigned int watchdog_alert_counter;
-extern void watchdog_go(void);
-extern asmlinkage void watchdog_handler(void);
-extern asmlinkage
-void watchdog_interrupt(struct pt_regs *, enum exception_code);
-#endif
-#endif /* __KERNEL__ */
-#endif /* _ASM_RESET_REGS_H */
diff --git a/include/asm-mn10300/resource.h b/include/asm-mn10300/resource.h
deleted file mode 100644
index 04bc4db8921b..000000000000
--- a/include/asm-mn10300/resource.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
diff --git a/include/asm-mn10300/rtc-regs.h b/include/asm-mn10300/rtc-regs.h
deleted file mode 100644
index c42deefaec11..000000000000
--- a/include/asm-mn10300/rtc-regs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* MN10300 on-chip Real-Time Clock registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_RTC_REGS_H
-#define _ASM_RTC_REGS_H
-#include <asm/intctl-regs.h>
-#ifdef __KERNEL__
-#define RTSCR                   __SYSREG(0xd8600000, u8) /* RTC seconds count reg */
-#define RTSAR                   __SYSREG(0xd8600001, u8) /* RTC seconds alarm reg */
-#define RTMCR                   __SYSREG(0xd8600002, u8) /* RTC minutes count reg */
-#define RTMAR                   __SYSREG(0xd8600003, u8) /* RTC minutes alarm reg */
-#define RTHCR                   __SYSREG(0xd8600004, u8) /* RTC hours count reg */
-#define RTHAR                   __SYSREG(0xd8600005, u8) /* RTC hours alarm reg */
-#define RTDWCR                  __SYSREG(0xd8600006, u8) /* RTC day of the week count reg */
-#define RTDMCR                  __SYSREG(0xd8600007, u8) /* RTC days count reg */
-#define RTMTCR                  __SYSREG(0xd8600008, u8) /* RTC months count reg */
-#define RTYCR                   __SYSREG(0xd8600009, u8) /* RTC years count reg */
-#define RTCRA                   __SYSREG(0xd860000a, u8)/* RTC control reg A */
-#define RTCRA_RS                0x0f    /* periodic timer interrupt cycle setting */
-#define RTCRA_RS_NONE           0x00    /* - off */
-#define RTCRA_RS_3_90625ms      0x01    /* - 3.90625ms  (1/256s) */
-#define RTCRA_RS_7_8125ms       0x02    /* - 7.8125ms   (1/128s) */
-#define RTCRA_RS_122_070us      0x03    /* - 122.070us  (1/8192s) */
-#define RTCRA_RS_244_141us      0x04    /* - 244.141us  (1/4096s) */
-#define RTCRA_RS_488_281us      0x05    /* - 488.281us  (1/2048s) */
-#define RTCRA_RS_976_5625us     0x06    /* - 976.5625us (1/1024s) */
-#define RTCRA_RS_1_953125ms     0x07    /* - 1.953125ms (1/512s) */
-#define RTCRA_RS_3_90624ms      0x08    /* - 3.90624ms  (1/256s) */
-#define RTCRA_RS_7_8125ms_b     0x09    /* - 7.8125ms   (1/128s) */
-#define RTCRA_RS_15_625ms       0x0a    /* - 15.625ms   (1/64s) */
-#define RTCRA_RS_31_25ms        0x0b    /* - 31.25ms    (1/32s) */
-#define RTCRA_RS_62_5ms         0x0c    /* - 62.5ms     (1/16s) */
-#define RTCRA_RS_125ms          0x0d    /* - 125ms      (1/8s) */
-#define RTCRA_RS_250ms          0x0e    /* - 250ms      (1/4s) */
-#define RTCRA_RS_500ms          0x0f    /* - 500ms      (1/2s) */
-#define RTCRA_DVR               0x40    /* divider reset */
-#define RTCRA_UIP               0x80    /* clock update flag */
-#define RTCRB                   __SYSREG(0xd860000b, u8) /* RTC control reg B */
-#define RTCRB_DSE               0x01    /* daylight savings time enable */
-#define RTCRB_TM                0x02    /* time format */
-#define RTCRB_TM_12HR           0x00    /* - 12 hour format */
-#define RTCRB_TM_24HR           0x02    /* - 24 hour format */
-#define RTCRB_DM                0x04    /* numeric value format */
-#define RTCRB_DM_BCD            0x00    /* - BCD */
-#define RTCRB_DM_BINARY         0x04    /* - binary */
-#define RTCRB_UIE               0x10    /* update interrupt disable */
-#define RTCRB_AIE               0x20    /* alarm interrupt disable */
-#define RTCRB_PIE               0x40    /* periodic interrupt disable */
-#define RTCRB_SET               0x80    /* clock update enable */
-#define RTSRC                   __SYSREG(0xd860000c, u8) /* RTC status reg C */
-#define RTSRC_UF                0x10    /* update end interrupt flag */
-#define RTSRC_AF                0x20    /* alarm interrupt flag */
-#define RTSRC_PF                0x40    /* periodic interrupt flag */
-#define RTSRC_IRQF              0x80    /* interrupt flag */
-#define RTIRQ                   32
-#define RTICR                   GxICR(RTIRQ)
-/*
- * MC146818 RTC compatibility defs for the MN10300 on-chip RTC
- */
-#define RTC_PORT(x)             0xd8600000
-#define RTC_ALWAYS_BCD          1       /* RTC operates in binary mode */
-#define CMOS_READ(addr)         __SYSREG(0xd8600000 + (addr), u8)
-#define CMOS_WRITE(val, addr)   \
-        do { __SYSREG(0xd8600000 + (addr), u8) = val; } while (0)
-#define RTC_IRQ                 RTIRQ
-#endif /* __KERNEL__ */
-#endif /* _ASM_RTC_REGS_H */
diff --git a/include/asm-mn10300/rtc.h b/include/asm-mn10300/rtc.h
deleted file mode 100644
index c295194cc703..000000000000
--- a/include/asm-mn10300/rtc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* MN10300 Real time clock definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_RTC_H
-#define _ASM_RTC_H
-#ifdef CONFIG_MN10300_RTC
-#include <linux/init.h>
-extern void check_rtc_time(void);
-extern void __init calibrate_clock(void);
-extern unsigned long __init get_initial_rtc_time(void);
-#else /* !CONFIG_MN10300_RTC */
-static inline void check_rtc_time(void)
-{
-}
-static inline void calibrate_clock(void)
-{
-}
-static inline unsigned long get_initial_rtc_time(void)
-{
-        return 0;
-}
-#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-#endif /* _ASM_RTC_H */
diff --git a/include/asm-mn10300/scatterlist.h b/include/asm-mn10300/scatterlist.h
deleted file mode 100644
index 67535901b9ff..000000000000
--- a/include/asm-mn10300/scatterlist.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* MN10300 Scatterlist definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-#include <asm/types.h>
-/*
- * Drivers must set either ->address or (preferred) page and ->offset
- * to indicate where data must be transferred to/from.
- *
- * Using page is recommended since it handles highmem data as well as
- * low mem. ->address is restricted to data which has a virtual mapping, and
- * it will go away in the future. Updating to page can be automated very
- * easily -- something like
- *
- * sg->address = some_ptr;
- *
- * can be rewritten as
- *
- * sg_set_page(virt_to_page(some_ptr));
- * sg->offset = (unsigned long) some_ptr & ~PAGE_MASK;
- *
- * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
- */
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;         /* for highmem, page offset */
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-#define ISA_DMA_THRESHOLD (0x00ffffff)
-/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns.
- */
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-#endif /* _ASM_SCATTERLIST_H */
diff --git a/include/asm-mn10300/sections.h b/include/asm-mn10300/sections.h
deleted file mode 100644
index 2b8c5160388f..000000000000
--- a/include/asm-mn10300/sections.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sections.h>
diff --git a/include/asm-mn10300/sembuf.h b/include/asm-mn10300/sembuf.h
deleted file mode 100644
index 301f3f9d8aa9..000000000000
--- a/include/asm-mn10300/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASM_SEMBUF_H
-#define _ASM_SEMBUF_H
-/*
- * The semid64_ds structure for MN10300 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 semid64_ds {
-        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
-        __kernel_time_t sem_otime;              /* last semop time */
-        unsigned long   __unused1;
-        __kernel_time_t sem_ctime;              /* last change time */
-        unsigned long   __unused2;
-        unsigned long   sem_nsems;              /* no. of semaphores in array */
-        unsigned long   __unused3;
-        unsigned long   __unused4;
-};
-#endif /* _ASM_SEMBUF_H */
diff --git a/include/asm-mn10300/serial-regs.h b/include/asm-mn10300/serial-regs.h
deleted file mode 100644
index 6498469e93ac..000000000000
--- a/include/asm-mn10300/serial-regs.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* MN10300 on-board serial port module registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SERIAL_REGS_H
-#define _ASM_SERIAL_REGS_H
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-#ifdef __KERNEL__
-/* serial port 0 */
-#define SC0CTR                  __SYSREG(0xd4002000, u16)       /* control reg */
-#define SC01CTR_CK              0x0007  /* clock source select */
-#define SC0CTR_CK_TM8UFLOW_8    0x0000  /* - 1/8 timer 8 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM9UFLOW_8    0x0000  /* - 1/8 timer 9 underflow (serial port 1 only) */
-#define SC01CTR_CK_IOCLK_8      0x0001  /* - 1/8 IOCLK */
-#define SC01CTR_CK_IOCLK_32     0x0002  /* - 1/32 IOCLK */
-#define SC0CTR_CK_TM2UFLOW_2    0x0003  /* - 1/2 timer 2 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM3UFLOW_2    0x0003  /* - 1/2 timer 3 underflow (serial port 1 only) */
-#define SC0CTR_CK_TM0UFLOW_8    0x0004  /* - 1/8 timer 1 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM1UFLOW_8    0x0004  /* - 1/8 timer 2 underflow (serial port 1 only) */
-#define SC0CTR_CK_TM2UFLOW_8    0x0005  /* - 1/8 timer 2 underflow (serial port 0 only) */
-#define SC1CTR_CK_TM3UFLOW_8    0x0005  /* - 1/8 timer 3 underflow (serial port 1 only) */
-#define SC01CTR_CK_EXTERN_8     0x0006  /* - 1/8 external closk */
-#define SC01CTR_CK_EXTERN       0x0007  /* - external closk */
-#define SC01CTR_STB             0x0008  /* stop bit select */
-#define SC01CTR_STB_1BIT        0x0000  /* - 1 stop bit */
-#define SC01CTR_STB_2BIT        0x0008  /* - 2 stop bits */
-#define SC01CTR_PB              0x0070  /* parity bit select */
-#define SC01CTR_PB_NONE         0x0000  /* - no parity */
-#define SC01CTR_PB_FIXED0       0x0040  /* - fixed at 0 */
-#define SC01CTR_PB_FIXED1       0x0050  /* - fixed at 1 */
-#define SC01CTR_PB_EVEN         0x0060  /* - even parity */
-#define SC01CTR_PB_ODD          0x0070  /* - odd parity */
-#define SC01CTR_CLN             0x0080  /* character length */
-#define SC01CTR_CLN_7BIT        0x0000  /* - 7 bit chars */
-#define SC01CTR_CLN_8BIT        0x0080  /* - 8 bit chars */
-#define SC01CTR_TOE             0x0100  /* T input output enable */
-#define SC01CTR_OD              0x0200  /* bit order select */
-#define SC01CTR_OD_LSBFIRST     0x0000  /* - LSB first */
-#define SC01CTR_OD_MSBFIRST     0x0200  /* - MSB first */
-#define SC01CTR_MD              0x0c00  /* mode select */
-#define SC01CTR_MD_STST_SYNC    0x0000  /* - start-stop synchronous */
-#define SC01CTR_MD_CLOCK_SYNC1  0x0400  /* - clock synchronous 1 */
-#define SC01CTR_MD_I2C          0x0800  /* - I2C mode */
-#define SC01CTR_MD_CLOCK_SYNC2  0x0c00  /* - clock synchronous 2 */
-#define SC01CTR_IIC             0x1000  /* I2C mode select */
-#define SC01CTR_BKE             0x2000  /* break transmit enable */
-#define SC01CTR_RXE             0x4000  /* receive enable */
-#define SC01CTR_TXE             0x8000  /* transmit enable */
-#define SC0ICR                  __SYSREG(0xd4002004, u8)        /* interrupt control reg */
-#define SC01ICR_DMD             0x80    /* output data mode */
-#define SC01ICR_TD              0x20    /* transmit DMA trigger cause */
-#define SC01ICR_TI              0x10    /* transmit interrupt cause */
-#define SC01ICR_RES             0x04    /* receive error select */
-#define SC01ICR_RI              0x01    /* receive interrupt cause */
-#define SC0TXB                  __SYSREG(0xd4002008, u8)        /* transmit buffer reg */
-#define SC0RXB                  __SYSREG(0xd4002009, u8)        /* receive buffer reg */
-#define SC0STR                  __SYSREG(0xd400200c, u16)       /* status reg */
-#define SC01STR_OEF             0x0001  /* overrun error found */
-#define SC01STR_PEF             0x0002  /* parity error found */
-#define SC01STR_FEF             0x0004  /* framing error found */
-#define SC01STR_RBF             0x0010  /* receive buffer status */
-#define SC01STR_TBF             0x0020  /* transmit buffer status */
-#define SC01STR_RXF             0x0040  /* receive status */
-#define SC01STR_TXF             0x0080  /* transmit status */
-#define SC01STR_STF             0x0100  /* I2C start sequence found */
-#define SC01STR_SPF             0x0200  /* I2C stop sequence found */
-#define SC0RXIRQ                20      /* timer 0 Receive IRQ */
-#define SC0TXIRQ                21      /* timer 0 Transmit IRQ */
-#define SC0RXICR                GxICR(SC0RXIRQ) /* serial 0 receive intr ctrl reg */
-#define SC0TXICR                GxICR(SC0TXIRQ) /* serial 0 transmit intr ctrl reg */
-/* serial port 1 */
-#define SC1CTR                  __SYSREG(0xd4002010, u16)       /* serial port 1 control */
-#define SC1ICR                  __SYSREG(0xd4002014, u8)        /* interrupt control reg */
-#define SC1TXB                  __SYSREG(0xd4002018, u8)        /* transmit buffer reg */
-#define SC1RXB                  __SYSREG(0xd4002019, u8)        /* receive buffer reg */
-#define SC1STR                  __SYSREG(0xd400201c, u16)       /* status reg */
-#define SC1RXIRQ                22      /* timer 1 Receive IRQ */
-#define SC1TXIRQ                23      /* timer 1 Transmit IRQ */
-#define SC1RXICR                GxICR(SC1RXIRQ) /* serial 1 receive intr ctrl reg */
-#define SC1TXICR                GxICR(SC1TXIRQ) /* serial 1 transmit intr ctrl reg */
-/* serial port 2 */
-#define SC2CTR                  __SYSREG(0xd4002020, u16)       /* control reg */
-#define SC2CTR_CK               0x0003  /* clock source select */
-#define SC2CTR_CK_TM10UFLOW     0x0000  /* - timer 10 underflow */
-#define SC2CTR_CK_TM2UFLOW      0x0001  /* - timer 2 underflow */
-#define SC2CTR_CK_EXTERN        0x0002  /* - external closk */
-#define SC2CTR_CK_TM3UFLOW      0x0003  /* - timer 3 underflow */
-#define SC2CTR_STB              0x0008  /* stop bit select */
-#define SC2CTR_STB_1BIT         0x0000  /* - 1 stop bit */
-#define SC2CTR_STB_2BIT         0x0008  /* - 2 stop bits */
-#define SC2CTR_PB               0x0070  /* parity bit select */
-#define SC2CTR_PB_NONE          0x0000  /* - no parity */
-#define SC2CTR_PB_FIXED0        0x0040  /* - fixed at 0 */
-#define SC2CTR_PB_FIXED1        0x0050  /* - fixed at 1 */
-#define SC2CTR_PB_EVEN          0x0060  /* - even parity */
-#define SC2CTR_PB_ODD           0x0070  /* - odd parity */
-#define SC2CTR_CLN              0x0080  /* character length */
-#define SC2CTR_CLN_7BIT         0x0000  /* - 7 bit chars */
-#define SC2CTR_CLN_8BIT         0x0080  /* - 8 bit chars */
-#define SC2CTR_TWE              0x0100  /* transmit wait enable (enable XCTS control) */
-#define SC2CTR_OD               0x0200  /* bit order select */
-#define SC2CTR_OD_LSBFIRST      0x0000  /* - LSB first */
-#define SC2CTR_OD_MSBFIRST      0x0200  /* - MSB first */
-#define SC2CTR_TWS              0x1000  /* transmit wait select */
-#define SC2CTR_TWS_XCTS_HIGH    0x0000  /* - interrupt TX when XCTS high */
-#define SC2CTR_TWS_XCTS_LOW     0x1000  /* - interrupt TX when XCTS low */
-#define SC2CTR_BKE              0x2000  /* break transmit enable */
-#define SC2CTR_RXE              0x4000  /* receive enable */
-#define SC2CTR_TXE              0x8000  /* transmit enable */
-#define SC2ICR                  __SYSREG(0xd4002024, u8)        /* interrupt control reg */
-#define SC2ICR_TD               0x20    /* transmit DMA trigger cause */
-#define SC2ICR_TI               0x10    /* transmit interrupt cause */
-#define SC2ICR_RES              0x04    /* receive error select */
-#define SC2ICR_RI               0x01    /* receive interrupt cause */
-#define SC2TXB                  __SYSREG(0xd4002018, u8)        /* transmit buffer reg */
-#define SC2RXB                  __SYSREG(0xd4002019, u8)        /* receive buffer reg */
-#define SC2STR                  __SYSREG(0xd400201c, u8)        /* status reg */
-#define SC2STR_OEF              0x0001  /* overrun error found */
-#define SC2STR_PEF              0x0002  /* parity error found */
-#define SC2STR_FEF              0x0004  /* framing error found */
-#define SC2STR_CTS              0x0008  /* XCTS input pin status (0 means high) */
-#define SC2STR_RBF              0x0010  /* receive buffer status */
-#define SC2STR_TBF              0x0020  /* transmit buffer status */
-#define SC2STR_RXF              0x0040  /* receive status */
-#define SC2STR_TXF              0x0080  /* transmit status */
-#define SC2TIM                  __SYSREG(0xd400202d, u8)        /* status reg */
-#define SC2RXIRQ                24      /* serial 2 Receive IRQ */
-#define SC2TXIRQ                25      /* serial 2 Transmit IRQ */
-#define SC2RXICR                GxICR(SC2RXIRQ) /* serial 2 receive intr ctrl reg */
-#define SC2TXICR                GxICR(SC2TXIRQ) /* serial 2 transmit intr ctrl reg */
-#endif /* __KERNEL__ */
-#endif /* _ASM_SERIAL_REGS_H */
diff --git a/include/asm-mn10300/serial.h b/include/asm-mn10300/serial.h
deleted file mode 100644
index 99785a9deadb..000000000000
--- a/include/asm-mn10300/serial.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Standard UART definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-/*
- * The ASB2305 has an 18.432 MHz clock the UART
- */
-#define BASE_BAUD       (18432000 / 16)
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS   (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS  (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS   (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS  ASYNC_BOOT_AUTOCONF
-#endif
-#ifdef CONFIG_SERIAL_MANY_PORTS
-#define FOURPORT_FLAGS  ASYNC_FOURPORT
-#define ACCENT_FLAGS    0
-#define BOCA_FLAGS      0
-#define HUB6_FLAGS      0
-#define RS_TABLE_SIZE   64
-#else
-#define RS_TABLE_SIZE
-#endif
-#include <asm/unit/serial.h>
diff --git a/include/asm-mn10300/setup.h b/include/asm-mn10300/setup.h
deleted file mode 100644
index 08356c832283..000000000000
--- a/include/asm-mn10300/setup.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MN10300 Setup declarations
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SETUP_H
-#define _ASM_SETUP_H
-extern void __init unit_setup(void);
-extern void __init unit_init_IRQ(void);
-#endif /* _ASM_SETUP_H */
diff --git a/include/asm-mn10300/shmbuf.h b/include/asm-mn10300/shmbuf.h
deleted file mode 100644
index 8f300cc35d6c..000000000000
--- a/include/asm-mn10300/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ASM_SHMBUF_H
-#define _ASM_SHMBUF_H
-/*
- * The shmid64_ds structure for MN10300 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 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 */
-        unsigned long           __unused1;
-        __kernel_time_t         shm_dtime;      /* last detach time */
-        unsigned long           __unused2;
-        __kernel_time_t         shm_ctime;      /* last change time */
-        unsigned long           __unused3;
-        __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 /* _ASM_SHMBUF_H */
diff --git a/include/asm-mn10300/shmparam.h b/include/asm-mn10300/shmparam.h
deleted file mode 100644
index ab666ed1a070..000000000000
--- a/include/asm-mn10300/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SHMPARAM_H
-#define _ASM_SHMPARAM_H
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-#endif /* _ASM_SHMPARAM_H */
diff --git a/include/asm-mn10300/sigcontext.h b/include/asm-mn10300/sigcontext.h
deleted file mode 100644
index 4de3afff4ad7..000000000000
--- a/include/asm-mn10300/sigcontext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* MN10300 Userspace signal context
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SIGCONTEXT_H
-#define _ASM_SIGCONTEXT_H
-struct fpucontext {
-        /* Regular FPU environment */
-        unsigned long   fs[32];         /* fpu registers */
-        unsigned long   fpcr;           /* fpu control register */
-};
-struct sigcontext {
-        unsigned long   d0;
-        unsigned long   d1;
-        unsigned long   d2;
-        unsigned long   d3;
-        unsigned long   a0;
-        unsigned long   a1;
-        unsigned long   a2;
-        unsigned long   a3;
-        unsigned long   e0;
-        unsigned long   e1;
-        unsigned long   e2;
-        unsigned long   e3;
-        unsigned long   e4;
-        unsigned long   e5;
-        unsigned long   e6;
-        unsigned long   e7;
-        unsigned long   lar;
-        unsigned long   lir;
-        unsigned long   mdr;
-        unsigned long   mcvf;
-        unsigned long   mcrl;
-        unsigned long   mcrh;
-        unsigned long   mdrq;
-        unsigned long   sp;
-        unsigned long   epsw;
-        unsigned long   pc;
-        struct fpucontext *fpucontext;
-        unsigned long   oldmask;
-};
-#endif /* _ASM_SIGCONTEXT_H */
diff --git a/include/asm-mn10300/siginfo.h b/include/asm-mn10300/siginfo.h
deleted file mode 100644
index 0815d29d82e5..000000000000
--- a/include/asm-mn10300/siginfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/siginfo.h>
diff --git a/include/asm-mn10300/signal.h b/include/asm-mn10300/signal.h
deleted file mode 100644
index e98817cec5f7..000000000000
--- a/include/asm-mn10300/signal.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/* MN10300 Signal definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SIGNAL_H
-#define _ASM_SIGNAL_H
-#include <linux/types.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-#ifdef __KERNEL__
-/* Most things should be clean enough to redefine this at will, if care
-   is taken to make libc match.  */
-#define _NSIG           64
-#define _NSIG_BPW       32
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-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-1)
-/*
- * 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    0x00000001U
-#define SA_NOCLDWAIT    0x00000002U
-#define SA_SIGINFO      0x00000004U
-#define SA_ONSTACK      0x08000000U
-#define SA_RESTART      0x10000000U
-#define SA_NODEFER      0x40000000U
-#define SA_RESETHAND    0x80000000U
-#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;
-        __sigrestore_t sa_restorer;
-};
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-struct k_sigaction {
-        struct sigaction sa;
-};
-#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;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#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;
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
-struct pt_regs;
-#define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
-#endif /* _ASM_SIGNAL_H */
diff --git a/include/asm-mn10300/smp.h b/include/asm-mn10300/smp.h
deleted file mode 100644
index 4eb8c61b7dab..000000000000
--- a/include/asm-mn10300/smp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* MN10300 SMP support
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SMP_H
-#define _ASM_SMP_H
-#ifdef CONFIG_SMP
-#error SMP not yet supported for MN10300
-#endif
-#endif
diff --git a/include/asm-mn10300/socket.h b/include/asm-mn10300/socket.h
deleted file mode 100644
index fb5daf438ec9..000000000000
--- a/include/asm-mn10300/socket.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#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
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-mn10300/sockios.h b/include/asm-mn10300/sockios.h
deleted file mode 100644
index b03043a1c564..000000000000
--- a/include/asm-mn10300/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_SOCKIOS_H
-#define _ASM_SOCKIOS_H
-/* 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 */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-#endif /* _ASM_SOCKIOS_H */
diff --git a/include/asm-mn10300/spinlock.h b/include/asm-mn10300/spinlock.h
deleted file mode 100644
index 4bf9c8b169e0..000000000000
--- a/include/asm-mn10300/spinlock.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 spinlock support
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SPINLOCK_H
-#define _ASM_SPINLOCK_H
-#error SMP spinlocks not implemented for MN10300
-#endif /* _ASM_SPINLOCK_H */
diff --git a/include/asm-mn10300/stat.h b/include/asm-mn10300/stat.h
deleted file mode 100644
index 63ff8371cf2c..000000000000
--- a/include/asm-mn10300/stat.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _ASM_STAT_H
-#define _ASM_STAT_H
-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 long  st_dev;
-        unsigned long  st_ino;
-        unsigned short st_mode;
-        unsigned short st_nlink;
-        unsigned short st_uid;
-        unsigned short st_gid;
-        unsigned long  st_rdev;
-        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 char   __pad0[4];
-#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 char   __pad3[4];
-        long long       st_size;
-        unsigned long   st_blksize;
-        unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-        unsigned long   __pad4;         /* future possible st_blocks high bits */
-        unsigned long   st_atime;
-        unsigned long   st_atime_nsec;
-        unsigned long   st_mtime;
-        unsigned int    st_mtime_nsec;
-        unsigned long   st_ctime;
-        unsigned long   st_ctime_nsec;
-        unsigned long long      st_ino;
-};
-#define STAT_HAVE_NSEC 1
-#endif /* _ASM_STAT_H */
diff --git a/include/asm-mn10300/statfs.h b/include/asm-mn10300/statfs.h
deleted file mode 100644
index 0b91fe198c20..000000000000
--- a/include/asm-mn10300/statfs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/statfs.h>
diff --git a/include/asm-mn10300/string.h b/include/asm-mn10300/string.h
deleted file mode 100644
index 47dbd4346c32..000000000000
--- a/include/asm-mn10300/string.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* MN10300 Optimised string functions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Modified by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_STRING_H
-#define _ASM_STRING_H
-#define __HAVE_ARCH_MEMSET
-#define __HAVE_ARCH_MEMCPY
-#define __HAVE_ARCH_MEMMOVE
-extern void *memset(void *dest, int ch, size_t count);
-extern void *memcpy(void *dest, const void *src, size_t count);
-extern void *memmove(void *dest, const void *src, size_t count);
-extern void __struct_cpy_bug(void);
-#define struct_cpy(x, y)                        \
-({                                              \
-        if (sizeof(*(x)) != sizeof(*(y)))       \
-                __struct_cpy_bug;               \
-        memcpy(x, y, sizeof(*(x)));             \
-})
-#endif /* _ASM_STRING_H */
diff --git a/include/asm-mn10300/swab.h b/include/asm-mn10300/swab.h
deleted file mode 100644
index bd818a820ca8..000000000000
--- a/include/asm-mn10300/swab.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* MN10300 Byte-order primitive construction
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SWAB_H
-#define _ASM_SWAB_H
-#include <linux/types.h>
-#ifdef __GNUC__
-static inline __attribute__((const))
-__u32 __arch_swab32(__u32 x)
-{
-        __u32 ret;
-        asm("swap %1,%0" : "=r" (ret) : "r" (x));
-        return ret;
-}
-#define __arch_swab32 __arch_swab32
-static inline __attribute__((const))
-__u16 __arch_swab16(__u16 x)
-{
-        __u16 ret;
-        asm("swaph %1,%0" : "=r" (ret) : "r" (x));
-        return ret;
-}
-#define __arch_swab32 __arch_swab32
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-#endif /* __GNUC__ */
-#endif /* _ASM_SWAB_H */
diff --git a/include/asm-mn10300/system.h b/include/asm-mn10300/system.h
deleted file mode 100644
index 8214fb7e7fe4..000000000000
--- a/include/asm-mn10300/system.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* MN10300 System definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SYSTEM_H
-#define _ASM_SYSTEM_H
-#include <asm/cpu-regs.h>
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-#include <linux/kernel.h>
-struct task_struct;
-struct thread_struct;
-extern asmlinkage
-struct task_struct *__switch_to(struct thread_struct *prev,
-                                struct thread_struct *next,
-                                struct task_struct *prev_task);
-/* context switching is now performed out-of-line in switch_to.S */
-#define switch_to(prev, next, last)                                     \
-do {                                                                    \
-        current->thread.wchan = (u_long) __builtin_return_address(0);   \
-        (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
-        mb();                                                           \
-        current->thread.wchan = 0;                                      \
-} while (0)
-#define arch_align_stack(x) (x)
-#define nop() asm volatile ("nop")
-#endif /* !__ASSEMBLY__ */
-/*
- * Force strict CPU ordering.
- * And yes, this is required on UP too when we're talking
- * to devices.
- *
- * For now, "wmb()" doesn't actually do anything, as all
- * Intel CPU's follow what Intel calls a *Processor Order*,
- * in which all writes are seen in the program order even
- * outside the CPU.
- *
- * I expect future Intel CPU's to have a weaker ordering,
- * but I'd also expect them to finally get their act together
- * and add some real memory barriers if so.
- *
- * Some non intel clones support out of order store. wmb() ceases to be a
- * nop for these.
- */
-#define mb()    asm volatile ("": : :"memory")
-#define rmb()   mb()
-#define wmb()   asm volatile ("": : :"memory")
-#ifdef CONFIG_SMP
-#define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
-#else
-#define smp_mb()        barrier()
-#define smp_rmb()       barrier()
-#define smp_wmb()       barrier()
-#endif
-#define set_mb(var, value)  do { var = value;  mb(); } while (0)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
-#define read_barrier_depends()          do {} while (0)
-#define smp_read_barrier_depends()      do {} while (0)
-/*****************************************************************************/
-/*
- * interrupt control
- * - "disabled": run in IM1/2
- *   - level 0 - GDB stub
- *   - level 1 - virtual serial DMA (if present)
- *   - level 5 - normal interrupt priority
- *   - level 6 - timer interrupt
- * - "enabled":  run in IM7
- */
-#ifdef CONFIG_MN10300_TTYSM
-#define MN10300_CLI_LEVEL       EPSW_IM_2
-#else
-#define MN10300_CLI_LEVEL       EPSW_IM_1
-#endif
-#define local_save_flags(x)                     \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov epsw,%0     \n"     \
-                : "=d"(x)                       \
-                );                              \
-} while (0)
-#define local_irq_disable()                                             \
-do {                                                                    \
-        asm volatile(                                                   \
-                "       and %0,epsw     \n"                             \
-                "       or %1,epsw      \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                :                                                       \
-                : "i"(~EPSW_IM), "i"(EPSW_IE | MN10300_CLI_LEVEL)       \
-                );                                                      \
-} while (0)
-#define local_irq_save(x)                       \
-do {                                            \
-        local_save_flags(x);                    \
-        local_irq_disable();                    \
-} while (0)
-/*
- * we make sure local_irq_enable() doesn't cause priority inversion
- */
-#ifndef __ASSEMBLY__
-extern unsigned long __mn10300_irq_enabled_epsw;
-#endif
-#define local_irq_enable()                                              \
-do {                                                                    \
-        unsigned long tmp;                                              \
-                                                                        \
-        asm volatile(                                                   \
-                "       mov     epsw,%0         \n"                     \
-                "       and     %1,%0           \n"                     \
-                "       or      %2,%0           \n"                     \
-                "       mov     %0,epsw         \n"                     \
-                : "=&d"(tmp)                                            \
-                : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw)        \
-                );                                                      \
-} while (0)
-#define local_irq_restore(x)                    \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov %0,epsw     \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                :                               \
-                : "d"(x)                        \
-                : "memory", "cc"                \
-                );                              \
-} while (0)
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long flags;                    \
-        local_save_flags(flags);                \
-        (flags & EPSW_IM) <= MN10300_CLI_LEVEL; \
-})
-/* hook to save power by halting the CPU
- * - called from the idle loop
- * - must reenable interrupts (which takes three instruction cycles to complete)
- */
-#define safe_halt()                                                     \
-do {                                                                    \
-        asm volatile("  or      %0,epsw \n"                             \
-                     "  nop             \n"                             \
-                     "  nop             \n"                             \
-                     "  bset    %2,(%1) \n"                             \
-                     :                                                  \
-                     : "i"(EPSW_IE|EPSW_IM), "n"(&CPUM), "i"(CPUM_SLEEP)\
-                     : "cc"                                             \
-                     );                                                 \
-} while (0)
-#define STI     or EPSW_IE|EPSW_IM,epsw
-#define CLI     and ~EPSW_IM,epsw; or EPSW_IE|MN10300_CLI_LEVEL,epsw; nop; nop; nop
-/*****************************************************************************/
-/*
- * MN10300 doesn't actually have an exchange instruction
- */
-#ifndef __ASSEMBLY__
-struct __xchg_dummy { unsigned long a[100]; };
-#define __xg(x) ((struct __xchg_dummy *)(x))
-static inline
-unsigned long __xchg(volatile unsigned long *m, unsigned long val)
-{
-        unsigned long retval;
-        unsigned long flags;
-        local_irq_save(flags);
-        retval = *m;
-        *m = val;
-        local_irq_restore(flags);
-        return retval;
-}
-#define xchg(ptr, v)                                            \
-        ((__typeof__(*(ptr))) __xchg((unsigned long *)(ptr),    \
-                                     (unsigned long)(v)))
-static inline unsigned long __cmpxchg(volatile unsigned long *m,
-                                      unsigned long old, unsigned long new)
-{
-        unsigned long retval;
-        unsigned long flags;
-        local_irq_save(flags);
-        retval = *m;
-        if (retval == old)
-                *m = new;
-        local_irq_restore(flags);
-        return retval;
-}
-#define cmpxchg(ptr, o, n)                                      \
-        ((__typeof__(*(ptr))) __cmpxchg((unsigned long *)(ptr), \
-                                        (unsigned long)(o),     \
-                                        (unsigned long)(n)))
-#endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_SYSTEM_H */
diff --git a/include/asm-mn10300/termbits.h b/include/asm-mn10300/termbits.h
deleted file mode 100644
index eb2b0dc1f696..000000000000
--- a/include/asm-mn10300/termbits.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef _ASM_TERMBITS_H
-#define _ASM_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 (not used) */
-#define CTVB      004000000000          /* VisioBraille Terminal flow control */
-#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 /* _ASM_TERMBITS_H */
diff --git a/include/asm-mn10300/termios.h b/include/asm-mn10300/termios.h
deleted file mode 100644
index dd7cf617e118..000000000000
--- a/include/asm-mn10300/termios.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _ASM_TERMIOS_H
-#define _ASM_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 */
-};
-#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"
-#endif
-/* 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
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-        unsigned short __tmp; \
-        get_user(__tmp, &(termio)->x); \
-        *(unsigned short *) &(termios)->x = __tmp; \
-}
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-#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))
-#define user_termios_to_kernel_termios_1(k, u) \
-        copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) \
-        copy_to_user(u, k, sizeof(struct termios))
-#endif  /* _ASM_TERMIOS_H */
diff --git a/include/asm-mn10300/thread_info.h b/include/asm-mn10300/thread_info.h
deleted file mode 100644
index 78a3881f3c12..000000000000
--- a/include/asm-mn10300/thread_info.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* MN10300 Low-level thread information
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_THREAD_INFO_H
-#define _ASM_THREAD_INFO_H
-#ifdef __KERNEL__
-#include <asm/page.h>
-#ifndef __ASSEMBLY__
-#include <asm/processor.h>
-#endif
-#define PREEMPT_ACTIVE          0x10000000
-#ifdef CONFIG_4KSTACKS
-#define THREAD_SIZE             (4096)
-#else
-#define THREAD_SIZE             (8192)
-#endif
-#define STACK_WARN              (THREAD_SIZE / 8)
-/*
- * 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
- */
-#ifndef __ASSEMBLY__
-struct thread_info {
-        struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
-        unsigned long           flags;          /* low level flags */
-        __u32                   cpu;            /* current CPU */
-        __s32                   preempt_count;  /* 0 => preemptable, <0 => BUG */
-        mm_segment_t            addr_limit;     /* thread address space:
-                                                   0-0xBFFFFFFF for user-thead
-                                                   0-0xFFFFFFFF for kernel-thread
-                                                */
-        struct restart_block    restart_block;
-        __u8                    supervisor_stack[0];
-};
-#else /* !__ASSEMBLY__ */
-#ifndef __ASM_OFFSETS_H__
-#include <asm/asm-offsets.h>
-#endif
-#endif
-/*
- * macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
- */
-#ifndef __ASSEMBLY__
-#define INIT_THREAD_INFO(tsk)                   \
-{                                               \
-        .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
-        .flags          = 0,                    \
-        .cpu            = 0,                    \
-        .preempt_count  = 1,                    \
-        .addr_limit     = KERNEL_DS,            \
-        .restart_block = {                      \
-                .fn = do_no_restart_syscall,    \
-        },                                      \
-}
-#define init_thread_info        (init_thread_union.thread_info)
-#define init_stack              (init_thread_union.stack)
-#define init_uregs                                                      \
-        ((struct pt_regs *)                                             \
-         ((unsigned long) init_stack + THREAD_SIZE - sizeof(struct pt_regs)))
-extern struct thread_info *__current_ti;
-/* how to get the thread information struct from C */
-static inline __attribute__((const))
-struct thread_info *current_thread_info(void)
-{
-        struct thread_info *ti;
-        asm("mov sp,%0\n"
-            "and %1,%0\n"
-            : "=d" (ti)
-            : "i" (~(THREAD_SIZE - 1))
-            : "cc");
-        return ti;
-}
-/* how to get the current stack pointer from C */
-static inline unsigned long current_stack_pointer(void)
-{
-        unsigned long sp;
-        asm("mov sp,%0; ":"=r" (sp));
-        return sp;
-}
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
-#else
-#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-#define free_thread_info(ti)    kfree((ti))
-#define get_thread_info(ti)     get_task_struct((ti)->task)
-#define put_thread_info(ti)     put_task_struct((ti)->task)
-#else /* !__ASSEMBLY__ */
-#ifndef __VMLINUX_LDS__
-/* how to get the thread information struct from ASM */
-.macro GET_THREAD_INFO reg
-        mov     sp,\reg
-        and     -THREAD_SIZE,\reg
-.endm
-#endif
-#endif
-/*
- * thread information flags
- * - these are process state flags that various assembly files may need to
- *   access
- * - pending work-to-be-done flags are in LSW
- * - other flags in MSW
- */
-#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
-#define TIF_SIGPENDING          2       /* signal pending */
-#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
-#define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_MEMDIE              17      /* OOM killer killed process */
-#define TIF_FREEZE              18      /* freezing for suspend */
-#define _TIF_SYSCALL_TRACE      +(1 << TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME      +(1 << TIF_NOTIFY_RESUME)
-#define _TIF_SIGPENDING         +(1 << TIF_SIGPENDING)
-#define _TIF_NEED_RESCHED       +(1 << TIF_NEED_RESCHED)
-#define _TIF_SINGLESTEP         +(1 << TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK    +(1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     +(1 << TIF_POLLING_NRFLAG)
-#define _TIF_FREEZE             +(1 << TIF_FREEZE)
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
-#endif /* __KERNEL__ */
-#endif /* _ASM_THREAD_INFO_H */
diff --git a/include/asm-mn10300/timer-regs.h b/include/asm-mn10300/timer-regs.h
deleted file mode 100644
index 1d883b7f94ab..000000000000
--- a/include/asm-mn10300/timer-regs.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/* AM33v2 on-board timer module registers
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TIMER_REGS_H
-#define _ASM_TIMER_REGS_H
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-#ifdef __KERNEL__
-/* timer prescalar control */
-#define TMPSCNT                 __SYSREG(0xd4003071, u8) /* timer prescaler control */
-#define TMPSCNT_ENABLE          0x80    /* timer prescaler enable */
-#define TMPSCNT_DISABLE         0x00    /* timer prescaler disable */
-/* 8 bit timers */
-#define TM0MD                   __SYSREG(0xd4003000, u8) /* timer 0 mode register */
-#define TM0MD_SRC               0x07    /* timer source */
-#define TM0MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM0MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM0MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM0MD_SRC_TM2IO         0x03    /* - TM2IO pin input */
-#define TM0MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM0MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM0MD_SRC_TM0IO         0x07    /* - TM0IO pin input */
-#define TM0MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM0MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM1MD                   __SYSREG(0xd4003001, u8) /* timer 1 mode register */
-#define TM1MD_SRC               0x07    /* timer source */
-#define TM1MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM1MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM1MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM1MD_SRC_TM0CASCADE    0x03    /* - cascade with timer 0 */
-#define TM1MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM1MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM1MD_SRC_TM1IO         0x07    /* - TM1IO pin input */
-#define TM1MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM1MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM2MD                   __SYSREG(0xd4003002, u8) /* timer 2 mode register */
-#define TM2MD_SRC               0x07    /* timer source */
-#define TM2MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM2MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM2MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM2MD_SRC_TM1CASCADE    0x03    /* - cascade with timer 1 */
-#define TM2MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM2MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM2MD_SRC_TM2IO         0x07    /* - TM2IO pin input */
-#define TM2MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM2MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM3MD                   __SYSREG(0xd4003003, u8) /* timer 3 mode register */
-#define TM3MD_SRC               0x07    /* timer source */
-#define TM3MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM3MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM3MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM3MD_SRC_TM1CASCADE    0x03    /* - cascade with timer 2 */
-#define TM3MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM3MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM3MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM3MD_SRC_TM3IO         0x07    /* - TM3IO pin input */
-#define TM3MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM3MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM01MD                  __SYSREG(0xd4003000, u16)  /* timer 0:1 mode register */
-#define TM0BR                   __SYSREG(0xd4003010, u8)   /* timer 0 base register */
-#define TM1BR                   __SYSREG(0xd4003011, u8)   /* timer 1 base register */
-#define TM2BR                   __SYSREG(0xd4003012, u8)   /* timer 2 base register */
-#define TM3BR                   __SYSREG(0xd4003013, u8)   /* timer 3 base register */
-#define TM01BR                  __SYSREG(0xd4003010, u16)  /* timer 0:1 base register */
-#define TM0BC                   __SYSREGC(0xd4003020, u8)  /* timer 0 binary counter */
-#define TM1BC                   __SYSREGC(0xd4003021, u8)  /* timer 1 binary counter */
-#define TM2BC                   __SYSREGC(0xd4003022, u8)  /* timer 2 binary counter */
-#define TM3BC                   __SYSREGC(0xd4003023, u8)  /* timer 3 binary counter */
-#define TM01BC                  __SYSREGC(0xd4003020, u16) /* timer 0:1 binary counter */
-#define TM0IRQ                  2       /* timer 0 IRQ */
-#define TM1IRQ                  3       /* timer 1 IRQ */
-#define TM2IRQ                  4       /* timer 2 IRQ */
-#define TM3IRQ                  5       /* timer 3 IRQ */
-#define TM0ICR                  GxICR(TM0IRQ)   /* timer 0 uflow intr ctrl reg */
-#define TM1ICR                  GxICR(TM1IRQ)   /* timer 1 uflow intr ctrl reg */
-#define TM2ICR                  GxICR(TM2IRQ)   /* timer 2 uflow intr ctrl reg */
-#define TM3ICR                  GxICR(TM3IRQ)   /* timer 3 uflow intr ctrl reg */
-/* 16-bit timers 4,5 & 7-11 */
-#define TM4MD                   __SYSREG(0xd4003080, u8)   /* timer 4 mode register */
-#define TM4MD_SRC               0x07    /* timer source */
-#define TM4MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM4MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM4MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM4MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM4MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM4MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM4MD_SRC_TM4IO         0x07    /* - TM4IO pin input */
-#define TM4MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM4MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM5MD                   __SYSREG(0xd4003082, u8)   /* timer 5 mode register */
-#define TM5MD_SRC               0x07    /* timer source */
-#define TM5MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM5MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM5MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM5MD_SRC_TM4CASCADE    0x03    /* - cascade with timer 4 */
-#define TM5MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM5MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM5MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM5MD_SRC_TM5IO         0x07    /* - TM5IO pin input */
-#define TM5MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM5MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM7MD                   __SYSREG(0xd4003086, u8)   /* timer 7 mode register */
-#define TM7MD_SRC               0x07    /* timer source */
-#define TM7MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM7MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM7MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM7MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM7MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM7MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM7MD_SRC_TM7IO         0x07    /* - TM7IO pin input */
-#define TM7MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM7MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM8MD                   __SYSREG(0xd4003088, u8)   /* timer 8 mode register */
-#define TM8MD_SRC               0x07    /* timer source */
-#define TM8MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM8MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM8MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM8MD_SRC_TM7CASCADE    0x03    /* - cascade with timer 7 */
-#define TM8MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM8MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM8MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM8MD_SRC_TM8IO         0x07    /* - TM8IO pin input */
-#define TM8MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM8MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM9MD                   __SYSREG(0xd400308a, u8)   /* timer 9 mode register */
-#define TM9MD_SRC               0x07    /* timer source */
-#define TM9MD_SRC_IOCLK         0x00    /* - IOCLK */
-#define TM9MD_SRC_IOCLK_8       0x01    /* - 1/8 IOCLK */
-#define TM9MD_SRC_IOCLK_32      0x02    /* - 1/32 IOCLK */
-#define TM9MD_SRC_TM8CASCADE    0x03    /* - cascade with timer 8 */
-#define TM9MD_SRC_TM0UFLOW      0x04    /* - timer 0 underflow */
-#define TM9MD_SRC_TM1UFLOW      0x05    /* - timer 1 underflow */
-#define TM9MD_SRC_TM2UFLOW      0x06    /* - timer 2 underflow */
-#define TM9MD_SRC_TM9IO         0x07    /* - TM9IO pin input */
-#define TM9MD_INIT_COUNTER      0x40    /* initialize TMnBC = TMnBR */
-#define TM9MD_COUNT_ENABLE      0x80    /* timer count enable */
-#define TM10MD                  __SYSREG(0xd400308c, u8)   /* timer 10 mode register */
-#define TM10MD_SRC              0x07    /* timer source */
-#define TM10MD_SRC_IOCLK        0x00    /* - IOCLK */
-#define TM10MD_SRC_IOCLK_8      0x01    /* - 1/8 IOCLK */
-#define TM10MD_SRC_IOCLK_32     0x02    /* - 1/32 IOCLK */
-#define TM10MD_SRC_TM9CASCADE   0x03    /* - cascade with timer 9 */
-#define TM10MD_SRC_TM0UFLOW     0x04    /* - timer 0 underflow */
-#define TM10MD_SRC_TM1UFLOW     0x05    /* - timer 1 underflow */
-#define TM10MD_SRC_TM2UFLOW     0x06    /* - timer 2 underflow */
-#define TM10MD_SRC_TM10IO       0x07    /* - TM10IO pin input */
-#define TM10MD_INIT_COUNTER     0x40    /* initialize TMnBC = TMnBR */
-#define TM10MD_COUNT_ENABLE     0x80    /* timer count enable */
-#define TM11MD                  __SYSREG(0xd400308e, u8)   /* timer 11 mode register */
-#define TM11MD_SRC              0x07    /* timer source */
-#define TM11MD_SRC_IOCLK        0x00    /* - IOCLK */
-#define TM11MD_SRC_IOCLK_8      0x01    /* - 1/8 IOCLK */
-#define TM11MD_SRC_IOCLK_32     0x02    /* - 1/32 IOCLK */
-#define TM11MD_SRC_TM7CASCADE   0x03    /* - cascade with timer 7 */
-#define TM11MD_SRC_TM0UFLOW     0x04    /* - timer 0 underflow */
-#define TM11MD_SRC_TM1UFLOW     0x05    /* - timer 1 underflow */
-#define TM11MD_SRC_TM2UFLOW     0x06    /* - timer 2 underflow */
-#define TM11MD_SRC_TM11IO       0x07    /* - TM11IO pin input */
-#define TM11MD_INIT_COUNTER     0x40    /* initialize TMnBC = TMnBR */
-#define TM11MD_COUNT_ENABLE     0x80    /* timer count enable */
-#define TM4BR                   __SYSREG(0xd4003090, u16)  /* timer 4 base register */
-#define TM5BR                   __SYSREG(0xd4003092, u16)  /* timer 5 base register */
-#define TM7BR                   __SYSREG(0xd4003096, u16)  /* timer 7 base register */
-#define TM8BR                   __SYSREG(0xd4003098, u16)  /* timer 8 base register */
-#define TM9BR                   __SYSREG(0xd400309a, u16)  /* timer 9 base register */
-#define TM10BR                  __SYSREG(0xd400309c, u16)  /* timer 10 base register */
-#define TM11BR                  __SYSREG(0xd400309e, u16)  /* timer 11 base register */
-#define TM45BR                  __SYSREG(0xd4003090, u32)  /* timer 4:5 base register */
-#define TM4BC                   __SYSREG(0xd40030a0, u16)  /* timer 4 binary counter */
-#define TM5BC                   __SYSREG(0xd40030a2, u16)  /* timer 5 binary counter */
-#define TM45BC                  __SYSREG(0xd40030a0, u32)  /* timer 4:5 binary counter */
-#define TM7BC                   __SYSREG(0xd40030a6, u16)  /* timer 7 binary counter */
-#define TM8BC                   __SYSREG(0xd40030a8, u16)  /* timer 8 binary counter */
-#define TM9BC                   __SYSREG(0xd40030aa, u16)  /* timer 9 binary counter */
-#define TM10BC                  __SYSREG(0xd40030ac, u16)  /* timer 10 binary counter */
-#define TM11BC                  __SYSREG(0xd40030ae, u16)  /* timer 11 binary counter */
-#define TM4IRQ                  6       /* timer 4 IRQ */
-#define TM5IRQ                  7       /* timer 5 IRQ */
-#define TM7IRQ                  11      /* timer 7 IRQ */
-#define TM8IRQ                  12      /* timer 8 IRQ */
-#define TM9IRQ                  13      /* timer 9 IRQ */
-#define TM10IRQ                 14      /* timer 10 IRQ */
-#define TM11IRQ                 15      /* timer 11 IRQ */
-#define TM4ICR                  GxICR(TM4IRQ)   /* timer 4 uflow intr ctrl reg */
-#define TM5ICR                  GxICR(TM5IRQ)   /* timer 5 uflow intr ctrl reg */
-#define TM7ICR                  GxICR(TM7IRQ)   /* timer 7 uflow intr ctrl reg */
-#define TM8ICR                  GxICR(TM8IRQ)   /* timer 8 uflow intr ctrl reg */
-#define TM9ICR                  GxICR(TM9IRQ)   /* timer 9 uflow intr ctrl reg */
-#define TM10ICR                 GxICR(TM10IRQ)  /* timer 10 uflow intr ctrl reg */
-#define TM11ICR                 GxICR(TM11IRQ)  /* timer 11 uflow intr ctrl reg */
-/* 16-bit timer 6 */
-#define TM6MD                   __SYSREG(0xd4003084, u16)  /* timer6 mode register */
-#define TM6MD_SRC               0x0007  /* timer source */
-#define TM6MD_SRC_IOCLK         0x0000  /* - IOCLK */
-#define TM6MD_SRC_IOCLK_8       0x0001  /* - 1/8 IOCLK */
-#define TM6MD_SRC_IOCLK_32      0x0002  /* - 1/32 IOCLK */
-#define TM6MD_SRC_TM0UFLOW      0x0004  /* - timer 0 underflow */
-#define TM6MD_SRC_TM1UFLOW      0x0005  /* - timer 1 underflow */
-#define TM6MD_SRC_TM6IOB_BOTH   0x0006  /* - TM6IOB pin input (both edges) */
-#define TM6MD_SRC_TM6IOB_SINGLE 0x0007  /* - TM6IOB pin input (single edge) */
-#define TM6MD_CLR_ENABLE        0x0010  /* clear count enable */
-#define TM6MD_ONESHOT_ENABLE    0x0040  /* oneshot count */
-#define TM6MD_TRIG_ENABLE       0x0080  /* TM6IOB pin trigger enable */
-#define TM6MD_PWM               0x3800  /* PWM output mode */
-#define TM6MD_PWM_DIS           0x0000  /* - disabled */
-#define TM6MD_PWM_10BIT         0x1000  /* - 10 bits mode */
-#define TM6MD_PWM_11BIT         0x1800  /* - 11 bits mode */
-#define TM6MD_PWM_12BIT         0x3000  /* - 12 bits mode */
-#define TM6MD_PWM_14BIT         0x3800  /* - 14 bits mode */
-#define TM6MD_INIT_COUNTER      0x4000  /* initialize TMnBC to zero */
-#define TM6MD_COUNT_ENABLE      0x8000  /* timer count enable */
-#define TM6MDA                  __SYSREG(0xd40030b4, u8)   /* timer6 cmp/cap A mode reg */
-#define TM6MDA_OUT              0x07    /* output select */
-#define TM6MDA_OUT_SETA_RESETB  0x00    /* - set at match A, reset at match B */
-#define TM6MDA_OUT_SETA_RESETOV 0x01    /* - set at match A, reset at overflow */
-#define TM6MDA_OUT_SETA         0x02    /* - set at match A */
-#define TM6MDA_OUT_RESETA       0x03    /* - reset at match A */
-#define TM6MDA_OUT_TOGGLE       0x04    /* - toggle on match A */
-#define TM6MDA_MODE             0xc0    /* compare A register mode */
-#define TM6MDA_MODE_CMP_SINGLE  0x00    /* - compare, single buffer mode */
-#define TM6MDA_MODE_CMP_DOUBLE  0x40    /* - compare, double buffer mode */
-#define TM6MDA_MODE_CAP_S_EDGE  0x80    /* - capture, single edge mode */
-#define TM6MDA_MODE_CAP_D_EDGE  0xc0    /* - capture, double edge mode */
-#define TM6MDA_EDGE             0x20    /* compare A edge select */
-#define TM6MDA_EDGE_FALLING     0x00    /* capture on falling edge */
-#define TM6MDA_EDGE_RISING      0x20    /* capture on rising edge */
-#define TM6MDA_CAPTURE_ENABLE   0x10    /* capture enable */
-#define TM6MDB                  __SYSREG(0xd40030b5, u8)   /* timer6 cmp/cap B mode reg */
-#define TM6MDB_OUT              0x07    /* output select */
-#define TM6MDB_OUT_SETB_RESETA  0x00    /* - set at match B, reset at match A */
-#define TM6MDB_OUT_SETB_RESETOV 0x01    /* - set at match B */
-#define TM6MDB_OUT_RESETB       0x03    /* - reset at match B */
-#define TM6MDB_OUT_TOGGLE       0x04    /* - toggle on match B */
-#define TM6MDB_MODE             0xc0    /* compare B register mode */
-#define TM6MDB_MODE_CMP_SINGLE  0x00    /* - compare, single buffer mode */
-#define TM6MDB_MODE_CMP_DOUBLE  0x40    /* - compare, double buffer mode */
-#define TM6MDB_MODE_CAP_S_EDGE  0x80    /* - capture, single edge mode */
-#define TM6MDB_MODE_CAP_D_EDGE  0xc0    /* - capture, double edge mode */
-#define TM6MDB_EDGE             0x20    /* compare B edge select */
-#define TM6MDB_EDGE_FALLING     0x00    /* capture on falling edge */
-#define TM6MDB_EDGE_RISING      0x20    /* capture on rising edge */
-#define TM6MDB_CAPTURE_ENABLE   0x10    /* capture enable */
-#define TM6CA                   __SYSREG(0xd40030c4, u16)   /* timer6 cmp/capture reg A */
-#define TM6CB                   __SYSREG(0xd40030d4, u16)   /* timer6 cmp/capture reg B */
-#define TM6BC                   __SYSREG(0xd40030a4, u16)   /* timer6 binary counter */
-#define TM6IRQ                  6       /* timer 6 IRQ */
-#define TM6AIRQ                 9       /* timer 6A IRQ */
-#define TM6BIRQ                 10      /* timer 6B IRQ */
-#define TM6ICR                  GxICR(TM6IRQ)   /* timer 6 uflow intr ctrl reg */
-#define TM6AICR                 GxICR(TM6AIRQ)  /* timer 6A intr control reg */
-#define TM6BICR                 GxICR(TM6BIRQ)  /* timer 6B intr control reg */
-#endif /* __KERNEL__ */
-#endif /* _ASM_TIMER_REGS_H */
diff --git a/include/asm-mn10300/timex.h b/include/asm-mn10300/timex.h
deleted file mode 100644
index 3944277dab67..000000000000
--- a/include/asm-mn10300/timex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* MN10300 Architecture time management specifications
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TIMEX_H
-#define _ASM_TIMEX_H
-#include <asm/hardirq.h>
-#include <asm/unit/timex.h>
-#define TICK_SIZE (tick_nsec / 1000)
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ - this should probably be set
-                                 * to something appropriate, but what? */
-extern cycles_t cacheflush_time;
-#ifdef __KERNEL__
-static inline cycles_t get_cycles(void)
-{
-        return read_timestamp_counter();
-}
-#endif /* __KERNEL__ */
-#endif /* _ASM_TIMEX_H */
diff --git a/include/asm-mn10300/tlb.h b/include/asm-mn10300/tlb.h
deleted file mode 100644
index 65d232b96613..000000000000
--- a/include/asm-mn10300/tlb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN10300 TLB definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TLB_H
-#define _ASM_TLB_H
-#include <asm/tlbflush.h>
-extern void check_pgt_cache(void);
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#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, address)      do { } while (0)
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)  flush_tlb_mm((tlb)->mm)
-/* for now, just use the generic stuff */
-#include <asm-generic/tlb.h>
-#endif /* _ASM_TLB_H */
diff --git a/include/asm-mn10300/tlbflush.h b/include/asm-mn10300/tlbflush.h
deleted file mode 100644
index e0239865abcb..000000000000
--- a/include/asm-mn10300/tlbflush.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* MN10300 TLB flushing functions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TLBFLUSH_H
-#define _ASM_TLBFLUSH_H
-#include <asm/processor.h>
-#define __flush_tlb()                                           \
-do {                                                            \
-        int w;                                                  \
-        __asm__ __volatile__                                    \
-                ("      mov %1,%0               \n"             \
-                 "      or %2,%0                \n"             \
-                 "      mov %0,%1               \n"             \
-                 : "=d"(w)                                      \
-                 : "m"(MMUCTR), "i"(MMUCTR_IIV|MMUCTR_DIV)      \
-                 : "memory"                                     \
-                 );                                             \
-} while (0)
-#define __flush_tlb_all() __flush_tlb()
-#define __flush_tlb_one(addr) __flush_tlb()
-/*
- * 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(mm, start, end) flushes a range of pages
- *  - flush_tlb_pgtables(mm, start, end) flushes a range of page tables
- */
-#define flush_tlb_all()                         \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while (0)
-#define flush_tlb_mm(mm)                        \
-do {                                            \
-        preempt_disable();                      \
-        __flush_tlb_all();                      \
-        preempt_enable();                       \
-} while (0)
-#define flush_tlb_range(vma, start, end)                        \
-do {                                                            \
-        unsigned long __s __attribute__((unused)) = (start);    \
-        unsigned long __e __attribute__((unused)) = (end);      \
-        preempt_disable();                                      \
-        __flush_tlb_all();                                      \
-        preempt_enable();                                       \
-} while (0)
-#define __flush_tlb_global()                    flush_tlb_all()
-#define flush_tlb()                             flush_tlb_all()
-#define flush_tlb_kernel_range(start, end)                      \
-do {                                                            \
-        unsigned long __s __attribute__((unused)) = (start);    \
-        unsigned long __e __attribute__((unused)) = (end);      \
-        flush_tlb_all();                                        \
-} while (0)
-extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);
-#define flush_tlb_pgtables(mm, start, end)      do {} while (0)
-#endif /* _ASM_TLBFLUSH_H */
diff --git a/include/asm-mn10300/topology.h b/include/asm-mn10300/topology.h
deleted file mode 100644
index 5428f333a02c..000000000000
--- a/include/asm-mn10300/topology.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/topology.h>
diff --git a/include/asm-mn10300/types.h b/include/asm-mn10300/types.h
deleted file mode 100644
index 7b9f01042fd4..000000000000
--- a/include/asm-mn10300/types.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* MN10300 Basic type definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TYPES_H
-#define _ASM_TYPES_H
-#include <asm-generic/int-ll64.h>
-#ifndef __ASSEMBLY__
-typedef unsigned short umode_t;
-#endif /* __ASSEMBLY__ */
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#define BITS_PER_LONG 32
-#ifndef __ASSEMBLY__
-/* Dma addresses are 32-bits wide.  */
-typedef u32 dma_addr_t;
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_TYPES_H */
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h
deleted file mode 100644
index 8a3a4dd55763..000000000000
--- a/include/asm-mn10300/uaccess.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* MN10300 userspace access functions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UACCESS_H
-#define _ASM_UACCESS_H
-/*
- * User space memory access functions
- */
-#include <linux/sched.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/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(s)  ((mm_segment_t) { (s) })
-#define KERNEL_XDS      MAKE_MM_SEG(0xBFFFFFFF)
-#define KERNEL_DS       MAKE_MM_SEG(0x9FFFFFFF)
-#define USER_DS         MAKE_MM_SEG(TASK_SIZE)
-#define get_ds()        (KERNEL_DS)
-#define get_fs()        (current_thread_info()->addr_limit)
-#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-#define __kernel_ds_p() (current_thread_info()->addr_limit.seg == 0x9FFFFFFF)
-#define segment_eq(a, b) ((a).seg == (b).seg)
-#define __addr_ok(addr) \
-        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-/*
- * check that a range of addresses falls within the current address limit
- */
-static inline int ___range_ok(unsigned long addr, unsigned int size)
-{
-        int flag = 1, tmp;
-        asm("   add     %3,%1   \n"     /* set C-flag if addr + size > 4Gb */
-            "   bcs     0f      \n"
-            "   cmp     %4,%1   \n"     /* jump if addr+size>limit (error) */
-            "   bhi     0f      \n"
-            "   clr     %0      \n"     /* mark okay */
-            "0:                 \n"
-            : "=r"(flag), "=&r"(tmp)
-            : "1"(addr), "ir"(size),
-              "r"(current_thread_info()->addr_limit.seg), "0"(flag)
-            : "cc"
-            );
-        return flag;
-}
-#define __range_ok(addr, size) ___range_ok((unsigned long)(addr), (u32)(size))
-#define access_ok(type, addr, size) (__range_ok((addr), (size)) == 0)
-#define __access_ok(addr, size)     (__range_ok((addr), (size)) == 0)
-static inline int verify_area(int type, const void *addr, unsigned long size)
-{
-        return access_ok(type, addr, size) ? 0 : -EFAULT;
-}
-/*
- * 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;
-};
-/* Returns 0 if exception not found and fixup otherwise.  */
-extern int fixup_exception(struct pt_regs *regs);
-#define put_user(x, ptr) __put_user_check((x), (ptr), sizeof(*(ptr)))
-#define get_user(x, ptr) __get_user_check((x), (ptr), sizeof(*(ptr)))
-/*
- * The "__xxx" versions do not do address space checking, useful when
- * doing multiple accesses to the same area (the user has to do the
- * checks by hand with "access_ok()")
- */
-#define __put_user(x, ptr) __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
-#define __get_user(x, ptr) __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
-/*
- * The "xxx_ret" versions return constant specified in third argument, if
- * something bad happens. These macros can be optimized for the
- * case of just returning from the function xxx_ret is used.
- */
-#define put_user_ret(x, ptr, ret) \
-        ({ if (put_user((x), (ptr)))    return (ret); })
-#define get_user_ret(x, ptr, ret) \
-        ({ if (get_user((x), (ptr)))    return (ret); })
-#define __put_user_ret(x, ptr, ret) \
-        ({ if (__put_user((x), (ptr)))  return (ret); })
-#define __get_user_ret(x, ptr, ret) \
-        ({ if (__get_user((x), (ptr)))  return (ret); })
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
-#define __get_user_nocheck(x, ptr, size)        \
-({                                              \
-        __typeof(*(ptr)) __gu_val;              \
-        unsigned long __gu_addr;                \
-        int __gu_err;                           \
-        __gu_addr = (unsigned long) (ptr);      \
-        switch (size) {                         \
-        case 1:  __get_user_asm("bu"); break;   \
-        case 2:  __get_user_asm("hu"); break;   \
-        case 4:  __get_user_asm(""  ); break;   \
-        default: __get_user_unknown(); break;   \
-        }                                       \
-        x = (__typeof__(*(ptr))) __gu_val;      \
-        __gu_err;                               \
-})
-#define __get_user_check(x, ptr, size)                  \
-({                                                      \
-        __typeof__(*(ptr)) __gu_val;                    \
-        unsigned long __gu_addr;                        \
-        int __gu_err;                                   \
-        __gu_addr = (unsigned long) (ptr);              \
-        if (likely(__access_ok(__gu_addr,size))) {      \
-                switch (size) {                         \
-                case 1:  __get_user_asm("bu"); break;   \
-                case 2:  __get_user_asm("hu"); break;   \
-                case 4:  __get_user_asm(""  ); break;   \
-                default: __get_user_unknown(); break;   \
-                }                                       \
-        }                                               \
-        else {                                          \
-                __gu_err = -EFAULT;                     \
-                __gu_val = 0;                           \
-        }                                               \
-        x = (__typeof__(*(ptr))) __gu_val;              \
-        __gu_err;                                       \
-})
-#define __get_user_asm(INSN)                                    \
-({                                                              \
-        asm volatile(                                   \
-                "1:\n"                                          \
-                "       mov"INSN"       %2,%1\n"                \
-                "       mov             0,%0\n"                 \
-                "2:\n"                                          \
-                "       .section        .fixup,\"ax\"\n"        \
-                "3:\n\t"                                        \
-                "       mov             %3,%0\n"                \
-                "       jmp             2b\n"                   \
-                "       .previous\n"                            \
-                "       .section        __ex_table,\"a\"\n"     \
-                "       .balign         4\n"                    \
-                "       .long           1b, 3b\n"               \
-                "       .previous"                              \
-                : "=&r" (__gu_err), "=&r" (__gu_val)            \
-                : "m" (__m(__gu_addr)), "i" (-EFAULT));         \
-})
-extern int __get_user_unknown(void);
-#define __put_user_nocheck(x, ptr, size)                        \
-({                                                              \
-        union {                                                 \
-                __typeof__(*(ptr)) val;                         \
-                u32 bits[2];                                    \
-        } __pu_val;                                             \
-        unsigned long __pu_addr;                                \
-        int __pu_err;                                           \
-        __pu_val.val = (x);                                     \
-        __pu_addr = (unsigned long) (ptr);                      \
-        switch (size) {                                         \
-        case 1:  __put_user_asm("bu"); break;                   \
-        case 2:  __put_user_asm("hu"); break;                   \
-        case 4:  __put_user_asm(""  ); break;                   \
-        case 8:  __put_user_asm8();    break;                   \
-        default: __pu_err = __put_user_unknown(); break;        \
-        }                                                       \
-        __pu_err;                                               \
-})
-#define __put_user_check(x, ptr, size)                                  \
-({                                                                      \
-        union {                                                         \
-                __typeof__(*(ptr)) val;                                 \
-                u32 bits[2];                                            \
-        } __pu_val;                                                     \
-        unsigned long __pu_addr;                                        \
-        int __pu_err;                                                   \
-        __pu_val.val = (x);                                             \
-        __pu_addr = (unsigned long) (ptr);                              \
-        if (likely(__access_ok(__pu_addr, size))) {                     \
-                switch (size) {                                         \
-                case 1:  __put_user_asm("bu"); break;                   \
-                case 2:  __put_user_asm("hu"); break;                   \
-                case 4:  __put_user_asm(""  ); break;                   \
-                case 8:  __put_user_asm8();    break;                   \
-                default: __pu_err = __put_user_unknown(); break;        \
-                }                                                       \
-        }                                                               \
-        else {                                                          \
-                __pu_err = -EFAULT;                                     \
-        }                                                               \
-        __pu_err;                                                       \
-})
-#define __put_user_asm(INSN)                                    \
-({                                                              \
-        asm volatile(                                           \
-                "1:\n"                                          \
-                "       mov"INSN"       %1,%2\n"                \
-                "       mov             0,%0\n"                 \
-                "2:\n"                                          \
-                "       .section        .fixup,\"ax\"\n"        \
-                "3:\n"                                          \
-                "       mov             %3,%0\n"                \
-                "       jmp             2b\n"                   \
-                "       .previous\n"                            \
-                "       .section        __ex_table,\"a\"\n"     \
-                "       .balign         4\n"                    \
-                "       .long           1b, 3b\n"               \
-                "       .previous"                              \
-                : "=&r" (__pu_err)                              \
-                : "r" (__pu_val.val), "m" (__m(__pu_addr)),     \
-                  "i" (-EFAULT)                                 \
-                );                                              \
-})
-#define __put_user_asm8()                                               \
-({                                                                      \
-        asm volatile(                                                   \
-                "1:     mov             %1,%3           \n"             \
-                "2:     mov             %2,%4           \n"             \
-                "       mov             0,%0            \n"             \
-                "3:                                     \n"             \
-                "       .section        .fixup,\"ax\"   \n"             \
-                "4:                                     \n"             \
-                "       mov             %5,%0           \n"             \
-                "       jmp             3b              \n"             \
-                "       .previous                       \n"             \
-                "       .section        __ex_table,\"a\"\n"             \
-                "       .balign         4               \n"             \
-                "       .long           1b, 4b          \n"             \
-                "       .long           2b, 4b          \n"             \
-                "       .previous                       \n"             \
-                : "=&r" (__pu_err)                                      \
-                : "r" (__pu_val.bits[0]), "r" (__pu_val.bits[1]),       \
-                  "m" (__m(__pu_addr)), "m" (__m(__pu_addr+4)),         \
-                  "i" (-EFAULT)                                         \
-                );                                                      \
-})
-extern int __put_user_unknown(void);
-/*
- * Copy To/From Userspace
- */
-/* Generic arbitrary sized copy.  */
-#define __copy_user(to, from, size)                                     \
-do {                                                                    \
-        if (size) {                                                     \
-                void *__to = to;                                        \
-                const void *__from = from;                              \
-                int w;                                                  \
-                asm volatile(                                           \
-                        "0:     movbu   (%0),%3;\n"                     \
-                        "1:     movbu   %3,(%1);\n"                     \
-                        "       inc     %0;\n"                          \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     0b;\n"                          \
-                        "2:\n"                                          \
-                        "       .section .fixup,\"ax\"\n"               \
-                        "3:     jmp     2b\n"                           \
-                        "       .previous\n"                            \
-                        "       .section __ex_table,\"a\"\n"            \
-                        "       .balign 4\n"                            \
-                        "       .long   0b,3b\n"                        \
-                        "       .long   1b,3b\n"                        \
-                        "       .previous\n"                            \
-                        : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
-                        : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
-        }                                                               \
-} while (0)
-#define __copy_user_zeroing(to, from, size)                             \
-do {                                                                    \
-        if (size) {                                                     \
-                void *__to = to;                                        \
-                const void *__from = from;                              \
-                int w;                                                  \
-                asm volatile(                                           \
-                        "0:     movbu   (%0),%3;\n"                     \
-                        "1:     movbu   %3,(%1);\n"                     \
-                        "       inc     %0;\n"                          \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     0b;\n"                          \
-                        "2:\n"                                          \
-                        "       .section .fixup,\"ax\"\n"               \
-                        "3:\n"                                          \
-                        "       mov     %2,%0\n"                        \
-                        "       clr     %3\n"                           \
-                        "4:     movbu   %3,(%1);\n"                     \
-                        "       inc     %1;\n"                          \
-                        "       add     -1,%2;\n"                       \
-                        "       bne     4b;\n"                          \
-                        "       mov     %0,%2\n"                        \
-                        "       jmp     2b\n"                           \
-                        "       .previous\n"                            \
-                        "       .section __ex_table,\"a\"\n"            \
-                        "       .balign 4\n"                            \
-                        "       .long   0b,3b\n"                        \
-                        "       .long   1b,3b\n"                        \
-                        "       .previous\n"                            \
-                        : "=a"(__from), "=a"(__to), "=r"(size), "=&r"(w)\
-                        : "0"(__from), "1"(__to), "2"(size)             \
-                        : "memory");                                    \
-        }                                                               \
-} while (0)
-/* We let the __ versions of copy_from/to_user inline, because they're often
- * used in fast paths and have only a small space overhead.
- */
-static inline
-unsigned long __generic_copy_from_user_nocheck(void *to, const void *from,
-                                               unsigned long n)
-{
-        __copy_user_zeroing(to, from, n);
-        return n;
-}
-static inline
-unsigned long __generic_copy_to_user_nocheck(void *to, const void *from,
-                                             unsigned long n)
-{
-        __copy_user(to, from, n);
-        return n;
-}
-#if 0
-#error don't use - these macros don't increment to & from pointers
-/* Optimize just a little bit when we know the size of the move. */
-#define __constant_copy_user(to, from, size)    \
-do {                                            \
-        asm volatile(                           \
-                "       mov %0,a0;\n"           \
-                "0:     movbu (%1),d3;\n"       \
-                "1:     movbu d3,(%2);\n"       \
-                "       add -1,a0;\n"           \
-                "       bne 0b;\n"              \
-                "2:;"                           \
-                ".section .fixup,\"ax\"\n"      \
-                "3:     jmp 2b\n"               \
-                ".previous\n"                   \
-                ".section __ex_table,\"a\"\n"   \
-                "       .balign 4\n"            \
-                "       .long 0b,3b\n"          \
-                "       .long 1b,3b\n"          \
-                ".previous"                     \
-                :                               \
-                : "d"(size), "d"(to), "d"(from) \
-                : "d3", "a0");                  \
-} while (0)
-/* Optimize just a little bit when we know the size of the move. */
-#define __constant_copy_user_zeroing(to, from, size)    \
-do {                                                    \
-        asm volatile(                                   \
-                "       mov %0,a0;\n"                   \
-                "0:     movbu (%1),d3;\n"               \
-                "1:     movbu d3,(%2);\n"               \
-                "       add -1,a0;\n"                   \
-                "       bne 0b;\n"                      \
-                "2:;"                                   \
-                ".section .fixup,\"ax\"\n"              \
-                "3:     jmp 2b\n"                       \
-                ".previous\n"                           \
-                ".section __ex_table,\"a\"\n"           \
-                "       .balign 4\n"                    \
-                "       .long 0b,3b\n"                  \
-                "       .long 1b,3b\n"                  \
-                ".previous"                             \
-                :                                       \
-                : "d"(size), "d"(to), "d"(from)         \
-                : "d3", "a0");                          \
-} while (0)
-static inline
-unsigned long __constant_copy_to_user(void *to, const void *from,
-                                      unsigned long n)
-{
-        if (access_ok(VERIFY_WRITE, to, n))
-                __constant_copy_user(to, from, n);
-        return n;
-}
-static inline
-unsigned long __constant_copy_from_user(void *to, const void *from,
-                                        unsigned long n)
-{
-        if (access_ok(VERIFY_READ, from, n))
-                __constant_copy_user_zeroing(to, from, n);
-        return n;
-}
-static inline
-unsigned long __constant_copy_to_user_nocheck(void *to, const void *from,
-                                              unsigned long n)
-{
-        __constant_copy_user(to, from, n);
-        return n;
-}
-static inline
-unsigned long __constant_copy_from_user_nocheck(void *to, const void *from,
-                                                unsigned long n)
-{
-        __constant_copy_user_zeroing(to, from, n);
-        return n;
-}
-#endif
-extern unsigned long __generic_copy_to_user(void __user *, const void *,
-                                            unsigned long);
-extern unsigned long __generic_copy_from_user(void *, const void __user *,
-                                              unsigned long);
-#define __copy_to_user_inatomic(to, from, n) \
-        __generic_copy_to_user_nocheck((to), (from), (n))
-#define __copy_from_user_inatomic(to, from, n) \
-        __generic_copy_from_user_nocheck((to), (from), (n))
-#define __copy_to_user(to, from, n)                     \
-({                                                      \
-        might_sleep();                                  \
-        __copy_to_user_inatomic((to), (from), (n));     \
-})
-#define __copy_from_user(to, from, n)                   \
-({                                                      \
-        might_sleep();                                  \
-        __copy_from_user_inatomic((to), (from), (n));   \
-})
-#define copy_to_user(to, from, n)   __generic_copy_to_user((to), (from), (n))
-#define copy_from_user(to, from, n) __generic_copy_from_user((to), (from), (n))
-extern long strncpy_from_user(char *dst, const char __user *src, long count);
-extern long __strncpy_from_user(char *dst, const char __user *src, long count);
-extern long strnlen_user(const char __user *str, long n);
-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
-extern unsigned long clear_user(void __user *mem, unsigned long len);
-extern unsigned long __clear_user(void __user *mem, unsigned long len);
-#endif /* _ASM_UACCESS_H */
diff --git a/include/asm-mn10300/ucontext.h b/include/asm-mn10300/ucontext.h
deleted file mode 100644
index fcab5c1d8e18..000000000000
--- a/include/asm-mn10300/ucontext.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* MN10300 User context
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UCONTEXT_H
-#define _ASM_UCONTEXT_H
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct sigcontext uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-#endif /* _ASM_UCONTEXT_H */
diff --git a/include/asm-mn10300/unaligned.h b/include/asm-mn10300/unaligned.h
deleted file mode 100644
index 0df671318ae4..000000000000
--- a/include/asm-mn10300/unaligned.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* MN10300 Unaligned memory access handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_MN10300_UNALIGNED_H
-#define _ASM_MN10300_UNALIGNED_H
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned   __get_unaligned_le
-#define put_unaligned   __put_unaligned_le
-#endif /* _ASM_MN10300_UNALIGNED_H */
diff --git a/include/asm-mn10300/unistd.h b/include/asm-mn10300/unistd.h
deleted file mode 100644
index 543a4f98695d..000000000000
--- a/include/asm-mn10300/unistd.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* MN10300 System call number list
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNISTD_H
-#define _ASM_UNISTD_H
-#define __NR_restart_syscall      0
-#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_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#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_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
-#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_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#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_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_profil              98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_ioperm             101
-#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_olduname           109
-#define __NR_iopl               110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_vm86old            113
-#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_modify_ldt         123
-#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_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#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_setresuid          164
-#define __NR_getresuid          165
-#define __NR_vm86               166
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#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_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#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_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_madvise1           219     /* delete when C lib stub is removed */
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-/* 223 is unused */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#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)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_cacheflush         289
-#define __NR_ioprio_set         290
-#define __NR_ioprio_get         291
-#define __NR_inotify_init       292
-#define __NR_inotify_add_watch  293
-#define __NR_inotify_rm_watch   294
-#define __NR_migrate_pages      295
-#define __NR_openat             296
-#define __NR_mkdirat            297
-#define __NR_mknodat            298
-#define __NR_fchownat           299
-#define __NR_futimesat          300
-#define __NR_fstatat64          301
-#define __NR_unlinkat           302
-#define __NR_renameat           303
-#define __NR_linkat             304
-#define __NR_symlinkat          305
-#define __NR_readlinkat         306
-#define __NR_fchmodat           307
-#define __NR_faccessat          308
-#define __NR_pselect6           309
-#define __NR_ppoll              310
-#define __NR_unshare            311
-#define __NR_set_robust_list    312
-#define __NR_get_robust_list    313
-#define __NR_splice             314
-#define __NR_sync_file_range    315
-#define __NR_tee                316
-#define __NR_vmsplice           317
-#define __NR_move_pages         318
-#define __NR_getcpu             319
-#define __NR_epoll_pwait        320
-#define __NR_utimensat          321
-#define __NR_signalfd           322
-#define __NR_timerfd_create     323
-#define __NR_eventfd            324
-#define __NR_fallocate          325
-#define __NR_timerfd_settime    326
-#define __NR_timerfd_gettime    327
-#define __NR_signalfd4          328
-#define __NR_eventfd2           329
-#define __NR_epoll_create1      330
-#define __NR_dup3               331
-#define __NR_pipe2              332
-#define __NR_inotify_init1      333
-#ifdef __KERNEL__
-#define NR_syscalls 326
-/*
- * specify the deprecated syscalls we want to support on this arch
- */
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
-#define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#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
-/*
- * "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
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-#endif
-#endif /* __KERNEL__ */
-#endif /* _ASM_UNISTD_H */
diff --git a/include/asm-mn10300/unit-asb2303/clock.h b/include/asm-mn10300/unit-asb2303/clock.h
deleted file mode 100644
index 8b450e920af1..000000000000
--- a/include/asm-mn10300/unit-asb2303/clock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ASB2303-specific clocks
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_CLOCK_H
-#define _ASM_UNIT_CLOCK_H
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_MN10300_RTC
-extern unsigned long mn10300_ioclk;     /* IOCLK (crystal speed) in HZ */
-extern unsigned long mn10300_iobclk;
-extern unsigned long mn10300_tsc_per_HZ;
-#define MN10300_IOCLK           ((unsigned long)mn10300_ioclk)
-/* If this processors has a another clock, uncomment the below. */
-/* #define MN10300_IOBCLK       ((unsigned long)mn10300_iobclk) */
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_IOCLK           33333333UL
-/* #define MN10300_IOBCLK       66666666UL */
-#endif /* !CONFIG_MN10300_RTC */
-#define MN10300_JCCLK           MN10300_IOCLK
-#define MN10300_TSCCLK          MN10300_IOCLK
-#ifdef CONFIG_MN10300_RTC
-#define MN10300_TSC_PER_HZ      ((unsigned long)mn10300_tsc_per_HZ)
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_TSC_PER_HZ      (MN10300_TSCCLK/HZ)
-#endif /* !CONFIG_MN10300_RTC */
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_UNIT_CLOCK_H */
diff --git a/include/asm-mn10300/unit-asb2303/leds.h b/include/asm-mn10300/unit-asb2303/leds.h
deleted file mode 100644
index 3a7543ea7b5c..000000000000
--- a/include/asm-mn10300/unit-asb2303/leds.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ASB2303-specific LEDs
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_LEDS_H
-#define _ASM_UNIT_LEDS_H
-#include <asm/pio-regs.h>
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-#define ASB2303_GPIO0DEF        __SYSREG(0xDB000000, u32)
-#define ASB2303_7SEGLEDS        __SYSREG(0xDB000008, u32)
-/*
- * use the 7-segment LEDs to indicate states
- */
-/* flip the 7-segment LEDs between "G" and "-" */
-#define mn10300_set_gdbleds(ONOFF)                      \
-do {                                                    \
-        ASB2303_7SEGLEDS = (ONOFF) ? 0x85 : 0x7f;       \
-} while (0)
-/* indicate double-fault by displaying "d" on the LEDs */
-#define mn10300_set_dbfleds                     \
-        mov     0x43,d0                 ;       \
-        movbu   d0,(ASB2303_7SEGLEDS)
-#ifndef __ASSEMBLY__
-extern void peripheral_leds_display_exception(enum exception_code code);
-extern void peripheral_leds_led_chase(void);
-extern void debug_to_serial(const char *p, int n);
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_UNIT_LEDS_H */
diff --git a/include/asm-mn10300/unit-asb2303/serial.h b/include/asm-mn10300/unit-asb2303/serial.h
deleted file mode 100644
index 0d55cf5896ac..000000000000
--- a/include/asm-mn10300/unit-asb2303/serial.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ASB2303-specific 8250 serial ports
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_SERIAL_H
-#define _ASM_UNIT_SERIAL_H
-#include <asm/cpu-regs.h>
-#include <asm/proc/irq.h>
-#include <linux/serial_reg.h>
-#define SERIAL_PORT0_BASE_ADDRESS       0xA6FB0000
-#define SERIAL_PORT1_BASE_ADDRESS       0xA6FC0000
-#define SERIAL_IRQ      XIRQ0   /* Dual serial (PC16552)        (Hi) */
-/*
- * dispose of the /dev/ttyS0 and /dev/ttyS1 serial ports
- */
-#ifndef CONFIG_GDBSTUB_ON_TTYSx
-#define SERIAL_PORT_DFNS                                                \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT0_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },                                                              \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT1_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },
-#ifndef __ASSEMBLY__
-static inline void __debug_to_serial(const char *p, int n)
-{
-}
-#endif /* !__ASSEMBLY__ */
-#else /* CONFIG_GDBSTUB_ON_TTYSx */
-#define SERIAL_PORT_DFNS /* both stolen by gdb-stub because they share an IRQ */
-#if defined(CONFIG_GDBSTUB_ON_TTYS0)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-#elif defined(CONFIG_GDBSTUB_ON_TTYS1)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT1_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-#endif
-#ifndef __ASSEMBLY__
-#define LSR_WAIT_FOR(STATE)                                     \
-do {                                                            \
-        while (!(GDBPORT_SERIAL_LSR & UART_LSR_##STATE)) {}     \
-} while (0)
-#define FLOWCTL_WAIT_FOR(LINE)                                  \
-do {                                                            \
-        while (!(GDBPORT_SERIAL_MSR & UART_MSR_##LINE)) {}      \
-} while (0)
-#define FLOWCTL_CLEAR(LINE)                     \
-do {                                            \
-        GDBPORT_SERIAL_MCR &= ~UART_MCR_##LINE; \
-} while (0)
-#define FLOWCTL_SET(LINE)                       \
-do {                                            \
-        GDBPORT_SERIAL_MCR |= UART_MCR_##LINE;  \
-} while (0)
-#define FLOWCTL_QUERY(LINE)     ({ GDBPORT_SERIAL_MSR & UART_MSR_##LINE; })
-static inline void __debug_to_serial(const char *p, int n)
-{
-        char ch;
-        FLOWCTL_SET(DTR);
-        for (; n > 0; n--) {
-                LSR_WAIT_FOR(THRE);
-                FLOWCTL_WAIT_FOR(CTS);
-                ch = *p++;
-                if (ch == 0x0a) {
-                        GDBPORT_SERIAL_TX = 0x0d;
-                        LSR_WAIT_FOR(THRE);
-                        FLOWCTL_WAIT_FOR(CTS);
-                }
-                GDBPORT_SERIAL_TX = ch;
-        }
-        FLOWCTL_CLEAR(DTR);
-}
-#endif /* !__ASSEMBLY__ */
-#endif /* CONFIG_GDBSTUB_ON_TTYSx */
-#endif /* _ASM_UNIT_SERIAL_H */
diff --git a/include/asm-mn10300/unit-asb2303/smc91111.h b/include/asm-mn10300/unit-asb2303/smc91111.h
deleted file mode 100644
index dd456e9c513f..000000000000
--- a/include/asm-mn10300/unit-asb2303/smc91111.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Support for the SMC91C111 NIC on an ASB2303
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_SMC91111_H
-#define _ASM_UNIT_SMC91111_H
-#include <asm/intctl-regs.h>
-#define SMC91111_BASE           0xAA000300UL
-#define SMC91111_BASE_END       0xAA000400UL
-#define SMC91111_IRQ            XIRQ3
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_NOWAIT              1
-#define SMC_IRQ_FLAGS           (0)
-#if SMC_CAN_USE_8BIT
-#define SMC_inb(a, r)           inb((unsigned long) ((a) + (r)))
-#define SMC_outb(v, a, r)       outb(v, (unsigned long) ((a) + (r)))
-#endif
-#if SMC_CAN_USE_16BIT
-#define SMC_inw(a, r)           inw((unsigned long) ((a) + (r)))
-#define SMC_outw(v, a, r)       outw(v, (unsigned long) ((a) + (r)))
-#define SMC_insw(a, r, p, l)    insw((unsigned long) ((a) + (r)), (p), (l))
-#define SMC_outsw(a, r, p, l)   outsw((unsigned long) ((a) + (r)), (p), (l))
-#endif
-#if SMC_CAN_USE_32BIT
-#define SMC_inl(a, r)           inl((unsigned long) ((a) + (r)))
-#define SMC_outl(v, a, r)       outl(v, (unsigned long) ((a) + (r)))
-#define SMC_insl(a, r, p, l)    insl((unsigned long) ((a) + (r)), (p), (l))
-#define SMC_outsl(a, r, p, l)   outsl((unsigned long) ((a) + (r)), (p), (l))
-#endif
-#define RPC_LSA_DEFAULT         RPC_LED_100_10
-#define RPC_LSB_DEFAULT         RPC_LED_TX_RX
-#define set_irq_type(irq, type)
-#endif /*  _ASM_UNIT_SMC91111_H */
diff --git a/include/asm-mn10300/unit-asb2303/timex.h b/include/asm-mn10300/unit-asb2303/timex.h
deleted file mode 100644
index 7e54b0cfdd03..000000000000
--- a/include/asm-mn10300/unit-asb2303/timex.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ASB2303-specific timer specifcations
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_TIMEX_H
-#define _ASM_UNIT_TIMEX_H
-#ifndef __ASSEMBLY__
-#include <linux/irq.h>
-#endif /* __ASSEMBLY__ */
-#include <asm/timer-regs.h>
-#include <asm/unit/clock.h>
-/*
- * jiffies counter specifications
- */
-#define TMJCBR_MAX              0xffff
-#define TMJCBC                  TM01BC
-#define TMJCMD                  TM01MD
-#define TMJCBR                  TM01BR
-#define TMJCIRQ                 TM1IRQ
-#define TMJCICR                 TM1ICR
-#define TMJCICR_LEVEL           GxICR_LEVEL_5
-#ifndef __ASSEMBLY__
-static inline void startup_jiffies_counter(void)
-{
-        unsigned rate;
-        u16 md, t16;
-        /* use as little prescaling as possible to avoid losing accuracy */
-        md = TM0MD_SRC_IOCLK;
-        rate = MN10300_JCCLK / HZ;
-        if (rate > TMJCBR_MAX) {
-                md = TM0MD_SRC_IOCLK_8;
-                rate = MN10300_JCCLK / 8 / HZ;
-                if (rate > TMJCBR_MAX) {
-                        md = TM0MD_SRC_IOCLK_32;
-                        rate = MN10300_JCCLK / 32 / HZ;
-                        if (rate > TMJCBR_MAX)
-                                BUG();
-                }
-        }
-        TMJCBR = rate - 1;
-        t16 = TMJCBR;
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_INIT_COUNTER |
-                TM1MD_INIT_COUNTER << 8;
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_COUNT_ENABLE |
-                TM1MD_COUNT_ENABLE << 8;
-        t16 = TMJCMD;
-        TMJCICR |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;
-        t16 = TMJCICR;
-}
-static inline void shutdown_jiffies_counter(void)
-{
-}
-#endif /* !__ASSEMBLY__ */
-/*
- * timestamp counter specifications
- */
-#define TMTSCBR_MAX             0xffffffff
-#define TMTSCBC                 TM45BC
-#ifndef __ASSEMBLY__
-static inline void startup_timestamp_counter(void)
-{
-        /* set up timer 4 & 5 cascaded as a 32-bit counter to count real time
-         * - count down from 4Gig-1 to 0 and wrap at IOCLK rate
-         */
-        TM45BR = TMTSCBR_MAX;
-        TM4MD = TM4MD_SRC_IOCLK;
-        TM4MD |= TM4MD_INIT_COUNTER;
-        TM4MD &= ~TM4MD_INIT_COUNTER;
-        TM4ICR = 0;
-        TM5MD = TM5MD_SRC_TM4CASCADE;
-        TM5MD |= TM5MD_INIT_COUNTER;
-        TM5MD &= ~TM5MD_INIT_COUNTER;
-        TM5ICR = 0;
-        TM5MD |= TM5MD_COUNT_ENABLE;
-        TM4MD |= TM4MD_COUNT_ENABLE;
-}
-static inline void shutdown_timestamp_counter(void)
-{
-        TM4MD = 0;
-        TM5MD = 0;
-}
-/*
- * we use a cascaded pair of 16-bit down-counting timers to count I/O
- * clock cycles for the purposes of time keeping
- */
-typedef unsigned long cycles_t;
-static inline cycles_t read_timestamp_counter(void)
-{
-        return (cycles_t)TMTSCBC;
-}
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_UNIT_TIMEX_H */
diff --git a/include/asm-mn10300/unit-asb2305/clock.h b/include/asm-mn10300/unit-asb2305/clock.h
deleted file mode 100644
index 7d514841ffda..000000000000
--- a/include/asm-mn10300/unit-asb2305/clock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ASB2305-specific clocks
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_CLOCK_H
-#define _ASM_UNIT_CLOCK_H
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_MN10300_RTC
-extern unsigned long mn10300_ioclk;     /* IOCLK (crystal speed) in HZ */
-extern unsigned long mn10300_iobclk;
-extern unsigned long mn10300_tsc_per_HZ;
-#define MN10300_IOCLK           ((unsigned long)mn10300_ioclk)
-/* If this processors has a another clock, uncomment the below. */
-/* #define MN10300_IOBCLK       ((unsigned long)mn10300_iobclk) */
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_IOCLK           33333333UL
-/* #define MN10300_IOBCLK       66666666UL */
-#endif /* !CONFIG_MN10300_RTC */
-#define MN10300_JCCLK           MN10300_IOCLK
-#define MN10300_TSCCLK          MN10300_IOCLK
-#ifdef CONFIG_MN10300_RTC
-#define MN10300_TSC_PER_HZ      ((unsigned long)mn10300_tsc_per_HZ)
-#else /* !CONFIG_MN10300_RTC */
-#define MN10300_TSC_PER_HZ      (MN10300_TSCCLK/HZ)
-#endif /* !CONFIG_MN10300_RTC */
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_UNIT_CLOCK_H */
diff --git a/include/asm-mn10300/unit-asb2305/leds.h b/include/asm-mn10300/unit-asb2305/leds.h
deleted file mode 100644
index bc471f617fd1..000000000000
--- a/include/asm-mn10300/unit-asb2305/leds.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ASB2305-specific LEDs
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_LEDS_H
-#define _ASM_UNIT_LEDS_H
-#include <asm/pio-regs.h>
-#include <asm/cpu-regs.h>
-#include <asm/exceptions.h>
-#define ASB2305_7SEGLEDS        __SYSREG(0xA6F90000, u32)
-/* perform a hard reset by driving PIO06 low */
-#define mn10300_unit_hard_reset()               \
-do {                                            \
-        P0OUT &= 0xbf;                          \
-        P0MD = (P0MD & P0MD_6) | P0MD_6_OUT;    \
-} while (0)
-/*
- * use the 7-segment LEDs to indicate states
- */
-/* indicate double-fault by displaying "db-f" on the LEDs */
-#define mn10300_set_dbfleds                     \
-        mov     0x43077f1d,d0           ;       \
-        mov     d0,(ASB2305_7SEGLEDS)
-/* flip the 7-segment LEDs between "Gdb-" and "----" */
-#define mn10300_set_gdbleds(ONOFF)                              \
-do {                                                            \
-        ASB2305_7SEGLEDS = (ONOFF) ? 0x8543077f : 0x7f7f7f7f;   \
-} while (0)
-#ifndef __ASSEMBLY__
-extern void peripheral_leds_display_exception(enum exception_code);
-extern void peripheral_leds_led_chase(void);
-extern void peripheral_leds7x4_display_dec(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_hex(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_minssecs(unsigned int, unsigned int);
-extern void peripheral_leds7x4_display_rtc(void);
-#endif /* __ASSEMBLY__ */
-#endif /* _ASM_UNIT_LEDS_H */
diff --git a/include/asm-mn10300/unit-asb2305/serial.h b/include/asm-mn10300/unit-asb2305/serial.h
deleted file mode 100644
index 73d31d67bb71..000000000000
--- a/include/asm-mn10300/unit-asb2305/serial.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ASB2305-specific 8250 serial ports
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_SERIAL_H
-#define _ASM_UNIT_SERIAL_H
-#include <asm/cpu/cpu-regs.h>
-#include <asm/proc/irq.h>
-#include <linux/serial_reg.h>
-#define SERIAL_PORT0_BASE_ADDRESS       0xA6FB0000
-#define ASB2305_DEBUG_MCR       __SYSREG(0xA6FB0000 + UART_MCR * 2, u8)
-#define SERIAL_IRQ      XIRQ0   /* Dual serial (PC16552)        (Hi) */
-/*
- * dispose of the /dev/ttyS0 serial port
- */
-#ifndef CONFIG_GDBSTUB_ON_TTYSx
-#define SERIAL_PORT_DFNS                                                \
-        {                                                               \
-        .baud_base              = BASE_BAUD,                            \
-        .irq                    = SERIAL_IRQ,                           \
-        .flags                  = STD_COM_FLAGS,                        \
-        .iomem_base             = (u8 *) SERIAL_PORT0_BASE_ADDRESS,     \
-        .iomem_reg_shift        = 2,                                    \
-        .io_type                = SERIAL_IO_MEM,                        \
-        },
-#ifndef __ASSEMBLY__
-static inline void __debug_to_serial(const char *p, int n)
-{
-}
-#endif /* !__ASSEMBLY__ */
-#else /* CONFIG_GDBSTUB_ON_TTYSx */
-#define SERIAL_PORT_DFNS /* stolen by gdb-stub */
-#if defined(CONFIG_GDBSTUB_ON_TTYS0)
-#define GDBPORT_SERIAL_RX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_RX  * 4, u8)
-#define GDBPORT_SERIAL_TX       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define GDBPORT_SERIAL_DLL      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLL * 4, u8)
-#define GDBPORT_SERIAL_DLM      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_DLM * 4, u8)
-#define GDBPORT_SERIAL_IER      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IER * 4, u8)
-#define GDBPORT_SERIAL_IIR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_IIR * 4, u8)
-#define GDBPORT_SERIAL_FCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_FCR * 4, u8)
-#define GDBPORT_SERIAL_LCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LCR * 4, u8)
-#define GDBPORT_SERIAL_MCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define GDBPORT_SERIAL_LSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define GDBPORT_SERIAL_MSR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-#define GDBPORT_SERIAL_SCR      __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_SCR * 4, u8)
-#define GDBPORT_SERIAL_IRQ      SERIAL_IRQ
-#elif defined(CONFIG_GDBSTUB_ON_TTYS1)
-#error The ASB2305 doesnt have a /dev/ttyS1
-#endif
-#ifndef __ASSEMBLY__
-#define TTYS0_TX        __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_TX  * 4, u8)
-#define TTYS0_MCR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MCR * 4, u8)
-#define TTYS0_LSR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_LSR * 4, u8)
-#define TTYS0_MSR       __SYSREG(SERIAL_PORT0_BASE_ADDRESS + UART_MSR * 4, u8)
-#define LSR_WAIT_FOR(STATE)                             \
-do {                                                    \
-        while (!(TTYS0_LSR & UART_LSR_##STATE)) {}      \
-} while (0)
-#define FLOWCTL_WAIT_FOR(LINE)                          \
-do {                                                    \
-        while (!(TTYS0_MSR & UART_MSR_##LINE)) {}       \
-} while (0)
-#define FLOWCTL_CLEAR(LINE)                     \
-do {                                            \
-        TTYS0_MCR &= ~UART_MCR_##LINE;          \
-} while (0)
-#define FLOWCTL_SET(LINE)                       \
-do {                                            \
-        TTYS0_MCR |= UART_MCR_##LINE;           \
-} while (0)
-#define FLOWCTL_QUERY(LINE)     ({ TTYS0_MSR & UART_MSR_##LINE; })
-static inline void __debug_to_serial(const char *p, int n)
-{
-        char ch;
-        FLOWCTL_SET(DTR);
-        for (; n > 0; n--) {
-                LSR_WAIT_FOR(THRE);
-                FLOWCTL_WAIT_FOR(CTS);
-                ch = *p++;
-                if (ch == 0x0a) {
-                        TTYS0_TX = 0x0d;
-                        LSR_WAIT_FOR(THRE);
-                        FLOWCTL_WAIT_FOR(CTS);
-                }
-                TTYS0_TX = ch;
-        }
-        FLOWCTL_CLEAR(DTR);
-}
-#endif /* !__ASSEMBLY__ */
-#endif /* CONFIG_GDBSTUB_ON_TTYSx */
-#endif /* _ASM_UNIT_SERIAL_H */
diff --git a/include/asm-mn10300/unit-asb2305/timex.h b/include/asm-mn10300/unit-asb2305/timex.h
deleted file mode 100644
index 10e1bfe34463..000000000000
--- a/include/asm-mn10300/unit-asb2305/timex.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ASB2305 timer specifcations
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_UNIT_TIMEX_H
-#define _ASM_UNIT_TIMEX_H
-#ifndef __ASSEMBLY__
-#include <linux/irq.h>
-#endif /* __ASSEMBLY__ */
-#include <asm/cpu/timer-regs.h>
-#include <asm/unit/clock.h>
-/*
- * jiffies counter specifications
- */
-#define TMJCBR_MAX              0xffff
-#define TMJCBC                  TM01BC
-#define TMJCMD                  TM01MD
-#define TMJCBR                  TM01BR
-#define TMJCIRQ                 TM1IRQ
-#define TMJCICR                 TM1ICR
-#define TMJCICR_LEVEL           GxICR_LEVEL_5
-#ifndef __ASSEMBLY__
-static inline void startup_jiffies_counter(void)
-{
-        unsigned rate;
-        u16 md, t16;
-        /* use as little prescaling as possible to avoid losing accuracy */
-        md = TM0MD_SRC_IOCLK;
-        rate = MN10300_JCCLK / HZ;
-        if (rate > TMJCBR_MAX) {
-                md = TM0MD_SRC_IOCLK_8;
-                rate = MN10300_JCCLK / 8 / HZ;
-                if (rate > TMJCBR_MAX) {
-                        md = TM0MD_SRC_IOCLK_32;
-                        rate = MN10300_JCCLK / 32 / HZ;
-                        if (rate > TMJCBR_MAX)
-                                BUG();
-                }
-        }
-        TMJCBR = rate - 1;
-        t16 = TMJCBR;
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_INIT_COUNTER |
-                TM1MD_INIT_COUNTER << 8;
-        TMJCMD =
-                md |
-                TM1MD_SRC_TM0CASCADE << 8 |
-                TM0MD_COUNT_ENABLE |
-                TM1MD_COUNT_ENABLE << 8;
-        t16 = TMJCMD;
-        TMJCICR |= GxICR_ENABLE | GxICR_DETECT | GxICR_REQUEST;
-        t16 = TMJCICR;
-}
-static inline void shutdown_jiffies_counter(void)
-{
-}
-#endif /* !__ASSEMBLY__ */
-/*
- * timestamp counter specifications
- */
-#define TMTSCBR_MAX             0xffffffff
-#define TMTSCBC                 TM45BC
-#ifndef __ASSEMBLY__
-static inline void startup_timestamp_counter(void)
-{
-        /* set up timer 4 & 5 cascaded as a 32-bit counter to count real time
-         * - count down from 4Gig-1 to 0 and wrap at IOCLK rate
-         */
-        TM45BR = TMTSCBR_MAX;
-        TM4MD = TM4MD_SRC_IOCLK;
-        TM4MD |= TM4MD_INIT_COUNTER;
-        TM4MD &= ~TM4MD_INIT_COUNTER;
-        TM4ICR = 0;
-        TM5MD = TM5MD_SRC_TM4CASCADE;
-        TM5MD |= TM5MD_INIT_COUNTER;
-        TM5MD &= ~TM5MD_INIT_COUNTER;
-        TM5ICR = 0;
-        TM5MD |= TM5MD_COUNT_ENABLE;
-        TM4MD |= TM4MD_COUNT_ENABLE;
-}
-static inline void shutdown_timestamp_counter(void)
-{
-        TM4MD = 0;
-        TM5MD = 0;
-}
-/*
- * we use a cascaded pair of 16-bit down-counting timers to count I/O
- * clock cycles for the purposes of time keeping
- */
-typedef unsigned long cycles_t;
-static inline cycles_t read_timestamp_counter(void)
-{
-        return (cycles_t) TMTSCBC;
-}
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_UNIT_TIMEX_H */
diff --git a/include/asm-mn10300/user.h b/include/asm-mn10300/user.h
deleted file mode 100644
index e1193908b78c..000000000000
--- a/include/asm-mn10300/user.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* MN10300 User process data
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_USER_H
-#define _ASM_USER_H
-#include <asm/page.h>
-#include <linux/ptrace.h>
-#ifndef __ASSEMBLY__
-/*
- * 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 pt_regs 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. */
-        int reserved;                   /* No longer used */
-        struct user_pt_regs *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 */
-};
-#endif
-#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 /* _ASM_USER_H */
diff --git a/include/asm-mn10300/vga.h b/include/asm-mn10300/vga.h
deleted file mode 100644
index 0163e50a3459..000000000000
--- a/include/asm-mn10300/vga.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* MN10300 VGA register definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_VGA_H
-#define _ASM_VGA_H
-#endif /* _ASM_VGA_H */
diff --git a/include/asm-mn10300/xor.h b/include/asm-mn10300/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/include/asm-mn10300/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 2df74eb09563..9477af01a639 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -472,6 +472,7 @@
        {0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
        {0, 0, 0}
 #define gamma_PCI_IDS \
@@ -533,4 +534,5 @@
        {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
        {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
        {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+        {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
        {0, 0, 0}
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 67e3353a56d6..95962fa8398a 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -594,6 +594,9 @@ struct drm_i915_gem_busy {
 #define I915_BIT_6_SWIZZLE_9_10_11      4
 /* Not seen by userland */
 #define I915_BIT_6_SWIZZLE_UNKNOWN      5
+/* Seen by userland. */
+#define I915_BIT_6_SWIZZLE_9_17         6
+#define I915_BIT_6_SWIZZLE_9_10_17      7
 struct drm_i915_gem_set_tiling {
        /** Handle of the buffer to have its tiling state updated */
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 6617c9f8f2ca..cb79b7a208e1 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -29,6 +29,8 @@
 #ifndef __LINUX_ATA_H__
 #define __LINUX_ATA_H__
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -91,6 +93,7 @@ enum {
        ATA_ID_CFA_POWER        = 160,
        ATA_ID_CFA_KEY_MGMT     = 162,
        ATA_ID_CFA_MODES        = 163,
+        ATA_ID_DATA_SET_MGMT    = 169,
        ATA_ID_ROT_SPEED        = 217,
        ATA_ID_PIO4             = (1 << 1),
@@ -248,6 +251,7 @@ enum {
        ATA_CMD_SMART           = 0xB0,
        ATA_CMD_MEDIA_LOCK      = 0xDE,
        ATA_CMD_MEDIA_UNLOCK    = 0xDF,
+        ATA_CMD_DSM             = 0x06,
        /* marked obsolete in the ATA/ATAPI-7 spec */
        ATA_CMD_RESTORE         = 0x10,
@@ -321,6 +325,9 @@ enum {
        ATA_SMART_READ_VALUES   = 0xD0,
        ATA_SMART_READ_THRESHOLDS = 0xD1,
+        /* feature values for Data Set Management */
+        ATA_DSM_TRIM            = 0x01,
        /* password used in LBA Mid / LBA High for executing SMART commands */
        ATA_SMART_LBAM_PASS     = 0x4F,
        ATA_SMART_LBAH_PASS     = 0xC2,
@@ -723,6 +730,14 @@ static inline int ata_id_has_unload(const u16 *id)
        return 0;
 }
+static inline int ata_id_has_trim(const u16 *id)
+{
+        if (ata_id_major_version(id) >= 7 &&
+            (id[ATA_ID_DATA_SET_MGMT] & 1))
+                return 1;
+        return 0;
+}
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -863,6 +878,32 @@ static inline void ata_id_to_hd_driveid(u16 *id)
 #endif
 }
+/*
+ * Write up to 'max' LBA Range Entries to the buffer that will cover the
+ * extent from sector to sector + count.  This is used for TRIM and for
+ * ADD LBA(S) TO NV CACHE PINNED SET.
+ */
+static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
+                                                u64 sector, unsigned long count)
+{
+        __le64 *buffer = _buffer;
+        unsigned i = 0;
+        while (i < max) {
+                u64 entry = sector |
+                        ((u64)(count > 0xffff ? 0xffff : count) << 48);
+                buffer[i++] = __cpu_to_le64(entry);
+                if (count <= 0xffff)
+                        break;
+                count -= 0xffff;
+                sector += 0xffff;
+        }
+        max = ALIGN(i * 8, 512);
+        memset(buffer + i, 0, max - i * 8);
+        return max;
+}
 static inline int is_multi_taskfile(struct ata_taskfile *tf)
 {
        return (tf->command == ATA_CMD_READ_MULTI) ||
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index bee52abb8a4d..0ec2c594868e 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -24,8 +24,8 @@ struct dentry;
 */
 enum bdi_state {
        BDI_pdflush,            /* A pdflush thread is working this device */
-        BDI_write_congested,    /* The write queue is getting full */
+        BDI_async_congested,    /* The async (write) queue is getting full */
-        BDI_read_congested,     /* The read queue is getting full */
+        BDI_sync_congested,     /* The sync queue is getting full */
        BDI_unused,             /* Available bits start here */
 };
@@ -215,18 +215,18 @@ static inline int bdi_congested(struct backing_dev_info *bdi, int bdi_bits)
 static inline int bdi_read_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_read_congested);
+        return bdi_congested(bdi, 1 << BDI_sync_congested);
 }
 static inline int bdi_write_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_write_congested);
+        return bdi_congested(bdi, 1 << BDI_async_congested);
 }
 static inline int bdi_rw_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, (1 << BDI_read_congested)|
+        return bdi_congested(bdi, (1 << BDI_sync_congested) |
-                                  (1 << BDI_write_congested));
+                                  (1 << BDI_async_congested));
 }
 void clear_bdi_congested(struct backing_dev_info *bdi, int rw);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index b05b1d4d17d2..b900d2c67d29 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -145,20 +145,21 @@ struct bio {
 * bit 2 -- barrier
 *      Insert a serialization point in the IO queue, forcing previously
 *      submitted IO to be completed before this one is issued.
- * bit 3 -- synchronous I/O hint: the block layer will unplug immediately
+ * bit 3 -- synchronous I/O hint.
- *      Note that this does NOT indicate that the IO itself is sync, just
+ * bit 4 -- Unplug the device immediately after submitting this bio.
- *      that the block layer will not postpone issue of this IO by plugging.
+ * bit 5 -- metadata request
- * bit 4 -- metadata request
 *      Used for tracing to differentiate metadata and data IO. May also
 *      get some preferential treatment in the IO scheduler
- * bit 5 -- discard sectors
+ * bit 6 -- discard sectors
 *      Informs the lower level device that this range of sectors is no longer
 *      used by the file system and may thus be freed by the device. Used
 *      for flash based storage.
- * bit 6 -- fail fast device errors
+ * bit 7 -- fail fast device errors
- * bit 7 -- fail fast transport errors
+ * bit 8 -- fail fast transport errors
- * bit 8 -- fail fast driver errors
+ * bit 9 -- fail fast driver errors
 *      Don't want driver retries for any fast fail whatever the reason.
+ * bit 10 -- Tell the IO scheduler not to wait for more requests after this
+        one has been submitted, even if it is a SYNC request.
 */
 #define BIO_RW          0       /* Must match RW in req flags (blkdev.h) */
 #define BIO_RW_AHEAD    1       /* Must match FAILFAST in req flags */
@@ -170,6 +171,7 @@ struct bio {
 #define BIO_RW_FAILFAST_DEV             7
 #define BIO_RW_FAILFAST_TRANSPORT       8
 #define BIO_RW_FAILFAST_DRIVER          9
+#define BIO_RW_NOIDLE   10
 #define bio_rw_flagged(bio, flag)       ((bio)->bi_rw & (1 << (flag)))
@@ -188,6 +190,7 @@ struct bio {
 #define bio_rw_ahead(bio)       bio_rw_flagged(bio, BIO_RW_AHEAD)
 #define bio_rw_meta(bio)        bio_rw_flagged(bio, BIO_RW_META)
 #define bio_discard(bio)        bio_rw_flagged(bio, BIO_RW_DISCARD)
+#define bio_noidle(bio)         bio_rw_flagged(bio, BIO_RW_NOIDLE)
 /*
 * upper 16 bits of bi_rw define the io priority of this bio
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 465d6babc847..ba54c834a590 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -38,6 +38,10 @@ struct request;
 typedef void (rq_end_io_fn)(struct request *, int);
 struct request_list {
+        /*
+         * count[], starved[], and wait[] are indexed by
+         * BLK_RW_SYNC/BLK_RW_ASYNC
+         */
        int count[2];
        int starved[2];
        int elvpriv;
@@ -66,6 +70,11 @@ enum rq_cmd_type_bits {
        REQ_TYPE_ATA_PC,
 };
+enum {
+        BLK_RW_ASYNC    = 0,
+        BLK_RW_SYNC     = 1,
+};
 /*
 * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
 * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
@@ -103,12 +112,12 @@ enum rq_flag_bits {
        __REQ_QUIET,            /* don't worry about errors */
        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
        __REQ_ORDERED_COLOR,    /* is before or after barrier */
-        __REQ_RW_SYNC,          /* request is sync (O_DIRECT) */
+        __REQ_RW_SYNC,          /* request is sync (sync write or read) */
        __REQ_ALLOCED,          /* request came from our alloc pool */
        __REQ_RW_META,          /* metadata io request */
        __REQ_COPY_USER,        /* contains copies of user pages */
        __REQ_INTEGRITY,        /* integrity metadata has been remapped */
-        __REQ_UNPLUG,           /* unplug queue on submission */
+        __REQ_NOIDLE,           /* Don't anticipate more IO after this one */
        __REQ_NR_BITS,          /* stops here */
 };
@@ -135,7 +144,7 @@ enum rq_flag_bits {
 #define REQ_RW_META     (1 << __REQ_RW_META)
 #define REQ_COPY_USER   (1 << __REQ_COPY_USER)
 #define REQ_INTEGRITY   (1 << __REQ_INTEGRITY)
-#define REQ_UNPLUG      (1 << __REQ_UNPLUG)
+#define REQ_NOIDLE      (1 << __REQ_NOIDLE)
 #define BLK_MAX_CDB     16
@@ -438,8 +447,8 @@ struct request_queue
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */
-#define QUEUE_FLAG_READFULL     3       /* read queue has been filled */
+#define QUEUE_FLAG_SYNCFULL     3       /* read queue has been filled */
-#define QUEUE_FLAG_WRITEFULL    4       /* write queue has been filled */
+#define QUEUE_FLAG_ASYNCFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
 #define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
@@ -611,32 +620,42 @@ enum {
 #define rq_data_dir(rq)         ((rq)->cmd_flags & 1)
 /*
- * We regard a request as sync, if it's a READ or a SYNC write.
+ * We regard a request as sync, if either a read or a sync write
 */
-#define rq_is_sync(rq)          (rq_data_dir((rq)) == READ || (rq)->cmd_flags & REQ_RW_SYNC)
+static inline bool rw_is_sync(unsigned int rw_flags)
+{
+        return !(rw_flags & REQ_RW) || (rw_flags & REQ_RW_SYNC);
+}
+static inline bool rq_is_sync(struct request *rq)
+{
+        return rw_is_sync(rq->cmd_flags);
+}
 #define rq_is_meta(rq)          ((rq)->cmd_flags & REQ_RW_META)
+#define rq_noidle(rq)           ((rq)->cmd_flags & REQ_NOIDLE)
-static inline int blk_queue_full(struct request_queue *q, int rw)
+static inline int blk_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                return test_bit(QUEUE_FLAG_READFULL, &q->queue_flags);
+                return test_bit(QUEUE_FLAG_SYNCFULL, &q->queue_flags);
-        return test_bit(QUEUE_FLAG_WRITEFULL, &q->queue_flags);
+        return test_bit(QUEUE_FLAG_ASYNCFULL, &q->queue_flags);
 }
-static inline void blk_set_queue_full(struct request_queue *q, int rw)
+static inline void blk_set_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                queue_flag_set(QUEUE_FLAG_READFULL, q);
+                queue_flag_set(QUEUE_FLAG_SYNCFULL, q);
        else
-                queue_flag_set(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_set(QUEUE_FLAG_ASYNCFULL, q);
 }
-static inline void blk_clear_queue_full(struct request_queue *q, int rw)
+static inline void blk_clear_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                queue_flag_clear(QUEUE_FLAG_READFULL, q);
+                queue_flag_clear(QUEUE_FLAG_SYNCFULL, q);
        else
-                queue_flag_clear(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_clear(QUEUE_FLAG_ASYNCFULL, q);
 }
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 4864a43b2b45..c3021105edc0 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -377,7 +377,21 @@ struct cpu_vfs_cap_data {
 #define CAP_FOR_EACH_U32(__capi)  \
        for (__capi = 0; __capi < _KERNEL_CAPABILITY_U32S; ++__capi)
+/*
+ * CAP_FS_MASK and CAP_NFSD_MASKS:
+ *
+ * The fs mask is all the privileges that fsuid==0 historically meant.
+ * At one time in the past, that included CAP_MKNOD and CAP_LINUX_IMMUTABLE.
+ *
+ * It has never meant setting security.* and trusted.* xattrs.
+ *
+ * We could also define fsmask as follows:
+ *   1. CAP_FS_MASK is the privilege to bypass all fs-related DAC permissions
+ *   2. The security.* and trusted.* xattrs are fs-related MAC permissions
+ */
 # define CAP_FS_MASK_B0     (CAP_TO_MASK(CAP_CHOWN)             \
+                            | CAP_TO_MASK(CAP_MKNOD)            \
                            | CAP_TO_MASK(CAP_DAC_OVERRIDE)     \
                            | CAP_TO_MASK(CAP_DAC_READ_SEARCH)  \
                            | CAP_TO_MASK(CAP_FOWNER)           \
@@ -392,11 +406,12 @@ struct cpu_vfs_cap_data {
 # define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
 # define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
 # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
-# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
+# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+                                    | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
+                                    CAP_FS_MASK_B1 } })
 # define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
-                                            | CAP_TO_MASK(CAP_SYS_RESOURCE) \
+                                    | CAP_TO_MASK(CAP_SYS_RESOURCE), \
-                                            | CAP_TO_MASK(CAP_MKNOD), \
+                                    CAP_FS_MASK_B1 } })
-                                            CAP_FS_MASK_B1 } })
 #endif /* _KERNEL_CAPABILITY_U32S != 2 */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 6faa7e549de4..37bcb50a4d7c 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -76,7 +76,8 @@ struct ftrace_branch_data {
 * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
 * to disable branch tracing on a per file basis.
 */
-#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) \
+    && !defined(DISABLE_BRANCH_PROFILING) && !defined(__CHECKER__)
 void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 #define likely_notrace(x)       __builtin_expect(!!(x), 1)
@@ -114,7 +115,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 * "Define 'is'", Bill Clinton
 * "Define 'if'", Steven Rostedt
 */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :          \
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+        if (__builtin_constant_p((cond)) ? !!(cond) :                   \
        ({                                                              \
                int ______r;                                            \
                static struct ftrace_branch_data                        \
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 096476f1fb35..29b3ce3f2a1d 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,12 +2,20 @@
 #define __LINUX_DEBUG_LOCKING_H
 #include <linux/kernel.h>
+#include <asm/atomic.h>
+#include <asm/system.h>
 struct task_struct;
 extern int debug_locks;
 extern int debug_locks_silent;
+static inline int __debug_locks_off(void)
+{
+        return xchg(&debug_locks, 0);
+}
 /*
 * Generic 'turn off all lock debugging' function:
 */
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 66ec05a57955..ded2d7c42668 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -116,7 +116,6 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d);
 /*
 * Target features
 */
-#define DM_TARGET_SUPPORTS_BARRIERS 0x00000001
 struct target_type {
        uint64_t features;
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index d7d090d21031..8083b6a36a38 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -115,7 +115,7 @@ static inline u64 dma_get_mask(struct device *dev)
 {
        if (dev && dev->dma_mask && *dev->dma_mask)
                return *dev->dma_mask;
-        return DMA_32BIT_MASK;
+        return DMA_BIT_MASK(32);
 }
 extern u64 dma_get_required_mask(struct device *dev);
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 2f3427468956..e397dc342cda 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -34,6 +34,7 @@ struct dmar_drhd_unit {
        u64     reg_base_addr;          /* register base address*/
        struct  pci_dev **devices;      /* target device array  */
        int     devices_cnt;            /* target device count  */
+        u16     segment;                /* PCI domain           */
        u8      ignored:1;              /* ignore drhd          */
        u8      include_all:1;
        struct intel_iommu *iommu;
@@ -44,6 +45,14 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
        list_for_each_entry(drhd, &dmar_drhd_units, list)
+#define for_each_active_iommu(i, drhd)                                  \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, drhd->ignored) {} else
+#define for_each_iommu(i, drhd)                                         \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, 0) {} else 
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
@@ -100,6 +109,8 @@ struct irte {
 #ifdef CONFIG_INTR_REMAP
 extern int intr_remapping_enabled;
 extern int enable_intr_remapping(int);
+extern void disable_intr_remapping(void);
+extern int reenable_intr_remapping(int);
 extern int get_irte(int irq, struct irte *entry);
 extern int modify_irte(int irq, struct irte *irte_modified);
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7a204256b155..c59b769f62b0 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -116,6 +116,7 @@ extern void elv_abort_queue(struct request_queue *);
 extern void elv_completed_request(struct request_queue *, struct request *);
 extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
 extern void elv_put_request(struct request_queue *, struct request *);
+extern void elv_drain_elevator(struct request_queue *);
 /*
 * io scheduler registration
diff --git a/include/linux/fb.h b/include/linux/fb.h
index f563c5013932..330c4b1bfcaa 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -173,8 +173,12 @@ struct fb_fix_screeninfo {
 /* Interpretation of offset for color fields: All offsets are from the right,
 * inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you
 * can use the offset as right argument to <<). A pixel afterwards is a bit
- * stream and is written to video memory as that unmodified. This implies
+ * stream and is written to video memory as that unmodified.
- * big-endian byte order if bits_per_pixel is greater than 8.
+ *
+ * For pseudocolor: offset and length should be the same for all color
+ * components. Offset specifies the position of the least significant bit
+ * of the pallette index in a pixel value. Length indicates the number
+ * of available palette entries (i.e. # of entries = 1 << length).
 */
 struct fb_bitfield {
        __u32 offset;                   /* beginning of bitfield        */
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 09d6c5bbdddd..a2ec74bc4812 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -5,12 +5,14 @@
 #ifndef __LINUX_FDTABLE_H
 #define __LINUX_FDTABLE_H
-#include <asm/atomic.h>
 #include <linux/posix_types.h>
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
 #include <linux/types.h>
+#include <linux/init.h>
+#include <asm/atomic.h>
 /*
 * The default fd array needs to be at least BITS_PER_LONG,
diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h
index 671decbd2aeb..934e22d65801 100644
--- a/include/linux/fiemap.h
+++ b/include/linux/fiemap.h
@@ -11,6 +11,8 @@
 #ifndef _LINUX_FIEMAP_H
 #define _LINUX_FIEMAP_H
+#include <linux/types.h>
 struct fiemap_extent {
        __u64 fe_logical;  /* logical offset in bytes for the start of
                            * the extent from the beginning of the file */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a09e17c8f5fd..562d2855cf30 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -95,8 +95,12 @@ struct inodes_stat_t {
 #define SWRITE 3        /* for ll_rw_block() - wait for buffer lock */
 #define READ_SYNC       (READ | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
 #define READ_META       (READ | (1 << BIO_RW_META))
-#define WRITE_SYNC      (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
-#define SWRITE_SYNC     (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_SYNC      (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
+#define WRITE_ODIRECT   (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define SWRITE_SYNC_PLUG        \
+                        (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
+#define SWRITE_SYNC     (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
 #define WRITE_BARRIER   (WRITE | (1 << BIO_RW_BARRIER))
 #define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD)
 #define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER))
@@ -1695,6 +1699,9 @@ struct file_system_type {
        struct lock_class_key i_alloc_sem_key;
 };
+extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
+        int (*fill_super)(struct super_block *, void *, int),
+        struct vfsmount *mnt);
 extern int get_sb_bdev(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data,
        int (*fill_super)(struct super_block *, void *, int),
@@ -2337,19 +2344,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf,
                                size_t size, loff_t *pos);
 int simple_transaction_release(struct inode *inode, struct file *file);
-static inline void simple_transaction_set(struct file *file, size_t n)
+void simple_transaction_set(struct file *file, size_t n);
-{
-        struct simple_transaction_argresp *ar = file->private_data;
-        BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);
-        /*
-         * The barrier ensures that ar->size will really remain zero until
-         * ar->data is ready for reading.
-         */
-        smp_mb();
-        ar->size = n;
-}
 /*
 * simple attribute files
@@ -2396,27 +2391,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf,
 ssize_t simple_attr_write(struct file *file, const char __user *buf,
                          size_t len, loff_t *ppos);
-#ifdef CONFIG_SECURITY
-static inline char *alloc_secdata(void)
-{
-        return (char *)get_zeroed_page(GFP_KERNEL);
-}
-static inline void free_secdata(void *secdata)
-{
-        free_page((unsigned long)secdata);
-}
-#else
-static inline char *alloc_secdata(void)
-{
-        return (char *)1;
-}
-static inline void free_secdata(void *secdata)
-{ }
-#endif  /* CONFIG_SECURITY */
 struct ctl_table;
 int proc_nr_files(struct ctl_table *table, int write, struct file *filp,
                  void __user *buffer, size_t *lenp, loff_t *ppos);
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 43fc95d822d5..244677cc082b 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -79,6 +79,10 @@ struct fsl_spi_platform_data {
        u16     max_chipselect;
        void    (*cs_control)(struct spi_device *spi, bool on);
        u32     sysclk;
+        /* Legacy hooks, used by mpc52xx_psc_spi driver. */
+        void    (*activate_cs)(u8 cs, u8 polarity);
+        void    (*deactivate_cs)(u8 cs, u8 polarity);
 };
 struct mpc8xx_pcmcia_ops {
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 015a3d22cf74..8a0c2f221e6b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -356,6 +356,9 @@ struct ftrace_graph_ret {
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
+/* for init task */
+#define INIT_FTRACE_GRAPH               .ret_stack = NULL,
 /*
 * Stack of return addresses for functions
 * of a thread.
@@ -430,10 +433,11 @@ static inline void unpause_graph_tracing(void)
 {
        atomic_dec(&current->tracing_graph_pause);
 }
-#else
+#else /* !CONFIG_FUNCTION_GRAPH_TRACER */
 #define __notrace_funcgraph
 #define __irq_entry
+#define INIT_FTRACE_GRAPH
 static inline void ftrace_graph_init_task(struct task_struct *t) { }
 static inline void ftrace_graph_exit_task(struct task_struct *t) { }
@@ -445,7 +449,7 @@ static inline int task_curr_ret_stack(struct task_struct *tsk)
 static inline void pause_graph_tracing(void) { }
 static inline void unpause_graph_tracing(void) { }
-#endif
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 #ifdef CONFIG_TRACING
 #include <linux/sched.h>
@@ -507,33 +511,4 @@ static inline void trace_hw_branch_oops(void) {}
 #endif /* CONFIG_HW_BRANCH_TRACER */
-/*
- * A syscall entry in the ftrace syscalls array.
- *
- * @name: name of the syscall
- * @nb_args: number of parameters it takes
- * @types: list of types as strings
- * @args: list of args as strings (args[i] matches types[i])
- */
-struct syscall_metadata {
-        const char      *name;
-        int             nb_args;
-        const char      **types;
-        const char      **args;
-};
-#ifdef CONFIG_FTRACE_SYSCALLS
-extern void arch_init_ftrace_syscalls(void);
-extern struct syscall_metadata *syscall_nr_to_meta(int nr);
-extern void start_ftrace_syscalls(void);
-extern void stop_ftrace_syscalls(void);
-extern void ftrace_syscall_enter(struct pt_regs *regs);
-extern void ftrace_syscall_exit(struct pt_regs *regs);
-#else
-static inline void start_ftrace_syscalls(void) { }
-static inline void stop_ftrace_syscalls(void) { }
-static inline void ftrace_syscall_enter(struct pt_regs *regs) { }
-static inline void ftrace_syscall_exit(struct pt_regs *regs) { }
-#endif
 #endif /* _LINUX_FTRACE_H */
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index faa1cf848bcd..45257475623c 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -116,7 +116,7 @@
 # define IRQ_EXIT_OFFSET HARDIRQ_OFFSET
 #endif
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_GENERIC_HARDIRQS)
 extern void synchronize_irq(unsigned int irq);
 #else
 # define synchronize_irq(irq)   barrier()
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index bd37078c2d7d..0d2f7c8a33d6 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -336,6 +336,11 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
                         const enum hrtimer_mode mode);
 extern int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
                        unsigned long range_ns, const enum hrtimer_mode mode);
+extern int
+__hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+                         unsigned long delta_ns,
+                         const enum hrtimer_mode mode, int wakeup);
 extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
diff --git a/include/linux/i2c-algo-sgi.h b/include/linux/i2c-algo-sgi.h
deleted file mode 100644
index 3b7715024e69..000000000000
--- a/include/linux/i2c-algo-sgi.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- */
-#ifndef I2C_ALGO_SGI_H
-#define I2C_ALGO_SGI_H 1
-#include <linux/i2c.h>
-struct i2c_algo_sgi_data {
-        void *data;     /* private data for lowlevel routines */
-        unsigned (*getctrl)(void *data);
-        void (*setctrl)(void *data, unsigned val);
-        unsigned (*rdata)(void *data);
-        void (*wdata)(void *data, unsigned val);
-        int xfer_timeout;
-        int ack_timeout;
-};
-int i2c_sgi_add_bus(struct i2c_adapter *);
-#endif /* I2C_ALGO_SGI_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index f27604af8378..c9087de5c6c6 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -33,47 +33,10 @@
 #define I2C_DRIVERID_MSP3400     1
 #define I2C_DRIVERID_TUNER       2
-#define I2C_DRIVERID_TEA6420     5      /* audio matrix switch          */
-#define I2C_DRIVERID_TEA6415C    6      /* video matrix switch          */
-#define I2C_DRIVERID_TDA9840     7      /* stereo sound processor       */
-#define I2C_DRIVERID_SAA7111A    8      /* video input processor        */
-#define I2C_DRIVERID_SAA7185B   13      /* video encoder                */
-#define I2C_DRIVERID_SAA7110    22      /* video decoder                */
-#define I2C_DRIVERID_SAA5249    24      /* SAA5249 and compatibles      */
 #define I2C_DRIVERID_TDA7432    27      /* Stereo sound processor       */
 #define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_TDA9875    32      /* TV sound decoder chip        */
-#define I2C_DRIVERID_BT819      40     /* video decoder                 */
-#define I2C_DRIVERID_BT856      41     /* video encoder                 */
-#define I2C_DRIVERID_VPX3220    42     /* video decoder+vbi/vtxt        */
-#define I2C_DRIVERID_ADV7175    48     /* ADV 7175/7176 video encoder   */
-#define I2C_DRIVERID_SAA7114    49      /* video decoder                */
-#define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#define I2C_DRIVERID_SAA7191    57      /* video decoder                */
-#define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
-#define I2C_DRIVERID_OVCAMCHIP  61      /* OmniVision CMOS image sens.  */
-#define I2C_DRIVERID_SAA6752HS  67      /* MPEG2 encoder                */
-#define I2C_DRIVERID_TVEEPROM   68      /* TV EEPROM                    */
-#define I2C_DRIVERID_WM8775     69      /* wm8775 audio processor       */
-#define I2C_DRIVERID_CS53L32A   70      /* cs53l32a audio processor     */
-#define I2C_DRIVERID_CX25840    71      /* cx2584x video encoder        */
-#define I2C_DRIVERID_SAA7127    72      /* saa7127 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
-#define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
-#define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
-#define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
-#define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
-#define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
-#define I2C_DRIVERID_BT866      85      /* Conexant bt866 video encoder */
-#define I2C_DRIVERID_KS0127     86      /* Samsung ks0127 video decoder */
-#define I2C_DRIVERID_TLV320AIC23B 87    /* TI TLV320AIC23B audio codec  */
-#define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
-#define I2C_DRIVERID_M52790     95      /* Mitsubishi M52790SP/FP AV switch */
-#define I2C_DRIVERID_CS5345     96      /* cs5345 audio processor       */
-#define I2C_DRIVERID_AU8522     97      /* Auvitek au8522       */
-#define I2C_DRIVERID_OV7670 1048        /* Omnivision 7670 camera */
 /*
 * ---- Adapter types ----------------------------------------------------
@@ -88,6 +51,7 @@
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828         0x010023 /* auvitek au0828 usb bridge */
+#define I2C_HW_B_CX231XX        0x010024 /* Conexant CX231XX USB based cards */
 #define I2C_HW_B_HDPVR          0x010025 /* Hauppauge HD PVR */
 /* --- SGI adapters                                                     */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index c86c3b07604c..ad2580596033 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -274,7 +274,7 @@ struct i2c_board_info {
 * are provided using conventional syntax.
 */
 #define I2C_BOARD_INFO(dev_type, dev_addr) \
-        .type = (dev_type), .addr = (dev_addr)
+        .type = dev_type, .addr = (dev_addr)
 /* Add-on boards should register/unregister their devices; e.g. a board
@@ -353,8 +353,8 @@ struct i2c_adapter {
        void *algo_data;
        /* --- administration stuff. */
-        int (*client_register)(struct i2c_client *);
+        int (*client_register)(struct i2c_client *) __deprecated;
-        int (*client_unregister)(struct i2c_client *);
+        int (*client_unregister)(struct i2c_client *) __deprecated;
        /* data fields that are valid for all devices   */
        u8 level;                       /* nesting level for lockdep */
diff --git a/include/linux/i2c/s6000.h b/include/linux/i2c/s6000.h
new file mode 100644
index 000000000000..d9b34bfdae76
--- /dev/null
+++ b/include/linux/i2c/s6000.h
@@ -0,0 +1,10 @@
+#ifndef __LINUX_I2C_S6000_H
+#define __LINUX_I2C_S6000_H
+struct s6_i2c_platform_data {
+        const char *clock; /* the clock to use */
+        int bus_num; /* the bus number to register */
+};
+#endif
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a5d26f66ef78..ff65fffb078f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -240,65 +240,38 @@ typedef enum {
 } ide_startstop_t;
 enum {
+        IDE_VALID_ERROR                 = (1 << 1),
+        IDE_VALID_FEATURE               = IDE_VALID_ERROR,
+        IDE_VALID_NSECT                 = (1 << 2),
+        IDE_VALID_LBAL                  = (1 << 3),
+        IDE_VALID_LBAM                  = (1 << 4),
+        IDE_VALID_LBAH                  = (1 << 5),
+        IDE_VALID_DEVICE                = (1 << 6),
+        IDE_VALID_LBA                   = IDE_VALID_LBAL |
+                                          IDE_VALID_LBAM |
+                                          IDE_VALID_LBAH,
+        IDE_VALID_OUT_TF                = IDE_VALID_FEATURE |
+                                          IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+        IDE_VALID_IN_TF                 = IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+        IDE_VALID_OUT_HOB               = IDE_VALID_OUT_TF,
+        IDE_VALID_IN_HOB                = IDE_VALID_ERROR |
+                                          IDE_VALID_NSECT |
+                                          IDE_VALID_LBA,
+};
+enum {
        IDE_TFLAG_LBA48                 = (1 << 0),
-        IDE_TFLAG_OUT_HOB_FEATURE       = (1 << 1),
+        IDE_TFLAG_WRITE                 = (1 << 1),
-        IDE_TFLAG_OUT_HOB_NSECT         = (1 << 2),
+        IDE_TFLAG_CUSTOM_HANDLER        = (1 << 2),
-        IDE_TFLAG_OUT_HOB_LBAL          = (1 << 3),
+        IDE_TFLAG_DMA_PIO_FALLBACK      = (1 << 3),
-        IDE_TFLAG_OUT_HOB_LBAM          = (1 << 4),
-        IDE_TFLAG_OUT_HOB_LBAH          = (1 << 5),
-        IDE_TFLAG_OUT_HOB               = IDE_TFLAG_OUT_HOB_FEATURE |
-                                          IDE_TFLAG_OUT_HOB_NSECT |
-                                          IDE_TFLAG_OUT_HOB_LBAL |
-                                          IDE_TFLAG_OUT_HOB_LBAM |
-                                          IDE_TFLAG_OUT_HOB_LBAH,
-        IDE_TFLAG_OUT_FEATURE           = (1 << 6),
-        IDE_TFLAG_OUT_NSECT             = (1 << 7),
-        IDE_TFLAG_OUT_LBAL              = (1 << 8),
-        IDE_TFLAG_OUT_LBAM              = (1 << 9),
-        IDE_TFLAG_OUT_LBAH              = (1 << 10),
-        IDE_TFLAG_OUT_TF                = IDE_TFLAG_OUT_FEATURE |
-                                          IDE_TFLAG_OUT_NSECT |
-                                          IDE_TFLAG_OUT_LBAL |
-                                          IDE_TFLAG_OUT_LBAM |
-                                          IDE_TFLAG_OUT_LBAH,
-        IDE_TFLAG_OUT_DEVICE            = (1 << 11),
-        IDE_TFLAG_WRITE                 = (1 << 12),
-        IDE_TFLAG_CUSTOM_HANDLER        = (1 << 13),
-        IDE_TFLAG_DMA_PIO_FALLBACK      = (1 << 14),
-        IDE_TFLAG_IN_HOB_ERROR          = (1 << 15),
-        IDE_TFLAG_IN_HOB_NSECT          = (1 << 16),
-        IDE_TFLAG_IN_HOB_LBAL           = (1 << 17),
-        IDE_TFLAG_IN_HOB_LBAM           = (1 << 18),
-        IDE_TFLAG_IN_HOB_LBAH           = (1 << 19),
-        IDE_TFLAG_IN_HOB_LBA            = IDE_TFLAG_IN_HOB_LBAL |
-                                          IDE_TFLAG_IN_HOB_LBAM |
-                                          IDE_TFLAG_IN_HOB_LBAH,
-        IDE_TFLAG_IN_HOB                = IDE_TFLAG_IN_HOB_ERROR |
-                                          IDE_TFLAG_IN_HOB_NSECT |
-                                          IDE_TFLAG_IN_HOB_LBA,
-        IDE_TFLAG_IN_ERROR              = (1 << 20),
-        IDE_TFLAG_IN_NSECT              = (1 << 21),
-        IDE_TFLAG_IN_LBAL               = (1 << 22),
-        IDE_TFLAG_IN_LBAM               = (1 << 23),
-        IDE_TFLAG_IN_LBAH               = (1 << 24),
-        IDE_TFLAG_IN_LBA                = IDE_TFLAG_IN_LBAL |
-                                          IDE_TFLAG_IN_LBAM |
-                                          IDE_TFLAG_IN_LBAH,
-        IDE_TFLAG_IN_TF                 = IDE_TFLAG_IN_NSECT |
-                                          IDE_TFLAG_IN_LBA,
-        IDE_TFLAG_IN_DEVICE             = (1 << 25),
-        IDE_TFLAG_HOB                   = IDE_TFLAG_OUT_HOB |
-                                          IDE_TFLAG_IN_HOB,
-        IDE_TFLAG_TF                    = IDE_TFLAG_OUT_TF |
-                                          IDE_TFLAG_IN_TF,
-        IDE_TFLAG_DEVICE                = IDE_TFLAG_OUT_DEVICE |
-                                          IDE_TFLAG_IN_DEVICE,
        /* force 16-bit I/O operations */
-        IDE_TFLAG_IO_16BIT              = (1 << 26),
+        IDE_TFLAG_IO_16BIT              = (1 << 4),
        /* struct ide_cmd was allocated using kmalloc() */
-        IDE_TFLAG_DYN                   = (1 << 27),
+        IDE_TFLAG_DYN                   = (1 << 5),
-        IDE_TFLAG_FS                    = (1 << 28),
+        IDE_TFLAG_FS                    = (1 << 6),
-        IDE_TFLAG_MULTI_PIO             = (1 << 29),
+        IDE_TFLAG_MULTI_PIO             = (1 << 7),
 };
 enum {
@@ -309,45 +282,34 @@ enum {
 };
 struct ide_taskfile {
-        u8      hob_data;       /*  0: high data byte (for TASKFILE IOCTL) */
+        u8      data;           /* 0: data byte (for TASKFILE ioctl) */
-                                /*  1-5: additional data to support LBA48 */
+        union {                 /* 1: */
-        union {
+                u8 error;       /*  read: error */
-                u8 hob_error;   /*   read: error */
+                u8 feature;     /* write: feature */
-                u8 hob_feature; /*  write: feature */
-        };
-        u8      hob_nsect;
-        u8      hob_lbal;
-        u8      hob_lbam;
-        u8      hob_lbah;
-        u8      data;           /*  6: low data byte (for TASKFILE IOCTL) */
-        union {                 /*  7: */
-                u8 error;       /*   read:  error */
-                u8 feature;     /*  write: feature */
        };
+        u8      nsect;          /* 2: number of sectors */
-        u8      nsect;          /*  8: number of sectors */
+        u8      lbal;           /* 3: LBA low */
-        u8      lbal;           /*  9: LBA low */
+        u8      lbam;           /* 4: LBA mid */
-        u8      lbam;           /* 10: LBA mid */
+        u8      lbah;           /* 5: LBA high */
-        u8      lbah;           /* 11: LBA high */
+        u8      device;         /* 6: device select */
+        union {                 /* 7: */
-        u8      device;         /* 12: device select */
+                u8 status;      /*  read: status */
-        union {                 /* 13: */
-                u8 status;      /*  read: status  */
                u8 command;     /* write: command */
        };
 };
 struct ide_cmd {
-        union {
+        struct ide_taskfile     tf;
-                struct ide_taskfile     tf;
+        struct ide_taskfile     hob;
-                u8                      tf_array[14];
+        struct {
-        };
+                struct {
+                        u8              tf;
+                        u8              hob;
+                } out, in;
+        } valid;
+        u8                      tf_flags;
        u8                      ftf_flags;      /* for TASKFILE ioctl */
-        u32                     tf_flags;
        int                     protocol;
        int                     sg_nents;         /* number of sg entries */
@@ -662,8 +624,8 @@ struct ide_tp_ops {
        void    (*write_devctl)(struct hwif_s *, u8);
        void    (*dev_select)(ide_drive_t *);
-        void    (*tf_load)(ide_drive_t *, struct ide_cmd *);
+        void    (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
-        void    (*tf_read)(ide_drive_t *, struct ide_cmd *);
+        void    (*tf_read)(ide_drive_t *, struct ide_taskfile *, u8);
        void    (*input_data)(ide_drive_t *, struct ide_cmd *,
                              void *, unsigned int);
@@ -1162,7 +1124,8 @@ extern int ide_devset_execute(ide_drive_t *drive,
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
 int ide_complete_rq(ide_drive_t *, int, unsigned int);
-void ide_tf_dump(const char *, struct ide_taskfile *);
+void ide_tf_readback(ide_drive_t *drive, struct ide_cmd *cmd);
+void ide_tf_dump(const char *, struct ide_cmd *);
 void ide_exec_command(ide_hwif_t *, u8);
 u8 ide_read_status(ide_hwif_t *);
@@ -1170,8 +1133,8 @@ u8 ide_read_altstatus(ide_hwif_t *);
 void ide_write_devctl(ide_hwif_t *, u8);
 void ide_dev_select(ide_drive_t *);
-void ide_tf_load(ide_drive_t *, struct ide_cmd *);
+void ide_tf_load(ide_drive_t *, struct ide_taskfile *, u8);
-void ide_tf_read(ide_drive_t *, struct ide_cmd *);
+void ide_tf_read(ide_drive_t *, struct ide_taskfile *, u8);
 void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
 void ide_output_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
@@ -1529,7 +1492,7 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
-u64 ide_get_lba_addr(struct ide_taskfile *, int);
+u64 ide_get_lba_addr(struct ide_cmd *, int);
 u8 ide_dump_status(ide_drive_t *, const char *, u8);
 struct ide_timing {
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index af1de95e711e..d87247d2641f 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -5,6 +5,7 @@
 #include <linux/irqflags.h>
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
+#include <linux/ftrace.h>
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
@@ -14,19 +15,6 @@
 extern struct files_struct init_files;
 extern struct fs_struct init_fs;
-#define INIT_KIOCTX(name, which_mm) \
-{                                                       \
-        .users          = ATOMIC_INIT(1),               \
-        .dead           = 0,                            \
-        .mm             = &which_mm,                    \
-        .user_id        = 0,                            \
-        .next           = NULL,                         \
-        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \
-        .ctx_lock       = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \
-        .reqs_active    = 0U,                           \
-        .max_reqs       = ~0U,                          \
-}
 #define INIT_MM(name) \
 {                                                               \
        .mm_rb          = RB_ROOT,                              \
@@ -185,6 +173,7 @@ extern struct cred init_cred;
        INIT_IDS                                                        \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
+        INIT_FTRACE_GRAPH                                               \
 }
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 77214ead1a36..aa8c53171233 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -164,6 +164,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GCMD_QIE (((u32)1) << 26)
 #define DMA_GCMD_SIRTP (((u32)1) << 24)
 #define DMA_GCMD_IRE (((u32) 1) << 25)
+#define DMA_GCMD_CFI (((u32) 1) << 23)
 /* GSTS_REG */
 #define DMA_GSTS_TES (((u32)1) << 31)
@@ -174,6 +175,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GSTS_QIES (((u32)1) << 26)
 #define DMA_GSTS_IRTPS (((u32)1) << 24)
 #define DMA_GSTS_IRES (((u32)1) << 25)
+#define DMA_GSTS_CFIS (((u32)1) << 23)
 /* CCMD_REG */
 #define DMA_CCMD_ICC (((u64)1) << 63)
@@ -284,6 +286,14 @@ struct iommu_flush {
                unsigned int size_order, u64 type, int non_present_entry_flush);
 };
+enum {
+        SR_DMAR_FECTL_REG,
+        SR_DMAR_FEDATA_REG,
+        SR_DMAR_FEADDR_REG,
+        SR_DMAR_FEUADDR_REG,
+        MAX_SR_DMAR_REGS
+};
 struct intel_iommu {
        void __iomem    *reg; /* Pointer to hardware regs, virtual addr */
        u64             cap;
@@ -304,6 +314,8 @@ struct intel_iommu {
        struct iommu_flush flush;
 #endif
        struct q_inval  *qi;            /* Queued invalidation info */
+        u32 *iommu_state; /* Store iommu states between suspend and resume.*/
 #ifdef CONFIG_INTR_REMAP
        struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
@@ -322,6 +334,7 @@ extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
 extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index ce2c07d99fc3..91bb76f44f14 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -59,6 +59,18 @@
 #define IRQF_NOBALANCING        0x00000800
 #define IRQF_IRQPOLL            0x00001000
+/*
+ * Bits used by threaded handlers:
+ * IRQTF_RUNTHREAD - signals that the interrupt handler thread should run
+ * IRQTF_DIED      - handler thread died
+ * IRQTF_WARNED    - warning "IRQ_WAKE_THREAD w/o thread_fn" has been printed
+ */
+enum {
+        IRQTF_RUNTHREAD,
+        IRQTF_DIED,
+        IRQTF_WARNED,
+};
 typedef irqreturn_t (*irq_handler_t)(int, void *);
 /**
@@ -71,6 +83,9 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);
 * @next:       pointer to the next irqaction for shared interrupts
 * @irq:        interrupt number
 * @dir:        pointer to the proc/irq/NN/name entry
+ * @thread_fn:  interupt handler function for threaded interrupts
+ * @thread:     thread pointer for threaded interrupts
+ * @thread_flags:       flags related to @thread
 */
 struct irqaction {
        irq_handler_t handler;
@@ -81,18 +96,68 @@ struct irqaction {
        struct irqaction *next;
        int irq;
        struct proc_dir_entry *dir;
+        irq_handler_t thread_fn;
+        struct task_struct *thread;
+        unsigned long thread_flags;
 };
 extern irqreturn_t no_action(int cpl, void *dev_id);
-extern int __must_check request_irq(unsigned int, irq_handler_t handler,
-                       unsigned long, const char *, void *);
+#ifdef CONFIG_GENERIC_HARDIRQS
+extern int __must_check
+request_threaded_irq(unsigned int irq, irq_handler_t handler,
+                     irq_handler_t thread_fn,
+                     unsigned long flags, const char *name, void *dev);
+static inline int __must_check
+request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
+            const char *name, void *dev)
+{
+        return request_threaded_irq(irq, handler, NULL, flags, name, dev);
+}
+extern void exit_irq_thread(void);
+#else
+extern int __must_check
+request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags,
+            const char *name, void *dev);
+/*
+ * Special function to avoid ifdeffery in kernel/irq/devres.c which
+ * gets magically built by GENERIC_HARDIRQS=n architectures (sparc,
+ * m68k). I really love these $@%#!* obvious Makefile references:
+ * ../../../kernel/irq/devres.o
+ */
+static inline int __must_check
+request_threaded_irq(unsigned int irq, irq_handler_t handler,
+                     irq_handler_t thread_fn,
+                     unsigned long flags, const char *name, void *dev)
+{
+        return request_irq(irq, handler, flags, name, dev);
+}
+static inline void exit_irq_thread(void) { }
+#endif
 extern void free_irq(unsigned int, void *);
 struct device;
-extern int __must_check devm_request_irq(struct device *dev, unsigned int irq,
+extern int __must_check
-                            irq_handler_t handler, unsigned long irqflags,
+devm_request_threaded_irq(struct device *dev, unsigned int irq,
-                            const char *devname, void *dev_id);
+                          irq_handler_t handler, irq_handler_t thread_fn,
+                          unsigned long irqflags, const char *devname,
+                          void *dev_id);
+static inline int __must_check
+devm_request_irq(struct device *dev, unsigned int irq, irq_handler_t handler,
+                 unsigned long irqflags, const char *devname, void *dev_id)
+{
+        return devm_request_threaded_irq(dev, irq, handler, NULL, irqflags,
+                                         devname, dev_id);
+}
 extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
 /*
@@ -299,6 +364,7 @@ extern void softirq_init(void);
 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
 extern void raise_softirq_irqoff(unsigned int nr);
 extern void raise_softirq(unsigned int nr);
+extern void wakeup_softirqd(void);
 /* This is the worklist that queues up per-cpu softirq work.
 *
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ea330f9e7100..3bf40e246a80 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -25,7 +25,7 @@ struct ipc_ids {
 };
 struct ipc_namespace {
-        struct kref     kref;
+        atomic_t        count;
        struct ipc_ids  ids[3];
        int             sem_ctls[4];
@@ -44,25 +44,57 @@ struct ipc_namespace {
        int             shm_tot;
        struct notifier_block ipcns_nb;
+        /* The kern_mount of the mqueuefs sb.  We take a ref on it */
+        struct vfsmount *mq_mnt;
+        /* # queues in this ns, protected by mq_lock */
+        unsigned int    mq_queues_count;
+        /* next fields are set through sysctl */
+        unsigned int    mq_queues_max;   /* initialized to DFLT_QUEUESMAX */
+        unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
+        unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
 };
 extern struct ipc_namespace init_ipc_ns;
 extern atomic_t nr_ipc_ns;
-#ifdef CONFIG_SYSVIPC
+extern spinlock_t mq_lock;
+#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
 #define INIT_IPC_NS(ns)         .ns             = &init_ipc_ns,
+#else
+#define INIT_IPC_NS(ns)
+#endif
+#ifdef CONFIG_SYSVIPC
 extern int register_ipcns_notifier(struct ipc_namespace *);
 extern int cond_register_ipcns_notifier(struct ipc_namespace *);
 extern void unregister_ipcns_notifier(struct ipc_namespace *);
 extern int ipcns_notify(unsigned long);
 #else /* CONFIG_SYSVIPC */
-#define INIT_IPC_NS(ns)
+static inline int register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline int cond_register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline void unregister_ipcns_notifier(struct ipc_namespace *ns) { }
+static inline int ipcns_notify(unsigned long l) { return 0; }
 #endif /* CONFIG_SYSVIPC */
-#if defined(CONFIG_SYSVIPC) && defined(CONFIG_IPC_NS)
+#ifdef CONFIG_POSIX_MQUEUE
-extern void free_ipc_ns(struct kref *kref);
+extern int mq_init_ns(struct ipc_namespace *ns);
+/* default values */
+#define DFLT_QUEUESMAX 256     /* max number of message queues */
+#define DFLT_MSGMAX    10      /* max number of messages in each queue */
+#define HARD_MSGMAX    (131072/sizeof(void *))
+#define DFLT_MSGSIZEMAX 8192   /* max message size */
+#else
+static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
+#endif
+#if defined(CONFIG_IPC_NS)
+extern void free_ipc_ns(struct ipc_namespace *ns);
 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
                                       struct ipc_namespace *ns);
 extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
@@ -72,14 +104,11 @@ extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
 {
        if (ns)
-                kref_get(&ns->kref);
+                atomic_inc(&ns->count);
        return ns;
 }
-static inline void put_ipc_ns(struct ipc_namespace *ns)
+extern void put_ipc_ns(struct ipc_namespace *ns);
-{
-        kref_put(&ns->kref, free_ipc_ns);
-}
 #else
 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
                struct ipc_namespace *ns)
@@ -99,4 +128,18 @@ static inline void put_ipc_ns(struct ipc_namespace *ns)
 {
 }
 #endif
+#ifdef CONFIG_POSIX_MQUEUE_SYSCTL
+struct ctl_table_header;
+extern struct ctl_table_header *mq_register_sysctl_table(void);
+#else /* CONFIG_POSIX_MQUEUE_SYSCTL */
+static inline struct ctl_table_header *mq_register_sysctl_table(void)
+{
+        return NULL;
+}
+#endif /* CONFIG_POSIX_MQUEUE_SYSCTL */
 #endif
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 974890b3c52f..b7cbeed972e4 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -22,6 +22,7 @@
 #include <linux/irqnr.h>
 #include <linux/errno.h>
 #include <linux/topology.h>
+#include <linux/wait.h>
 #include <asm/irq.h>
 #include <asm/ptrace.h>
@@ -158,6 +159,8 @@ struct irq_2_iommu;
 * @affinity:           IRQ affinity on SMP
 * @cpu:                cpu index useful for balancing
 * @pending_mask:       pending rebalanced interrupts
+ * @threads_active:     number of irqaction threads currently running
+ * @wait_for_threads:   wait queue for sync_irq to wait for threaded handlers
 * @dir:                /proc/irq/ procfs entry
 * @name:               flow handler name for /proc/interrupts output
 */
@@ -189,6 +192,8 @@ struct irq_desc {
        cpumask_var_t           pending_mask;
 #endif
 #endif
+        atomic_t                threads_active;
+        wait_queue_head_t       wait_for_threads;
 #ifdef CONFIG_PROC_FS
        struct proc_dir_entry   *dir;
 #endif
@@ -482,6 +487,16 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc,
 #endif
 }
+static inline void free_desc_masks(struct irq_desc *old_desc,
+                                   struct irq_desc *new_desc)
+{
+        free_cpumask_var(old_desc->affinity);
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+        free_cpumask_var(old_desc->pending_mask);
+#endif
+}
 #else /* !CONFIG_SMP */
 static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu,
@@ -495,6 +510,10 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc,
 {
 }
+static inline void free_desc_masks(struct irq_desc *old_desc,
+                                   struct irq_desc *new_desc)
+{
+}
 #endif  /* CONFIG_SMP */
 #endif /* _LINUX_IRQ_H */
diff --git a/include/linux/irqreturn.h b/include/linux/irqreturn.h
index c5584ca5b8c9..819acaaac3f5 100644
--- a/include/linux/irqreturn.h
+++ b/include/linux/irqreturn.h
@@ -5,10 +5,12 @@
 * enum irqreturn
 * @IRQ_NONE            interrupt was not from this device
 * @IRQ_HANDLED         interrupt was handled by this device
+ * @IRQ_WAKE_THREAD     handler requests to wake the handler thread
 */
 enum irqreturn {
        IRQ_NONE,
        IRQ_HANDLED,
+        IRQ_WAKE_THREAD,
 };
 typedef enum irqreturn irqreturn_t;
diff --git a/include/linux/key.h b/include/linux/key.h
index 21d32a142c00..e544f466d69a 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -20,6 +20,7 @@
 #include <linux/rbtree.h>
 #include <linux/rcupdate.h>
 #include <linux/sysctl.h>
+#include <linux/rwsem.h>
 #include <asm/atomic.h>
 #ifdef __KERNEL__
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index d5fa565086d1..384ca8bbf1ac 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -34,7 +34,7 @@ extern int __request_module(bool wait, const char *name, ...) \
 #define request_module(mod...) __request_module(true, mod)
 #define request_module_nowait(mod...) __request_module(false, mod)
 #define try_then_request_module(x, mod...) \
-        ((x) ?: (__request_module(false, mod), (x)))
+        ((x) ?: (__request_module(true, mod), (x)))
 #else
 static inline int request_module(const char *name, ...) { return -ENOSYS; }
 static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; }
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 2ec6cc14a114..bcd9c07848be 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -94,12 +94,16 @@ struct kprobe {
        /* Called after addr is executed, unless... */
        kprobe_post_handler_t post_handler;
-        /* ... called if executing addr causes a fault (eg. page fault).
+        /*
-         * Return 1 if it handled fault, otherwise kernel will see it. */
+         * ... called if executing addr causes a fault (eg. page fault).
+         * Return 1 if it handled fault, otherwise kernel will see it.
+         */
        kprobe_fault_handler_t fault_handler;
-        /* ... called if breakpoint trap occurs in probe handler.
+        /*
-         * Return 1 if it handled break, otherwise kernel will see it. */
+         * ... called if breakpoint trap occurs in probe handler.
+         * Return 1 if it handled break, otherwise kernel will see it.
+         */
        kprobe_break_handler_t break_handler;
        /* Saved opcode (which has been replaced with breakpoint) */
@@ -108,18 +112,28 @@ struct kprobe {
        /* copy of the original instruction */
        struct arch_specific_insn ainsn;
-        /* Indicates various status flags.  Protected by kprobe_mutex. */
+        /*
+         * Indicates various status flags.
+         * Protected by kprobe_mutex after this kprobe is registered.
+         */
        u32 flags;
 };
 /* Kprobe status flags */
 #define KPROBE_FLAG_GONE        1 /* breakpoint has already gone */
+#define KPROBE_FLAG_DISABLED    2 /* probe is temporarily disabled */
+/* Has this kprobe gone ? */
 static inline int kprobe_gone(struct kprobe *p)
 {
        return p->flags & KPROBE_FLAG_GONE;
 }
+/* Is this kprobe disabled ? */
+static inline int kprobe_disabled(struct kprobe *p)
+{
+        return p->flags & (KPROBE_FLAG_DISABLED | KPROBE_FLAG_GONE);
+}
 /*
 * Special probe type that uses setjmp-longjmp type tricks to resume
 * execution at a specified entry with a matching prototype corresponding
@@ -279,6 +293,9 @@ void unregister_kretprobes(struct kretprobe **rps, int num);
 void kprobe_flush_task(struct task_struct *tk);
 void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
+int disable_kprobe(struct kprobe *kp);
+int enable_kprobe(struct kprobe *kp);
 #else /* !CONFIG_KPROBES: */
 static inline int kprobes_built_in(void)
@@ -345,5 +362,30 @@ static inline void unregister_kretprobes(struct kretprobe **rps, int num)
 static inline void kprobe_flush_task(struct task_struct *tk)
 {
 }
+static inline int disable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
+static inline int enable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
 #endif /* CONFIG_KPROBES */
+static inline int disable_kretprobe(struct kretprobe *rp)
+{
+        return disable_kprobe(&rp->kp);
+}
+static inline int enable_kretprobe(struct kretprobe *rp)
+{
+        return enable_kprobe(&rp->kp);
+}
+static inline int disable_jprobe(struct jprobe *jp)
+{
+        return disable_kprobe(&jp->kp);
+}
+static inline int enable_jprobe(struct jprobe *jp)
+{
+        return enable_kprobe(&jp->kp);
+}
 #endif /* _LINUX_KPROBES_H */
diff --git a/include/linux/leds-bd2802.h b/include/linux/leds-bd2802.h
new file mode 100644
index 000000000000..42f854a1a199
--- /dev/null
+++ b/include/linux/leds-bd2802.h
@@ -0,0 +1,26 @@
+/*
+ * leds-bd2802.h - RGB LED Driver
+ *
+ * Copyright (C) 2009 Samsung Electronics
+ * Kim Kyuwon <q1.kim@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Datasheet: http://www.rohm.com/products/databook/driver/pdf/bd2802gu-e.pdf
+ *
+ */
+#ifndef _LEDS_BD2802_H_
+#define _LEDS_BD2802_H_
+struct bd2802_led_platform_data{
+        int     reset_gpio;
+        u8      rgb_time;
+};
+#define RGB_TIME(slopedown, slopeup, waveform) \
+        ((slopedown) << 6 | (slopeup) << 4 | (waveform))
+#endif /* _LEDS_BD2802_H_ */
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 24489da701e3..376fe07732ea 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -30,6 +30,7 @@ enum led_brightness {
 struct led_classdev {
        const char              *name;
        int                      brightness;
+        int                      max_brightness;
        int                      flags;
        /* Lower 16 bits reflect status */
@@ -140,7 +141,8 @@ struct gpio_led {
        const char *name;
        const char *default_trigger;
        unsigned        gpio;
-        u8              active_low;
+        u8              active_low : 1;
+        u8              retain_state_suspended : 1;
 };
 struct gpio_led_platform_data {
diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
new file mode 100644
index 000000000000..33a071167489
--- /dev/null
+++ b/include/linux/leds_pwm.h
@@ -0,0 +1,21 @@
+/*
+ * PWM LED driver data - see drivers/leds/leds-pwm.c
+ */
+#ifndef __LINUX_LEDS_PWM_H
+#define __LINUX_LEDS_PWM_H
+struct led_pwm {
+        const char      *name;
+        const char      *default_trigger;
+        unsigned        pwm_id;
+        u8              active_low;
+        unsigned        max_brightness;
+        unsigned        pwm_period_ns;
+};
+struct led_pwm_platform_data {
+        int                     num_leds;
+        struct led_pwm  *leds;
+};
+#endif
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 7dc5b6cb44cd..d39ed1cc5fbf 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -25,13 +25,13 @@ struct svc_rqst;
 #define NLM_MAXCOOKIELEN        32
 #define NLM_MAXSTRLEN           1024
-#define nlm_granted             __constant_htonl(NLM_LCK_GRANTED)
+#define nlm_granted             cpu_to_be32(NLM_LCK_GRANTED)
-#define nlm_lck_denied          __constant_htonl(NLM_LCK_DENIED)
+#define nlm_lck_denied          cpu_to_be32(NLM_LCK_DENIED)
-#define nlm_lck_denied_nolocks  __constant_htonl(NLM_LCK_DENIED_NOLOCKS)
+#define nlm_lck_denied_nolocks  cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
-#define nlm_lck_blocked         __constant_htonl(NLM_LCK_BLOCKED)
+#define nlm_lck_blocked         cpu_to_be32(NLM_LCK_BLOCKED)
-#define nlm_lck_denied_grace_period     __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
+#define nlm_lck_denied_grace_period     cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
-#define nlm_drop_reply          __constant_htonl(30000)
+#define nlm_drop_reply          cpu_to_be32(30000)
 /* Lock info passed via NLM */
 struct nlm_lock {
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 12bfe09de2b1..7353821341ed 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -15,11 +15,11 @@
 #include <linux/lockd/xdr.h>
 /* error codes new to NLMv4 */
-#define nlm4_deadlock           __constant_htonl(NLM_DEADLCK)
+#define nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
-#define nlm4_rofs               __constant_htonl(NLM_ROFS)
+#define nlm4_rofs               cpu_to_be32(NLM_ROFS)
-#define nlm4_stale_fh           __constant_htonl(NLM_STALE_FH)
+#define nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
-#define nlm4_fbig               __constant_htonl(NLM_FBIG)
+#define nlm4_fbig               cpu_to_be32(NLM_FBIG)
-#define nlm4_failed             __constant_htonl(NLM_FAILED)
+#define nlm4_failed             cpu_to_be32(NLM_FAILED)
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index 4455b212d75a..c8f51c3c0a72 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -29,6 +29,8 @@ struct pcf50633_platform_data {
        char **batteries;
        int num_batteries;
+        int charging_restart_interval;
        /* Callbacks */
        void (*probe_done)(struct pcf50633 *);
        void (*mbc_event_callback)(struct pcf50633 *, int);
diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h
index 6e17619b773a..4119579acf2c 100644
--- a/include/linux/mfd/pcf50633/mbc.h
+++ b/include/linux/mfd/pcf50633/mbc.h
@@ -128,7 +128,6 @@ enum pcf50633_reg_mbcs3 {
 int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);
 int pcf50633_mbc_get_status(struct pcf50633 *);
-void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status);
 #endif
diff --git a/include/linux/mg_disk.h b/include/linux/mg_disk.h
new file mode 100644
index 000000000000..1f76b1ebf627
--- /dev/null
+++ b/include/linux/mg_disk.h
@@ -0,0 +1,206 @@
+/*
+ *  include/linux/mg_disk.c
+ *
+ *  Support for the mGine m[g]flash IO mode.
+ *  Based on legacy hd.c
+ *
+ * (c) 2008 mGine Co.,LTD
+ * (c) 2008 unsik Kim <donari75@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#ifndef __MG_DISK_H__
+#define __MG_DISK_H__
+#include <linux/blkdev.h>
+#include <linux/ata.h>
+/* name for block device */
+#define MG_DISK_NAME "mgd"
+/* name for platform device */
+#define MG_DEV_NAME "mg_disk"
+#define MG_DISK_MAJ 0
+#define MG_DISK_MAX_PART 16
+#define MG_SECTOR_SIZE 512
+#define MG_MAX_SECTS 256
+/* Register offsets */
+#define MG_BUFF_OFFSET                  0x8000
+#define MG_STORAGE_BUFFER_SIZE          0x200
+#define MG_REG_OFFSET                   0xC000
+#define MG_REG_FEATURE                  (MG_REG_OFFSET + 2)     /* write case */
+#define MG_REG_ERROR                    (MG_REG_OFFSET + 2)     /* read case */
+#define MG_REG_SECT_CNT                 (MG_REG_OFFSET + 4)
+#define MG_REG_SECT_NUM                 (MG_REG_OFFSET + 6)
+#define MG_REG_CYL_LOW                  (MG_REG_OFFSET + 8)
+#define MG_REG_CYL_HIGH                 (MG_REG_OFFSET + 0xA)
+#define MG_REG_DRV_HEAD                 (MG_REG_OFFSET + 0xC)
+#define MG_REG_COMMAND                  (MG_REG_OFFSET + 0xE)   /* write case */
+#define MG_REG_STATUS                   (MG_REG_OFFSET + 0xE)   /* read  case */
+#define MG_REG_DRV_CTRL                 (MG_REG_OFFSET + 0x10)
+#define MG_REG_BURST_CTRL               (MG_REG_OFFSET + 0x12)
+/* "Drive Select/Head Register" bit values */
+#define MG_REG_HEAD_MUST_BE_ON          0xA0 /* These 2 bits are always on */
+#define MG_REG_HEAD_DRIVE_MASTER        (0x00 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_DRIVE_SLAVE         (0x10 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_LBA_MODE            (0x40 | MG_REG_HEAD_MUST_BE_ON)
+/* "Device Control Register" bit values */
+#define MG_REG_CTRL_INTR_ENABLE                 0x0
+#define MG_REG_CTRL_INTR_DISABLE                (0x1<<1)
+#define MG_REG_CTRL_RESET                       (0x1<<2)
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_HIGH       0x0
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_LOW        (0x1<<4)
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_LOW         0x0
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_HIGH        (0x1<<5)
+#define MG_REG_CTRL_DPD_DISABLE                 0x0
+#define MG_REG_CTRL_DPD_ENABLE                  (0x1<<6)
+/* Status register bit */
+/* error bit in status register */
+#define MG_REG_STATUS_BIT_ERROR                 0x01
+/* corrected error in status register */
+#define MG_REG_STATUS_BIT_CORRECTED_ERROR       0x04
+/* data request bit in status register */
+#define MG_REG_STATUS_BIT_DATA_REQ              0x08
+/* DSC - Drive Seek Complete */
+#define MG_REG_STATUS_BIT_SEEK_DONE             0x10
+/* DWF - Drive Write Fault */
+#define MG_REG_STATUS_BIT_WRITE_FAULT           0x20
+#define MG_REG_STATUS_BIT_READY                 0x40
+#define MG_REG_STATUS_BIT_BUSY                  0x80
+/* handy status */
+#define MG_STAT_READY   (MG_REG_STATUS_BIT_READY | MG_REG_STATUS_BIT_SEEK_DONE)
+#define MG_READY_OK(s)  (((s) & (MG_STAT_READY | \
+                                (MG_REG_STATUS_BIT_BUSY | \
+                                 MG_REG_STATUS_BIT_WRITE_FAULT | \
+                                 MG_REG_STATUS_BIT_ERROR))) == MG_STAT_READY)
+/* Error register */
+#define MG_REG_ERR_AMNF         0x01
+#define MG_REG_ERR_ABRT         0x04
+#define MG_REG_ERR_IDNF         0x10
+#define MG_REG_ERR_UNC          0x40
+#define MG_REG_ERR_BBK          0x80
+/* error code for others */
+#define MG_ERR_NONE             0
+#define MG_ERR_TIMEOUT          0x100
+#define MG_ERR_INIT_STAT        0x101
+#define MG_ERR_TRANSLATION      0x102
+#define MG_ERR_CTRL_RST         0x103
+#define MG_ERR_INV_STAT         0x104
+#define MG_ERR_RSTOUT           0x105
+#define MG_MAX_ERRORS   6       /* Max read/write errors */
+/* command */
+#define MG_CMD_RD 0x20
+#define MG_CMD_WR 0x30
+#define MG_CMD_SLEEP 0x99
+#define MG_CMD_WAKEUP 0xC3
+#define MG_CMD_ID 0xEC
+#define MG_CMD_WR_CONF 0x3C
+#define MG_CMD_RD_CONF 0x40
+/* operation mode */
+#define MG_OP_CASCADE (1 << 0)
+#define MG_OP_CASCADE_SYNC_RD (1 << 1)
+#define MG_OP_CASCADE_SYNC_WR (1 << 2)
+#define MG_OP_INTERLEAVE (1 << 3)
+/* synchronous */
+#define MG_BURST_LAT_4 (3 << 4)
+#define MG_BURST_LAT_5 (4 << 4)
+#define MG_BURST_LAT_6 (5 << 4)
+#define MG_BURST_LAT_7 (6 << 4)
+#define MG_BURST_LAT_8 (7 << 4)
+#define MG_BURST_LEN_4 (1 << 1)
+#define MG_BURST_LEN_8 (2 << 1)
+#define MG_BURST_LEN_16 (3 << 1)
+#define MG_BURST_LEN_32 (4 << 1)
+#define MG_BURST_LEN_CONT (0 << 1)
+/* timeout value (unit: ms) */
+#define MG_TMAX_CONF_TO_CMD     1
+#define MG_TMAX_WAIT_RD_DRQ     10
+#define MG_TMAX_WAIT_WR_DRQ     500
+#define MG_TMAX_RST_TO_BUSY     10
+#define MG_TMAX_HDRST_TO_RDY    500
+#define MG_TMAX_SWRST_TO_RDY    500
+#define MG_TMAX_RSTOUT          3000
+/* device attribution */
+/* use mflash as boot device */
+#define MG_BOOT_DEV             (1 << 0)
+/* use mflash as storage device */
+#define MG_STORAGE_DEV          (1 << 1)
+/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
+#define MG_STORAGE_DEV_SKIP_RST (1 << 2)
+#define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST)
+/* names of GPIO resource */
+#define MG_RST_PIN      "mg_rst"
+/* except MG_BOOT_DEV, reset-out pin should be assigned */
+#define MG_RSTOUT_PIN   "mg_rstout"
+/* private driver data */
+struct mg_drv_data {
+        /* disk resource */
+        u32 use_polling;
+        /* device attribution */
+        u32 dev_attr;
+        /* internally used */
+        struct mg_host *host;
+};
+/* main structure for mflash driver */
+struct mg_host {
+        struct device *dev;
+        struct request_queue *breq;
+        spinlock_t lock;
+        struct gendisk *gd;
+        struct timer_list timer;
+        void (*mg_do_intr) (struct mg_host *);
+        u16 id[ATA_ID_WORDS];
+        u16 cyls;
+        u16 heads;
+        u16 sectors;
+        u32 n_sectors;
+        u32 nres_sectors;
+        void __iomem *dev_base;
+        unsigned int irq;
+        unsigned int rst;
+        unsigned int rstout;
+        u32 major;
+        u32 error;
+};
+/*
+ * Debugging macro and defines
+ */
+#undef DO_MG_DEBUG
+#ifdef DO_MG_DEBUG
+#  define MG_DBG(fmt, args...) \
+        printk(KERN_DEBUG "%s:%d "fmt, __func__, __LINE__, ##args)
+#else /* CONFIG_MG_DEBUG */
+#  define MG_DBG(fmt, args...) do { } while (0)
+#endif /* CONFIG_MG_DEBUG */
+#endif
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 3aa5d77c2cdb..5675b63a0631 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/notifier.h>
+#include <linux/device.h>
 #include <linux/mtd/compatmac.h>
 #include <mtd/mtd-abi.h>
@@ -162,6 +163,20 @@ struct mtd_info {
        /* We probably shouldn't allow XIP if the unpoint isn't a NULL */
        void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
+        /* Allow NOMMU mmap() to directly map the device (if not NULL)
+         * - return the address to which the offset maps
+         * - return -ENOSYS to indicate refusal to do the mapping
+         */
+        unsigned long (*get_unmapped_area) (struct mtd_info *mtd,
+                                            unsigned long len,
+                                            unsigned long offset,
+                                            unsigned long flags);
+        /* Backing device capabilities for this device
+         * - provides mmap capabilities
+         */
+        struct backing_dev_info *backing_dev_info;
        int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
        int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
@@ -223,6 +238,7 @@ struct mtd_info {
        void *priv;
        struct module *owner;
+        struct device dev;
        int usecount;
        /* If the driver is something smart, like UBI, it may need to maintain
@@ -233,6 +249,11 @@ struct mtd_info {
        void (*put_device) (struct mtd_info *mtd);
 };
+static inline struct mtd_info *dev_to_mtd(struct device *dev)
+{
+        return dev ? container_of(dev, struct mtd_info, dev) : NULL;
+}
 static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
 {
        if (mtd->erasesize_shift)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index db5b63da2a7e..7efb9be34662 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -43,8 +43,8 @@ extern void nand_wait_ready(struct mtd_info *mtd);
 * is supported now. If you add a chip with bigger oobsize/page
 * adjust this accordingly.
 */
-#define NAND_MAX_OOBSIZE        64
+#define NAND_MAX_OOBSIZE        128
-#define NAND_MAX_PAGESIZE       2048
+#define NAND_MAX_PAGESIZE       4096
 /*
 * Constants for hardware specific CLE/ALE/NCE function
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index a45dd831b3f8..7535a74083b9 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -76,4 +76,16 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                                      struct device_node *node,
                                      struct mtd_partition **pparts);
+#ifdef CONFIG_MTD_PARTITIONS
+static inline int mtd_has_partitions(void) { return 1; }
+#else
+static inline int mtd_has_partitions(void) { return 0; }
+#endif
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+static inline int mtd_has_cmdlinepart(void) { return 1; }
+#else
+static inline int mtd_has_cmdlinepart(void) { return 0; }
+#endif
 #endif
diff --git a/include/linux/nfs.h b/include/linux/nfs.h
index 54af92c1c70b..214d499718f7 100644
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
@@ -109,7 +109,6 @@
        NFSERR_FILE_OPEN = 10046,      /*       v4 */
        NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
        NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-        NFSERR_REPLAY_ME = 10049        /*       v4 */
 };
 /* NFSv2 file types - beware, these are not the same in NFSv3 */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index b912311a56b1..e3f0cbcbd0db 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -21,6 +21,7 @@
 #define NFS4_FHSIZE             128
 #define NFS4_MAXPATHLEN         PATH_MAX
 #define NFS4_MAXNAMLEN          NAME_MAX
+#define NFS4_MAX_SESSIONID_LEN  16
 #define NFS4_ACCESS_READ        0x0001
 #define NFS4_ACCESS_LOOKUP      0x0002
@@ -38,6 +39,7 @@
 #define NFS4_OPEN_RESULT_CONFIRM 0x0002
 #define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
+#define NFS4_SHARE_ACCESS_MASK  0x000F
 #define NFS4_SHARE_ACCESS_READ  0x0001
 #define NFS4_SHARE_ACCESS_WRITE 0x0002
 #define NFS4_SHARE_ACCESS_BOTH  0x0003
@@ -45,6 +47,19 @@
 #define NFS4_SHARE_DENY_WRITE   0x0002
 #define NFS4_SHARE_DENY_BOTH    0x0003
+/* nfs41 */
+#define NFS4_SHARE_WANT_MASK            0xFF00
+#define NFS4_SHARE_WANT_NO_PREFERENCE   0x0000
+#define NFS4_SHARE_WANT_READ_DELEG      0x0100
+#define NFS4_SHARE_WANT_WRITE_DELEG     0x0200
+#define NFS4_SHARE_WANT_ANY_DELEG       0x0300
+#define NFS4_SHARE_WANT_NO_DELEG        0x0400
+#define NFS4_SHARE_WANT_CANCEL          0x0500
+#define NFS4_SHARE_WHEN_MASK            0xF0000
+#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL        0x10000
+#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED          0x20000
 #define NFS4_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
@@ -88,6 +103,31 @@
 #define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
 #define NFS4_ACE_MASK_ALL                     0x001F01FF
+#define EXCHGID4_FLAG_SUPP_MOVED_REFER          0x00000001
+#define EXCHGID4_FLAG_SUPP_MOVED_MIGR           0x00000002
+#define EXCHGID4_FLAG_USE_NON_PNFS              0x00010000
+#define EXCHGID4_FLAG_USE_PNFS_MDS              0x00020000
+#define EXCHGID4_FLAG_USE_PNFS_DS               0x00040000
+#define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A       0x40000000
+#define EXCHGID4_FLAG_CONFIRMED_R               0x80000000
+/*
+ * Since the validity of these bits depends on whether
+ * they're set in the argument or response, have separate
+ * invalid flag masks for arg (_A) and resp (_R).
+ */
+#define EXCHGID4_FLAG_MASK_A                    0x40070003
+#define EXCHGID4_FLAG_MASK_R                    0x80070003
+#define SEQ4_STATUS_CB_PATH_DOWN                0x00000001
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING    0x00000002
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED     0x00000004
+#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED   0x00000008
+#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED  0x00000010
+#define SEQ4_STATUS_ADMIN_STATE_REVOKED         0x00000020
+#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED    0x00000040
+#define SEQ4_STATUS_LEASE_MOVED                 0x00000080
+#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED      0x00000100
 #define NFS4_MAX_UINT64 (~(u64)0)
 enum nfs4_acl_whotype {
@@ -154,6 +194,28 @@ enum nfs_opnum4 {
        OP_VERIFY = 37,
        OP_WRITE = 38,
        OP_RELEASE_LOCKOWNER = 39,
+        /* nfs41 */
+        OP_BACKCHANNEL_CTL = 40,
+        OP_BIND_CONN_TO_SESSION = 41,
+        OP_EXCHANGE_ID = 42,
+        OP_CREATE_SESSION = 43,
+        OP_DESTROY_SESSION = 44,
+        OP_FREE_STATEID = 45,
+        OP_GET_DIR_DELEGATION = 46,
+        OP_GETDEVICEINFO = 47,
+        OP_GETDEVICELIST = 48,
+        OP_LAYOUTCOMMIT = 49,
+        OP_LAYOUTGET = 50,
+        OP_LAYOUTRETURN = 51,
+        OP_SECINFO_NO_NAME = 52,
+        OP_SEQUENCE = 53,
+        OP_SET_SSV = 54,
+        OP_TEST_STATEID = 55,
+        OP_WANT_DELEGATION = 56,
+        OP_DESTROY_CLIENTID = 57,
+        OP_RECLAIM_COMPLETE = 58,
        OP_ILLEGAL = 10044,
 };
@@ -230,7 +292,48 @@ enum nfsstat4 {
        NFS4ERR_DEADLOCK = 10045,
        NFS4ERR_FILE_OPEN = 10046,
        NFS4ERR_ADMIN_REVOKED = 10047,
-        NFS4ERR_CB_PATH_DOWN = 10048
+        NFS4ERR_CB_PATH_DOWN = 10048,
+        /* nfs41 */
+        NFS4ERR_BADIOMODE       = 10049,
+        NFS4ERR_BADLAYOUT       = 10050,
+        NFS4ERR_BAD_SESSION_DIGEST = 10051,
+        NFS4ERR_BADSESSION      = 10052,
+        NFS4ERR_BADSLOT         = 10053,
+        NFS4ERR_COMPLETE_ALREADY = 10054,
+        NFS4ERR_CONN_NOT_BOUND_TO_SESSION = 10055,
+        NFS4ERR_DELEG_ALREADY_WANTED = 10056,
+        NFS4ERR_BACK_CHAN_BUSY  = 10057,        /* backchan reqs outstanding */
+        NFS4ERR_LAYOUTTRYLATER  = 10058,
+        NFS4ERR_LAYOUTUNAVAILABLE = 10059,
+        NFS4ERR_NOMATCHING_LAYOUT = 10060,
+        NFS4ERR_RECALLCONFLICT  = 10061,
+        NFS4ERR_UNKNOWN_LAYOUTTYPE = 10062,
+        NFS4ERR_SEQ_MISORDERED = 10063,         /* unexpected seq.id in req */
+        NFS4ERR_SEQUENCE_POS    = 10064,        /* [CB_]SEQ. op not 1st op */
+        NFS4ERR_REQ_TOO_BIG     = 10065,        /* request too big */
+        NFS4ERR_REP_TOO_BIG     = 10066,        /* reply too big */
+        NFS4ERR_REP_TOO_BIG_TO_CACHE = 10067,   /* rep. not all cached */
+        NFS4ERR_RETRY_UNCACHED_REP = 10068,     /* retry & rep. uncached */
+        NFS4ERR_UNSAFE_COMPOUND = 10069,        /* retry/recovery too hard */
+        NFS4ERR_TOO_MANY_OPS    = 10070,        /* too many ops in [CB_]COMP */
+        NFS4ERR_OP_NOT_IN_SESSION = 10071,      /* op needs [CB_]SEQ. op */
+        NFS4ERR_HASH_ALG_UNSUPP = 10072,        /* hash alg. not supp. */
+                                                /* Error 10073 is unused. */
+        NFS4ERR_CLIENTID_BUSY   = 10074,        /* clientid has state */
+        NFS4ERR_PNFS_IO_HOLE    = 10075,        /* IO to _SPARSE file hole */
+        NFS4ERR_SEQ_FALSE_RETRY = 10076,        /* retry not origional */
+        NFS4ERR_BAD_HIGH_SLOT   = 10077,        /* sequence arg bad */
+        NFS4ERR_DEADSESSION     = 10078,        /* persistent session dead */
+        NFS4ERR_ENCR_ALG_UNSUPP = 10079,        /* SSV alg mismatch */
+        NFS4ERR_PNFS_NO_LAYOUT  = 10080,        /* direct I/O with no layout */
+        NFS4ERR_NOT_ONLY_OP     = 10081,        /* bad compound */
+        NFS4ERR_WRONG_CRED      = 10082,        /* permissions:state change */
+        NFS4ERR_WRONG_TYPE      = 10083,        /* current operation mismatch */
+        NFS4ERR_DIRDELEG_UNAVAIL = 10084,       /* no directory delegation */
+        NFS4ERR_REJECT_DELEG    = 10085,        /* on callback */
+        NFS4ERR_RETURNCONFLICT  = 10086,        /* outstanding layoutreturn */
+        NFS4ERR_DELEG_REVOKED   = 10087,        /* deleg./layout revoked */
 };
 /*
@@ -265,7 +368,13 @@ enum opentype4 {
 enum createmode4 {
        NFS4_CREATE_UNCHECKED = 0,
        NFS4_CREATE_GUARDED = 1,
-        NFS4_CREATE_EXCLUSIVE = 2
+        NFS4_CREATE_EXCLUSIVE = 2,
+        /*
+         * New to NFSv4.1. If session is persistent,
+         * GUARDED4 MUST be used. Otherwise, use
+         * EXCLUSIVE4_1 instead of EXCLUSIVE4.
+         */
+        NFS4_CREATE_EXCLUSIVE4_1 = 3
 };
 enum limit_by4 {
@@ -301,6 +410,8 @@ enum lock_type4 {
 #define FATTR4_WORD0_UNIQUE_HANDLES     (1UL << 9)
 #define FATTR4_WORD0_LEASE_TIME         (1UL << 10)
 #define FATTR4_WORD0_RDATTR_ERROR       (1UL << 11)
+/* Mandatory in NFSv4.1 */
+#define FATTR4_WORD2_SUPPATTR_EXCLCREAT (1UL << 11)
 /* Recommended Attributes */
 #define FATTR4_WORD0_ACL                (1UL << 12)
@@ -391,6 +502,29 @@ enum {
        NFSPROC4_CLNT_GETACL,
        NFSPROC4_CLNT_SETACL,
        NFSPROC4_CLNT_FS_LOCATIONS,
+        /* nfs41 */
+        NFSPROC4_CLNT_EXCHANGE_ID,
+        NFSPROC4_CLNT_CREATE_SESSION,
+        NFSPROC4_CLNT_DESTROY_SESSION,
+        NFSPROC4_CLNT_SEQUENCE,
+        NFSPROC4_CLNT_GET_LEASE_TIME,
+};
+/* nfs41 types */
+struct nfs4_sessionid {
+        unsigned char data[NFS4_MAX_SESSIONID_LEN];
+};
+/* Create Session Flags */
+#define SESSION4_PERSIST         0x001
+#define SESSION4_BACK_CHAN       0x002
+#define SESSION4_RDMA            0x004
+enum state_protect_how4 {
+        SP4_NONE        = 0,
+        SP4_MACH_CRED   = 1,
+        SP4_SSV         = 2
 };
 #endif
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index 04b355c801d8..5bccaab81056 100644
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -76,4 +76,12 @@ void	nfsd_reply_cache_shutdown(void);
 int     nfsd_cache_lookup(struct svc_rqst *, int);
 void    nfsd_cache_update(struct svc_rqst *, int, __be32 *);
+#ifdef CONFIG_NFSD_V4
+void    nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
+#else  /* CONFIG_NFSD_V4 */
+static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
+{
+}
+#endif /* CONFIG_NFSD_V4 */
 #endif /* NFSCACHE_H */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index e19f45991b2e..2b49d676d0c9 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -23,7 +23,7 @@
 /*
 * nfsd version
 */
-#define NFSD_SUPPORTED_MINOR_VERSION    0
+#define NFSD_SUPPORTED_MINOR_VERSION    1
 /*
 * Flags for nfsd_permission
@@ -53,6 +53,7 @@ typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
 extern struct svc_program       nfsd_program;
 extern struct svc_version       nfsd_version2, nfsd_version3,
                                nfsd_version4;
+extern u32                      nfsd_supported_minorversion;
 extern struct mutex             nfsd_mutex;
 extern struct svc_serv          *nfsd_serv;
@@ -105,7 +106,7 @@ void		nfsd_close(struct file *);
 __be32          nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
                                loff_t, struct kvec *, int, unsigned long *);
 __be32          nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
-                                loff_t, struct kvec *,int, unsigned long, int *);
+                                loff_t, struct kvec *,int, unsigned long *, int *);
 __be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
                                char *, int *);
 __be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
@@ -149,6 +150,7 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
 enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
 int nfsd_vers(int vers, enum vers_op change);
+int nfsd_minorversion(u32 minorversion, enum vers_op change);
 void nfsd_reset_versions(void);
 int nfsd_create_serv(void);
@@ -186,78 +188,119 @@ void		nfsd_lockd_shutdown(void);
 /*
 * These macros provide pre-xdr'ed values for faster operation.
 */
-#define nfs_ok                  __constant_htonl(NFS_OK)
+#define nfs_ok                  cpu_to_be32(NFS_OK)
-#define nfserr_perm             __constant_htonl(NFSERR_PERM)
+#define nfserr_perm             cpu_to_be32(NFSERR_PERM)
-#define nfserr_noent            __constant_htonl(NFSERR_NOENT)
+#define nfserr_noent            cpu_to_be32(NFSERR_NOENT)
-#define nfserr_io               __constant_htonl(NFSERR_IO)
+#define nfserr_io               cpu_to_be32(NFSERR_IO)
-#define nfserr_nxio             __constant_htonl(NFSERR_NXIO)
+#define nfserr_nxio             cpu_to_be32(NFSERR_NXIO)
-#define nfserr_eagain           __constant_htonl(NFSERR_EAGAIN)
+#define nfserr_eagain           cpu_to_be32(NFSERR_EAGAIN)
-#define nfserr_acces            __constant_htonl(NFSERR_ACCES)
+#define nfserr_acces            cpu_to_be32(NFSERR_ACCES)
-#define nfserr_exist            __constant_htonl(NFSERR_EXIST)
+#define nfserr_exist            cpu_to_be32(NFSERR_EXIST)
-#define nfserr_xdev             __constant_htonl(NFSERR_XDEV)
+#define nfserr_xdev             cpu_to_be32(NFSERR_XDEV)
-#define nfserr_nodev            __constant_htonl(NFSERR_NODEV)
+#define nfserr_nodev            cpu_to_be32(NFSERR_NODEV)
-#define nfserr_notdir           __constant_htonl(NFSERR_NOTDIR)
+#define nfserr_notdir           cpu_to_be32(NFSERR_NOTDIR)
-#define nfserr_isdir            __constant_htonl(NFSERR_ISDIR)
+#define nfserr_isdir            cpu_to_be32(NFSERR_ISDIR)
-#define nfserr_inval            __constant_htonl(NFSERR_INVAL)
+#define nfserr_inval            cpu_to_be32(NFSERR_INVAL)
-#define nfserr_fbig             __constant_htonl(NFSERR_FBIG)
+#define nfserr_fbig             cpu_to_be32(NFSERR_FBIG)
-#define nfserr_nospc            __constant_htonl(NFSERR_NOSPC)
+#define nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
-#define nfserr_rofs             __constant_htonl(NFSERR_ROFS)
+#define nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
-#define nfserr_mlink            __constant_htonl(NFSERR_MLINK)
+#define nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
-#define nfserr_opnotsupp        __constant_htonl(NFSERR_OPNOTSUPP)
+#define nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
-#define nfserr_nametoolong      __constant_htonl(NFSERR_NAMETOOLONG)
+#define nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
-#define nfserr_notempty         __constant_htonl(NFSERR_NOTEMPTY)
+#define nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
-#define nfserr_dquot            __constant_htonl(NFSERR_DQUOT)
+#define nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)
-#define nfserr_stale            __constant_htonl(NFSERR_STALE)
+#define nfserr_stale            cpu_to_be32(NFSERR_STALE)
-#define nfserr_remote           __constant_htonl(NFSERR_REMOTE)
+#define nfserr_remote           cpu_to_be32(NFSERR_REMOTE)
-#define nfserr_wflush           __constant_htonl(NFSERR_WFLUSH)
+#define nfserr_wflush           cpu_to_be32(NFSERR_WFLUSH)
-#define nfserr_badhandle        __constant_htonl(NFSERR_BADHANDLE)
+#define nfserr_badhandle        cpu_to_be32(NFSERR_BADHANDLE)
-#define nfserr_notsync          __constant_htonl(NFSERR_NOT_SYNC)
+#define nfserr_notsync          cpu_to_be32(NFSERR_NOT_SYNC)
-#define nfserr_badcookie        __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_badcookie        cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_notsupp          __constant_htonl(NFSERR_NOTSUPP)
+#define nfserr_notsupp          cpu_to_be32(NFSERR_NOTSUPP)
-#define nfserr_toosmall         __constant_htonl(NFSERR_TOOSMALL)
+#define nfserr_toosmall         cpu_to_be32(NFSERR_TOOSMALL)
-#define nfserr_serverfault      __constant_htonl(NFSERR_SERVERFAULT)
+#define nfserr_serverfault      cpu_to_be32(NFSERR_SERVERFAULT)
-#define nfserr_badtype          __constant_htonl(NFSERR_BADTYPE)
+#define nfserr_badtype          cpu_to_be32(NFSERR_BADTYPE)
-#define nfserr_jukebox          __constant_htonl(NFSERR_JUKEBOX)
+#define nfserr_jukebox          cpu_to_be32(NFSERR_JUKEBOX)
-#define nfserr_denied           __constant_htonl(NFSERR_DENIED)
+#define nfserr_denied           cpu_to_be32(NFSERR_DENIED)
-#define nfserr_deadlock         __constant_htonl(NFSERR_DEADLOCK)
+#define nfserr_deadlock         cpu_to_be32(NFSERR_DEADLOCK)
-#define nfserr_expired          __constant_htonl(NFSERR_EXPIRED)
+#define nfserr_expired          cpu_to_be32(NFSERR_EXPIRED)
-#define nfserr_bad_cookie       __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_bad_cookie       cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_same             __constant_htonl(NFSERR_SAME)
+#define nfserr_same             cpu_to_be32(NFSERR_SAME)
-#define nfserr_clid_inuse       __constant_htonl(NFSERR_CLID_INUSE)
+#define nfserr_clid_inuse       cpu_to_be32(NFSERR_CLID_INUSE)
-#define nfserr_stale_clientid   __constant_htonl(NFSERR_STALE_CLIENTID)
+#define nfserr_stale_clientid   cpu_to_be32(NFSERR_STALE_CLIENTID)
-#define nfserr_resource         __constant_htonl(NFSERR_RESOURCE)
+#define nfserr_resource         cpu_to_be32(NFSERR_RESOURCE)
-#define nfserr_moved            __constant_htonl(NFSERR_MOVED)
+#define nfserr_moved            cpu_to_be32(NFSERR_MOVED)
-#define nfserr_nofilehandle     __constant_htonl(NFSERR_NOFILEHANDLE)
+#define nfserr_nofilehandle     cpu_to_be32(NFSERR_NOFILEHANDLE)
-#define nfserr_minor_vers_mismatch      __constant_htonl(NFSERR_MINOR_VERS_MISMATCH)
+#define nfserr_minor_vers_mismatch      cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
-#define nfserr_share_denied     __constant_htonl(NFSERR_SHARE_DENIED)
+#define nfserr_share_denied     cpu_to_be32(NFSERR_SHARE_DENIED)
-#define nfserr_stale_stateid    __constant_htonl(NFSERR_STALE_STATEID)
+#define nfserr_stale_stateid    cpu_to_be32(NFSERR_STALE_STATEID)
-#define nfserr_old_stateid      __constant_htonl(NFSERR_OLD_STATEID)
+#define nfserr_old_stateid      cpu_to_be32(NFSERR_OLD_STATEID)
-#define nfserr_bad_stateid      __constant_htonl(NFSERR_BAD_STATEID)
+#define nfserr_bad_stateid      cpu_to_be32(NFSERR_BAD_STATEID)
-#define nfserr_bad_seqid        __constant_htonl(NFSERR_BAD_SEQID)
+#define nfserr_bad_seqid        cpu_to_be32(NFSERR_BAD_SEQID)
-#define nfserr_symlink          __constant_htonl(NFSERR_SYMLINK)
+#define nfserr_symlink          cpu_to_be32(NFSERR_SYMLINK)
-#define nfserr_not_same         __constant_htonl(NFSERR_NOT_SAME)
+#define nfserr_not_same         cpu_to_be32(NFSERR_NOT_SAME)
-#define nfserr_restorefh        __constant_htonl(NFSERR_RESTOREFH)
+#define nfserr_restorefh        cpu_to_be32(NFSERR_RESTOREFH)
-#define nfserr_attrnotsupp      __constant_htonl(NFSERR_ATTRNOTSUPP)
+#define nfserr_attrnotsupp      cpu_to_be32(NFSERR_ATTRNOTSUPP)
-#define nfserr_bad_xdr          __constant_htonl(NFSERR_BAD_XDR)
+#define nfserr_bad_xdr          cpu_to_be32(NFSERR_BAD_XDR)
-#define nfserr_openmode         __constant_htonl(NFSERR_OPENMODE)
+#define nfserr_openmode         cpu_to_be32(NFSERR_OPENMODE)
-#define nfserr_locks_held       __constant_htonl(NFSERR_LOCKS_HELD)
+#define nfserr_locks_held       cpu_to_be32(NFSERR_LOCKS_HELD)
-#define nfserr_op_illegal       __constant_htonl(NFSERR_OP_ILLEGAL)
+#define nfserr_op_illegal       cpu_to_be32(NFSERR_OP_ILLEGAL)
-#define nfserr_grace            __constant_htonl(NFSERR_GRACE)
+#define nfserr_grace            cpu_to_be32(NFSERR_GRACE)
-#define nfserr_no_grace         __constant_htonl(NFSERR_NO_GRACE)
+#define nfserr_no_grace         cpu_to_be32(NFSERR_NO_GRACE)
-#define nfserr_reclaim_bad      __constant_htonl(NFSERR_RECLAIM_BAD)
+#define nfserr_reclaim_bad      cpu_to_be32(NFSERR_RECLAIM_BAD)
-#define nfserr_badname          __constant_htonl(NFSERR_BADNAME)
+#define nfserr_badname          cpu_to_be32(NFSERR_BADNAME)
-#define nfserr_cb_path_down     __constant_htonl(NFSERR_CB_PATH_DOWN)
+#define nfserr_cb_path_down     cpu_to_be32(NFSERR_CB_PATH_DOWN)
-#define nfserr_locked           __constant_htonl(NFSERR_LOCKED)
+#define nfserr_locked           cpu_to_be32(NFSERR_LOCKED)
-#define nfserr_wrongsec         __constant_htonl(NFSERR_WRONGSEC)
+#define nfserr_wrongsec         cpu_to_be32(NFSERR_WRONGSEC)
-#define nfserr_replay_me        __constant_htonl(NFSERR_REPLAY_ME)
+#define nfserr_badiomode                cpu_to_be32(NFS4ERR_BADIOMODE)
+#define nfserr_badlayout                cpu_to_be32(NFS4ERR_BADLAYOUT)
+#define nfserr_bad_session_digest       cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)
+#define nfserr_badsession               cpu_to_be32(NFS4ERR_BADSESSION)
+#define nfserr_badslot                  cpu_to_be32(NFS4ERR_BADSLOT)
+#define nfserr_complete_already         cpu_to_be32(NFS4ERR_COMPLETE_ALREADY)
+#define nfserr_conn_not_bound_to_session cpu_to_be32(NFS4ERR_CONN_NOT_BOUND_TO_SESSION)
+#define nfserr_deleg_already_wanted     cpu_to_be32(NFS4ERR_DELEG_ALREADY_WANTED)
+#define nfserr_back_chan_busy           cpu_to_be32(NFS4ERR_BACK_CHAN_BUSY)
+#define nfserr_layouttrylater           cpu_to_be32(NFS4ERR_LAYOUTTRYLATER)
+#define nfserr_layoutunavailable        cpu_to_be32(NFS4ERR_LAYOUTUNAVAILABLE)
+#define nfserr_nomatching_layout        cpu_to_be32(NFS4ERR_NOMATCHING_LAYOUT)
+#define nfserr_recallconflict           cpu_to_be32(NFS4ERR_RECALLCONFLICT)
+#define nfserr_unknown_layouttype       cpu_to_be32(NFS4ERR_UNKNOWN_LAYOUTTYPE)
+#define nfserr_seq_misordered           cpu_to_be32(NFS4ERR_SEQ_MISORDERED)
+#define nfserr_sequence_pos             cpu_to_be32(NFS4ERR_SEQUENCE_POS)
+#define nfserr_req_too_big              cpu_to_be32(NFS4ERR_REQ_TOO_BIG)
+#define nfserr_rep_too_big              cpu_to_be32(NFS4ERR_REP_TOO_BIG)
+#define nfserr_rep_too_big_to_cache     cpu_to_be32(NFS4ERR_REP_TOO_BIG_TO_CACHE)
+#define nfserr_retry_uncached_rep       cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP)
+#define nfserr_unsafe_compound          cpu_to_be32(NFS4ERR_UNSAFE_COMPOUND)
+#define nfserr_too_many_ops             cpu_to_be32(NFS4ERR_TOO_MANY_OPS)
+#define nfserr_op_not_in_session        cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION)
+#define nfserr_hash_alg_unsupp          cpu_to_be32(NFS4ERR_HASH_ALG_UNSUPP)
+#define nfserr_clientid_busy            cpu_to_be32(NFS4ERR_CLIENTID_BUSY)
+#define nfserr_pnfs_io_hole             cpu_to_be32(NFS4ERR_PNFS_IO_HOLE)
+#define nfserr_seq_false_retry          cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY)
+#define nfserr_bad_high_slot            cpu_to_be32(NFS4ERR_BAD_HIGH_SLOT)
+#define nfserr_deadsession              cpu_to_be32(NFS4ERR_DEADSESSION)
+#define nfserr_encr_alg_unsupp          cpu_to_be32(NFS4ERR_ENCR_ALG_UNSUPP)
+#define nfserr_pnfs_no_layout           cpu_to_be32(NFS4ERR_PNFS_NO_LAYOUT)
+#define nfserr_not_only_op              cpu_to_be32(NFS4ERR_NOT_ONLY_OP)
+#define nfserr_wrong_cred               cpu_to_be32(NFS4ERR_WRONG_CRED)
+#define nfserr_wrong_type               cpu_to_be32(NFS4ERR_WRONG_TYPE)
+#define nfserr_dirdeleg_unavail         cpu_to_be32(NFS4ERR_DIRDELEG_UNAVAIL)
+#define nfserr_reject_deleg             cpu_to_be32(NFS4ERR_REJECT_DELEG)
+#define nfserr_returnconflict           cpu_to_be32(NFS4ERR_RETURNCONFLICT)
+#define nfserr_deleg_revoked            cpu_to_be32(NFS4ERR_DELEG_REVOKED)
 /* error codes for internal use */
 /* if a request fails due to kmalloc failure, it gets dropped.
 *  Client should resend eventually
 */
-#define nfserr_dropit           __constant_htonl(30000)
+#define nfserr_dropit           cpu_to_be32(30000)
 /* end-of-file indicator in readdir */
-#define nfserr_eof              __constant_htonl(30001)
+#define nfserr_eof              cpu_to_be32(30001)
+/* replay detected */
+#define nfserr_replay_me        cpu_to_be32(11001)
+/* nfs41 replay detected */
+#define nfserr_replay_cache     cpu_to_be32(11002)
 /* Check for dir entries '.' and '..' */
 #define isdotent(n, l)  (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
@@ -300,7 +343,7 @@ extern struct timeval	nfssvc_boot;
 *    TIME_BACKUP   (unlikely to be supported any time soon)
 *    TIME_CREATE   (unlikely to be supported any time soon)
 */
-#define NFSD_SUPPORTED_ATTRS_WORD0                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD0                                                         \
 (FATTR4_WORD0_SUPPORTED_ATTRS   | FATTR4_WORD0_TYPE         | FATTR4_WORD0_FH_EXPIRE_TYPE   \
 | FATTR4_WORD0_CHANGE          | FATTR4_WORD0_SIZE         | FATTR4_WORD0_LINK_SUPPORT     \
 | FATTR4_WORD0_SYMLINK_SUPPORT | FATTR4_WORD0_NAMED_ATTR   | FATTR4_WORD0_FSID             \
@@ -312,7 +355,7 @@ extern struct timeval	nfssvc_boot;
 | FATTR4_WORD0_MAXFILESIZE     | FATTR4_WORD0_MAXLINK      | FATTR4_WORD0_MAXNAME          \
 | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE     | FATTR4_WORD0_ACL)
-#define NFSD_SUPPORTED_ATTRS_WORD1                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD1                                                         \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_NO_TRUNC     | FATTR4_WORD1_NUMLINKS         \
 | FATTR4_WORD1_OWNER           | FATTR4_WORD1_OWNER_GROUP  | FATTR4_WORD1_RAWDEV           \
 | FATTR4_WORD1_SPACE_AVAIL     | FATTR4_WORD1_SPACE_FREE   | FATTR4_WORD1_SPACE_TOTAL      \
@@ -320,6 +363,35 @@ extern struct timeval	nfssvc_boot;
 | FATTR4_WORD1_TIME_DELTA   | FATTR4_WORD1_TIME_METADATA    \
 | FATTR4_WORD1_TIME_MODIFY     | FATTR4_WORD1_TIME_MODIFY_SET | FATTR4_WORD1_MOUNTED_ON_FILEID)
+#define NFSD4_SUPPORTED_ATTRS_WORD2 0
+#define NFSD4_1_SUPPORTED_ATTRS_WORD0 \
+        NFSD4_SUPPORTED_ATTRS_WORD0
+#define NFSD4_1_SUPPORTED_ATTRS_WORD1 \
+        NFSD4_SUPPORTED_ATTRS_WORD1
+#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \
+        (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)
+static inline u32 nfsd_suppattrs0(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
+                            : NFSD4_SUPPORTED_ATTRS_WORD0;
+}
+static inline u32 nfsd_suppattrs1(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD1
+                            : NFSD4_SUPPORTED_ATTRS_WORD1;
+}
+static inline u32 nfsd_suppattrs2(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
+                            : NFSD4_SUPPORTED_ATTRS_WORD2;
+}
 /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
 #define NFSD_WRITEONLY_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_TIME_ACCESS_SET   | FATTR4_WORD1_TIME_MODIFY_SET)
@@ -330,6 +402,19 @@ extern struct timeval	nfssvc_boot;
 #define NFSD_WRITEABLE_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_OWNER         | FATTR4_WORD1_OWNER_GROUP     \
 | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)
+#define NFSD_WRITEABLE_ATTRS_WORD2 0
+#define NFSD_SUPPATTR_EXCLCREAT_WORD0 \
+        NFSD_WRITEABLE_ATTRS_WORD0
+/*
+ * we currently store the exclusive create verifier in the v_{a,m}time
+ * attributes so the client can't set these at create time using EXCLUSIVE4_1
+ */
+#define NFSD_SUPPATTR_EXCLCREAT_WORD1 \
+        (NFSD_WRITEABLE_ATTRS_WORD1 & \
+         ~(FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET))
+#define NFSD_SUPPATTR_EXCLCREAT_WORD2 \
+        NFSD_WRITEABLE_ATTRS_WORD2
 #endif /* CONFIG_NFSD_V4 */
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index fa317f6c154b..afa19016c4a8 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -269,6 +269,13 @@ fh_copy(struct svc_fh *dst, struct svc_fh *src)
        return dst;
 }
+static inline void
+fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
+{
+        dst->fh_size = src->fh_size;
+        memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
+}
 static __inline__ struct svc_fh *
 fh_init(struct svc_fh *fhp, int maxsize)
 {
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 128298c0362d..4d61c873feed 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -66,8 +66,7 @@ struct nfs4_cb_recall {
        u32                     cbr_ident;
        int                     cbr_trunc;
        stateid_t               cbr_stateid;
-        u32                     cbr_fhlen;
+        struct knfsd_fh         cbr_fh;
-        char                    cbr_fhval[NFS4_FHSIZE];
        struct nfs4_delegation  *cbr_dp;
 };
@@ -86,8 +85,7 @@ struct nfs4_delegation {
 };
 #define dl_stateid      dl_recall.cbr_stateid
-#define dl_fhlen        dl_recall.cbr_fhlen
+#define dl_fh           dl_recall.cbr_fh
-#define dl_fhval        dl_recall.cbr_fhval
 /* client delegation callback info */
 struct nfs4_callback {
@@ -101,6 +99,64 @@ struct nfs4_callback {
        struct rpc_clnt *       cb_client;
 };
+/* Maximum number of slots per session. 128 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION      128
+/* Maximum number of pages per slot cache entry */
+#define NFSD_PAGES_PER_SLOT     1
+/* Maximum number of operations per session compound */
+#define NFSD_MAX_OPS_PER_COMPOUND       16
+struct nfsd4_cache_entry {
+        __be32          ce_status;
+        struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
+        struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
+        int             ce_cachethis;
+        short           ce_resused;
+        int             ce_opcnt;
+        int             ce_rpchdrlen;
+};
+struct nfsd4_slot {
+        bool                            sl_inuse;
+        u32                             sl_seqid;
+        struct nfsd4_cache_entry        sl_cache_entry;
+};
+struct nfsd4_session {
+        struct kref             se_ref;
+        struct list_head        se_hash;        /* hash by sessionid */
+        struct list_head        se_perclnt;
+        u32                     se_flags;
+        struct nfs4_client      *se_client;     /* for expire_client */
+        struct nfs4_sessionid   se_sessionid;
+        u32                     se_fmaxreq_sz;
+        u32                     se_fmaxresp_sz;
+        u32                     se_fmaxresp_cached;
+        u32                     se_fmaxops;
+        u32                     se_fnumslots;
+        struct nfsd4_slot       se_slots[];     /* forward channel slots */
+};
+static inline void
+nfsd4_put_session(struct nfsd4_session *ses)
+{
+        extern void free_session(struct kref *kref);
+        kref_put(&ses->se_ref, free_session);
+}
+static inline void
+nfsd4_get_session(struct nfsd4_session *ses)
+{
+        kref_get(&ses->se_ref);
+}
+/* formatted contents of nfs4_sessionid */
+struct nfsd4_sessionid {
+        clientid_t      clientid;
+        u32             sequence;
+        u32             reserved;
+};
 #define HEXDIR_LEN     33 /* hex version of 16 byte md5 of cl_name plus '\0' */
 /*
@@ -132,6 +188,12 @@ struct nfs4_client {
        struct nfs4_callback    cl_callback;    /* callback info */
        atomic_t                cl_count;       /* ref count */
        u32                     cl_firststate;  /* recovery dir creation */
+        /* for nfs41 */
+        struct list_head        cl_sessions;
+        struct nfsd4_slot       cl_slot;        /* create_session slot */
+        u32                     cl_exchange_flags;
+        struct nfs4_sessionid   cl_sessionid;
 };
 /* struct nfs4_client_reset
@@ -168,8 +230,7 @@ struct nfs4_replay {
        unsigned int            rp_buflen;
        char                    *rp_buf;
        unsigned                intrp_allocated;
-        int                     rp_openfh_len;
+        struct knfsd_fh         rp_openfh;
-        char                    rp_openfh[NFS4_FHSIZE];
        char                    rp_ibuf[NFSD4_REPLAY_ISIZE];
 };
@@ -217,7 +278,7 @@ struct nfs4_stateowner {
 *      share_acces, share_deny on the file.
 */
 struct nfs4_file {
-        struct kref             fi_ref;
+        atomic_t                fi_ref;
        struct list_head        fi_hash;    /* hash by "struct inode *" */
        struct list_head        fi_stateids;
        struct list_head        fi_delegations;
@@ -259,14 +320,13 @@ struct nfs4_stateid {
 };
 /* flags for preprocess_seqid_op() */
-#define CHECK_FH                0x00000001
+#define HAS_SESSION             0x00000001
 #define CONFIRM                 0x00000002
 #define OPEN_STATE              0x00000004
 #define LOCK_STATE              0x00000008
 #define RD_STATE                0x00000010
 #define WR_STATE                0x00000020
 #define CLOSE_STATE             0x00000040
-#define DELEG_RET               0x00000080
 #define seqid_mutating_err(err)                       \
        (((err) != nfserr_stale_clientid) &&    \
@@ -274,7 +334,9 @@ struct nfs4_stateid {
        ((err) != nfserr_stale_stateid) &&      \
        ((err) != nfserr_bad_stateid))
-extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
+struct nfsd4_compound_state;
+extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
                stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
 extern void nfs4_unlock_state(void);
@@ -290,7 +352,7 @@ extern void nfsd4_init_recdir(char *recdir_name);
 extern int nfsd4_recdir_load(void);
 extern void nfsd4_shutdown_recdir(void);
 extern int nfs4_client_to_reclaim(const char *name);
-extern int nfs4_has_reclaimed_state(const char *name);
+extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
 extern void nfsd4_recdir_purge_old(void);
 extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
 extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h
index 7678cfbe9960..2693ef647df6 100644
--- a/include/linux/nfsd/stats.h
+++ b/include/linux/nfsd/stats.h
@@ -11,6 +11,11 @@
 #include <linux/nfs4.h>
+/* thread usage wraps very million seconds (approx one fortnight) */
+#define NFSD_USAGE_WRAP (HZ*1000000)
+#ifdef __KERNEL__
 struct nfsd_stats {
        unsigned int    rchits;         /* repcache hits */
        unsigned int    rcmisses;       /* repcache hits */
@@ -35,10 +40,6 @@ struct nfsd_stats {
 };
-/* thread usage wraps very million seconds (approx one fortnight) */
-#define NFSD_USAGE_WRAP (HZ*1000000)
-#ifdef __KERNEL__
 extern struct nfsd_stats        nfsdstats;
 extern struct svc_stat          nfsd_svcstats;
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 27bd3e38ec5a..f80d6013fdc3 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -45,10 +45,22 @@
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 struct nfsd4_compound_state {
-        struct svc_fh current_fh;
+        struct svc_fh           current_fh;
-        struct svc_fh save_fh;
+        struct svc_fh           save_fh;
-        struct nfs4_stateowner *replay_owner;
+        struct nfs4_stateowner  *replay_owner;
-};
+        /* For sessions DRC */
+        struct nfsd4_session    *session;
+        struct nfsd4_slot       *slot;
+        __be32                  *statp;
+        size_t                  iovlen;
+        u32                     minorversion;
+        u32                     status;
+};
+static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)
+{
+        return cs->slot != NULL;
+}
 struct nfsd4_change_info {
        u32             atomic;
@@ -90,7 +102,7 @@ struct nfsd4_create {
                        u32 specdata2;
                } dev;    /* NF4BLK, NF4CHR */
        } u;
-        u32             cr_bmval[2];        /* request */
+        u32             cr_bmval[3];        /* request */
        struct iattr    cr_iattr;           /* request */
        struct nfsd4_change_info  cr_cinfo; /* response */
        struct nfs4_acl *cr_acl;
@@ -105,7 +117,7 @@ struct nfsd4_delegreturn {
 };
 struct nfsd4_getattr {
-        u32             ga_bmval[2];        /* request */
+        u32             ga_bmval[3];        /* request */
        struct svc_fh   *ga_fhp;            /* response */
 };
@@ -206,11 +218,9 @@ struct nfsd4_open {
        stateid_t       op_delegate_stateid; /* request - response */
        u32             op_create;          /* request */
        u32             op_createmode;      /* request */
-        u32             op_bmval[2];        /* request */
+        u32             op_bmval[3];        /* request */
-        union {                             /* request */
+        struct iattr    iattr;              /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
-                struct iattr    iattr;                      /* UNCHECKED4,GUARDED4 */
+        nfs4_verifier   verf;               /* EXCLUSIVE4 */
-                nfs4_verifier   verf;                                /* EXCLUSIVE4 */
-        } u;
        clientid_t      op_clientid;        /* request */
        struct xdr_netobj op_owner;           /* request */
        u32             op_seqid;           /* request */
@@ -224,8 +234,8 @@ struct nfsd4_open {
        struct nfs4_stateowner *op_stateowner; /* used during processing */
        struct nfs4_acl *op_acl;
 };
-#define op_iattr        u.iattr
+#define op_iattr        iattr
-#define op_verf         u.verf
+#define op_verf         verf
 struct nfsd4_open_confirm {
        stateid_t       oc_req_stateid          /* request */;
@@ -259,7 +269,7 @@ struct nfsd4_readdir {
        nfs4_verifier   rd_verf;            /* request */
        u32             rd_dircount;        /* request */
        u32             rd_maxcount;        /* request */
-        u32             rd_bmval[2];        /* request */
+        u32             rd_bmval[3];        /* request */
        struct svc_rqst *rd_rqstp;          /* response */
        struct svc_fh * rd_fhp;             /* response */
@@ -301,7 +311,7 @@ struct nfsd4_secinfo {
 struct nfsd4_setattr {
        stateid_t       sa_stateid;         /* request */
-        u32             sa_bmval[2];        /* request */
+        u32             sa_bmval[3];        /* request */
        struct iattr    sa_iattr;           /* request */
        struct nfs4_acl *sa_acl;
 };
@@ -327,7 +337,7 @@ struct nfsd4_setclientid_confirm {
 /* also used for NVERIFY */
 struct nfsd4_verify {
-        u32             ve_bmval[2];        /* request */
+        u32             ve_bmval[3];        /* request */
        u32             ve_attrlen;         /* request */
        char *          ve_attrval;         /* request */
 };
@@ -344,6 +354,54 @@ struct nfsd4_write {
        nfs4_verifier   wr_verifier;        /* response */
 };
+struct nfsd4_exchange_id {
+        nfs4_verifier   verifier;
+        struct xdr_netobj clname;
+        u32             flags;
+        clientid_t      clientid;
+        u32             seqid;
+        int             spa_how;
+};
+struct nfsd4_channel_attrs {
+        u32             headerpadsz;
+        u32             maxreq_sz;
+        u32             maxresp_sz;
+        u32             maxresp_cached;
+        u32             maxops;
+        u32             maxreqs;
+        u32             nr_rdma_attrs;
+        u32             rdma_attrs;
+};
+struct nfsd4_create_session {
+        clientid_t              clientid;
+        struct nfs4_sessionid   sessionid;
+        u32                     seqid;
+        u32                     flags;
+        struct nfsd4_channel_attrs fore_channel;
+        struct nfsd4_channel_attrs back_channel;
+        u32                     callback_prog;
+        u32                     uid;
+        u32                     gid;
+};
+struct nfsd4_sequence {
+        struct nfs4_sessionid   sessionid;              /* request/response */
+        u32                     seqid;                  /* request/response */
+        u32                     slotid;                 /* request/response */
+        u32                     maxslots;               /* request/response */
+        u32                     cachethis;              /* request */
+#if 0
+        u32                     target_maxslots;        /* response */
+        u32                     status_flags;           /* response */
+#endif /* not yet */
+};
+struct nfsd4_destroy_session {
+        struct nfs4_sessionid   sessionid;
+};
 struct nfsd4_op {
        int                                     opnum;
        __be32                                  status;
@@ -378,6 +436,12 @@ struct nfsd4_op {
                struct nfsd4_verify             verify;
                struct nfsd4_write              write;
                struct nfsd4_release_lockowner  release_lockowner;
+                /* NFSv4.1 */
+                struct nfsd4_exchange_id        exchange_id;
+                struct nfsd4_create_session     create_session;
+                struct nfsd4_destroy_session    destroy_session;
+                struct nfsd4_sequence           sequence;
        } u;
        struct nfs4_replay *                    replay;
 };
@@ -416,9 +480,22 @@ struct nfsd4_compoundres {
        u32                             taglen;
        char *                          tag;
        u32                             opcnt;
-        __be32 *                        tagp; /* where to encode tag and  opcount */
+        __be32 *                        tagp; /* tag, opcount encode location */
+        struct nfsd4_compound_state     cstate;
 };
+static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
+{
+        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
+        return args->opcnt == 1;
+}
+static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
+{
+        return !resp->cstate.slot->sl_cache_entry.ce_cachethis ||
+                        nfsd4_is_solo_sequence(resp);
+}
 #define NFS4_SVC_XDRSIZE                sizeof(struct nfsd4_compoundargs)
 static inline void
@@ -448,7 +525,23 @@ extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
 extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                struct nfsd4_compound_state *,
                struct nfsd4_setclientid_confirm *setclientid_confirm);
-extern __be32 nfsd4_process_open1(struct nfsd4_open *open);
+extern void nfsd4_store_cache_entry(struct nfsd4_compoundres *resp);
+extern __be32 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
+                struct nfsd4_sequence *seq);
+extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+struct nfsd4_exchange_id *);
+                extern __be32 nfsd4_create_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_create_session *);
+extern __be32 nfsd4_sequence(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_sequence *);
+extern __be32 nfsd4_destroy_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_destroy_session *);
+extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *,
+                struct nfsd4_open *open);
 extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
                struct svc_fh *current_fh, struct nfsd4_open *open);
 extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
new file mode 100644
index 000000000000..79fec6af3f9f
--- /dev/null
+++ b/include/linux/nilfs2_fs.h
@@ -0,0 +1,801 @@
+/*
+ * nilfs2_fs.h - NILFS2 on-disk structures and common declarations.
+ *
+ * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Written by Koji Sato <koji@osrg.net>
+ *            Ryusuke Konishi <ryusuke@osrg.net>
+ */
+/*
+ *  linux/include/linux/ext2_fs.h
+ *
+ * Copyright (C) 1992, 1993, 1994, 1995
+ * Remy Card (card@masi.ibp.fr)
+ * Laboratoire MASI - Institut Blaise Pascal
+ * Universite Pierre et Marie Curie (Paris VI)
+ *
+ *  from
+ *
+ *  linux/include/linux/minix_fs.h
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+#ifndef _LINUX_NILFS_FS_H
+#define _LINUX_NILFS_FS_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+/*
+ * Inode flags stored in nilfs_inode and on-memory nilfs inode
+ *
+ * We define these flags based on ext2-fs because of the
+ * compatibility reason; to avoid problems in chattr(1)
+ */
+#define NILFS_SECRM_FL          0x00000001 /* Secure deletion */
+#define NILFS_UNRM_FL           0x00000002 /* Undelete */
+#define NILFS_SYNC_FL           0x00000008 /* Synchronous updates */
+#define NILFS_IMMUTABLE_FL      0x00000010 /* Immutable file */
+#define NILFS_APPEND_FL         0x00000020 /* writes to file may only append */
+#define NILFS_NODUMP_FL         0x00000040 /* do not dump file */
+#define NILFS_NOATIME_FL        0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define NILFS_NOTAIL_FL         0x00008000 /* file tail should not be merged */
+#define NILFS_DIRSYNC_FL        0x00010000 /* dirsync behaviour */
+#define NILFS_FL_USER_VISIBLE   0x0003DFFF /* User visible flags */
+#define NILFS_FL_USER_MODIFIABLE        0x000380FF /* User modifiable flags */
+#define NILFS_INODE_BMAP_SIZE   7
+/**
+ * struct nilfs_inode - structure of an inode on disk
+ * @i_blocks: blocks count
+ * @i_size: size in bytes
+ * @i_ctime: creation time (seconds)
+ * @i_mtime: modification time (seconds)
+ * @i_ctime_nsec: creation time (nano seconds)
+ * @i_mtime_nsec: modification time (nano seconds)
+ * @i_uid: user id
+ * @i_gid: group id
+ * @i_mode: file mode
+ * @i_links_count: links count
+ * @i_flags: file flags
+ * @i_bmap: block mapping
+ * @i_xattr: extended attributes
+ * @i_generation: file generation (for NFS)
+ * @i_pad:      padding
+ */
+struct nilfs_inode {
+        __le64  i_blocks;
+        __le64  i_size;
+        __le64  i_ctime;
+        __le64  i_mtime;
+        __le32  i_ctime_nsec;
+        __le32  i_mtime_nsec;
+        __le32  i_uid;
+        __le32  i_gid;
+        __le16  i_mode;
+        __le16  i_links_count;
+        __le32  i_flags;
+        __le64  i_bmap[NILFS_INODE_BMAP_SIZE];
+#define i_device_code   i_bmap[0]
+        __le64  i_xattr;
+        __le32  i_generation;
+        __le32  i_pad;
+};
+/**
+ * struct nilfs_super_root - structure of super root
+ * @sr_sum: check sum
+ * @sr_bytes: byte count of the structure
+ * @sr_flags: flags (reserved)
+ * @sr_nongc_ctime: write time of the last segment not for cleaner operation
+ * @sr_dat: DAT file inode
+ * @sr_cpfile: checkpoint file inode
+ * @sr_sufile: segment usage file inode
+ */
+struct nilfs_super_root {
+        __le32 sr_sum;
+        __le16 sr_bytes;
+        __le16 sr_flags;
+        __le64 sr_nongc_ctime;
+        struct nilfs_inode sr_dat;
+        struct nilfs_inode sr_cpfile;
+        struct nilfs_inode sr_sufile;
+};
+#define NILFS_SR_MDT_OFFSET(inode_size, i)  \
+        ((unsigned long)&((struct nilfs_super_root *)0)->sr_dat + \
+                        (inode_size) * (i))
+#define NILFS_SR_DAT_OFFSET(inode_size)     NILFS_SR_MDT_OFFSET(inode_size, 0)
+#define NILFS_SR_CPFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 1)
+#define NILFS_SR_SUFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 2)
+#define NILFS_SR_BYTES                  (sizeof(struct nilfs_super_root))
+/*
+ * Maximal mount counts
+ */
+#define NILFS_DFL_MAX_MNT_COUNT         50      /* 50 mounts */
+/*
+ * File system states (sbp->s_state, nilfs->ns_mount_state)
+ */
+#define NILFS_VALID_FS                  0x0001  /* Unmounted cleanly */
+#define NILFS_ERROR_FS                  0x0002  /* Errors detected */
+#define NILFS_RESIZE_FS                 0x0004  /* Resize required */
+/*
+ * Mount flags (sbi->s_mount_opt)
+ */
+#define NILFS_MOUNT_ERROR_MODE          0x0070  /* Error mode mask */
+#define NILFS_MOUNT_ERRORS_CONT         0x0010  /* Continue on errors */
+#define NILFS_MOUNT_ERRORS_RO           0x0020  /* Remount fs ro on errors */
+#define NILFS_MOUNT_ERRORS_PANIC        0x0040  /* Panic on errors */
+#define NILFS_MOUNT_SNAPSHOT            0x0080  /* Snapshot flag */
+#define NILFS_MOUNT_BARRIER             0x1000  /* Use block barriers */
+#define NILFS_MOUNT_STRICT_ORDER        0x2000  /* Apply strict in-order
+                                                   semantics also for data */
+/**
+ * struct nilfs_super_block - structure of super block on disk
+ */
+struct nilfs_super_block {
+        __le32  s_rev_level;            /* Revision level */
+        __le16  s_minor_rev_level;      /* minor revision level */
+        __le16  s_magic;                /* Magic signature */
+        __le16  s_bytes;                /* Bytes count of CRC calculation
+                                           for this structure. s_reserved
+                                           is excluded. */
+        __le16  s_flags;                /* flags */
+        __le32  s_crc_seed;             /* Seed value of CRC calculation */
+        __le32  s_sum;                  /* Check sum of super block */
+        __le32  s_log_block_size;       /* Block size represented as follows
+                                           blocksize =
+                                               1 << (s_log_block_size + 10) */
+        __le64  s_nsegments;            /* Number of segments in filesystem */
+        __le64  s_dev_size;             /* block device size in bytes */
+        __le64  s_first_data_block;     /* 1st seg disk block number */
+        __le32  s_blocks_per_segment;   /* number of blocks per full segment */
+        __le32  s_r_segments_percentage; /* Reserved segments percentage */
+        __le64  s_last_cno;             /* Last checkpoint number */
+        __le64  s_last_pseg;            /* disk block addr pseg written last */
+        __le64  s_last_seq;             /* seq. number of seg written last */
+        __le64  s_free_blocks_count;    /* Free blocks count */
+        __le64  s_ctime;                /* Creation time (execution time of
+                                           newfs) */
+        __le64  s_mtime;                /* Mount time */
+        __le64  s_wtime;                /* Write time */
+        __le16  s_mnt_count;            /* Mount count */
+        __le16  s_max_mnt_count;        /* Maximal mount count */
+        __le16  s_state;                /* File system state */
+        __le16  s_errors;               /* Behaviour when detecting errors */
+        __le64  s_lastcheck;            /* time of last check */
+        __le32  s_checkinterval;        /* max. time between checks */
+        __le32  s_creator_os;           /* OS */
+        __le16  s_def_resuid;           /* Default uid for reserved blocks */
+        __le16  s_def_resgid;           /* Default gid for reserved blocks */
+        __le32  s_first_ino;            /* First non-reserved inode */
+        __le16  s_inode_size;           /* Size of an inode */
+        __le16  s_dat_entry_size;       /* Size of a dat entry */
+        __le16  s_checkpoint_size;      /* Size of a checkpoint */
+        __le16  s_segment_usage_size;   /* Size of a segment usage */
+        __u8    s_uuid[16];             /* 128-bit uuid for volume */
+        char    s_volume_name[16];      /* volume name */
+        char    s_last_mounted[64];     /* directory where last mounted */
+        __le32  s_c_interval;           /* Commit interval of segment */
+        __le32  s_c_block_max;          /* Threshold of data amount for
+                                           the segment construction */
+        __u32   s_reserved[192];        /* padding to the end of the block */
+};
+/*
+ * Codes for operating systems
+ */
+#define NILFS_OS_LINUX          0
+/* Codes from 1 to 4 are reserved to keep compatibility with ext2 creator-OS */
+/*
+ * Revision levels
+ */
+#define NILFS_CURRENT_REV       2       /* current major revision */
+#define NILFS_MINOR_REV         0       /* minor revision */
+/*
+ * Bytes count of super_block for CRC-calculation
+ */
+#define NILFS_SB_BYTES  \
+        ((long)&((struct nilfs_super_block *)0)->s_reserved)
+/*
+ * Special inode number
+ */
+#define NILFS_ROOT_INO          2       /* Root file inode */
+#define NILFS_DAT_INO           3       /* DAT file */
+#define NILFS_CPFILE_INO        4       /* checkpoint file */
+#define NILFS_SUFILE_INO        5       /* segment usage file */
+#define NILFS_IFILE_INO         6       /* ifile */
+#define NILFS_ATIME_INO         7       /* Atime file (reserved) */
+#define NILFS_XATTR_INO         8       /* Xattribute file (reserved) */
+#define NILFS_SKETCH_INO        10      /* Sketch file */
+#define NILFS_USER_INO          11      /* Fisrt user's file inode number */
+#define NILFS_SB_OFFSET_BYTES   1024    /* byte offset of nilfs superblock */
+#define NILFS_SUPER_MAGIC       0x3434  /* NILFS filesystem  magic number */
+#define NILFS_SEG_MIN_BLOCKS    16      /* Minimum number of blocks in
+                                           a full segment */
+#define NILFS_PSEG_MIN_BLOCKS   2       /* Minimum number of blocks in
+                                           a partial segment */
+#define NILFS_MIN_NRSVSEGS      8       /* Minimum number of reserved
+                                           segments */
+/*
+ * bytes offset of secondary super block
+ */
+#define NILFS_SB2_OFFSET_BYTES(devsize) ((((devsize) >> 12) - 1) << 12)
+/*
+ * Maximal count of links to a file
+ */
+#define NILFS_LINK_MAX          32000
+/*
+ * Structure of a directory entry
+ *  (Same as ext2)
+ */
+#define NILFS_NAME_LEN 255
+/*
+ * The new version of the directory entry.  Since V0 structures are
+ * stored in intel byte order, and the name_len field could never be
+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
+ * file_type field.
+ */
+struct nilfs_dir_entry {
+        __le64  inode;                  /* Inode number */
+        __le16  rec_len;                /* Directory entry length */
+        __u8    name_len;               /* Name length */
+        __u8    file_type;
+        char    name[NILFS_NAME_LEN];   /* File name */
+        char    pad;
+};
+/*
+ * NILFS directory file types.  Only the low 3 bits are used.  The
+ * other bits are reserved for now.
+ */
+enum {
+        NILFS_FT_UNKNOWN,
+        NILFS_FT_REG_FILE,
+        NILFS_FT_DIR,
+        NILFS_FT_CHRDEV,
+        NILFS_FT_BLKDEV,
+        NILFS_FT_FIFO,
+        NILFS_FT_SOCK,
+        NILFS_FT_SYMLINK,
+        NILFS_FT_MAX
+};
+/*
+ * NILFS_DIR_PAD defines the directory entries boundaries
+ *
+ * NOTE: It must be a multiple of 8
+ */
+#define NILFS_DIR_PAD                   8
+#define NILFS_DIR_ROUND                 (NILFS_DIR_PAD - 1)
+#define NILFS_DIR_REC_LEN(name_len)     (((name_len) + 12 + NILFS_DIR_ROUND) & \
+                                        ~NILFS_DIR_ROUND)
+/**
+ * struct nilfs_finfo - file information
+ * @fi_ino: inode number
+ * @fi_cno: checkpoint number
+ * @fi_nblocks: number of blocks (including intermediate blocks)
+ * @fi_ndatablk: number of file data blocks
+ */
+struct nilfs_finfo {
+        __le64 fi_ino;
+        __le64 fi_cno;
+        __le32 fi_nblocks;
+        __le32 fi_ndatablk;
+        /* array of virtual block numbers */
+};
+/**
+ * struct nilfs_binfo_v - information for the block to which a virtual block number is assigned
+ * @bi_vblocknr: virtual block number
+ * @bi_blkoff: block offset
+ */
+struct nilfs_binfo_v {
+        __le64 bi_vblocknr;
+        __le64 bi_blkoff;
+};
+/**
+ * struct nilfs_binfo_dat - information for the block which belongs to the DAT file
+ * @bi_blkoff: block offset
+ * @bi_level: level
+ * @bi_pad: padding
+ */
+struct nilfs_binfo_dat {
+        __le64 bi_blkoff;
+        __u8 bi_level;
+        __u8 bi_pad[7];
+};
+/**
+ * union nilfs_binfo: block information
+ * @bi_v: nilfs_binfo_v structure
+ * @bi_dat: nilfs_binfo_dat structure
+ */
+union nilfs_binfo {
+        struct nilfs_binfo_v bi_v;
+        struct nilfs_binfo_dat bi_dat;
+};
+/**
+ * struct nilfs_segment_summary - segment summary
+ * @ss_datasum: checksum of data
+ * @ss_sumsum: checksum of segment summary
+ * @ss_magic: magic number
+ * @ss_bytes: size of this structure in bytes
+ * @ss_flags: flags
+ * @ss_seq: sequence number
+ * @ss_create: creation timestamp
+ * @ss_next: next segment
+ * @ss_nblocks: number of blocks
+ * @ss_nfinfo: number of finfo structures
+ * @ss_sumbytes: total size of segment summary in bytes
+ * @ss_pad: padding
+ */
+struct nilfs_segment_summary {
+        __le32 ss_datasum;
+        __le32 ss_sumsum;
+        __le32 ss_magic;
+        __le16 ss_bytes;
+        __le16 ss_flags;
+        __le64 ss_seq;
+        __le64 ss_create;
+        __le64 ss_next;
+        __le32 ss_nblocks;
+        __le32 ss_nfinfo;
+        __le32 ss_sumbytes;
+        __le32 ss_pad;
+        /* array of finfo structures */
+};
+#define NILFS_SEGSUM_MAGIC      0x1eaffa11  /* segment summary magic number */
+/*
+ * Segment summary flags
+ */
+#define NILFS_SS_LOGBGN 0x0001  /* begins a logical segment */
+#define NILFS_SS_LOGEND 0x0002  /* ends a logical segment */
+#define NILFS_SS_SR     0x0004  /* has super root */
+#define NILFS_SS_SYNDT  0x0008  /* includes data only updates */
+#define NILFS_SS_GC     0x0010  /* segment written for cleaner operation */
+/**
+ * struct nilfs_palloc_group_desc - block group descriptor
+ * @pg_nfrees: number of free entries in block group
+ */
+struct nilfs_palloc_group_desc {
+        __le32 pg_nfrees;
+};
+/**
+ * struct nilfs_dat_entry - disk address translation entry
+ * @dt_blocknr: block number
+ * @dt_start: start checkpoint number
+ * @dt_end: end checkpoint number
+ * @dt_rsv: reserved for future use
+ */
+struct nilfs_dat_entry {
+        __le64 de_blocknr;
+        __le64 de_start;
+        __le64 de_end;
+        __le64 de_rsv;
+};
+/**
+ * struct nilfs_dat_group_desc - block group descriptor
+ * @dg_nfrees: number of free virtual block numbers in block group
+ */
+struct nilfs_dat_group_desc {
+        __le32 dg_nfrees;
+};
+/**
+ * struct nilfs_snapshot_list - snapshot list
+ * @ssl_next: next checkpoint number on snapshot list
+ * @ssl_prev: previous checkpoint number on snapshot list
+ */
+struct nilfs_snapshot_list {
+        __le64 ssl_next;
+        __le64 ssl_prev;
+};
+/**
+ * struct nilfs_checkpoint - checkpoint structure
+ * @cp_flags: flags
+ * @cp_checkpoints_count: checkpoints count in a block
+ * @cp_snapshot_list: snapshot list
+ * @cp_cno: checkpoint number
+ * @cp_create: creation timestamp
+ * @cp_nblk_inc: number of blocks incremented by this checkpoint
+ * @cp_inodes_count: inodes count
+ * @cp_blocks_count: blocks count
+ * @cp_ifile_inode: inode of ifile
+ */
+struct nilfs_checkpoint {
+        __le32 cp_flags;
+        __le32 cp_checkpoints_count;
+        struct nilfs_snapshot_list cp_snapshot_list;
+        __le64 cp_cno;
+        __le64 cp_create;
+        __le64 cp_nblk_inc;
+        __le64 cp_inodes_count;
+        __le64 cp_blocks_count;         /* Reserved (might be deleted) */
+        /* Do not change the byte offset of ifile inode.
+           To keep the compatibility of the disk format,
+           additional fields should be added behind cp_ifile_inode. */
+        struct nilfs_inode cp_ifile_inode;
+};
+/* checkpoint flags */
+enum {
+        NILFS_CHECKPOINT_SNAPSHOT,
+        NILFS_CHECKPOINT_INVALID,
+        NILFS_CHECKPOINT_SKETCH,
+        NILFS_CHECKPOINT_MINOR,
+};
+#define NILFS_CHECKPOINT_FNS(flag, name)                                \
+static inline void                                                      \
+nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp)                \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) |          \
+                                   (1UL << NILFS_CHECKPOINT_##flag));   \
+}                                                                       \
+static inline void                                                      \
+nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) &          \
+                                   ~(1UL << NILFS_CHECKPOINT_##flag));  \
+}                                                                       \
+static inline int                                                       \
+nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        return !!(le32_to_cpu(cp->cp_flags) &                           \
+                  (1UL << NILFS_CHECKPOINT_##flag));                    \
+}
+NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
+NILFS_CHECKPOINT_FNS(INVALID, invalid)
+NILFS_CHECKPOINT_FNS(MINOR, minor)
+/**
+ * struct nilfs_cpinfo - checkpoint information
+ * @ci_flags: flags
+ * @ci_pad: padding
+ * @ci_cno: checkpoint number
+ * @ci_create: creation timestamp
+ * @ci_nblk_inc: number of blocks incremented by this checkpoint
+ * @ci_inodes_count: inodes count
+ * @ci_blocks_count: blocks count
+ * @ci_next: next checkpoint number in snapshot list
+ */
+struct nilfs_cpinfo {
+        __u32 ci_flags;
+        __u32 ci_pad;
+        __u64 ci_cno;
+        __u64 ci_create;
+        __u64 ci_nblk_inc;
+        __u64 ci_inodes_count;
+        __u64 ci_blocks_count;
+        __u64 ci_next;
+};
+#define NILFS_CPINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_cpinfo_##name(const struct nilfs_cpinfo *cpinfo)                  \
+{                                                                       \
+        return !!(cpinfo->ci_flags & (1UL << NILFS_CHECKPOINT_##flag)); \
+}
+NILFS_CPINFO_FNS(SNAPSHOT, snapshot)
+NILFS_CPINFO_FNS(INVALID, invalid)
+NILFS_CPINFO_FNS(MINOR, minor)
+/**
+ * struct nilfs_cpfile_header - checkpoint file header
+ * @ch_ncheckpoints: number of checkpoints
+ * @ch_nsnapshots: number of snapshots
+ * @ch_snapshot_list: snapshot list
+ */
+struct nilfs_cpfile_header {
+        __le64 ch_ncheckpoints;
+        __le64 ch_nsnapshots;
+        struct nilfs_snapshot_list ch_snapshot_list;
+};
+#define NILFS_CPFILE_FIRST_CHECKPOINT_OFFSET    \
+        ((sizeof(struct nilfs_cpfile_header) +                          \
+          sizeof(struct nilfs_checkpoint) - 1) /                        \
+                        sizeof(struct nilfs_checkpoint))
+/**
+ * struct nilfs_segment_usage - segment usage
+ * @su_lastmod: last modified timestamp
+ * @su_nblocks: number of blocks in segment
+ * @su_flags: flags
+ */
+struct nilfs_segment_usage {
+        __le64 su_lastmod;
+        __le32 su_nblocks;
+        __le32 su_flags;
+};
+/* segment usage flag */
+enum {
+        NILFS_SEGMENT_USAGE_ACTIVE,
+        NILFS_SEGMENT_USAGE_DIRTY,
+        NILFS_SEGMENT_USAGE_ERROR,
+        /* ... */
+};
+#define NILFS_SEGMENT_USAGE_FNS(flag, name)                             \
+static inline void                                                      \
+nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su)          \
+{                                                                       \
+        su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) |          \
+                                   (1UL << NILFS_SEGMENT_USAGE_##flag));\
+}                                                                       \
+static inline void                                                      \
+nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su)        \
+{                                                                       \
+        su->su_flags =                                                  \
+                cpu_to_le32(le32_to_cpu(su->su_flags) &                 \
+                            ~(1UL << NILFS_SEGMENT_USAGE_##flag));      \
+}                                                                       \
+static inline int                                                       \
+nilfs_segment_usage_##name(const struct nilfs_segment_usage *su)        \
+{                                                                       \
+        return !!(le32_to_cpu(su->su_flags) &                           \
+                  (1UL << NILFS_SEGMENT_USAGE_##flag));                 \
+}
+NILFS_SEGMENT_USAGE_FNS(ACTIVE, active)
+NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty)
+NILFS_SEGMENT_USAGE_FNS(ERROR, error)
+static inline void
+nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
+{
+        su->su_lastmod = cpu_to_le64(0);
+        su->su_nblocks = cpu_to_le32(0);
+        su->su_flags = cpu_to_le32(0);
+}
+static inline int
+nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
+{
+        return !le32_to_cpu(su->su_flags);
+}
+/**
+ * struct nilfs_sufile_header - segment usage file header
+ * @sh_ncleansegs: number of clean segments
+ * @sh_ndirtysegs: number of dirty segments
+ * @sh_last_alloc: last allocated segment number
+ */
+struct nilfs_sufile_header {
+        __le64 sh_ncleansegs;
+        __le64 sh_ndirtysegs;
+        __le64 sh_last_alloc;
+        /* ... */
+};
+#define NILFS_SUFILE_FIRST_SEGMENT_USAGE_OFFSET \
+        ((sizeof(struct nilfs_sufile_header) +                          \
+          sizeof(struct nilfs_segment_usage) - 1) /                     \
+                         sizeof(struct nilfs_segment_usage))
+/**
+ * nilfs_suinfo - segment usage information
+ * @sui_lastmod:
+ * @sui_nblocks:
+ * @sui_flags:
+ */
+struct nilfs_suinfo {
+        __u64 sui_lastmod;
+        __u32 sui_nblocks;
+        __u32 sui_flags;
+};
+#define NILFS_SUINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_suinfo_##name(const struct nilfs_suinfo *si)                      \
+{                                                                       \
+        return si->sui_flags & (1UL << NILFS_SEGMENT_USAGE_##flag);     \
+}
+NILFS_SUINFO_FNS(ACTIVE, active)
+NILFS_SUINFO_FNS(DIRTY, dirty)
+NILFS_SUINFO_FNS(ERROR, error)
+static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si)
+{
+        return !si->sui_flags;
+}
+/* ioctl */
+enum {
+        NILFS_CHECKPOINT,
+        NILFS_SNAPSHOT,
+};
+/**
+ * struct nilfs_cpmode -
+ * @cc_cno:
+ * @cc_mode:
+ */
+struct nilfs_cpmode {
+        __u64 cm_cno;
+        __u32 cm_mode;
+        __u32 cm_pad;
+};
+/**
+ * struct nilfs_argv - argument vector
+ * @v_base:
+ * @v_nmembs:
+ * @v_size:
+ * @v_flags:
+ * @v_index:
+ */
+struct nilfs_argv {
+        __u64 v_base;
+        __u32 v_nmembs; /* number of members */
+        __u16 v_size;   /* size of members */
+        __u16 v_flags;
+        __u64 v_index;
+};
+/**
+ * struct nilfs_period -
+ * @p_start:
+ * @p_end:
+ */
+struct nilfs_period {
+        __u64 p_start;
+        __u64 p_end;
+};
+/**
+ * struct nilfs_cpstat -
+ * @cs_cno: checkpoint number
+ * @cs_ncps: number of checkpoints
+ * @cs_nsss: number of snapshots
+ */
+struct nilfs_cpstat {
+        __u64 cs_cno;
+        __u64 cs_ncps;
+        __u64 cs_nsss;
+};
+/**
+ * struct nilfs_sustat -
+ * @ss_nsegs: number of segments
+ * @ss_ncleansegs: number of clean segments
+ * @ss_ndirtysegs: number of dirty segments
+ * @ss_ctime: creation time of the last segment
+ * @ss_nongc_ctime: creation time of the last segment not for GC
+ * @ss_prot_seq: least sequence number of segments which must not be reclaimed
+ */
+struct nilfs_sustat {
+        __u64 ss_nsegs;
+        __u64 ss_ncleansegs;
+        __u64 ss_ndirtysegs;
+        __u64 ss_ctime;
+        __u64 ss_nongc_ctime;
+        __u64 ss_prot_seq;
+};
+/**
+ * struct nilfs_vinfo - virtual block number information
+ * @vi_vblocknr:
+ * @vi_start:
+ * @vi_end:
+ * @vi_blocknr:
+ */
+struct nilfs_vinfo {
+        __u64 vi_vblocknr;
+        __u64 vi_start;
+        __u64 vi_end;
+        __u64 vi_blocknr;
+};
+/**
+ * struct nilfs_vdesc -
+ */
+struct nilfs_vdesc {
+        __u64 vd_ino;
+        __u64 vd_cno;
+        __u64 vd_vblocknr;
+        struct nilfs_period vd_period;
+        __u64 vd_blocknr;
+        __u64 vd_offset;
+        __u32 vd_flags;
+        __u32 vd_pad;
+};
+/**
+ * struct nilfs_bdesc -
+ */
+struct nilfs_bdesc {
+        __u64 bd_ino;
+        __u64 bd_oblocknr;
+        __u64 bd_blocknr;
+        __u64 bd_offset;
+        __u32 bd_level;
+        __u32 bd_pad;
+};
+#define NILFS_IOCTL_IDENT               'n'
+#define NILFS_IOCTL_CHANGE_CPMODE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode)
+#define NILFS_IOCTL_DELETE_CHECKPOINT  \
+        _IOW(NILFS_IOCTL_IDENT, 0x81, __u64)
+#define NILFS_IOCTL_GET_CPINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x82, struct nilfs_argv)
+#define NILFS_IOCTL_GET_CPSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x83, struct nilfs_cpstat)
+#define NILFS_IOCTL_GET_SUINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x84, struct nilfs_argv)
+#define NILFS_IOCTL_GET_SUSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x85, struct nilfs_sustat)
+#define NILFS_IOCTL_GET_VINFO  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x86, struct nilfs_argv)
+#define NILFS_IOCTL_GET_BDESCS  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
+#define NILFS_IOCTL_CLEAN_SEGMENTS  \
+        _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
+#define NILFS_IOCTL_SYNC  \
+        _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
+#define NILFS_IOCTL_RESIZE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x8B, __u64)
+#endif  /* _LINUX_NILFS_FS_H */
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index ea8c6d84996d..cc1767f5cca8 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -228,10 +228,11 @@ extern void parport_pc_release_resources(struct parport *p);
 extern int parport_pc_claim_resources(struct parport *p);
 /* PCMCIA code will want to get us to look at a port.  Provide a mechanism. */
-extern struct parport *parport_pc_probe_port (unsigned long base,
+extern struct parport *parport_pc_probe_port(unsigned long base,
-                                              unsigned long base_hi,
+                                             unsigned long base_hi,
-                                              int irq, int dma,
+                                             int irq, int dma,
-                                              struct device *dev);
+                                             struct device *dev,
-extern void parport_pc_unregister_port (struct parport *p);
+                                             int irqflags);
+extern void parport_pc_unregister_port(struct parport *p);
 #endif
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a7fe4bbd7ff1..72698d89e767 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -674,6 +674,11 @@ int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
+static inline int pci_is_enabled(struct pci_dev *pdev)
+{
+        return (atomic_read(&pdev->enable_cnt) > 0);
+}
 static inline int pci_is_managed(struct pci_dev *pdev)
 {
        return pdev->is_managed;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 170f8b1f22db..06ba90c211a5 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -944,6 +944,32 @@
 #define PCI_DEVICE_ID_SUN_TOMATILLO     0xa801
 #define PCI_DEVICE_ID_SUN_CASSINI       0xabba
+#define PCI_VENDOR_ID_NI                0x1093
+#define PCI_DEVICE_ID_NI_PCI2322        0xd130
+#define PCI_DEVICE_ID_NI_PCI2324        0xd140
+#define PCI_DEVICE_ID_NI_PCI2328        0xd150
+#define PCI_DEVICE_ID_NI_PXI8422_2322   0xd190
+#define PCI_DEVICE_ID_NI_PXI8422_2324   0xd1a0
+#define PCI_DEVICE_ID_NI_PXI8420_2322   0xd1d0
+#define PCI_DEVICE_ID_NI_PXI8420_2324   0xd1e0
+#define PCI_DEVICE_ID_NI_PXI8420_2328   0xd1f0
+#define PCI_DEVICE_ID_NI_PXI8420_23216  0xd1f1
+#define PCI_DEVICE_ID_NI_PCI2322I       0xd250
+#define PCI_DEVICE_ID_NI_PCI2324I       0xd270
+#define PCI_DEVICE_ID_NI_PCI23216       0xd2b0
+#define PCI_DEVICE_ID_NI_PXI8430_2322   0x7080
+#define PCI_DEVICE_ID_NI_PCI8430_2322   0x70db
+#define PCI_DEVICE_ID_NI_PXI8430_2324   0x70dd
+#define PCI_DEVICE_ID_NI_PCI8430_2324   0x70df
+#define PCI_DEVICE_ID_NI_PXI8430_2328   0x70e2
+#define PCI_DEVICE_ID_NI_PCI8430_2328   0x70e4
+#define PCI_DEVICE_ID_NI_PXI8430_23216  0x70e6
+#define PCI_DEVICE_ID_NI_PCI8430_23216  0x70e7
+#define PCI_DEVICE_ID_NI_PXI8432_2322   0x70e8
+#define PCI_DEVICE_ID_NI_PCI8432_2322   0x70ea
+#define PCI_DEVICE_ID_NI_PXI8432_2324   0x70ec
+#define PCI_DEVICE_ID_NI_PCI8432_2324   0x70ee
 #define PCI_VENDOR_ID_CMD               0x1095
 #define PCI_DEVICE_ID_CMD_643           0x0643
 #define PCI_DEVICE_ID_CMD_646           0x0646
@@ -2488,6 +2514,8 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3   0x3433
 #define PCI_DEVICE_ID_INTEL_82830_HB    0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC   0x3577
+#define PCI_DEVICE_ID_INTEL_82854_HB    0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG    0x358e
 #define PCI_DEVICE_ID_INTEL_82855GM_HB  0x3580
 #define PCI_DEVICE_ID_INTEL_82855GM_IG  0x3582
 #define PCI_DEVICE_ID_INTEL_E7520_MCH   0x3590
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index cb7d10f30763..d4cf7a2ceb3e 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -31,6 +31,8 @@ struct pda_power_pdata {
        unsigned int wait_for_status; /* msecs, default is 500 */
        unsigned int wait_for_charger; /* msecs, default is 500 */
        unsigned int polling_interval; /* msecs, default is 2000 */
+        unsigned long ac_max_uA; /* current to draw when on AC */
 };
 #endif /* __PDA_POWER_H__ */
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index ee5615d65211..cfda2d5ad319 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -168,4 +168,56 @@ static inline void free_percpu(void *p)
 #define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type), \
                                                       __alignof__(type))
+/*
+ * Optional methods for optimized non-lvalue per-cpu variable access.
+ *
+ * @var can be a percpu variable or a field of it and its size should
+ * equal char, int or long.  percpu_read() evaluates to a lvalue and
+ * all others to void.
+ *
+ * These operations are guaranteed to be atomic w.r.t. preemption.
+ * The generic versions use plain get/put_cpu_var().  Archs are
+ * encouraged to implement single-instruction alternatives which don't
+ * require preemption protection.
+ */
+#ifndef percpu_read
+# define percpu_read(var)                                               \
+  ({                                                                    \
+        typeof(per_cpu_var(var)) __tmp_var__;                           \
+        __tmp_var__ = get_cpu_var(var);                                 \
+        put_cpu_var(var);                                               \
+        __tmp_var__;                                                    \
+  })
+#endif
+#define __percpu_generic_to_op(var, val, op)                            \
+do {                                                                    \
+        get_cpu_var(var) op val;                                        \
+        put_cpu_var(var);                                               \
+} while (0)
+#ifndef percpu_write
+# define percpu_write(var, val)         __percpu_generic_to_op(var, (val), =)
+#endif
+#ifndef percpu_add
+# define percpu_add(var, val)           __percpu_generic_to_op(var, (val), +=)
+#endif
+#ifndef percpu_sub
+# define percpu_sub(var, val)           __percpu_generic_to_op(var, (val), -=)
+#endif
+#ifndef percpu_and
+# define percpu_and(var, val)           __percpu_generic_to_op(var, (val), &=)
+#endif
+#ifndef percpu_or
+# define percpu_or(var, val)            __percpu_generic_to_op(var, (val), |=)
+#endif
+#ifndef percpu_xor
+# define percpu_xor(var, val)           __percpu_generic_to_op(var, (val), ^=)
+#endif
 #endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index 80044a4f3ab9..bfd92e1e5d2c 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
@@ -108,25 +107,14 @@ struct rcu_data {
        struct rcu_head barrier;
 };
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
 /*
 * Increment the quiescent state counter.
 * The counter is a bit degenerated: We do not need to know
 * how many quiescent states passed, just if there was at least
 * one since the start of the grace period. Thus just a flag.
 */
-static inline void rcu_qsctr_inc(int cpu)
+extern void rcu_qsctr_inc(int cpu);
-{
+extern void rcu_bh_qsctr_inc(int cpu);
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-}
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 528343e6da51..15fbb3ca634d 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 #include <linux/lockdep.h>
diff --git a/include/linux/rcupreempt.h b/include/linux/rcupreempt.h
index 74304b4538d8..fce522782ffa 100644
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
@@ -36,34 +36,19 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
+#include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
-struct rcu_dyntick_sched {
+extern void rcu_qsctr_inc(int cpu);
-        int dynticks;
+static inline void rcu_bh_qsctr_inc(int cpu) { }
-        int dynticks_snap;
-        int sched_qs;
-        int sched_qs_snap;
-        int sched_dynticks_snap;
-};
-DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched);
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
-        rdssp->sched_qs++;
-}
-#define rcu_bh_qsctr_inc(cpu)
 /*
 * Someone might want to pass call_rcu_bh as a function pointer.
 * So this needs to just be a rename and not a macro function.
 *  (no parentheses)
 */
-#define call_rcu_bh             call_rcu
+#define call_rcu_bh             call_rcu
 /**
 * call_rcu_sched - Queue RCU callback for invocation after sched grace period.
@@ -117,30 +102,12 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu);
 struct softirq_action;
 #ifdef CONFIG_NO_HZ
+extern void rcu_enter_nohz(void);
-static inline void rcu_enter_nohz(void)
+extern void rcu_exit_nohz(void);
-{
+#else
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
+# define rcu_enter_nohz()       do { } while (0)
+# define rcu_exit_nohz()        do { } while (0)
-        smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
+#endif
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        WARN_ON_RATELIMIT(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1, &rs);
-}
-static inline void rcu_exit_nohz(void)
-{
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
-        WARN_ON_RATELIMIT(!(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1),
-                                &rs);
-}
-#else /* CONFIG_NO_HZ */
-#define rcu_enter_nohz()        do { } while (0)
-#define rcu_exit_nohz()         do { } while (0)
-#endif /* CONFIG_NO_HZ */
 /*
 * A context switch is a grace period for rcupreempt synchronize_rcu()
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index a722fb67bb2d..0cdda00f2b2a 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -33,7 +33,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
@@ -236,30 +235,8 @@ struct rcu_state {
 #endif /* #ifdef CONFIG_NO_HZ */
 };
-extern struct rcu_state rcu_state;
+extern void rcu_qsctr_inc(int cpu);
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
+extern void rcu_bh_qsctr_inc(int cpu);
-extern struct rcu_state rcu_bh_state;
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
-/*
- * Increment the quiescent state counter.
- * The counter is a bit degenerated: We do not need to know
- * how many quiescent states passed, just if there was at least
- * one since the start of the grace period. Thus just a flag.
- */
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h
new file mode 100644
index 000000000000..12d63a30c347
--- /dev/null
+++ b/include/linux/rotary_encoder.h
@@ -0,0 +1,13 @@
+#ifndef __ROTARY_ENCODER_H__
+#define __ROTARY_ENCODER_H__
+struct rotary_encoder_platform_data {
+        unsigned int steps;
+        unsigned int axis;
+        unsigned int gpio_a;
+        unsigned int gpio_b;
+        unsigned int inverted_a;
+        unsigned int inverted_b;
+};
+#endif /* __ROTARY_ENCODER_H__ */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index b94f3541f67b..b4c38bc8049c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -205,7 +205,8 @@ extern unsigned long long time_sync_thresh;
 #define task_is_stopped_or_traced(task) \
                        ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
 #define task_contributes_to_load(task)  \
-                                ((task->state & TASK_UNINTERRUPTIBLE) != 0)
+                                ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
+                                 (task->flags & PF_FROZEN) == 0)
 #define __set_task_state(tsk, state_value)              \
        do { (tsk)->state = (state_value); } while (0)
@@ -300,17 +301,11 @@ extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write,
                                    struct file *filp, void __user *buffer,
                                    size_t *lenp, loff_t *ppos);
 extern unsigned int  softlockup_panic;
-extern unsigned long sysctl_hung_task_check_count;
-extern unsigned long sysctl_hung_task_timeout_secs;
-extern unsigned long sysctl_hung_task_warnings;
 extern int softlockup_thresh;
 #else
 static inline void softlockup_tick(void)
 {
 }
-static inline void spawn_softlockup_task(void)
-{
-}
 static inline void touch_softlockup_watchdog(void)
 {
 }
@@ -319,6 +314,15 @@ static inline void touch_all_softlockup_watchdogs(void)
 }
 #endif
+#ifdef CONFIG_DETECT_HUNG_TASK
+extern unsigned int  sysctl_hung_task_panic;
+extern unsigned long sysctl_hung_task_check_count;
+extern unsigned long sysctl_hung_task_timeout_secs;
+extern unsigned long sysctl_hung_task_warnings;
+extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
+                                         struct file *filp, void __user *buffer,
+                                         size_t *lenp, loff_t *ppos);
+#endif
 /* Attach to any functions which should be ignored in wchan output. */
 #define __sched         __attribute__((__section__(".sched.text")))
@@ -1255,9 +1259,8 @@ struct task_struct {
 /* ipc stuff */
        struct sysv_sem sysvsem;
 #endif
-#ifdef CONFIG_DETECT_SOFTLOCKUP
+#ifdef CONFIG_DETECT_HUNG_TASK
 /* hung task detection */
-        unsigned long last_switch_timestamp;
        unsigned long last_switch_count;
 #endif
 /* CPU-specific state of this task */
@@ -1294,6 +1297,11 @@ struct task_struct {
 /* Protection of (de-)allocation: mm, files, fs, tty, keyrings */
        spinlock_t alloc_lock;
+#ifdef CONFIG_GENERIC_HARDIRQS
+        /* IRQ handler threads */
+        struct irqaction *irqaction;
+#endif
        /* Protection of the PI data structures: */
        spinlock_t pi_lock;
diff --git a/include/linux/security.h b/include/linux/security.h
index 54ed15799a83..d5fd6163606f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -32,6 +32,7 @@
 #include <linux/sched.h>
 #include <linux/key.h>
 #include <linux/xfrm.h>
+#include <linux/gfp.h>
 #include <net/flow.h>
 /* Maximum number of letters for an LSM name string */
@@ -2953,5 +2954,28 @@ static inline void securityfs_remove(struct dentry *dentry)
 #endif
+#ifdef CONFIG_SECURITY
+static inline char *alloc_secdata(void)
+{
+        return (char *)get_zeroed_page(GFP_KERNEL);
+}
+static inline void free_secdata(void *secdata)
+{
+        free_page((unsigned long)secdata);
+}
+#else
+static inline char *alloc_secdata(void)
+{
+        return (char *)1;
+}
+static inline void free_secdata(void *secdata)
+{ }
+#endif /* CONFIG_SECURITY */
 #endif /* ! __LINUX_SECURITY_H */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c7bd3b..57a97e52e58d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -164,6 +164,9 @@
 /* NWPSERIAL */
 #define PORT_NWPSERIAL  85
+/* MAX3100 */
+#define PORT_MAX3100    86
 #ifdef __KERNEL__
 #include <linux/compiler.h>
@@ -277,7 +280,7 @@ struct uart_port {
        struct uart_icount      icount;                 /* statistics */
        struct console          *cons;                  /* struct console, if any */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
        unsigned long           sysrq;                  /* sysrq timeout */
 #endif
diff --git a/include/linux/serial_max3100.h b/include/linux/serial_max3100.h
new file mode 100644
index 000000000000..4976befb6aeb
--- /dev/null
+++ b/include/linux/serial_max3100.h
@@ -0,0 +1,52 @@
+/*
+ *
+ *  Copyright (C) 2007 Christian Pellegrin
+ *
+ * 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.
+ */
+#ifndef _LINUX_SERIAL_MAX3100_H
+#define _LINUX_SERIAL_MAX3100_H 1
+/**
+ * struct plat_max3100 - MAX3100 SPI UART platform data
+ * @loopback:            force MAX3100 in loopback
+ * @crystal:             1 for 3.6864 Mhz, 0 for 1.8432
+ * @max3100_hw_suspend:  MAX3100 has a shutdown pin. This is a hook
+ *                       called on suspend and resume to activate it.
+ * @poll_time:           poll time for CTS signal in ms, 0 disables (so no hw
+ *                       flow ctrl is possible but you have less CPU usage)
+ *
+ * You should use this structure in your machine description to specify
+ * how the MAX3100 is connected. Example:
+ *
+ * static struct plat_max3100 max3100_plat_data = {
+ *  .loopback = 0,
+ *  .crystal = 0,
+ *  .poll_time = 100,
+ * };
+ *
+ * static struct spi_board_info spi_board_info[] = {
+ * {
+ *  .modalias   = "max3100",
+ *  .platform_data      = &max3100_plat_data,
+ *  .irq                = IRQ_EINT12,
+ *  .max_speed_hz       = 5*1000*1000,
+ *  .chip_select        = 0,
+ * },
+ * };
+ *
+ **/
+struct plat_max3100 {
+        int loopback;
+        int crystal;
+        void (*max3100_hw_suspend) (int suspend);
+        int poll_time;
+};
+#endif
diff --git a/include/linux/sht15.h b/include/linux/sht15.h
new file mode 100644
index 000000000000..046bce05ecab
--- /dev/null
+++ b/include/linux/sht15.h
@@ -0,0 +1,24 @@
+/*
+ * sht15.h - support for the SHT15 Temperature and Humidity Sensor
+ *
+ * Copyright (c) 2009 Jonathan Cameron
+ *
+ * Copyright (c) 2007 Wouter Horre
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/**
+ * struct sht15_platform_data - sht15 connectivity info
+ * @gpio_data:  no. of gpio to which bidirectional data line is connected
+ * @gpio_sck:   no. of gpio to which the data clock is connected.
+ * @supply_mv:  supply voltage in mv. Overridden by regulator if available.
+ **/
+struct sht15_platform_data {
+        int gpio_data;
+        int gpio_sck;
+        int supply_mv;
+};
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index f4523651fa42..5ac9b0bcaf9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -73,8 +73,8 @@ found:
                ret = kmem_cache_alloc_notrace(cachep, flags);
-                kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
+                trace_kmalloc(_THIS_IP_, ret,
-                                     size, slab_buffer_size(cachep), flags);
+                              size, slab_buffer_size(cachep), flags);
                return ret;
        }
@@ -128,9 +128,9 @@ found:
                ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_,
+                trace_kmalloc_node(_THIS_IP_, ret,
-                                          ret, size, slab_buffer_size(cachep),
+                                   size, slab_buffer_size(cachep),
-                                          flags, node);
+                                   flags, node);
                return ret;
        }
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index a1f90528e70b..5046f90c1171 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -233,8 +233,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
        unsigned int order = get_order(size);
        void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
-        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
+        trace_kmalloc(_THIS_IP_, ret, size, PAGE_SIZE << order, flags);
-                             size, PAGE_SIZE << order, flags);
        return ret;
 }
@@ -255,9 +254,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
                        ret = kmem_cache_alloc_notrace(s, flags);
-                        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC,
+                        trace_kmalloc(_THIS_IP_, ret, size, s->size, flags);
-                                             _THIS_IP_, ret,
-                                             size, s->size, flags);
                        return ret;
                }
@@ -296,9 +293,8 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                ret = kmem_cache_alloc_node_notrace(s, flags, node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
+                trace_kmalloc_node(_THIS_IP_, ret,
-                                          _THIS_IP_, ret,
+                                   size, s->size, flags, node);
-                                          size, s->size, flags, node);
                return ret;
        }
diff --git a/include/linux/spi/ad7879.h b/include/linux/spi/ad7879.h
new file mode 100644
index 000000000000..4231104c9afa
--- /dev/null
+++ b/include/linux/spi/ad7879.h
@@ -0,0 +1,35 @@
+/* linux/spi/ad7879.h */
+/* Touchscreen characteristics vary between boards and models.  The
+ * platform_data for the device's "struct device" holds this information.
+ *
+ * It's OK if the min/max values are zero.
+ */
+struct ad7879_platform_data {
+        u16     model;                  /* 7879 */
+        u16     x_plate_ohms;
+        u16     x_min, x_max;
+        u16     y_min, y_max;
+        u16     pressure_min, pressure_max;
+        /* [0..255] 0=OFF Starts at 1=550us and goes
+         * all the way to 9.440ms in steps of 35us.
+         */
+        u8      pen_down_acc_interval;
+        /* [0..15] Starts at 0=128us and goes all the
+         * way to 4.096ms in steps of 128us.
+         */
+        u8      first_conversion_delay;
+        /* [0..3] 0 = 2us, 1 = 4us, 2 = 8us, 3 = 16us */
+        u8      acquisition_time;
+        /* [0..3] Average X middle samples 0 = 2, 1 = 4, 2 = 8, 3 = 16 */
+        u8      averaging;
+        /* [0..3] Perform X measurements 0 = OFF,
+         * 1 = 4, 2 = 8, 3 = 16 (median > averaging)
+         */
+        u8      median;
+        /* 1 = AUX/VBAT/GPIO set to GPIO Output */
+        u8      gpio_output;
+        /* Initial GPIO pin state (valid if gpio_output = 1) */
+        u8      gpio_default;
+};
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 68bb1c501d0d..2cc43fa380cb 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -204,6 +204,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
 *      SPI slaves, and are numbered from zero to num_chipselects.
 *      each slave has a chipselect signal, but it's common that not
 *      every chipselect is connected to a slave.
+ * @dma_alignment: SPI controller constraint on DMA buffers alignment.
 * @setup: updates the device mode and clocking records used by a
 *      device's SPI controller; protocol code may call this.  This
 *      must fail if an unrecognized or unsupported mode is requested.
@@ -239,6 +240,11 @@ struct spi_master {
         */
        u16                     num_chipselect;
+        /* some SPI controllers pose alignment requirements on DMAable
+         * buffers; let protocol drivers know about these requirements.
+         */
+        u16                     dma_alignment;
        /* setup mode and clock, etc (spi driver may call many times) */
        int                     (*setup)(struct spi_device *spi);
diff --git a/include/linux/stringify.h b/include/linux/stringify.h
index 0b4388356c87..841cec8ed525 100644
--- a/include/linux/stringify.h
+++ b/include/linux/stringify.h
@@ -6,7 +6,7 @@
 * converts to "bar".
 */
-#define __stringify_1(x)        #x
+#define __stringify_1(x...)     #x
-#define __stringify(x)          __stringify_1(x)
+#define __stringify(x...)       __stringify_1(x)
 #endif  /* !__LINUX_STRINGIFY_H */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index d3a4c0231933..2a30775959e9 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -24,6 +24,15 @@
 */
 typedef int             (*svc_thread_fn)(void *);
+/* statistics for svc_pool structures */
+struct svc_pool_stats {
+        unsigned long   packets;
+        unsigned long   sockets_queued;
+        unsigned long   threads_woken;
+        unsigned long   overloads_avoided;
+        unsigned long   threads_timedout;
+};
 /*
 *
 * RPC service thread pool.
@@ -41,6 +50,8 @@ struct svc_pool {
        struct list_head        sp_sockets;     /* pending sockets */
        unsigned int            sp_nrthreads;   /* # of threads in pool */
        struct list_head        sp_all_threads; /* all server threads */
+        int                     sp_nwaking;     /* number of threads woken but not yet active */
+        struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
 } ____cacheline_aligned_in_smp;
 /*
@@ -83,6 +94,8 @@ struct svc_serv {
        struct module *         sv_module;      /* optional module to count when
                                                 * adding threads */
        svc_thread_fn           sv_function;    /* main function for threads */
+        unsigned int            sv_drc_max_pages; /* Total pages for DRC */
+        unsigned int            sv_drc_pages_used;/* DRC pages used */
 };
 /*
@@ -218,6 +231,7 @@ struct svc_rqst {
        struct svc_cred         rq_cred;        /* auth info */
        void *                  rq_xprt_ctxt;   /* transport specific context ptr */
        struct svc_deferred_req*rq_deferred;    /* deferred request we are replaying */
+        int                     rq_usedeferral; /* use deferral */
        size_t                  rq_xprt_hlen;   /* xprt header len */
        struct xdr_buf          rq_arg;
@@ -263,6 +277,7 @@ struct svc_rqst {
                                                 * cache pages */
        wait_queue_head_t       rq_wait;        /* synchronization */
        struct task_struct      *rq_task;       /* service thread */
+        int                     rq_waking;      /* 1 if thread is being woken */
 };
 /*
@@ -393,6 +408,7 @@ struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,
                        void (*shutdown)(struct svc_serv *),
                        svc_thread_fn, struct module *);
 int                svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
+int                svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void               svc_destroy(struct svc_serv *);
 int                svc_process(struct svc_rqst *);
 int                svc_register(const struct svc_serv *, const int,
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 49e1eb454465..d8910b68e1bd 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -69,27 +69,27 @@ struct xdr_buf {
 * pre-xdr'ed macros.
 */
-#define xdr_zero        __constant_htonl(0)
+#define xdr_zero        cpu_to_be32(0)
-#define xdr_one         __constant_htonl(1)
+#define xdr_one         cpu_to_be32(1)
-#define xdr_two         __constant_htonl(2)
+#define xdr_two         cpu_to_be32(2)
-#define rpc_success             __constant_htonl(RPC_SUCCESS)
+#define rpc_success             cpu_to_be32(RPC_SUCCESS)
-#define rpc_prog_unavail        __constant_htonl(RPC_PROG_UNAVAIL)
+#define rpc_prog_unavail        cpu_to_be32(RPC_PROG_UNAVAIL)
-#define rpc_prog_mismatch       __constant_htonl(RPC_PROG_MISMATCH)
+#define rpc_prog_mismatch       cpu_to_be32(RPC_PROG_MISMATCH)
-#define rpc_proc_unavail        __constant_htonl(RPC_PROC_UNAVAIL)
+#define rpc_proc_unavail        cpu_to_be32(RPC_PROC_UNAVAIL)
-#define rpc_garbage_args        __constant_htonl(RPC_GARBAGE_ARGS)
+#define rpc_garbage_args        cpu_to_be32(RPC_GARBAGE_ARGS)
-#define rpc_system_err          __constant_htonl(RPC_SYSTEM_ERR)
+#define rpc_system_err          cpu_to_be32(RPC_SYSTEM_ERR)
-#define rpc_drop_reply          __constant_htonl(RPC_DROP_REPLY)
+#define rpc_drop_reply          cpu_to_be32(RPC_DROP_REPLY)
-#define rpc_auth_ok             __constant_htonl(RPC_AUTH_OK)
+#define rpc_auth_ok             cpu_to_be32(RPC_AUTH_OK)
-#define rpc_autherr_badcred     __constant_htonl(RPC_AUTH_BADCRED)
+#define rpc_autherr_badcred     cpu_to_be32(RPC_AUTH_BADCRED)
-#define rpc_autherr_rejectedcred __constant_htonl(RPC_AUTH_REJECTEDCRED)
+#define rpc_autherr_rejectedcred cpu_to_be32(RPC_AUTH_REJECTEDCRED)
-#define rpc_autherr_badverf     __constant_htonl(RPC_AUTH_BADVERF)
+#define rpc_autherr_badverf     cpu_to_be32(RPC_AUTH_BADVERF)
-#define rpc_autherr_rejectedverf __constant_htonl(RPC_AUTH_REJECTEDVERF)
+#define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)
-#define rpc_autherr_tooweak     __constant_htonl(RPC_AUTH_TOOWEAK)
+#define rpc_autherr_tooweak     cpu_to_be32(RPC_AUTH_TOOWEAK)
-#define rpcsec_gsserr_credproblem       __constant_htonl(RPCSEC_GSS_CREDPROBLEM)
+#define rpcsec_gsserr_credproblem       cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)
-#define rpcsec_gsserr_ctxproblem        __constant_htonl(RPCSEC_GSS_CTXPROBLEM)
+#define rpcsec_gsserr_ctxproblem        cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)
-#define rpc_autherr_oldseqnum   __constant_htonl(101)
+#define rpc_autherr_oldseqnum   cpu_to_be32(101)
 /*
 * Miscellaneous XDR helper functions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 6470f74074af..dabe4ad89141 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -65,7 +65,7 @@ struct old_linux_dirent;
 #include <asm/signal.h>
 #include <linux/quota.h>
 #include <linux/key.h>
-#include <linux/ftrace.h>
+#include <trace/syscall.h>
 #define __SC_DECL1(t1, a1)      t1 a1
 #define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 8615d661ab60..bcba84ea2d86 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -309,7 +309,8 @@ extern void tty_set_operations(struct tty_driver *driver,
 extern struct tty_driver *tty_find_polling_driver(char *name, int *line);
 extern void tty_driver_kref_put(struct tty_driver *driver);
-extern inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
+static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
 {
        kref_get(&d->kref);
        return d;
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index b95842542590..625e9e4639c6 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -29,7 +29,7 @@
 /**
 * usb_serial_port: structure for the specific ports of a device.
 * @serial: pointer back to the struct usb_serial owner of this port.
- * @tty: pointer to the corresponding tty for this port.
+ * @port: pointer to the corresponding tty_port for this port.
 * @lock: spinlock to grab when updating portions of this structure.
 * @mutex: mutex used to synchronize serial_open() and serial_close()
 *      access for this port.
@@ -44,19 +44,22 @@
 * @interrupt_out_endpointAddress: endpoint address for the interrupt out pipe
 *      for this port.
 * @bulk_in_buffer: pointer to the bulk in buffer for this port.
+ * @bulk_in_size: the size of the bulk_in_buffer, in bytes.
 * @read_urb: pointer to the bulk in struct urb for this port.
 * @bulk_in_endpointAddress: endpoint address for the bulk in pipe for this
 *      port.
 * @bulk_out_buffer: pointer to the bulk out buffer for this port.
 * @bulk_out_size: the size of the bulk_out_buffer, in bytes.
 * @write_urb: pointer to the bulk out struct urb for this port.
+ * @write_urb_busy: port`s writing status
 * @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
 *      port.
 * @write_wait: a wait_queue_head_t used by the port.
 * @work: work queue entry for the line discipline waking up.
- * @open_count: number of times this port has been opened.
 * @throttled: nonzero if the read urb is inactive to throttle the device
 * @throttle_req: nonzero if the tty wants to throttle us
+ * @console: attached usb serial console
+ * @dev: pointer to the serial device
 *
 * This structure is used by the usb-serial core and drivers for the specific
 * ports of a device.
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 139d234923cd..ebb2ea6b4995 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -737,6 +737,11 @@ struct v4l2_input {
 #define V4L2_IN_ST_NO_SIGNAL   0x00000002
 #define V4L2_IN_ST_NO_COLOR    0x00000004
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
 /* field 'status' - analog */
 #define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
 #define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 93445477f86a..9c1ed1fb6ddb 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -168,6 +168,8 @@ void writeback_set_ratelimit(void);
 /* pdflush.c */
 extern int nr_pdflush_threads;  /* Global so it can be exported to sysctl
                                   read-only. */
+extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */
+extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */
 #endif          /* WRITEBACK_H */
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 6ab854931c05..90cf22ada8b4 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
   =======
   So to specify a complete routing scheme for the msp3400 you will have to
-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:
   1) which tuner input to use
   2) which SCART input to use
   3) which DSP input to use for each DSP output
-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:
   1) which SCART input to use for each SCART output
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 57db48dd85b8..30d9629198ef 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -17,10 +17,45 @@
 #define OV772X_FLAG_VFLIP     0x00000001 /* Vertical flip image */
 #define OV772X_FLAG_HFLIP     0x00000002 /* Horizontal flip image */
+/*
+ * for Edge ctrl
+ *
+ * strength also control Auto or Manual Edge Control Mode
+ * see also OV772X_MANUAL_EDGE_CTRL
+ */
+struct ov772x_edge_ctrl {
+        unsigned char strength;
+        unsigned char threshold;
+        unsigned char upper;
+        unsigned char lower;
+};
+#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
+#define EDGE_STRENGTH_MASK      0x1F
+#define EDGE_THRESHOLD_MASK     0x0F
+#define EDGE_UPPER_MASK         0xFF
+#define EDGE_LOWER_MASK         0xFF
+#define OV772X_AUTO_EDGECTRL(u, l)      \
+{                                       \
+        .upper = (u & EDGE_UPPER_MASK), \
+        .lower = (l & EDGE_LOWER_MASK), \
+}
+#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
+{                                                                       \
+        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
+        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+}
+/*
+ * ov772x camera info
+ */
 struct ov772x_camera_info {
        unsigned long          buswidth;
        unsigned long          flags;
        struct soc_camera_link link;
+        struct ov772x_edge_ctrl edgectrl;
 };
 #endif /* __OV772X_H__ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index fff4235adae5..7a9f76ecbbbd 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -18,7 +18,7 @@
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000600   /* 0.6.0 */
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
diff --git a/include/media/tvaudio.h b/include/media/tvaudio.h
index 6915aafc875a..1ac8184693f8 100644
--- a/include/media/tvaudio.h
+++ b/include/media/tvaudio.h
@@ -21,10 +21,29 @@
 #ifndef _TVAUDIO_H
 #define _TVAUDIO_H
+#include <media/i2c-addr.h>
 /* The tvaudio module accepts the following inputs: */
 #define TVAUDIO_INPUT_TUNER  0
 #define TVAUDIO_INPUT_RADIO  1
 #define TVAUDIO_INPUT_EXTERN 2
 #define TVAUDIO_INPUT_INTERN 3
+static inline const unsigned short *tvaudio_addrs(void)
+{
+        static const unsigned short addrs[] = {
+                I2C_ADDR_TDA8425   >> 1,
+                I2C_ADDR_TEA6300   >> 1,
+                I2C_ADDR_TEA6420   >> 1,
+                I2C_ADDR_TDA9840   >> 1,
+                I2C_ADDR_TDA985x_L >> 1,
+                I2C_ADDR_TDA985x_H >> 1,
+                I2C_ADDR_TDA9874   >> 1,
+                I2C_ADDR_PIC16C54  >> 1,
+                I2C_CLIENT_END
+        };
+        return addrs;
+}
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 3a6905615d68..c48c24e4d0fa 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -125,7 +125,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
 /* ------------------------------------------------------------------------- */
-/* Helper function for I2C legacy drivers */
+/* I2C Helper functions */
 struct i2c_driver;
 struct i2c_adapter;
@@ -135,21 +135,24 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct v4l2_subdev_ops;
-int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-                const char *name,
-                int (*probe)(struct i2c_client *, const struct i2c_device_id *));
 /* Load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type, u8 addr);
 /* Probe and load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
                const unsigned short *addrs);
+/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr);
 /* Initialize an v4l2_subdev with data from an i2c_client struct */
 void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
                const struct v4l2_subdev_ops *ops);
@@ -171,139 +174,23 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
 /* ------------------------------------------------------------------------- */
-/* Internal ioctls */
+/* Note: these remaining ioctls/structs should be removed as well, but they are
+   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
-/* VIDIOC_INT_DECODE_VBI_LINE */
+   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
-struct v4l2_decode_vbi_line {
+   is needed in those modules. */
-        u32 is_second_field;    /* Set to 0 for the first (odd) field,
-                                   set to 1 for the second (even) field. */
-        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
-                                   On exit points to the start of the payload. */
-        u32 line;               /* Line number of the sliced VBI data (1-23) */
-        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
-};
+/* s_config */
 struct v4l2_priv_tun_config {
        int tuner;
        void *priv;
 };
-/* audio ioctls */
-/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
-#define AUDC_SET_RADIO        _IO('d',88)
-/* tuner ioctls */
-/* Sets tuner type and its I2C addr */
-#define TUNER_SET_TYPE_ADDR          _IOW('d', 90, int)
-/* Puts tuner on powersaving state, disabling it, except for i2c. To be replaced
-   by VIDIOC_INT_S_STANDBY. */
-#define TUNER_SET_STANDBY            _IOW('d', 91, int)
-/* Sets tda9887 specific stuff, like port1, port2 and qss */
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
-/* Switch the tuner to a specific tuner mode. Replacement of AUDC_SET_RADIO */
-#define VIDIOC_INT_S_TUNER_MODE      _IOW('d', 93, enum v4l2_tuner_type)
-/* Generic standby command. Passing -1 (all bits set to 1) will put the whole
-   chip into standby mode, value 0 will make the chip fully active. Specific
-   bits can be used by certain chips to enable/disable specific subsystems.
-   Replacement of TUNER_SET_STANDBY. */
-#define VIDIOC_INT_S_STANDBY         _IOW('d', 94, u32)
-/* 100, 101 used by  VIDIOC_DBG_[SG]_REGISTER */
-/* Generic reset command. The argument selects which subsystems to reset.
-   Passing 0 will always reset the whole chip. */
 #define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
-/* Set the frequency (in Hz) of the audio clock output.
-   Used to slave an audio processor to the video decoder, ensuring that audio
-   and video remain synchronized.
-   Usual values for the frequency are 48000, 44100 or 32000 Hz.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_AUDIO_CLOCK_FREQ     _IOW ('d', 103, u32)
-/* Video decoders that support sliced VBI need to implement this ioctl.
-   Field p of the v4l2_sliced_vbi_line struct is set to the start of the VBI
-   data that was generated by the decoder. The driver then parses the sliced
-   VBI data and sets the other fields in the struct accordingly. The pointer p
-   is updated to point to the start of the payload which can be copied
-   verbatim into the data field of the v4l2_sliced_vbi_data struct. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_DECODE_VBI_LINE      _IOWR('d', 104, struct v4l2_decode_vbi_line)
-/* Used to generate VBI signals on a video signal. v4l2_sliced_vbi_data is
-   filled with the data packets that should be output. Note that if you set
-   the line field to 0, then that VBI signal is disabled. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_S_VBI_DATA           _IOW ('d', 105, struct v4l2_sliced_vbi_data)
-/* Used to obtain the sliced VBI packet from a readback register. Not all
-   video decoders support this. If no data is available because the readback
-   register contains invalid or erroneous data -EIO is returned. Note that
-   you must fill in the 'id' member and the 'field' member (to determine
-   whether CC data from the first or second field should be obtained). */
-#define VIDIOC_INT_G_VBI_DATA           _IOWR('d', 106, struct v4l2_sliced_vbi_data)
-/* Sets I2S speed in bps. This is used to provide a standard way to select I2S
-   clock used by driving digital audio streams at some board designs.
-   Usual values for the frequency are 1024000 and 2048000.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_I2S_CLOCK_FREQ       _IOW ('d', 108, u32)
-/* Routing definition, device dependent. It specifies which inputs (if any)
-   should be routed to which outputs (if any). */
 struct v4l2_routing {
        u32 input;
        u32 output;
 };
-/* These internal commands should be used to define the inputs and outputs
-   of an audio/video chip. They will replace the v4l2 API commands
-   VIDIOC_S/G_INPUT, VIDIOC_S/G_OUTPUT, VIDIOC_S/G_AUDIO and VIDIOC_S/G_AUDOUT
-   that are meant to be used by the user.
-   The internal commands should be used to switch inputs/outputs
-   because only the driver knows how to map a 'Television' input to the precise
-   input/output routing of an A/D converter, or a DSP, or a video digitizer.
-   These four commands should only be sent directly to an i2c device, they
-   should not be broadcast as the routing is very device specific. */
-#define VIDIOC_INT_S_AUDIO_ROUTING      _IOW ('d', 109, struct v4l2_routing)
-#define VIDIOC_INT_G_AUDIO_ROUTING      _IOR ('d', 110, struct v4l2_routing)
-#define VIDIOC_INT_S_VIDEO_ROUTING      _IOW ('d', 111, struct v4l2_routing)
-#define VIDIOC_INT_G_VIDEO_ROUTING      _IOR ('d', 112, struct v4l2_routing)
-struct v4l2_crystal_freq {
-        u32 freq;       /* frequency in Hz of the crystal */
-        u32 flags;      /* device specific flags */
-};
-/* Sets the frequency of the crystal used to generate the clocks.
-   An extra flags field allows device specific configuration regarding
-   clock frequency dividers, etc. If not used, then set flags to 0.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_S_CRYSTAL_FREQ       _IOW('d', 113, struct v4l2_crystal_freq)
-/* Initialize the sensor registors to some sort of reasonable
-   default values. */
-#define VIDIOC_INT_INIT                 _IOW('d', 114, u32)
-/* Set v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_S_STD_OUTPUT         _IOW('d', 115, v4l2_std_id)
-/* Get v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_G_STD_OUTPUT         _IOW('d', 116, v4l2_std_id)
-/* Set GPIO pins. Very simple right now, might need to be extended with
-   a v4l2_gpio struct if a direction is also needed. */
-#define VIDIOC_INT_S_GPIO               _IOW('d', 117, u32)
-/* Get input status. Same as the status field in the v4l2_input struct. */
-#define VIDIOC_INT_G_INPUT_STATUS       _IOR('d', 118, u32)
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
deleted file mode 100644
index e65dd9d84e8b..000000000000
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * v4l2-i2c-drv-legacy.h - contains I2C handling code that's identical
- *                  for all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is used by both legacy drivers and
- *                  drivers converted to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on older kernels as well.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- */
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int driverid;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
-        const struct i2c_device_id *id_table;
-};
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static const struct i2c_client_address_data addr_data;
-static struct i2c_driver v4l2_i2c_driver_legacy;
-static char v4l2_i2c_drv_name_legacy[32];
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-{
-        return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver_legacy,
-                        v4l2_i2c_drv_name_legacy, v4l2_i2c_data.probe);
-}
-static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
-{
-        if (v4l2_i2c_data.legacy_probe) {
-                if (v4l2_i2c_data.legacy_probe(adapter))
-                        return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-                return 0;
-        }
-        if (adapter->class & v4l2_i2c_data.legacy_class)
-                return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-        return 0;
-}
-static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
-{
-        int err;
-        if (v4l2_i2c_data.remove)
-                v4l2_i2c_data.remove(client);
-        err = i2c_detach_client(client);
-        if (err)
-                return err;
-        kfree(client);
-        return 0;
-}
-static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
-{
-        return v4l2_i2c_data.suspend ? v4l2_i2c_data.suspend(client, state) : 0;
-}
-static int v4l2_i2c_drv_resume_helper(struct i2c_client *client)
-{
-        return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
-}
-/* ----------------------------------------------------------------------- */
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver_legacy = {
-        .driver = {
-                .owner = THIS_MODULE,
-        },
-        .attach_adapter = v4l2_i2c_drv_probe_legacy,
-        .detach_client = v4l2_i2c_drv_detach_legacy,
-        .suspend = v4l2_i2c_drv_suspend_helper,
-        .resume  = v4l2_i2c_drv_resume_helper,
-};
-/* ----------------------------------------------------------------------- */
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver = {
-        .suspend        = v4l2_i2c_drv_suspend_helper,
-        .resume         = v4l2_i2c_drv_resume_helper,
-};
-static int __init v4l2_i2c_drv_init(void)
-{
-        int err;
-        strlcpy(v4l2_i2c_drv_name_legacy, v4l2_i2c_data.name, sizeof(v4l2_i2c_drv_name_legacy));
-        strlcat(v4l2_i2c_drv_name_legacy, "'", sizeof(v4l2_i2c_drv_name_legacy));
-        if (v4l2_i2c_data.legacy_class == 0)
-                v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-        v4l2_i2c_driver_legacy.driver.name = v4l2_i2c_drv_name_legacy;
-        v4l2_i2c_driver_legacy.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver_legacy.command = v4l2_i2c_data.command;
-        err = i2c_add_driver(&v4l2_i2c_driver_legacy);
-        if (err)
-                return err;
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        err = i2c_add_driver(&v4l2_i2c_driver);
-        if (err)
-                i2c_del_driver(&v4l2_i2c_driver_legacy);
-        return err;
-}
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver_legacy);
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..10a2882c3cbf 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
 struct v4l2_i2c_driver_data {
        const char * const name;
-        int driverid;
        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
        int (*remove)(struct i2c_client *client);
        int (*suspend)(struct i2c_client *client, pm_message_t state);
        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
        const struct i2c_device_id *id_table;
 };
@@ -54,12 +51,11 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data;
 static struct i2c_driver v4l2_i2c_driver;
-/* Bus-based I2C implementation for kernels >= 2.6.22 */
+/* Bus-based I2C implementation for kernels >= 2.6.26 */
 static int __init v4l2_i2c_drv_init(void)
 {
        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
        v4l2_i2c_driver.command = v4l2_i2c_data.command;
        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 1d181b4ccb01..17856081c809 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -27,6 +27,16 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
+/* decode_vbi_line */
+struct v4l2_decode_vbi_line {
+        u32 is_second_field;    /* Set to 0 for the first (odd) field,
+                                   set to 1 for the second (even) field. */
+        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
+                                   On exit points to the start of the payload. */
+        u32 line;               /* Line number of the sliced VBI data (1-23) */
+        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
+};
 /* Sub-devices are devices that are connected somehow to the main bridge
   device. These devices are usually audio/video muxers/encoders/decoders or
   sensors and webcam controllers.
@@ -68,11 +78,26 @@ struct tuner_setup;
   the use-case it might be better to use subdev-specific ops (currently
   not yet implemented) since ops provide proper type-checking.
 */
+/* init: initialize the sensor registors to some sort of reasonable default
+        values. Do not use for new drivers and should be removed in existing
+        drivers.
+   load_fw: load firmware.
+   reset: generic reset command. The argument selects which subsystems to
+        reset. Passing 0 will always reset the whole chip. Do not use for new
+        drivers without discussing this first on the linux-media mailinglist.
+        There should be no reason normally to reset a device.
+   s_gpio: set GPIO pins. Very simple right now, might need to be extended with
+        a direction argument if needed.
+ */
 struct v4l2_subdev_core_ops {
        int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
        int (*log_status)(struct v4l2_subdev *sd);
        int (*init)(struct v4l2_subdev *sd, u32 val);
-        int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
+        int (*load_fw)(struct v4l2_subdev *sd);
        int (*reset)(struct v4l2_subdev *sd, u32 val);
        int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
        int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
@@ -82,6 +107,7 @@ struct v4l2_subdev_core_ops {
        int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
        int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
        int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
        long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
@@ -89,6 +115,16 @@ struct v4l2_subdev_core_ops {
 #endif
 };
+/* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
+   s_radio: v4l device was opened in Radio mode, to be replaced by s_mode.
+   s_type_addr: sets tuner type and its I2C addr.
+   s_config: sets tda9887 specific stuff, like port1, port2 and qss
+   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
+ */
 struct v4l2_subdev_tuner_ops {
        int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
        int (*s_radio)(struct v4l2_subdev *sd);
@@ -96,20 +132,77 @@ struct v4l2_subdev_tuner_ops {
        int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
        int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
        int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
-        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
        int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
        int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
+        int (*s_standby)(struct v4l2_subdev *sd);
 };
+/* s_clock_freq: set the frequency (in Hz) of the audio clock output.
+        Used to slave an audio processor to the video decoder, ensuring that
+        audio and video remain synchronized. Usual values for the frequency
+        are 48000, 44100 or 32000 Hz. If the frequency is not supported, then
+        -EINVAL is returned.
+   s_i2s_clock_freq: sets I2S speed in bps. This is used to provide a standard
+        way to select I2S clock used by driving digital audio streams at some
+        board designs. Usual values for the frequency are 1024000 and 2048000.
+        If the frequency is not supported, then -EINVAL is returned.
+   s_routing: used to define the input and/or output pins of an audio chip,
+        and any additional configuration data.
+        Never attempt to use user-level input IDs (e.g. Composite, S-Video,
+        Tuner) at this level. An i2c device shouldn't know about whether an
+        input pin is connected to a Composite connector, become on another
+        board or platform it might be connected to something else entirely.
+        The calling driver is responsible for mapping a user-level input to
+        the right pins on the i2c device.
+ */
 struct v4l2_subdev_audio_ops {
        int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
        int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
 };
+/*
+   decode_vbi_line: video decoders that support sliced VBI need to implement
+        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
+        start of the VBI data that was generated by the decoder. The driver
+        then parses the sliced VBI data and sets the other fields in the
+        struct accordingly. The pointer p is updated to point to the start of
+        the payload which can be copied verbatim into the data field of the
+        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
+        type field is set to 0 on return.
+   s_vbi_data: used to generate VBI signals on a video signal.
+        v4l2_sliced_vbi_data is filled with the data packets that should be
+        output. Note that if you set the line field to 0, then that VBI signal
+        is disabled. If no valid VBI data was found, then the type field is
+        set to 0 on return.
+   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
+        Not all video decoders support this. If no data is available because
+        the readback register contains invalid or erroneous data -EIO is
+        returned. Note that you must fill in the 'id' member and the 'field'
+        member (to determine whether CC data from the first or second field
+        should be obtained).
+   s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
+        video input devices.
+  s_crystal_freq: sets the frequency of the crystal used to generate the
+        clocks in Hz. An extra flags field allows device specific configuration
+        regarding clock frequency dividers, etc. If not used, then set flags
+        to 0. If the frequency is not supported, then -EINVAL is returned.
+   g_input_status: get input status. Same as the status field in the v4l2_input
+        struct.
+   s_routing: see s_routing in audio_ops, except this version is for video
+        devices.
+ */
 struct v4l2_subdev_video_ops {
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
-        int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
+        int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
        int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
        int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
        int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
@@ -163,18 +256,6 @@ static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
        return sd->priv;
 }
-/* Convert an ioctl-type command to the proper v4l2_subdev_ops function call.
-   This is used by subdev modules that can be called by both old-style ioctl
-   commands and through the v4l2_subdev_ops.
-   The ioctl API of the subdev driver can call this function to call the
-   right ops based on the ioctl cmd and arg.
-   Once all subdev drivers have been converted and all drivers no longer
-   use the ioctl interface, then this function can be removed.
- */
-int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg);
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
                                        const struct v4l2_subdev_ops *ops)
 {
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index ab17a159ac66..a9652806d0df 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -99,9 +99,12 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
                       const union nf_inet_addr *,
                       u_int8_t, const __be16 *, const __be16 *);
 void nf_ct_expect_put(struct nf_conntrack_expect *exp);
-int nf_ct_expect_related(struct nf_conntrack_expect *expect);
 int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
                                u32 pid, int report);
+static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect)
+{
+        return nf_ct_expect_related_report(expect, 0, 0);
+}
 #endif /*_NF_CONNTRACK_EXPECT_H*/
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
new file mode 100644
index 000000000000..0627a9ae6347
--- /dev/null
+++ b/include/scsi/fc/fc_fip.h
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FC_FIP_H_
+#define _FC_FIP_H_
+/*
+ * This version is based on:
+ * http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf
+ */
+/*
+ * The FIP ethertype eventually goes in net/if_ether.h.
+ */
+#ifndef ETH_P_FIP
+#define ETH_P_FIP       0x8914  /* FIP Ethertype */
+#endif
+#define FIP_DEF_PRI     128     /* default selection priority */
+#define FIP_DEF_FC_MAP  0x0efc00 /* default FCoE MAP (MAC OUI) value */
+#define FIP_DEF_FKA     8000    /* default FCF keep-alive/advert period (mS) */
+#define FIP_VN_KA_PERIOD 90000  /* required VN_port keep-alive period (mS) */
+#define FIP_FCF_FUZZ    100     /* random time added by FCF (mS) */
+/*
+ * Multicast MAC addresses.  T11-adopted.
+ */
+#define FIP_ALL_FCOE_MACS       ((u8[6]) { 1, 0x10, 0x18, 1, 0, 0 })
+#define FIP_ALL_ENODE_MACS      ((u8[6]) { 1, 0x10, 0x18, 1, 0, 1 })
+#define FIP_ALL_FCF_MACS        ((u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })
+#define FIP_VER         1               /* version for fip_header */
+struct fip_header {
+        __u8    fip_ver;                /* upper 4 bits are the version */
+        __u8    fip_resv1;              /* reserved */
+        __be16  fip_op;                 /* operation code */
+        __u8    fip_resv2;              /* reserved */
+        __u8    fip_subcode;            /* lower 4 bits are sub-code */
+        __be16  fip_dl_len;             /* length of descriptors in words */
+        __be16  fip_flags;              /* header flags */
+} __attribute__((packed));
+#define FIP_VER_SHIFT   4
+#define FIP_VER_ENCAPS(v) ((v) << FIP_VER_SHIFT)
+#define FIP_VER_DECAPS(v) ((v) >> FIP_VER_SHIFT)
+#define FIP_BPW         4               /* bytes per word for lengths */
+/*
+ * fip_op.
+ */
+enum fip_opcode {
+        FIP_OP_DISC =   1,              /* discovery, advertisement, etc. */
+        FIP_OP_LS =     2,              /* Link Service request or reply */
+        FIP_OP_CTRL =   3,              /* Keep Alive / Link Reset */
+        FIP_OP_VLAN =   4,              /* VLAN discovery */
+        FIP_OP_VENDOR_MIN = 0xfff8,     /* min vendor-specific opcode */
+        FIP_OP_VENDOR_MAX = 0xfffe,     /* max vendor-specific opcode */
+};
+/*
+ * Subcodes for FIP_OP_DISC.
+ */
+enum fip_disc_subcode {
+        FIP_SC_SOL =    1,              /* solicitation */
+        FIP_SC_ADV =    2,              /* advertisement */
+};
+/*
+ * Subcodes for FIP_OP_LS.
+ */
+enum fip_trans_subcode {
+        FIP_SC_REQ =    1,              /* request */
+        FIP_SC_REP =    2,              /* reply */
+};
+/*
+ * Subcodes for FIP_OP_RESET.
+ */
+enum fip_reset_subcode {
+        FIP_SC_KEEP_ALIVE = 1,          /* keep-alive from VN_Port */
+        FIP_SC_CLR_VLINK = 2,           /* clear virtual link from VF_Port */
+};
+/*
+ * Subcodes for FIP_OP_VLAN.
+ */
+enum fip_vlan_subcode {
+        FIP_SC_VL_REQ = 1,              /* request */
+        FIP_SC_VL_REP = 2,              /* reply */
+};
+/*
+ * flags in header fip_flags.
+ */
+enum fip_flag {
+        FIP_FL_FPMA =   0x8000,         /* supports FPMA fabric-provided MACs */
+        FIP_FL_SPMA =   0x4000,         /* supports SPMA server-provided MACs */
+        FIP_FL_AVAIL =  0x0004,         /* available for FLOGI/ELP */
+        FIP_FL_SOL =    0x0002,         /* this is a solicited message */
+        FIP_FL_FPORT =  0x0001,         /* sent from an F port */
+};
+/*
+ * Common descriptor header format.
+ */
+struct fip_desc {
+        __u8    fip_dtype;              /* type - see below */
+        __u8    fip_dlen;               /* length - in 32-bit words */
+};
+enum fip_desc_type {
+        FIP_DT_PRI =    1,              /* priority for forwarder selection */
+        FIP_DT_MAC =    2,              /* MAC address */
+        FIP_DT_MAP_OUI = 3,             /* FC-MAP OUI */
+        FIP_DT_NAME =   4,              /* switch name or node name */
+        FIP_DT_FAB =    5,              /* fabric descriptor */
+        FIP_DT_FCOE_SIZE = 6,           /* max FCoE frame size */
+        FIP_DT_FLOGI =  7,              /* FLOGI request or response */
+        FIP_DT_FDISC =  8,              /* FDISC request or response */
+        FIP_DT_LOGO =   9,              /* LOGO request or response */
+        FIP_DT_ELP =    10,             /* ELP request or response */
+        FIP_DT_VN_ID =  11,             /* VN_Node Identifier */
+        FIP_DT_FKA =    12,             /* advertisement keep-alive period */
+        FIP_DT_VENDOR = 13,             /* vendor ID */
+        FIP_DT_VLAN =   14,             /* vlan number */
+        FIP_DT_LIMIT,                   /* max defined desc_type + 1 */
+        FIP_DT_VENDOR_BASE = 128,       /* first vendor-specific desc_type */
+};
+/*
+ * FIP_DT_PRI - priority descriptor.
+ */
+struct fip_pri_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd;
+        __u8            fd_pri;         /* FCF priority:  higher is better */
+} __attribute__((packed));
+/*
+ * FIP_DT_MAC - MAC address descriptor.
+ */
+struct fip_mac_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+} __attribute__((packed));
+/*
+ * FIP_DT_MAP - descriptor.
+ */
+struct fip_map_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[3];
+        __u8            fd_map[3];
+} __attribute__((packed));
+/*
+ * FIP_DT_NAME descriptor.
+ */
+struct fip_wwn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be64          fd_wwn;         /* 64-bit WWN, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FAB descriptor.
+ */
+struct fip_fab_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_vfid;        /* virtual fabric ID */
+        __u8            fd_resvd;
+        __u8            fd_map[3];      /* FC-MAP value */
+        __be64          fd_wwn;         /* fabric name, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FCOE_SIZE descriptor.
+ */
+struct fip_size_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_size;
+} __attribute__((packed));
+/*
+ * Descriptor that encapsulates an ELS or ILS frame.
+ * The encapsulated frame immediately follows this header, without
+ * SOF, EOF, or CRC.
+ */
+struct fip_encaps {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+} __attribute__((packed));
+/*
+ * FIP_DT_VN_ID - VN_Node Identifier descriptor.
+ */
+struct fip_vn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+        __u8            fd_resvd;
+        __u8            fd_fc_id[3];
+        __be64          fd_wwpn;        /* port name, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FKA - Advertisement keep-alive period.
+ */
+struct fip_fka_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be32          fd_fka_period;  /* adv./keep-alive period in mS */
+} __attribute__((packed));
+/*
+ * FIP_DT_VENDOR descriptor.
+ */
+struct fip_vendor_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __u8            fd_vendor_id[8];
+} __attribute__((packed));
+#endif /* _FC_FIP_H_ */
diff --git a/include/scsi/fc_transport_fcoe.h b/include/scsi/fc_transport_fcoe.h
deleted file mode 100644
index 8dca2af14ffc..000000000000
--- a/include/scsi/fc_transport_fcoe.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef FC_TRANSPORT_FCOE_H
-#define FC_TRANSPORT_FCOE_H
-#include <linux/device.h>
-#include <linux/netdevice.h>
-#include <scsi/scsi_host.h>
-#include <scsi/libfc.h>
-/**
- * struct fcoe_transport - FCoE transport struct for generic transport
- * for Ethernet devices as well as pure HBAs
- *
- * @name: name for thsi transport
- * @bus: physical bus type (pci_bus_type)
- * @driver: physical bus driver for network device
- * @create: entry create function
- * @destroy: exit destroy function
- * @list: list of transports
- */
-struct fcoe_transport {
-        char *name;
-        unsigned short vendor;
-        unsigned short device;
-        struct bus_type *bus;
-        struct device_driver *driver;
-        int (*create)(struct net_device *device);
-        int (*destroy)(struct net_device *device);
-        bool (*match)(struct net_device *device);
-        struct list_head list;
-        struct list_head devlist;
-        struct mutex devlock;
-};
-/**
- * MODULE_ALIAS_FCOE_PCI
- *
- * some care must be taken with this, vendor and device MUST be a hex value
- * preceded with 0x and with letters in lower case (0x12ab, not 0x12AB or 12AB)
- */
-#define MODULE_ALIAS_FCOE_PCI(vendor, device) \
-        MODULE_ALIAS("fcoe-pci-" __stringify(vendor) "-" __stringify(device))
-/* exported funcs */
-int fcoe_transport_attach(struct net_device *netdev);
-int fcoe_transport_release(struct net_device *netdev);
-int fcoe_transport_register(struct fcoe_transport *t);
-int fcoe_transport_unregister(struct fcoe_transport *t);
-int fcoe_load_transport_driver(struct net_device *netdev);
-int __init fcoe_transport_init(void);
-int __exit fcoe_transport_exit(void);
-/* fcow_sw is the default transport */
-extern struct fcoe_transport fcoe_sw_transport;
-#endif /* FC_TRANSPORT_FCOE_H */
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index a70eafaad084..0303a6a098cc 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -22,6 +22,7 @@
 #include <linux/timer.h>
 #include <linux/if.h>
+#include <linux/percpu.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
@@ -661,7 +662,8 @@ struct fc_lport {
        unsigned long           boot_time;
        struct fc_host_statistics host_stats;
-        struct fcoe_dev_stats   *dev_stats[NR_CPUS];
+        struct fcoe_dev_stats   *dev_stats;
        u64                     wwpn;
        u64                     wwnn;
        u8                      retry_count;
@@ -694,11 +696,6 @@ struct fc_lport {
 /*
 * FC_LPORT HELPER FUNCTIONS
 *****************************/
-static inline void *lport_priv(const struct fc_lport *lp)
-{
-        return (void *)(lp + 1);
-}
 static inline int fc_lport_test_ready(struct fc_lport *lp)
 {
        return lp->state == LPORT_ST_READY;
@@ -722,6 +719,42 @@ static inline void fc_lport_state_enter(struct fc_lport *lp,
        lp->state = state;
 }
+static inline int fc_lport_init_stats(struct fc_lport *lp)
+{
+        /* allocate per cpu stats block */
+        lp->dev_stats = alloc_percpu(struct fcoe_dev_stats);
+        if (!lp->dev_stats)
+                return -ENOMEM;
+        return 0;
+}
+static inline void fc_lport_free_stats(struct fc_lport *lp)
+{
+        free_percpu(lp->dev_stats);
+}
+static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lp)
+{
+        return per_cpu_ptr(lp->dev_stats, smp_processor_id());
+}
+static inline void *lport_priv(const struct fc_lport *lp)
+{
+        return (void *)(lp + 1);
+}
+/**
+ * libfc_host_alloc() - Allocate a Scsi_Host with room for the fc_lport
+ * @sht: ptr to the scsi host templ
+ * @priv_size: size of private data after fc_lport
+ *
+ * Returns: ptr to Scsi_Host
+ */
+static inline struct Scsi_Host *
+libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
+{
+        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+}
 /*
 * LOCAL PORT LAYER
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index c41f7d0c6efc..666cc131732e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -1,5 +1,6 @@
 /*
- * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
+ * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2008 Intel Corporation.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -20,134 +21,144 @@
 #ifndef _LIBFCOE_H
 #define _LIBFCOE_H
+#include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
 /*
- * this percpu struct for fcoe
+ * FIP tunable parameters.
 */
-struct fcoe_percpu_s {
+#define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
-        int             cpu;
+#define FCOE_CTRL_SOL_TOV       2000    /* min. solicitation interval (mS) */
-        struct task_struct *thread;
+#define FCOE_CTLR_FCF_LIMIT     20      /* max. number of FCF entries */
-        struct sk_buff_head fcoe_rx_list;
-        struct page *crc_eof_page;
+/**
-        int crc_eof_offset;
+ * enum fip_state - internal state of FCoE controller.
+ * @FIP_ST_DISABLED:    controller has been disabled or not yet enabled.
+ * @FIP_ST_LINK_WAIT:   the physical link is down or unusable.
+ * @FIP_ST_AUTO:        determining whether to use FIP or non-FIP mode.
+ * @FIP_ST_NON_FIP:     non-FIP mode selected.
+ * @FIP_ST_ENABLED:     FIP mode selected.
+ */
+enum fip_state {
+        FIP_ST_DISABLED,
+        FIP_ST_LINK_WAIT,
+        FIP_ST_AUTO,
+        FIP_ST_NON_FIP,
+        FIP_ST_ENABLED,
 };
-/*
+/**
- * the fcoe sw transport private data
+ * struct fcoe_ctlr - FCoE Controller and FIP state.
+ * @state:      internal FIP state for network link and FIP or non-FIP mode.
+ * @lp:         &fc_lport: libfc local port.
+ * @sel_fcf:    currently selected FCF, or NULL.
+ * @fcfs:       list of discovered FCFs.
+ * @fcf_count:  number of discovered FCF entries.
+ * @sol_time:   time when a multicast solicitation was last sent.
+ * @sel_time:   time after which to select an FCF.
+ * @port_ka_time: time of next port keep-alive.
+ * @ctlr_ka_time: time of next controller keep-alive.
+ * @timer:      timer struct used for all delayed events.
+ * @link_work:  &work_struct for doing FCF selection.
+ * @recv_work:  &work_struct for receiving FIP frames.
+ * @fip_recv_list: list of received FIP frames.
+ * @user_mfs:   configured maximum FC frame size, including FC header.
+ * @flogi_oxid: exchange ID of most recent fabric login.
+ * @flogi_count: number of FLOGI attempts in AUTO mode.
+ * @link:       current link status for libfc.
+ * @last_link:  last link state reported to libfc.
+ * @map_dest:   use the FC_MAP mode for destination MAC addresses.
+ * @dest_addr:  MAC address of the selected FC forwarder.
+ * @ctl_src_addr: the native MAC address of our local port.
+ * @data_src_addr: the assigned MAC address for the local port after FLOGI.
+ * @send:       LLD-supplied function to handle sending of FIP Ethernet frames.
+ * @update_mac: LLD-supplied function to handle changes to MAC addresses.
+ * @lock:       lock protecting this structure.
+ *
+ * This structure is used by all FCoE drivers.  It contains information
+ * needed by all FCoE low-level drivers (LLDs) as well as internal state
+ * for FIP, and fields shared with the LLDS.
 */
-struct fcoe_softc {
+struct fcoe_ctlr {
-        struct list_head list;
+        enum fip_state state;
        struct fc_lport *lp;
-        struct net_device *real_dev;
+        struct fcoe_fcf *sel_fcf;
-        struct net_device *phys_dev;            /* device with ethtool_ops */
+        struct list_head fcfs;
-        struct packet_type  fcoe_packet_type;
+        u16 fcf_count;
-        struct sk_buff_head fcoe_pending_queue;
+        unsigned long sol_time;
-        u8      fcoe_pending_queue_active;
+        unsigned long sel_time;
+        unsigned long port_ka_time;
+        unsigned long ctlr_ka_time;
+        struct timer_list timer;
+        struct work_struct link_work;
+        struct work_struct recv_work;
+        struct sk_buff_head fip_recv_list;
+        u16 user_mfs;
+        u16 flogi_oxid;
+        u8 flogi_count;
+        u8 link;
+        u8 last_link;
+        u8 map_dest;
        u8 dest_addr[ETH_ALEN];
        u8 ctl_src_addr[ETH_ALEN];
        u8 data_src_addr[ETH_ALEN];
-        /*
-         * fcoe protocol address learning related stuff
-         */
-        u16 flogi_oxid;
-        u8 flogi_progress;
-        u8 address_mode;
-};
-static inline struct net_device *fcoe_netdev(
-        const struct fc_lport *lp)
-{
-        return ((struct fcoe_softc *)lport_priv(lp))->real_dev;
-}
-static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)
-{
-        return (struct fcoe_hdr *)skb_network_header(skb);
-}
-static inline int skb_fcoe_offset(const struct sk_buff *skb)
-{
-        return skb_network_offset(skb);
-}
-static inline struct fc_frame_header *skb_fc_header(const struct sk_buff *skb)
-{
-        return (struct fc_frame_header *)skb_transport_header(skb);
-}
-static inline int skb_fc_offset(const struct sk_buff *skb)
-{
-        return skb_transport_offset(skb);
-}
-static inline void skb_reset_fc_header(struct sk_buff *skb)
+        void (*send)(struct fcoe_ctlr *, struct sk_buff *);
-{
+        void (*update_mac)(struct fcoe_ctlr *, u8 *old, u8 *new);
-        skb_reset_network_header(skb);
+        spinlock_t lock;
-        skb_set_transport_header(skb, skb_network_offset(skb) +
+};
-                                 sizeof(struct fcoe_hdr));
-}
-static inline bool skb_fc_is_data(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_SOL_DATA;
-}
-static inline bool skb_fc_is_cmd(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_UNSOL_CMD;
-}
-static inline bool skb_fc_has_exthdr(const struct sk_buff *skb)
+/*
-{
+ * struct fcoe_fcf - Fibre-Channel Forwarder.
-        return (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_VFTH) ||
+ * @list:       list linkage.
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_IFRH) ||
+ * @time:       system time (jiffies) when an advertisement was last received.
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_ENCH);
+ * @switch_name: WWN of switch from advertisement.
-}
+ * @fabric_name: WWN of fabric from advertisement.
+ * @fc_map:     FC_MAP value from advertisement.
+ * @fcf_mac:    Ethernet address of the FCF.
+ * @vfid:       virtual fabric ID.
+ * @pri:        seletion priority, smaller values are better.
+ * @flags:      flags received from advertisement.
+ * @fka_period: keep-alive period, in jiffies.
+ *
+ * A Fibre-Channel Forwarder (FCF) is the entity on the Ethernet that
+ * passes FCoE frames on to an FC fabric.  This structure represents
+ * one FCF from which advertisements have been received.
+ *
+ * When looking up an FCF, @switch_name, @fabric_name, @fc_map, @vfid, and
+ * @fcf_mac together form the lookup key.
+ */
+struct fcoe_fcf {
+        struct list_head list;
+        unsigned long time;
-static inline bool skb_fc_is_roff(const struct sk_buff *skb)
+        u64 switch_name;
-{
+        u64 fabric_name;
-        return skb_fc_header(skb)->fh_f_ctl[2] & FC_FC_REL_OFF;
+        u32 fc_map;
-}
+        u16 vfid;
+        u8 fcf_mac[ETH_ALEN];
-static inline u16 skb_fc_oxid(const struct sk_buff *skb)
+        u8 pri;
-{
+        u16 flags;
-        return be16_to_cpu(skb_fc_header(skb)->fh_ox_id);
+        u32 fka_period;
-}
+};
-static inline u16 skb_fc_rxid(const struct sk_buff *skb)
+/* FIP API functions */
-{
+void fcoe_ctlr_init(struct fcoe_ctlr *);
-        return be16_to_cpu(skb_fc_header(skb)->fh_rx_id);
+void fcoe_ctlr_destroy(struct fcoe_ctlr *);
-}
+void fcoe_ctlr_link_up(struct fcoe_ctlr *);
+int fcoe_ctlr_link_down(struct fcoe_ctlr *);
+int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct sk_buff *);
+void fcoe_ctlr_recv(struct fcoe_ctlr *, struct sk_buff *);
+int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_frame *fp, u8 *sa);
 /* libfcoe funcs */
-int fcoe_reset(struct Scsi_Host *shost);
+u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
-u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
-                      unsigned int scheme, unsigned int port);
-u32 fcoe_fc_crc(struct fc_frame *fp);
-int fcoe_xmit(struct fc_lport *, struct fc_frame *);
-int fcoe_rcv(struct sk_buff *, struct net_device *,
-             struct packet_type *, struct net_device *);
-int fcoe_percpu_receive_thread(void *arg);
-void fcoe_clean_pending_queue(struct fc_lport *lp);
-void fcoe_percpu_clean(struct fc_lport *lp);
-void fcoe_watchdog(ulong vp);
-int fcoe_link_ok(struct fc_lport *lp);
-struct fc_lport *fcoe_hostlist_lookup(const struct net_device *);
-int fcoe_hostlist_add(const struct fc_lport *);
-int fcoe_hostlist_remove(const struct fc_lport *);
-struct Scsi_Host *fcoe_host_alloc(struct scsi_host_template *, int);
 int fcoe_libfc_config(struct fc_lport *, struct libfc_function_template *);
-/* fcoe sw hba */
-int __init fcoe_sw_init(void);
-int __exit fcoe_sw_exit(void);
 #endif /* _LIBFCOE_H */
diff --git a/include/scsi/scsi_scan.h b/include/scsi/scsi_scan.h
new file mode 100644
index 000000000000..78898889243d
--- /dev/null
+++ b/include/scsi/scsi_scan.h
@@ -0,0 +1,11 @@
+#ifndef _SCSI_SCSI_SCAN_H
+#define _SCSI_SCSI_SCAN_H
+#ifdef CONFIG_SCSI
+/* drivers/scsi/scsi_scan.c */
+extern int scsi_complete_async_scans(void);
+#else
+static inline int scsi_complete_async_scans(void) { return 0; }
+#endif
+#endif /* _SCSI_SCSI_SCAN_H */
diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h
index ad8b7857855a..28ee69f9cd46 100644
--- a/include/trace/kmemtrace.h
+++ b/include/trace/kmemtrace.h
@@ -9,65 +9,53 @@
 #ifdef __KERNEL__
+#include <linux/tracepoint.h>
 #include <linux/types.h>
-#include <linux/marker.h>
-enum kmemtrace_type_id {
-        KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
-        KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-        KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-};
 #ifdef CONFIG_KMEMTRACE
 extern void kmemtrace_init(void);
+#else
-extern void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
-                                             const void *ptr,
-                                             size_t bytes_req,
-                                             size_t bytes_alloc,
-                                             gfp_t gfp_flags,
-                                             int node);
-extern void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                       unsigned long call_site,
-                                       const void *ptr);
-#else /* CONFIG_KMEMTRACE */
 static inline void kmemtrace_init(void)
 {
 }
+#endif
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
+DECLARE_TRACE(kmalloc,
-                                             const void *ptr,
+              TP_PROTO(unsigned long call_site,
-                                             size_t bytes_req,
+                      const void *ptr,
-                                             size_t bytes_alloc,
+                      size_t bytes_req,
-                                             gfp_t gfp_flags,
+                      size_t bytes_alloc,
-                                             int node)
+                      gfp_t gfp_flags),
-{
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
-}
+DECLARE_TRACE(kmem_cache_alloc,
+              TP_PROTO(unsigned long call_site,
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
+                      const void *ptr,
-                                       unsigned long call_site,
+                      size_t bytes_req,
-                                       const void *ptr)
+                      size_t bytes_alloc,
-{
+                      gfp_t gfp_flags),
-}
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmalloc_node,
-#endif /* CONFIG_KMEMTRACE */
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
-static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id,
+                      size_t bytes_req,
-                                        unsigned long call_site,
+                      size_t bytes_alloc,
-                                        const void *ptr,
+                      gfp_t gfp_flags,
-                                        size_t bytes_req,
+                      int node),
-                                        size_t bytes_alloc,
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
-                                        gfp_t gfp_flags)
+DECLARE_TRACE(kmem_cache_alloc_node,
-{
+              TP_PROTO(unsigned long call_site,
-        kmemtrace_mark_alloc_node(type_id, call_site, ptr,
+                      const void *ptr,
-                                  bytes_req, bytes_alloc, gfp_flags, -1);
+                      size_t bytes_req,
-}
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags,
+                      int node),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kfree,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
+DECLARE_TRACE(kmem_cache_free,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
 #endif /* __KERNEL__ */
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
new file mode 100644
index 000000000000..8cfe515cbc47
--- /dev/null
+++ b/include/trace/syscall.h
@@ -0,0 +1,35 @@
+#ifndef _TRACE_SYSCALL_H
+#define _TRACE_SYSCALL_H
+#include <asm/ptrace.h>
+/*
+ * A syscall entry in the ftrace syscalls array.
+ *
+ * @name: name of the syscall
+ * @nb_args: number of parameters it takes
+ * @types: list of types as strings
+ * @args: list of args as strings (args[i] matches types[i])
+ */
+struct syscall_metadata {
+        const char      *name;
+        int             nb_args;
+        const char      **types;
+        const char      **args;
+};
+#ifdef CONFIG_FTRACE_SYSCALLS
+extern void arch_init_ftrace_syscalls(void);
+extern struct syscall_metadata *syscall_nr_to_meta(int nr);
+extern void start_ftrace_syscalls(void);
+extern void stop_ftrace_syscalls(void);
+extern void ftrace_syscall_enter(struct pt_regs *regs);
+extern void ftrace_syscall_exit(struct pt_regs *regs);
+#else
+static inline void start_ftrace_syscalls(void)                  { }
+static inline void stop_ftrace_syscalls(void)                   { }
+static inline void ftrace_syscall_enter(struct pt_regs *regs)   { }
+static inline void ftrace_syscall_exit(struct pt_regs *regs)    { }
+#endif
+#endif /* _TRACE_SYSCALL_H */
diff --git a/include/video/cyblafb.h b/include/video/cyblafb.h
deleted file mode 100644
index d3c1d4e2c8e3..000000000000
--- a/include/video/cyblafb.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef CYBLAFB_DEBUG
-#define CYBLAFB_DEBUG 0
-#endif
-#if CYBLAFB_DEBUG
-#define debug(f,a...)   printk("%s:" f,  __func__ , ## a);
-#else
-#define debug(f,a...)
-#endif
-#define output(f, a...) printk("cyblafb: " f, ## a)
-#define Kb      (1024)
-#define Mb      (Kb*Kb)
-/* PCI IDS of supported cards temporarily here */
-#define CYBERBLADEi1    0x8500
-/* these defines are for 'lcd' variable */
-#define LCD_STRETCH     0
-#define LCD_CENTER      1
-#define LCD_BIOS        2
-/* display types */
-#define DISPLAY_CRT     0
-#define DISPLAY_FP      1
-#define ROP_S   0xCC
-#define point(x,y) ((y)<<16|(x))
-//
-// Attribute Regs, ARxx, 3c0/3c1
-//
-#define AR00    0x00
-#define AR01    0x01
-#define AR02    0x02
-#define AR03    0x03
-#define AR04    0x04
-#define AR05    0x05
-#define AR06    0x06
-#define AR07    0x07
-#define AR08    0x08
-#define AR09    0x09
-#define AR0A    0x0A
-#define AR0B    0x0B
-#define AR0C    0x0C
-#define AR0D    0x0D
-#define AR0E    0x0E
-#define AR0F    0x0F
-#define AR10    0x10
-#define AR12    0x12
-#define AR13    0x13
-//
-// Sequencer Regs, SRxx, 3c4/3c5
-//
-#define SR00    0x00
-#define SR01    0x01
-#define SR02    0x02
-#define SR03    0x03
-#define SR04    0x04
-#define SR0D    0x0D
-#define SR0E    0x0E
-#define SR11    0x11
-#define SR18    0x18
-#define SR19    0x19
-//
-//
-//
-#define CR00    0x00
-#define CR01    0x01
-#define CR02    0x02
-#define CR03    0x03
-#define CR04    0x04
-#define CR05    0x05
-#define CR06    0x06
-#define CR07    0x07
-#define CR08    0x08
-#define CR09    0x09
-#define CR0A    0x0A
-#define CR0B    0x0B
-#define CR0C    0x0C
-#define CR0D    0x0D
-#define CR0E    0x0E
-#define CR0F    0x0F
-#define CR10    0x10
-#define CR11    0x11
-#define CR12    0x12
-#define CR13    0x13
-#define CR14    0x14
-#define CR15    0x15
-#define CR16    0x16
-#define CR17    0x17
-#define CR18    0x18
-#define CR19    0x19
-#define CR1A    0x1A
-#define CR1B    0x1B
-#define CR1C    0x1C
-#define CR1D    0x1D
-#define CR1E    0x1E
-#define CR1F    0x1F
-#define CR20    0x20
-#define CR21    0x21
-#define CR27    0x27
-#define CR29    0x29
-#define CR2A    0x2A
-#define CR2B    0x2B
-#define CR2D    0x2D
-#define CR2F    0x2F
-#define CR36    0x36
-#define CR38    0x38
-#define CR39    0x39
-#define CR3A    0x3A
-#define CR55    0x55
-#define CR56    0x56
-#define CR57    0x57
-#define CR58    0x58
-//
-//
-//
-#define GR00    0x01
-#define GR01    0x01
-#define GR02    0x02
-#define GR03    0x03
-#define GR04    0x04
-#define GR05    0x05
-#define GR06    0x06
-#define GR07    0x07
-#define GR08    0x08
-#define GR0F    0x0F
-#define GR20    0x20
-#define GR23    0x23
-#define GR2F    0x2F
-#define GR30    0x30
-#define GR31    0x31
-#define GR33    0x33
-#define GR52    0x52
-#define GR53    0x53
-#define GR5D    0x5d
-//
-// Graphics Engine
-//
-#define GEBase  0x2100          // could be mapped elsewhere if we like it
-#define GE00    (GEBase+0x00)   // source 1, p 111
-#define GE04    (GEBase+0x04)   // source 2, p 111
-#define GE08    (GEBase+0x08)   // destination 1, p 111
-#define GE0C    (GEBase+0x0C)   // destination 2, p 112
-#define GE10    (GEBase+0x10)   // right view base & enable, p 112
-#define GE13    (GEBase+0x13)   // left view base & enable, p 112
-#define GE18    (GEBase+0x18)   // block write start address, p 112
-#define GE1C    (GEBase+0x1C)   // block write end address, p 112
-#define GE20    (GEBase+0x20)   // engine status, p 113
-#define GE24    (GEBase+0x24)   // reset all GE pointers
-#define GE44    (GEBase+0x44)   // command register, p 126
-#define GE48    (GEBase+0x48)   // raster operation, p 127
-#define GE60    (GEBase+0x60)   // foreground color, p 128
-#define GE64    (GEBase+0x64)   // background color, p 128
-#define GE6C    (GEBase+0x6C)   // Pattern and Style, p 129, ok
-#define GE9C    (GEBase+0x9C)   // pixel engine data port, p 125
-#define GEB8    (GEBase+0xB8)   // Destination Stride / Buffer Base 0, p 133
-#define GEBC    (GEBase+0xBC)   // Destination Stride / Buffer Base 1, p 133
-#define GEC0    (GEBase+0xC0)   // Destination Stride / Buffer Base 2, p 133
-#define GEC4    (GEBase+0xC4)   // Destination Stride / Buffer Base 3, p 133
-#define GEC8    (GEBase+0xC8)   // Source Stride / Buffer Base 0, p 133
-#define GECC    (GEBase+0xCC)   // Source Stride / Buffer Base 1, p 133
-#define GED0    (GEBase+0xD0)   // Source Stride / Buffer Base 2, p 133
-#define GED4    (GEBase+0xD4)   // Source Stride / Buffer Base 3, p 133
diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index 7431d9681e57..befbaf0a92d8 100644
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -1,6 +1,9 @@
 #ifndef _TDFX_H
 #define _TDFX_H
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
 /* membase0 register offsets */
 #define STATUS          0x00
 #define PCIINIT0        0x04
@@ -123,6 +126,18 @@
 #define VIDCFG_PIXFMT_SHIFT             18
 #define DACMODE_2X                      BIT(0)
+/* I2C bit locations in the VIDSERPARPORT register */
+#define DDC_ENAB        0x00040000
+#define DDC_SCL_OUT     0x00080000
+#define DDC_SDA_OUT     0x00100000
+#define DDC_SCL_IN      0x00200000
+#define DDC_SDA_IN      0x00400000
+#define I2C_ENAB        0x00800000
+#define I2C_SCL_OUT     0x01000000
+#define I2C_SDA_OUT     0x02000000
+#define I2C_SCL_IN      0x04000000
+#define I2C_SDA_IN      0x08000000
 /* VGA rubbish, need to change this for multihead support */
 #define MISC_W          0x3c2
 #define MISC_R          0x3cc
@@ -168,12 +183,23 @@ struct banshee_reg {
        unsigned long miscinit0;
 };
+struct tdfx_par;
+struct tdfxfb_i2c_chan {
+        struct tdfx_par *par;
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
 struct tdfx_par {
        u32 max_pixclock;
        u32 palette[16];
        void __iomem *regbase_virt;
        unsigned long iobase;
        int mtrr_handle;
+#ifdef CONFIG_FB_3DFX_I2C
+        struct tdfxfb_i2c_chan chan[2];
+#endif
 };
 #endif  /* __KERNEL__ */