229 files changed, 2084 insertions, 5320 deletions

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 47faf27913a5..7f1e92930b62 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -64,7 +64,7 @@
 /* Host-dependent types and defines */
 
 #define ACPI_MACHINE_WIDTH          BITS_PER_LONG
-#define acpi_cache_t                        kmem_cache_t
+#define acpi_cache_t                        struct kmem_cache
 #define acpi_spinlock                   spinlock_t *
 #define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
 #define strtoul                     simple_strtoul
diff --git a/include/asm-alpha/dma-mapping.h b/include/asm-alpha/dma-mapping.h
index b9ff4d8cb33a..57e09f5e3424 100644
--- a/include/asm-alpha/dma-mapping.h
+++ b/include/asm-alpha/dma-mapping.h
@@ -51,7 +51,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 
 #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)
-#define dma_is_consistent(dev)                  (1)
+#define dma_is_consistent(d, h)                 (1)
 
 int dma_set_mask(struct device *dev, u64 mask);
 
@@ -60,7 +60,7 @@ int dma_set_mask(struct device *dev, u64 mask);
 #define dma_sync_single_range(dev, addr, off, size, dir)  do { } while (0)
 #define dma_sync_sg_for_cpu(dev, sg, nents, dir)          do { } while (0)
 #define dma_sync_sg_for_device(dev, sg, nents, dir)       do { } while (0)
-#define dma_cache_sync(va, size, dir)                     do { } while (0)
+#define dma_cache_sync(dev, va, size, dir)                do { } while (0)
 
 #define dma_get_cache_alignment()                         L1_CACHE_BYTES
 
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 2cabbd465c0c..84313d14e780 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -387,188 +387,6 @@
 
 #define NR_SYSCALLS                     447
 
-#if defined(__GNUC__)
-
-#define _syscall_return(type)                                           \
-        return (_sc_err ? errno = _sc_ret, _sc_ret = -1L : 0), (type) _sc_ret
-
-#define _syscall_clobbers                                               \
-        "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8",                 \
-        "$22", "$23", "$24", "$25", "$27", "$28"                        \
-
-#define _syscall0(type, name)                                           \
-type name(void)                                                         \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_19 __asm__("$19");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                __asm__("callsys # %0 %1 %2"                            \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0)                                    \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall1(type,name,type1,arg1)                                 \
-type name(type1 arg1)                                                   \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_19 __asm__("$19");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                __asm__("callsys # %0 %1 %2 %3"                         \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16)                       \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                      \
-type name(type1 arg1,type2 arg2)                                        \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_17 __asm__("$17");                    \
-                register long _sc_19 __asm__("$19");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                _sc_17 = (long) (arg2);                                 \
-                __asm__("callsys # %0 %1 %2 %3 %4"                      \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17)          \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)           \
-type name(type1 arg1,type2 arg2,type3 arg3)                             \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_17 __asm__("$17");                    \
-                register long _sc_18 __asm__("$18");                    \
-                register long _sc_19 __asm__("$19");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                _sc_17 = (long) (arg2);                                 \
-                _sc_18 = (long) (arg3);                                 \
-                __asm__("callsys # %0 %1 %2 %3 %4 %5"                   \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17),         \
-                          "r"(_sc_18)                                   \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4)               \
-{                                                                        \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_17 __asm__("$17");                    \
-                register long _sc_18 __asm__("$18");                    \
-                register long _sc_19 __asm__("$19");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                _sc_17 = (long) (arg2);                                 \
-                _sc_18 = (long) (arg3);                                 \
-                _sc_19 = (long) (arg4);                                 \
-                __asm__("callsys # %0 %1 %2 %3 %4 %5 %6"                \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17),         \
-                          "r"(_sc_18), "1"(_sc_19)                      \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5)                                                    \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)      \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_17 __asm__("$17");                    \
-                register long _sc_18 __asm__("$18");                    \
-                register long _sc_19 __asm__("$19");                    \
-                register long _sc_20 __asm__("$20");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                _sc_17 = (long) (arg2);                                 \
-                _sc_18 = (long) (arg3);                                 \
-                _sc_19 = (long) (arg4);                                 \
-                _sc_20 = (long) (arg5);                                 \
-                __asm__("callsys # %0 %1 %2 %3 %4 %5 %6 %7"             \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17),         \
-                          "r"(_sc_18), "1"(_sc_19), "r"(_sc_20)         \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6)                                         \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6)\
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_16 __asm__("$16");                    \
-                register long _sc_17 __asm__("$17");                    \
-                register long _sc_18 __asm__("$18");                    \
-                register long _sc_19 __asm__("$19");                    \
-                register long _sc_20 __asm__("$20");                    \
-                register long _sc_21 __asm__("$21");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                _sc_16 = (long) (arg1);                                 \
-                _sc_17 = (long) (arg2);                                 \
-                _sc_18 = (long) (arg3);                                 \
-                _sc_19 = (long) (arg4);                                 \
-                _sc_20 = (long) (arg5);                                 \
-                _sc_21 = (long) (arg6);                                 \
-                __asm__("callsys # %0 %1 %2 %3 %4 %5 %6 %7 %8"          \
-                        : "=r"(_sc_0), "=r"(_sc_19)                     \
-                        : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17),         \
-                          "r"(_sc_18), "1"(_sc_19), "r"(_sc_20), "r"(_sc_21) \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19;                      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#endif /* __GNUC__ */
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-arm/arch-omap/irda.h b/include/asm-arm/arch-omap/irda.h
index 805ae3575e44..345a649ec838 100644
--- a/include/asm-arm/arch-omap/irda.h
+++ b/include/asm-arm/arch-omap/irda.h
@@ -24,7 +24,7 @@ struct omap_irda_config {
         /* Very specific to the needs of some platforms (h3,h4)
          * having calls which can sleep in irda_set_speed.
          */
-        struct work_struct gpio_expa;
+        struct delayed_work gpio_expa;
         int rx_channel;
         int tx_channel;
         unsigned long dest_start;
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index 666617711c81..9bc46b486afb 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -48,7 +48,7 @@ static inline int dma_get_cache_alignment(void)
         return 32;
 }
 
-static inline int dma_is_consistent(dma_addr_t handle)
+static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
 {
         return !!arch_is_coherent();
 }
diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index aa4b5782f0c9..e5407392afca 100644
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -14,55 +14,57 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
 
+#include <asm/types.h>
+
 #define COMMAND_LINE_SIZE 1024
 
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE       0x00000000
 
 struct tag_header {
-        u32 size;
-        u32 tag;
+        __u32 size;
+        __u32 tag;
 };
 
 /* The list must start with an ATAG_CORE node */
 #define ATAG_CORE       0x54410001
 
 struct tag_core {
-        u32 flags;              /* bit 0 = read-only */
-        u32 pagesize;
-        u32 rootdev;
+        __u32 flags;            /* bit 0 = read-only */
+        __u32 pagesize;
+        __u32 rootdev;
 };
 
 /* it is allowed to have multiple ATAG_MEM nodes */
 #define ATAG_MEM        0x54410002
 
 struct tag_mem32 {
-        u32     size;
-        u32     start;  /* physical start address */
+        __u32   size;
+        __u32   start;  /* physical start address */
 };
 
 /* VGA text type displays */
 #define ATAG_VIDEOTEXT  0x54410003
 
 struct tag_videotext {
-        u8              x;
-        u8              y;
-        u16             video_page;
-        u8              video_mode;
-        u8              video_cols;
-        u16             video_ega_bx;
-        u8              video_lines;
-        u8              video_isvga;
-        u16             video_points;
+        __u8            x;
+        __u8            y;
+        __u16           video_page;
+        __u8            video_mode;
+        __u8            video_cols;
+        __u16           video_ega_bx;
+        __u8            video_lines;
+        __u8            video_isvga;
+        __u16           video_points;
 };
 
 /* describes how the ramdisk will be used in kernel */
 #define ATAG_RAMDISK    0x54410004
 
 struct tag_ramdisk {
-        u32 flags;      /* bit 0 = load, bit 1 = prompt */
-        u32 size;       /* decompressed ramdisk size in _kilo_ bytes */
-        u32 start;      /* starting block of floppy-based RAM disk image */
+        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
+        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
+        __u32 start;    /* starting block of floppy-based RAM disk image */
 };
 
 /* describes where the compressed ramdisk image lives (virtual address) */
@@ -76,23 +78,23 @@ struct tag_ramdisk {
 #define ATAG_INITRD2    0x54420005
 
 struct tag_initrd {
-        u32 start;      /* physical start address */
-        u32 size;       /* size of compressed ramdisk image in bytes */
+        __u32 start;    /* physical start address */
+        __u32 size;     /* size of compressed ramdisk image in bytes */
 };
 
 /* board serial number. "64 bits should be enough for everybody" */
 #define ATAG_SERIAL     0x54410006
 
 struct tag_serialnr {
-        u32 low;
-        u32 high;
+        __u32 low;
+        __u32 high;
 };
 
 /* board revision */
 #define ATAG_REVISION   0x54410007
 
 struct tag_revision {
-        u32 rev;
+        __u32 rev;
 };
 
 /* initial values for vesafb-type framebuffers. see struct screen_info
@@ -101,20 +103,20 @@ struct tag_revision {
 #define ATAG_VIDEOLFB   0x54410008
 
 struct tag_videolfb {
-        u16             lfb_width;
-        u16             lfb_height;
-        u16             lfb_depth;
-        u16             lfb_linelength;
-        u32             lfb_base;
-        u32             lfb_size;
-        u8              red_size;
-        u8              red_pos;
-        u8              green_size;
-        u8              green_pos;
-        u8              blue_size;
-        u8              blue_pos;
-        u8              rsvd_size;
-        u8              rsvd_pos;
+        __u16           lfb_width;
+        __u16           lfb_height;
+        __u16           lfb_depth;
+        __u16           lfb_linelength;
+        __u32           lfb_base;
+        __u32           lfb_size;
+        __u8            red_size;
+        __u8            red_pos;
+        __u8            green_size;
+        __u8            green_pos;
+        __u8            blue_size;
+        __u8            blue_pos;
+        __u8            rsvd_size;
+        __u8            rsvd_pos;
 };
 
 /* command line: \0 terminated string */
@@ -128,17 +130,17 @@ struct tag_cmdline {
 #define ATAG_ACORN      0x41000101
 
 struct tag_acorn {
-        u32 memc_control_reg;
-        u32 vram_pages;
-        u8 sounddefault;
-        u8 adfsdrives;
+        __u32 memc_control_reg;
+        __u32 vram_pages;
+        __u8 sounddefault;
+        __u8 adfsdrives;
 };
 
 /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
 #define ATAG_MEMCLK     0x41000402
 
 struct tag_memclk {
-        u32 fmemclk;
+        __u32 fmemclk;
 };
 
 struct tag {
@@ -167,24 +169,26 @@ struct tag {
 };
 
 struct tagtable {
-        u32 tag;
+        __u32 tag;
         int (*parse)(const struct tag *);
 };
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
-#define __tagtable(tag, fn) \
-static struct tagtable __tagtable_##fn __tag = { tag, fn }
-
 #define tag_member_present(tag,member)                          \
         ((unsigned long)(&((struct tag *)0L)->member + 1)       \
                 <= (tag)->hdr.size * 4)
 
-#define tag_next(t)     ((struct tag *)((u32 *)(t) + (t)->hdr.size))
+#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
 #define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
 
 #define for_each_tag(t,base)            \
         for (t = base; t->hdr.size; t = tag_next(t))
 
+#ifdef __KERNEL__
+
+#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
+#define __tagtable(tag, fn) \
+static struct tagtable __tagtable_##fn __tag = { tag, fn }
+
 /*
  * Memory map description
  */
@@ -217,4 +221,6 @@ struct early_params {
 static struct early_params __early_##fn __attribute_used__      \
 __attribute__((__section__(".early_param.init"))) = { name, fn }
 
+#endif  /*  __KERNEL__  */
+
 #endif
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 14a87eec5a2d..d44c629d8424 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -377,156 +377,6 @@
 #endif
 
 #ifdef __KERNEL__
-#include <linux/err.h>
-#include <linux/linkage.h>
-
-#define __sys2(x) #x
-#define __sys1(x) __sys2(x)
-
-#ifndef __syscall
-#if defined(__thumb__) || defined(__ARM_EABI__)
-#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
-#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
-#define __syscall(name) "swi\t0"
-#else
-#define __SYS_REG(name)
-#define __SYS_REG_LIST(regs...) regs
-#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
-#endif
-#endif
-
-#define __syscall_return(type, res)                                     \
-do {                                                                    \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) {      \
-                errno = -(res);                                         \
-                res = -1;                                               \
-        }                                                               \
-        return (type) (res);                                            \
-} while (0)
-
-#define _syscall0(type,name)                                            \
-type name(void) {                                                       \
-  __SYS_REG(name)                                                       \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST()                                              \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall1(type,name,type1,arg1)                                 \
-type name(type1 arg1) {                                                 \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0) )                                  \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                      \
-type name(type1 arg1,type2 arg2) {                                      \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0), "r" (__r1) )                      \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)           \
-type name(type1 arg1,type2 arg2,type3 arg3) {                           \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) )          \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {             \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-  
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)     \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __r4 __asm__("r4") = (long)arg5;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2),           \
-                          "r" (__r3), "r" (__r4) )                      \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6)  \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) {     \
-  __SYS_REG(name)                                                       \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __r4 __asm__("r4") = (long)arg5;                        \
-  register long __r5 __asm__("r5") = (long)arg6;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2),           \
-                          "r" (__r3), "r" (__r4), "r" (__r5) )          \
-        : "memory" );                                                   \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-arm26/pgalloc.h b/include/asm-arm26/pgalloc.h
index 6437167b1ffe..7725af3ddb4d 100644
--- a/include/asm-arm26/pgalloc.h
+++ b/include/asm-arm26/pgalloc.h
@@ -15,7 +15,7 @@
 #include <asm/tlbflush.h>
 #include <linux/slab.h>
 
-extern kmem_cache_t *pte_cache;
+extern struct kmem_cache *pte_cache;
 
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr){
         return kmem_cache_alloc(pte_cache, GFP_KERNEL);
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h
index 6348931be65d..1a867b4e8d53 100644
--- a/include/asm-arm26/setup.h
+++ b/include/asm-arm26/setup.h
@@ -16,6 +16,8 @@
 
 #define COMMAND_LINE_SIZE 1024
 
+#ifdef __KERNEL__
+
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE       0x00000000
 
@@ -202,4 +204,6 @@ struct meminfo {
 
 extern struct meminfo meminfo;
 
+#endif  /*  __KERNEL__  */
+
 #endif
diff --git a/include/asm-arm26/unistd.h b/include/asm-arm26/unistd.h
index 25a5eead85be..4c3b919177e5 100644
--- a/include/asm-arm26/unistd.h
+++ b/include/asm-arm26/unistd.h
@@ -311,139 +311,6 @@
 #define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
 
 #ifdef __KERNEL__
-#include <linux/err.h>
-#include <linux/linkage.h>
-
-#define __sys2(x) #x
-#define __sys1(x) __sys2(x)
-
-#ifndef __syscall
-#define __syscall(name) "swi\t" __sys1(__NR_##name) ""
-#endif
-
-#define __syscall_return(type, res)                                     \
-do {                                                                    \
-        if ((unsigned long)(res) >= (unsigned long)-MAX_ERRNO) {        \
-                errno = -(res);                                         \
-                res = -1;                                               \
-        }                                                               \
-        return (type) (res);                                            \
-} while (0)
-
-#define _syscall0(type,name)                                            \
-type name(void) {                                                       \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        :                                                               \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall1(type,name,type1,arg1)                                 \
-type name(type1 arg1) {                                                 \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0)                                                    \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                      \
-type name(type1 arg1,type2 arg2) {                                      \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0),"r" (__r1)                                         \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)           \
-type name(type1 arg1,type2 arg2,type3 arg3) {                           \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0),"r" (__r1),"r" (__r2)                              \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {             \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3)                   \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-  
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)     \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __r4 __asm__("r4") = (long)arg5;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3),"r" (__r4)        \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6)  \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) {     \
-  register long __r0 __asm__("r0") = (long)arg1;                        \
-  register long __r1 __asm__("r1") = (long)arg2;                        \
-  register long __r2 __asm__("r2") = (long)arg3;                        \
-  register long __r3 __asm__("r3") = (long)arg4;                        \
-  register long __r4 __asm__("r4") = (long)arg5;                        \
-  register long __r5 __asm__("r5") = (long)arg6;                        \
-  register long __res_r0 __asm__("r0");                                 \
-  long __res;                                                           \
-  __asm__ __volatile__ (                                                \
-  __syscall(name)                                                       \
-        : "=r" (__res_r0)                                               \
-        : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3), "r" (__r4),"r" (__r5)            \
-        : "lr");                                                        \
-  __res = __res_r0;                                                     \
-  __syscall_return(type,__res);                                         \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-avr32/dma-mapping.h b/include/asm-avr32/dma-mapping.h
index 4c40cb41cdf8..0580b5d62bba 100644
--- a/include/asm-avr32/dma-mapping.h
+++ b/include/asm-avr32/dma-mapping.h
@@ -8,7 +8,8 @@
 #include <asm/cacheflush.h>
 #include <asm/io.h>
 
-extern void dma_cache_sync(void *vaddr, size_t size, int direction);
+extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+        int direction);
 
 /*
  * Return whether the given device DMA address mask can be supported
@@ -307,7 +308,7 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
 #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)
 
-static inline int dma_is_consistent(dma_addr_t dma_addr)
+static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 1;
 }
diff --git a/include/asm-avr32/setup.h b/include/asm-avr32/setup.h
index 10193da4113b..0a5224245e44 100644
--- a/include/asm-avr32/setup.h
+++ b/include/asm-avr32/setup.h
@@ -13,6 +13,8 @@
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 /* Magic number indicating that a tag table is present */
 #define ATAG_MAGIC      0xa2a25441
 
@@ -138,4 +140,6 @@ void chip_enable_sdram(void);
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_AVR32_SETUP_H__ */
diff --git a/include/asm-cris/arch-v10/bitops.h b/include/asm-cris/arch-v10/bitops.h
index b73f5396e5a6..be85f6de25d3 100644
--- a/include/asm-cris/arch-v10/bitops.h
+++ b/include/asm-cris/arch-v10/bitops.h
@@ -10,7 +10,7 @@
  * number.  They differ in that the first function also inverts all bits
  * in the input.
  */
-extern inline unsigned long cris_swapnwbrlz(unsigned long w)
+static inline unsigned long cris_swapnwbrlz(unsigned long w)
 {
         /* Let's just say we return the result in the same register as the
            input.  Saying we clobber the input but can return the result
@@ -26,7 +26,7 @@ extern inline unsigned long cris_swapnwbrlz(unsigned long w)
         return res;
 }
 
-extern inline unsigned long cris_swapwbrlz(unsigned long w)
+static inline unsigned long cris_swapwbrlz(unsigned long w)
 {
         unsigned res;
         __asm__ ("swapwbr %0 \n\t"
@@ -40,7 +40,7 @@ extern inline unsigned long cris_swapwbrlz(unsigned long w)
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-extern inline unsigned long ffz(unsigned long w)
+static inline unsigned long ffz(unsigned long w)
 {
         return cris_swapnwbrlz(w);
 }
@@ -51,7 +51,7 @@ extern inline unsigned long ffz(unsigned long w)
  *
  * Undefined if no bit exists, so code should check against 0 first.
  */
-extern inline unsigned long __ffs(unsigned long word)
+static inline unsigned long __ffs(unsigned long word)
 {
         return cris_swapnwbrlz(~word);
 }
@@ -65,7 +65,7 @@ extern inline unsigned long __ffs(unsigned long word)
  * differs in spirit from the above ffz (man ffs).
  */
 
-extern inline unsigned long kernel_ffs(unsigned long w)
+static inline unsigned long kernel_ffs(unsigned long w)
 {
         return w ? cris_swapwbrlz (w) + 1 : 0;
 }
diff --git a/include/asm-cris/dma-mapping.h b/include/asm-cris/dma-mapping.h
index cbf1a98f0129..662cea70152d 100644
--- a/include/asm-cris/dma-mapping.h
+++ b/include/asm-cris/dma-mapping.h
@@ -156,10 +156,10 @@ dma_get_cache_alignment(void)
         return (1 << INTERNODE_CACHE_SHIFT);
 }
 
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
 }
diff --git a/include/asm-cris/semaphore-helper.h b/include/asm-cris/semaphore-helper.h
index dbd0f30b85b6..a8e1e6cb7cd0 100644
--- a/include/asm-cris/semaphore-helper.h
+++ b/include/asm-cris/semaphore-helper.h
@@ -20,12 +20,12 @@
 /*
  * These two _must_ execute atomically wrt each other.
  */
-extern inline void wake_one_more(struct semaphore * sem)
+static inline void wake_one_more(struct semaphore * sem)
 {
         atomic_inc(&sem->waking);
 }
 
-extern inline int waking_non_zero(struct semaphore *sem)
+static inline int waking_non_zero(struct semaphore *sem)
 {
         unsigned long flags;
         int ret = 0;
@@ -40,7 +40,7 @@ extern inline int waking_non_zero(struct semaphore *sem)
         return ret;
 }
 
-extern inline int waking_non_zero_interruptible(struct semaphore *sem,
+static inline int waking_non_zero_interruptible(struct semaphore *sem,
                                                 struct task_struct *tsk)
 {
         int ret = 0;
@@ -59,7 +59,7 @@ extern inline int waking_non_zero_interruptible(struct semaphore *sem,
         return ret;
 }
 
-extern inline int waking_non_zero_trylock(struct semaphore *sem)
+static inline int waking_non_zero_trylock(struct semaphore *sem)
 {
         int ret = 1;
         unsigned long flags;
diff --git a/include/asm-frv/dma-mapping.h b/include/asm-frv/dma-mapping.h
index e9fc1d47797e..bcb2df68496e 100644
--- a/include/asm-frv/dma-mapping.h
+++ b/include/asm-frv/dma-mapping.h
@@ -172,10 +172,10 @@ int dma_get_cache_alignment(void)
         return 1 << L1_CACHE_SHIFT;
 }
 
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                     enum dma_data_direction direction)
 {
         flush_write_buffers();
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index 0f390f41f816..ff4d6cdeb152 100644
--- a/include/asm-frv/highmem.h
+++ b/include/asm-frv/highmem.h
@@ -115,7 +115,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 {
         unsigned long paddr;
 
-        inc_preempt_count();
+        pagefault_disable();
         paddr = page_to_phys(page);
 
         switch (type) {
@@ -170,8 +170,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
         default:
                 BUG();
         }
-        dec_preempt_count();
-        preempt_check_resched();
+        pagefault_enable();
 }
 
 #endif /* !__ASSEMBLY__ */
diff --git a/include/asm-frv/param.h b/include/asm-frv/param.h
index 168381ebb41a..365653b1726c 100644
--- a/include/asm-frv/param.h
+++ b/include/asm-frv/param.h
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN          64      /* max length of hostname */
-#define COMMAND_LINE_SIZE       512
 
 #endif /* _ASM_PARAM_H */
diff --git a/include/asm-frv/setup.h b/include/asm-frv/setup.h
index 0d293b9a5857..afd787ceede6 100644
--- a/include/asm-frv/setup.h
+++ b/include/asm-frv/setup.h
@@ -12,6 +12,10 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
 
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #include <linux/init.h>
 
 #ifndef __ASSEMBLY__
@@ -22,4 +26,6 @@ extern unsigned long __initdata num_mappedpages;
 
 #endif /* !__ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _ASM_SETUP_H */
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index 725e854928cf..584c0417ae4d 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -320,125 +320,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls 310
-#include <linux/err.h>
-
-/*
- * process the return value of a syscall, consigning it to one of two possible fates
- * - user-visible error numbers are in the range -1 - -4095: see <asm-frv/errno.h>
- */
-#undef __syscall_return
-#define __syscall_return(type, res)                                     \
-do {                                                                    \
-        unsigned long __sr2 = (res);                                    \
-        if (__builtin_expect(__sr2 >= (unsigned long)(-MAX_ERRNO), 0)) { \
-                errno = (-__sr2);                                       \
-                __sr2 = ~0UL;                                           \
-        }                                                               \
-        return (type) __sr2;                                            \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-
-#undef _syscall0
-#define _syscall0(type,name)                                            \
-type name(void)                                                         \
-{                                                                       \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name); \
-        register unsigned long __sc0 __asm__ ("gr8");                   \
-        __asm__ __volatile__ ("tira gr0,#0"                             \
-                              : "=r" (__sc0)                            \
-                              : "r" (__scnum));                         \
-        __syscall_return(type, __sc0);                                  \
-}
-
-#undef _syscall1
-#define _syscall1(type,name,type1,arg1)                                         \
-type name(type1 arg1)                                                           \
-{                                                                               \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);         \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;    \
-        __asm__ __volatile__ ("tira gr0,#0"                                     \
-                              : "+r" (__sc0)                                    \
-                              : "r" (__scnum));                                 \
-        __syscall_return(type, __sc0);                                          \
-}
-
-#undef _syscall2
-#define _syscall2(type,name,type1,arg1,type2,arg2)                              \
-type name(type1 arg1,type2 arg2)                                                \
-{                                                                               \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);         \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;    \
-        register unsigned long __sc1 __asm__ ("gr9") = (unsigned long) arg2;    \
-        __asm__ __volatile__ ("tira gr0,#0"                                     \
-                              : "+r" (__sc0)                                    \
-                              : "r" (__scnum), "r" (__sc1));                    \
-        __syscall_return(type, __sc0);                                          \
-}
-
-#undef _syscall3
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)                   \
-type name(type1 arg1,type2 arg2,type3 arg3)                                     \
-{                                                                               \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);         \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;    \
-        register unsigned long __sc1 __asm__ ("gr9") = (unsigned long) arg2;    \
-        register unsigned long __sc2 __asm__ ("gr10") = (unsigned long) arg3;   \
-        __asm__ __volatile__ ("tira gr0,#0"                                     \
-                              : "+r" (__sc0)                                    \
-                              : "r" (__scnum), "r" (__sc1), "r" (__sc2));       \
-        __syscall_return(type, __sc0);                                          \
-}
-
-#undef _syscall4
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)                \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4)                              \
-{                                                                                       \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);                 \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;            \
-        register unsigned long __sc1 __asm__ ("gr9") = (unsigned long) arg2;            \
-        register unsigned long __sc2 __asm__ ("gr10") = (unsigned long) arg3;           \
-        register unsigned long __sc3 __asm__ ("gr11") = (unsigned long) arg4;           \
-        __asm__ __volatile__ ("tira gr0,#0"                                             \
-                              : "+r" (__sc0)                                            \
-                              : "r" (__scnum), "r" (__sc1), "r" (__sc2), "r" (__sc3));  \
-        __syscall_return(type, __sc0);                                                  \
-}
-
-#undef _syscall5
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)     \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)                  \
-{                                                                                       \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);                 \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;            \
-        register unsigned long __sc1 __asm__ ("gr9") = (unsigned long) arg2;            \
-        register unsigned long __sc2 __asm__ ("gr10") = (unsigned long) arg3;           \
-        register unsigned long __sc3 __asm__ ("gr11") = (unsigned long) arg4;           \
-        register unsigned long __sc4 __asm__ ("gr12") = (unsigned long) arg5;           \
-        __asm__ __volatile__ ("tira gr0,#0"                                             \
-                              : "+r" (__sc0)                                            \
-                              : "r" (__scnum), "r" (__sc1), "r" (__sc2),                \
-                              "r" (__sc3), "r" (__sc4));                                \
-        __syscall_return(type, __sc0);                                                  \
-}
-
-#undef _syscall6
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6, arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6)               \
-{                                                                                                \
-        register unsigned long __scnum __asm__ ("gr7") = (__NR_##name);                          \
-        register unsigned long __sc0 __asm__ ("gr8") = (unsigned long) arg1;                     \
-        register unsigned long __sc1 __asm__ ("gr9") = (unsigned long) arg2;                     \
-        register unsigned long __sc2 __asm__ ("gr10") = (unsigned long) arg3;                    \
-        register unsigned long __sc3 __asm__ ("gr11") = (unsigned long) arg4;                    \
-        register unsigned long __sc4 __asm__ ("gr12") = (unsigned long) arg5;                    \
-        register unsigned long __sc5 __asm__ ("gr13") = (unsigned long) arg6;                    \
-        __asm__ __volatile__ ("tira gr0,#0"                                                      \
-                              : "+r" (__sc0)                                                     \
-                              : "r" (__scnum), "r" (__sc1), "r" (__sc2),                         \
-                              "r" (__sc3), "r" (__sc4), "r" (__sc5));                            \
-        __syscall_return(type, __sc0);                                                           \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 /* #define __ARCH_WANT_OLD_READDIR */
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 3c06be381701..fa14f8cd30c5 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -1,4 +1,3 @@
-header-y += atomic.h
 header-y += errno-base.h
 header-y += errno.h
 header-y += fcntl.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index a84c3d88a189..a37e95fe58d6 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -14,6 +14,7 @@ unifdef-y += posix_types.h
 unifdef-y += ptrace.h
 unifdef-y += resource.h
 unifdef-y += sembuf.h
+unifdef-y += setup.h
 unifdef-y += shmbuf.h
 unifdef-y += sigcontext.h
 unifdef-y += siginfo.h
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 42a95d9a0641..b7e4a0467cb1 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -66,7 +66,7 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
         atomic64_sub(i, v);
 }
 
-#else
+#else  /*  BITS_PER_LONG == 64  */
 
 typedef atomic_t atomic_long_t;
 
@@ -113,5 +113,6 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
         atomic_sub(i, v);
 }
 
-#endif
-#endif
+#endif  /*  BITS_PER_LONG == 64  */
+
+#endif  /*  _ASM_GENERIC_ATOMIC_H  */
diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h
index b541e48cc545..783ab9944d70 100644
--- a/include/asm-generic/dma-mapping.h
+++ b/include/asm-generic/dma-mapping.h
@@ -266,7 +266,7 @@ dma_error(dma_addr_t dma_addr)
 
 #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)
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline int
 dma_get_cache_alignment(void)
@@ -295,7 +295,7 @@ dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
 }
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         /* could define this in terms of the dma_cache ... operations,
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index df893c160318..f422df0956a2 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -21,7 +21,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -33,7 +33,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-h8300/delay.h b/include/asm-h8300/delay.h
index cbccbbdd640f..743beba70f82 100644
--- a/include/asm-h8300/delay.h
+++ b/include/asm-h8300/delay.h
@@ -9,7 +9,7 @@
  * Delay routines, using a pre-computed "loops_per_second" value.
  */
 
-extern __inline__ void __delay(unsigned long loops)
+static inline void __delay(unsigned long loops)
 {
         __asm__ __volatile__ ("1:\n\t"
                               "dec.l #1,%0\n\t"
@@ -27,7 +27,7 @@ extern __inline__ void __delay(unsigned long loops)
 
 extern unsigned long loops_per_jiffy;
 
-extern __inline__ void udelay(unsigned long usecs)
+static inline void udelay(unsigned long usecs)
 {
         usecs *= 4295;          /* 2**32 / 1000000 */
         usecs /= (loops_per_jiffy*HZ);
diff --git a/include/asm-h8300/mmu_context.h b/include/asm-h8300/mmu_context.h
index 855721a5dcc9..5c165f7bee0e 100644
--- a/include/asm-h8300/mmu_context.h
+++ b/include/asm-h8300/mmu_context.h
@@ -9,7 +9,7 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 {
 }
 
-extern inline int
+static inline int
 init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
         // mm->context = virt_to_phys(mm->pgd);
@@ -23,7 +23,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str
 {
 }
 
-extern inline void activate_mm(struct mm_struct *prev_mm,
+static inline void activate_mm(struct mm_struct *prev_mm,
                                struct mm_struct *next_mm)
 {
 }
diff --git a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h
index 5edad5b70fd5..0c771b05fdd5 100644
--- a/include/asm-h8300/pci.h
+++ b/include/asm-h8300/pci.h
@@ -10,12 +10,12 @@
 #define pcibios_assign_all_busses()     0
 #define pcibios_scan_all_fns(a, b)      0
 
-extern inline void pcibios_set_master(struct pci_dev *dev)
+static inline void pcibios_set_master(struct pci_dev *dev)
 {
         /* No special bus mastering setup handling */
 }
 
-extern inline void pcibios_penalize_isa_irq(int irq, int active)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
         /* We don't do dynamic PCI IRQ allocation */
 }
diff --git a/include/asm-h8300/tlbflush.h b/include/asm-h8300/tlbflush.h
index bbdffbeeedef..9a2c5c9fd700 100644
--- a/include/asm-h8300/tlbflush.h
+++ b/include/asm-h8300/tlbflush.h
@@ -47,12 +47,12 @@ static inline void flush_tlb_range(struct mm_struct *mm,
         BUG();
 }
 
-extern inline void flush_tlb_kernel_page(unsigned long addr)
+static inline void flush_tlb_kernel_page(unsigned long addr)
 {
         BUG();
 }
 
-extern inline void flush_tlb_pgtables(struct mm_struct *mm,
+static inline void flush_tlb_pgtables(struct mm_struct *mm,
                                       unsigned long start, unsigned long end)
 {
         BUG();
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 747788d629ae..7ddd414f8d16 100644
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -295,172 +295,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls 289
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
-   <asm-m68k/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-        /* avoid using res which is declared to be in register d0; \
-           errno might expand to a function call and clobber it.  */ \
-                int __err = -(res); \
-                errno = __err; \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-#define _syscall0(type, name)                           \
-type name(void)                                         \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  __asm__ __volatile__ ("mov.l %1,er0\n\t"              \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name)             \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall1(type, name, atype, a)                 \
-type name(atype a)                                      \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  _a = (long)a;                                         \
-  __asm__ __volatile__ ("mov.l %1,er0\n\t"              \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall2(type, name, atype, a, btype, b)       \
-type name(atype a, btype b)                             \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  register long _b __asm__("er2");                      \
-  _a = (long)a;                                         \
-  _b = (long)b;                                         \
-  __asm__ __volatile__ ("mov.l %1,er0\n\t"              \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a),                     \
-                          "g" (_b)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall3(type, name, atype, a, btype, b, ctype, c)     \
-type name(atype a, btype b, ctype c)                    \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  register long _b __asm__("er2");                      \
-  register long _c __asm__("er3");                      \
-  _a = (long)a;                                         \
-  _b = (long)b;                                         \
-  _c = (long)c;                                         \
-  __asm__ __volatile__ ("mov.l %1,er0\n\t"              \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a),                     \
-                          "g" (_b),                     \
-                          "g" (_c)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall4(type, name, atype, a, btype, b,       \
-                  ctype, c, dtype, d)                   \
-type name(atype a, btype b, ctype c, dtype d)           \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  register long _b __asm__("er2");                      \
-  register long _c __asm__("er3");                      \
-  register long _d __asm__("er4");                      \
-  _a = (long)a;                                         \
-  _b = (long)b;                                         \
-  _c = (long)c;                                         \
-  _d = (long)d;                                         \
-  __asm__ __volatile__ ("mov.l  %1,er0\n\t"             \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a),                     \
-                          "g" (_b),                     \
-                          "g" (_c),                     \
-                          "g" (_d)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall5(type, name, atype, a, btype, b,       \
-                  ctype, c, dtype, d, etype, e)         \
-type name(atype a, btype b, ctype c, dtype d, etype e)  \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  register long _b __asm__("er2");                      \
-  register long _c __asm__("er3");                      \
-  register long _d __asm__("er4");                      \
-  register long _e __asm__("er5");                      \
-  _a = (long)a;                                         \
-  _b = (long)b;                                         \
-  _c = (long)c;                                         \
-  _d = (long)d;                                         \
-  _e = (long)e;                                         \
-  __asm__ __volatile__ ("mov.l  %1,er0\n\t"             \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a),                     \
-                          "g" (_b),                     \
-                          "g" (_c),                     \
-                          "g" (_d),                     \
-                          "g" (_e)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
-
-#define _syscall6(type, name, atype, a, btype, b,       \
-                  ctype, c, dtype, d, etype, e, ftype, f)       \
-type name(atype a, btype b, ctype c, dtype d, etype e, ftype f) \
-{                                                       \
-  register long __res __asm__("er0");                   \
-  register long _a __asm__("er1");                      \
-  register long _b __asm__("er2");                      \
-  register long _c __asm__("er3");                      \
-  register long _d __asm__("er4");                      \
-  register long _e __asm__("er5");                      \
-  register long _f __asm__("er6");                      \
-  _a = (long)a;                                         \
-  _b = (long)b;                                         \
-  _c = (long)c;                                         \
-  _d = (long)d;                                         \
-  _e = (long)e;                                         \
-  _f = (long)f;                                         \
-  __asm__ __volatile__ ("mov.l  %1,er0\n\t"             \
-                        "trapa  #0\n\t"                 \
-                        : "=r" (__res)                  \
-                        : "g" (__NR_##name),            \
-                          "g" (_a),                     \
-                          "g" (_b),                     \
-                          "g" (_c),                     \
-                          "g" (_d),                     \
-                          "g" (_e)                      \
-                          "g" (_f)                      \
-                        : "cc", "memory");              \
-  __syscall_return(type, __res);                        \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index 147e4ac1ebf0..5ae93afc67e1 100644
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -7,5 +7,4 @@ header-y += ptrace-abi.h
 header-y += ucontext.h
 
 unifdef-y += mtrr.h
-unifdef-y += setup.h
 unifdef-y += vm86.h
diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h
index 6aab7a105fad..c57441bb2905 100644
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -14,7 +14,7 @@
  * on us. We need to use _exactly_ the address the user gave us,
  * not some alias that contains the same information.
  */
-typedef struct { volatile int counter; } atomic_t;
+typedef struct { int counter; } atomic_t;
 
 #define ATOMIC_INIT(i)  { (i) }
 
diff --git a/include/asm-i386/dma-mapping.h b/include/asm-i386/dma-mapping.h
index 81999a3ebe7c..183eebeebbdc 100644
--- a/include/asm-i386/dma-mapping.h
+++ b/include/asm-i386/dma-mapping.h
@@ -156,10 +156,10 @@ dma_get_cache_alignment(void)
         return (1 << INTERNODE_CACHE_SHIFT);
 }
 
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         flush_write_buffers();
diff --git a/include/asm-i386/futex.h b/include/asm-i386/futex.h
index 946d97cfea23..438ef0ec7101 100644
--- a/include/asm-i386/futex.h
+++ b/include/asm-i386/futex.h
@@ -56,7 +56,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         if (op == FUTEX_OP_SET)
                 __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
@@ -88,7 +88,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 }
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 61b073322006..3503ad66945e 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -120,13 +120,26 @@ static inline int pfn_valid(int pfn)
         __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages(x) \
         __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0)
-#define alloc_bootmem_node(ignore, x) \
-        __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
-#define alloc_bootmem_pages_node(ignore, x) \
-        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
-#define alloc_bootmem_low_pages_node(ignore, x) \
-        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0)
-
+#define alloc_bootmem_node(pgdat, x)                                    \
+({                                                                      \
+        struct pglist_data  __attribute__ ((unused))                    \
+                                *__alloc_bootmem_node__pgdat = (pgdat); \
+        __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES,        \
+                                                __pa(MAX_DMA_ADDRESS)); \
+})
+#define alloc_bootmem_pages_node(pgdat, x)                              \
+({                                                                      \
+        struct pglist_data  __attribute__ ((unused))                    \
+                                *__alloc_bootmem_node__pgdat = (pgdat); \
+        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE,              \
+                                                __pa(MAX_DMA_ADDRESS))  \
+})
+#define alloc_bootmem_low_pages_node(pgdat, x)                          \
+({                                                                      \
+        struct pglist_data  __attribute__ ((unused))                    \
+                                *__alloc_bootmem_node__pgdat = (pgdat); \
+        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0);          \
+})
 #endif /* CONFIG_NEED_MULTIPLE_NODES */
 
 #endif /* _ASM_MMZONE_H_ */
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h
index 745dc5bd0fbc..21b32466fcdc 100644
--- a/include/asm-i386/param.h
+++ b/include/asm-i386/param.h
@@ -18,6 +18,5 @@
 #endif
 
 #define MAXHOSTNAMELEN  64      /* max length of hostname */
-#define COMMAND_LINE_SIZE 256
 
 #endif
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index b4a301f647ba..e6a4723f0eb1 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -35,14 +35,14 @@ struct vm_area_struct;
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 extern unsigned long empty_zero_page[1024];
 extern pgd_t swapper_pg_dir[1024];
-extern kmem_cache_t *pgd_cache;
-extern kmem_cache_t *pmd_cache;
+extern struct kmem_cache *pgd_cache;
+extern struct kmem_cache *pmd_cache;
 extern spinlock_t pgd_lock;
 extern struct page *pgd_list;
 
-void pmd_ctor(void *, kmem_cache_t *, unsigned long);
-void pgd_ctor(void *, kmem_cache_t *, unsigned long);
-void pgd_dtor(void *, kmem_cache_t *, unsigned long);
+void pmd_ctor(void *, struct kmem_cache *, unsigned long);
+void pgd_ctor(void *, struct kmem_cache *, unsigned long);
+void pgd_dtor(void *, struct kmem_cache *, unsigned long);
 void pgtable_cache_init(void);
 void paging_init(void);
 
diff --git a/include/asm-i386/rwsem.h b/include/asm-i386/rwsem.h
index bc598d6388e3..041906f3c6df 100644
--- a/include/asm-i386/rwsem.h
+++ b/include/asm-i386/rwsem.h
@@ -75,8 +75,8 @@ struct rw_semaphore {
 
 
 #define __RWSEM_INITIALIZER(name) \
-{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \
-        __RWSEM_DEP_MAP_INIT(name) }
+{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
+  LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
 
 #define DECLARE_RWSEM(name) \
         struct rw_semaphore name = __RWSEM_INITIALIZER(name)
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h
index 9930c5a355fc..67659dbaf120 100644
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -6,6 +6,8 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
 #include <linux/pfn.h>
 
@@ -14,10 +16,8 @@
  */
 #define MAXMEM_PFN      PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN  (1 << 20)
-#endif
 
 #define PARAM_SIZE 4096
-#define COMMAND_LINE_SIZE 256
 
 #define OLD_CL_MAGIC_ADDR       0x90020
 #define OLD_CL_MAGIC            0xA33F
@@ -79,4 +79,6 @@ void __init add_memory_region(unsigned long long start,
 
 #endif /* __ASSEMBLY__ */
 
+#endif  /*  __KERNEL__  */
+
 #endif /* _i386_SETUP_H */
diff --git a/include/asm-i386/spinlock_types.h b/include/asm-i386/spinlock_types.h
index 59efe849f351..4da9345c1500 100644
--- a/include/asm-i386/spinlock_types.h
+++ b/include/asm-i386/spinlock_types.h
@@ -6,13 +6,13 @@
 #endif
 
 typedef struct {
-        volatile unsigned int slock;
+        unsigned int slock;
 } raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED        { 1 }
 
 typedef struct {
-        volatile unsigned int lock;
+        unsigned int lock;
 } raw_rwlock_t;
 
 #define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h
index 30361526d568..8dbaafe611ff 100644
--- a/include/asm-i386/suspend.h
+++ b/include/asm-i386/suspend.h
@@ -6,18 +6,7 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 
-static inline int
-arch_prepare_suspend(void)
-{
-        /* If you want to make non-PSE machine work, turn off paging
-           in swsusp_arch_suspend. swsusp_pg_dir should have identity mapping, so
-           it could work...  */
-        if (!cpu_has_pse) {
-                printk(KERN_ERR "PSE is required for swsusp.\n");
-                return -EPERM;
-        }
-        return 0;
-}
+static inline int arch_prepare_suspend(void) { return 0; }
 
 /* image of the saved processor state */
 struct saved_context {
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index beeeaf6b054a..833fa1704ff9 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -329,104 +329,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls 320
-#include <linux/err.h>
-
-/*
- * user-visible error numbers are in the range -1 - -MAX_ERRNO: see
- * <asm-i386/errno.h>
- */
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-                errno = -(res); \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile ("int $0x80" \
-        : "=a" (__res) \
-        : "0" (__NR_##name)); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"ri" ((long)(arg1)) : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-                  "d" ((long)(arg3)) : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-          "d" ((long)(arg3)),"S" ((long)(arg4)) : "memory"); \
-__syscall_return(type,__res); \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; movl %1,%%eax ; " \
-                  "int $0x80 ; pop %%ebx" \
-        : "=a" (__res) \
-        : "i" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
-{ \
-long __res; \
-  struct { long __a1; long __a6; } __s = { (long)arg1, (long)arg6 }; \
-__asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \
-                  "movl 0(%2),%%ebx ; movl %1,%%eax ; int $0x80 ; " \
-                  "pop %%ebx ;  pop %%ebp" \
-        : "=a" (__res) \
-        : "i" (__NR_##name),"0" ((long)(&__s)),"c" ((long)(arg2)), \
-          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
index 15818a18bc52..4a1e48b9f403 100644
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
@@ -10,7 +10,6 @@ header-y += intrinsics.h
 header-y += perfmon_default_smpl.h
 header-y += ptrace_offsets.h
 header-y += rse.h
-header-y += setup.h
 header-y += ucontext.h
 
 unifdef-y += perfmon.h
diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index 99a8f8e1218c..ebd5887f4b1a 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -50,7 +50,8 @@ dma_set_mask (struct device *dev, u64 mask)
 extern int dma_get_cache_alignment(void);
 
 static inline void
-dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
+dma_cache_sync (struct device *dev, void *vaddr, size_t size,
+        enum dma_data_direction dir)
 {
         /*
          * IA-64 is cache-coherent, so this is mostly a no-op.  However, we do need to
@@ -59,6 +60,6 @@ dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
         mb();
 }
 
-#define dma_is_consistent(dma_handle)   (1)     /* all we do is coherent memory... */
+#define dma_is_consistent(d, h) (1)     /* all we do is coherent memory... */
 
 #endif /* _ASM_IA64_DMA_MAPPING_H */
diff --git a/include/asm-ia64/futex.h b/include/asm-ia64/futex.h
index 07d77f3a8cbe..8a98a2654139 100644
--- a/include/asm-ia64/futex.h
+++ b/include/asm-ia64/futex.h
@@ -59,7 +59,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -83,7 +83,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h
index 9cb68e9b377e..393e04c42a2c 100644
--- a/include/asm-ia64/pgalloc.h
+++ b/include/asm-ia64/pgalloc.h
@@ -60,7 +60,7 @@ static inline void *pgtable_quicklist_alloc(void)
 static inline void pgtable_quicklist_free(void *pgtable_entry)
 {
 #ifdef CONFIG_NUMA
-        unsigned long nid = page_to_nid(virt_to_page(pgtable_entry));
+        int nid = page_to_nid(virt_to_page(pgtable_entry));
 
         if (unlikely(nid != numa_node_id())) {
                 free_page((unsigned long)pgtable_entry);
diff --git a/include/asm-m32r/setup.h b/include/asm-m32r/setup.h
index 52f4fa29abfc..6a0b32202d4e 100644
--- a/include/asm-m32r/setup.h
+++ b/include/asm-m32r/setup.h
@@ -1,6 +1,11 @@
 /*
  * This is set up by the setup-routine at boot-time
  */
+
+#define COMMAND_LINE_SIZE       512
+
+#ifdef __KERNEL__
+
 #define PARAM                   ((unsigned char *)empty_zero_page)
 
 #define MOUNT_ROOT_RDONLY       (*(unsigned long *) (PARAM+0x000))
@@ -18,8 +23,6 @@
 
 #define SCREEN_INFO             (*(struct screen_info *) (PARAM+0x200))
 
-#define COMMAND_LINE_SIZE       (512)
-
 #define RAMDISK_IMAGE_START_MASK        (0x07FF)
 #define RAMDISK_PROMPT_FLAG             (0x8000)
 #define RAMDISK_LOAD_FLAG               (0x4000)
@@ -27,3 +30,5 @@
 extern unsigned long memory_start;
 extern unsigned long memory_end;
 
+#endif  /*  __KERNEL__  */
+
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index 95aa34298d82..5b66bd3c6ed6 100644
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -296,117 +296,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls 285
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
- * <asm-m32r/errno.h>
- */
-
-#include <asm/syscall.h>        /* SYSCALL_* */
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-        /* Avoid using "res" which is declared to be in register r0; \
-           errno might expand to a function call and clobber it.  */ \
-                int __err = -(res); \
-                errno = __err; \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __res __asm__("r0"); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __res __asm__ ("r0") = (long)(arg1); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno), "0" (__res) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __arg2 __asm__ ("r1") = (long)(arg2); \
-register long __res __asm__ ("r0") = (long)(arg1); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno), "0" (__res), "r" (__arg2) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __arg3 __asm__ ("r2") = (long)(arg3); \
-register long __arg2 __asm__ ("r1") = (long)(arg2); \
-register long __res __asm__ ("r0") = (long)(arg1); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno), "0" (__res), "r" (__arg2), \
-                "r" (__arg3) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name(type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __arg4 __asm__ ("r3") = (long)(arg4); \
-register long __arg3 __asm__ ("r2") = (long)(arg3); \
-register long __arg2 __asm__ ("r1") = (long)(arg2); \
-register long __res __asm__ ("r0") = (long)(arg1); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno), "0" (__res), "r" (__arg2), \
-                "r" (__arg3), "r" (__arg4) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-        type5,arg5) \
-type name(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-register long __scno __asm__ ("r7") = __NR_##name; \
-register long __arg5 __asm__ ("r4") = (long)(arg5); \
-register long __arg4 __asm__ ("r3") = (long)(arg4); \
-register long __arg3 __asm__ ("r2") = (long)(arg3); \
-register long __arg2 __asm__ ("r1") = (long)(arg2); \
-register long __res __asm__ ("r0") = (long)(arg1); \
-__asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR "|| nop"\
-        : "=r" (__res) \
-        : "r" (__scno), "0" (__res), "r" (__arg2), \
-                "r" (__arg3), "r" (__arg4), "r" (__arg5) \
-        : "memory"); \
-__syscall_return(type,__res); \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h
index d90d841d3dfd..00259ed6fc95 100644
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -21,7 +21,7 @@ static inline int dma_get_cache_alignment(void)
         return 1 << L1_CACHE_SHIFT;
 }
 
-static inline int dma_is_consistent(dma_addr_t dma_addr)
+static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return 0;
 }
@@ -41,7 +41,7 @@ static inline void dma_free_noncoherent(struct device *dev, size_t size,
 {
         dma_free_coherent(dev, size, addr, handle);
 }
-static inline void dma_cache_sync(void *vaddr, size_t size,
+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                                   enum dma_data_direction dir)
 {
         /* we use coherent allocation, so not much to do here. */
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 7facc9a46e74..2a8853cd6554 100644
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
@@ -41,8 +41,12 @@
 #define MACH_Q40     10
 #define MACH_SUN3X   11
 
+#define COMMAND_LINE_SIZE 256
+
 #ifdef __KERNEL__
 
+#define CL_SIZE COMMAND_LINE_SIZE
+
 #ifndef __ASSEMBLY__
 extern unsigned long m68k_machtype;
 #endif /* !__ASSEMBLY__ */
@@ -355,8 +359,6 @@ extern int m68k_is040or060;
      */
 
 #define NUM_MEMINFO     4
-#define CL_SIZE         256
-#define COMMAND_LINE_SIZE       CL_SIZE
 
 #ifndef __ASSEMBLY__
 struct mem_info {
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index ad4348058c66..fdbb60e6a0d4 100644
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -317,103 +317,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls             311
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
-   <asm-m68k/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-        /* avoid using res which is declared to be in register d0; \
-           errno might expand to a function call and clobber it.  */ \
-                int __err = -(res); \
-                errno = __err; \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,atype,a) \
-type name(atype a) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-register long __a __asm__ ("%d1") = (long)(a); \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) \
-                      : "d" (__a)  ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,atype,a,btype,b) \
-type name(atype a,btype b) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-register long __a __asm__ ("%d1") = (long)(a); \
-register long __b __asm__ ("%d2") = (long)(b); \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) \
-                      : "d" (__a), "d" (__b) \
-                     ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,atype,a,btype,b,ctype,c) \
-type name(atype a,btype b,ctype c) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-register long __a __asm__ ("%d1") = (long)(a); \
-register long __b __asm__ ("%d2") = (long)(b); \
-register long __c __asm__ ("%d3") = (long)(c); \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) \
-                      : "d" (__a), "d" (__b), \
-                        "d" (__c) \
-                     ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \
-type name (atype a, btype b, ctype c, dtype d) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-register long __a __asm__ ("%d1") = (long)(a); \
-register long __b __asm__ ("%d2") = (long)(b); \
-register long __c __asm__ ("%d3") = (long)(c); \
-register long __d __asm__ ("%d4") = (long)(d); \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) \
-                      : "d" (__a), "d" (__b), \
-                        "d" (__c), "d" (__d)  \
-                     ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-type name (atype a,btype b,ctype c,dtype d,etype e) \
-{ \
-register long __res __asm__ ("%d0") = __NR_##name; \
-register long __a __asm__ ("%d1") = (long)(a); \
-register long __b __asm__ ("%d2") = (long)(b); \
-register long __c __asm__ ("%d3") = (long)(c); \
-register long __d __asm__ ("%d4") = (long)(d); \
-register long __e __asm__ ("%d5") = (long)(e); \
-__asm__ __volatile__ ("trap  #0" \
-                      : "+d" (__res) \
-                      : "d" (__a), "d" (__b), \
-                        "d" (__c), "d" (__d), "d" (__e)  \
-                     ); \
-__syscall_return(type,__res); \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h
index 45e7a2fd1689..7b8f874f8429 100644
--- a/include/asm-m68knommu/irq.h
+++ b/include/asm-m68knommu/irq.h
@@ -86,5 +86,6 @@ extern void (*mach_disable_irq)(unsigned int);
 #define enable_irq(x)   do { } while (0)
 #define disable_irq(x)  do { } while (0)
 #define disable_irq_nosync(x)   disable_irq(x)
+#define irq_canonicalize(irq)   (irq)
 
 #endif /* _M68K_IRQ_H_ */
diff --git a/include/asm-m68knommu/rtc.h b/include/asm-m68knommu/rtc.h
new file mode 100644
index 000000000000..eaf18ec83c8e
--- /dev/null
+++ b/include/asm-m68knommu/rtc.h
@@ -0,0 +1 @@
+#include <asm-m68k/rtc.h>
diff --git a/include/asm-m68knommu/setup.h b/include/asm-m68knommu/setup.h
index d2b0fcce41b2..fb86bb2a6078 100644
--- a/include/asm-m68knommu/setup.h
+++ b/include/asm-m68knommu/setup.h
@@ -1,5 +1,10 @@
+#ifdef __KERNEL__
+
 #include <asm-m68k/setup.h>
 
 /* We have a bigger command line buffer. */
 #undef COMMAND_LINE_SIZE
+
+#endif  /*  __KERNEL__  */
+
 #define COMMAND_LINE_SIZE       512
diff --git a/include/asm-m68knommu/ucontext.h b/include/asm-m68knommu/ucontext.h
index 5d570cedbb02..713a27f901cd 100644
--- a/include/asm-m68knommu/ucontext.h
+++ b/include/asm-m68knommu/ucontext.h
@@ -5,21 +5,17 @@ typedef int greg_t;
 #define NGREG 18
 typedef greg_t gregset_t[NGREG];
 
-#ifdef CONFIG_FPU
 typedef struct fpregset {
         int f_pcr;
         int f_psr;
         int f_fpiaddr;
         int f_fpregs[8][3];
 } fpregset_t;
-#endif
 
 struct mcontext {
         int version;
         gregset_t gregs;
-#ifdef CONFIG_FPU
         fpregset_t fpregs;
-#endif
 };
 
 #define MCONTEXT_VERSION 2
@@ -29,9 +25,7 @@ struct ucontext {
         struct ucontext  *uc_link;
         stack_t           uc_stack;
         struct mcontext   uc_mcontext;
-#ifdef CONFIG_FPU
         unsigned long     uc_filler[80];
-#endif
         sigset_t          uc_sigmask;   /* mask last for extensibility */
 };
 
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index ebaf03197114..82e03195f325 100644
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -318,156 +318,6 @@
 #ifdef __KERNEL__
 
 #define NR_syscalls             311
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
-   <asm-m68k/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-        /* avoid using res which is declared to be in register d0; \
-           errno might expand to a function call and clobber it.  */ \
-                int __err = -(res); \
-                errno = __err; \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-#define _syscall0(type, name)                                                   \
-type name(void)                                                                 \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name)                                     \
-                        : "cc", "%d0");                                         \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
-
-#define _syscall1(type, name, atype, a)                                         \
-type name(atype a)                                                              \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %2, %%d1\n\t"                                   \
-                        "movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name),                                    \
-                          "g" ((long)a)                                         \
-                        : "cc", "%d0", "%d1");                                  \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
-
-#define _syscall2(type, name, atype, a, btype, b)                               \
-type name(atype a, btype b)                                                     \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %3, %%d2\n\t"                                   \
-                        "movel  %2, %%d1\n\t"                                   \
-                        "movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name),                                    \
-                          "a" ((long)a),                                        \
-                          "g" ((long)b)                                         \
-                        : "cc", "%d0", "%d1", "%d2");                           \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
-
-#define _syscall3(type, name, atype, a, btype, b, ctype, c)                     \
-type name(atype a, btype b, ctype c)                                            \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %4, %%d3\n\t"                                   \
-                        "movel  %3, %%d2\n\t"                                   \
-                        "movel  %2, %%d1\n\t"                                   \
-                        "movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name),                                    \
-                          "a" ((long)a),                                        \
-                          "a" ((long)b),                                        \
-                          "g" ((long)c)                                         \
-                        : "cc", "%d0", "%d1", "%d2", "%d3");                    \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
-
-#define _syscall4(type, name, atype, a, btype, b, ctype, c, dtype, d)           \
-type name(atype a, btype b, ctype c, dtype d)                                   \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %5, %%d4\n\t"                                   \
-                        "movel  %4, %%d3\n\t"                                   \
-                        "movel  %3, %%d2\n\t"                                   \
-                        "movel  %2, %%d1\n\t"                                   \
-                        "movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name),                                    \
-                          "a" ((long)a),                                        \
-                          "a" ((long)b),                                        \
-                          "a" ((long)c),                                        \
-                          "g" ((long)d)                                         \
-                        : "cc", "%d0", "%d1", "%d2", "%d3",                     \
-                          "%d4");                                               \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
-
-#define _syscall5(type, name, atype, a, btype, b, ctype, c, dtype, d, etype, e) \
-type name(atype a, btype b, ctype c, dtype d, etype e)                          \
-{                                                                               \
-  long __res;                                                                   \
-  __asm__ __volatile__ ("movel  %6, %%d5\n\t"                                   \
-                        "movel  %5, %%d4\n\t"                                   \
-                        "movel  %4, %%d3\n\t"                                   \
-                        "movel  %3, %%d2\n\t"                                   \
-                        "movel  %2, %%d1\n\t"                                   \
-                        "movel  %1, %%d0\n\t"                                   \
-                        "trap   #0\n\t"                                         \
-                        "movel  %%d0, %0"                                       \
-                        : "=g" (__res)                                          \
-                        : "i" (__NR_##name),                                    \
-                          "a" ((long)a),                                        \
-                          "a" ((long)b),                                        \
-                          "a" ((long)c),                                        \
-                          "a" ((long)d),                                        \
-                          "g" ((long)e)                                         \
-                        : "cc", "%d0", "%d1", "%d2", "%d3",                     \
-                          "%d4", "%d5");                                        \
-  if ((unsigned long)(__res) >= (unsigned long)(-125)) {                                \
-    errno = -__res;                                                             \
-    __res = -1;                                                                 \
-  }                                                                             \
-  return (type)__res;                                                           \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-mips/dma-mapping.h b/include/asm-mips/dma-mapping.h
index 43288634c38a..236d1a467cc7 100644
--- a/include/asm-mips/dma-mapping.h
+++ b/include/asm-mips/dma-mapping.h
@@ -63,9 +63,9 @@ dma_get_cache_alignment(void)
         return 128;
 }
 
-extern int dma_is_consistent(dma_addr_t dma_addr);
+extern int dma_is_consistent(struct device *dev, dma_addr_t dma_addr);
 
-extern void dma_cache_sync(void *vaddr, size_t size,
+extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction);
 
 #define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
diff --git a/include/asm-mips/futex.h b/include/asm-mips/futex.h
index 927a216bd530..47e5679c2353 100644
--- a/include/asm-mips/futex.h
+++ b/include/asm-mips/futex.h
@@ -88,7 +88,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -115,7 +115,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
index c976bfaaba83..f8c8182f7f2e 100644
--- a/include/asm-mips/highmem.h
+++ b/include/asm-mips/highmem.h
@@ -21,6 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/uaccess.h>
 #include <asm/kmap_types.h>
 
 /* undef for production */
@@ -70,11 +71,16 @@ static inline void *kmap(struct page *page)
 
 static inline void *kmap_atomic(struct page *page, enum km_type type)
 {
+        pagefault_disable();
         return page_address(page);
 }
 
-static inline void kunmap_atomic(void *kvaddr, enum km_type type) { }
-#define kmap_atomic_pfn(pfn, idx)       page_address(pfn_to_page(pfn))
+static inline void kunmap_atomic(void *kvaddr, enum km_type type)
+{
+        pagefault_enable();
+}
+
+#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx))
 
 #define kmap_atomic_to_page(ptr) virt_to_page(ptr)
 
diff --git a/include/asm-mips/i8259.h b/include/asm-mips/i8259.h
index 0214abe3f0af..4df8d8b118c0 100644
--- a/include/asm-mips/i8259.h
+++ b/include/asm-mips/i8259.h
@@ -19,10 +19,31 @@
 
 #include <asm/io.h>
 
+/* i8259A PIC registers */
+#define PIC_MASTER_CMD          0x20
+#define PIC_MASTER_IMR          0x21
+#define PIC_MASTER_ISR          PIC_MASTER_CMD
+#define PIC_MASTER_POLL         PIC_MASTER_ISR
+#define PIC_MASTER_OCW3         PIC_MASTER_ISR
+#define PIC_SLAVE_CMD           0xa0
+#define PIC_SLAVE_IMR           0xa1
+
+/* i8259A PIC related value */
+#define PIC_CASCADE_IR          2
+#define MASTER_ICW4_DEFAULT     0x01
+#define SLAVE_ICW4_DEFAULT      0x01
+#define PIC_ICW4_AEOI           2
+
 extern spinlock_t i8259A_lock;
 
+extern void init_8259A(int auto_eoi);
+extern void enable_8259A_irq(unsigned int irq);
+extern void disable_8259A_irq(unsigned int irq);
+
 extern void init_i8259_irqs(void);
 
+#define I8259A_IRQ_BASE 0
+
 /*
  * Do the traditional i8259 interrupt polling thing.  This is for the few
  * cases where no better interrupt acknowledge method is available and we
@@ -35,15 +56,15 @@ static inline int i8259_irq(void)
         spin_lock(&i8259A_lock);
 
         /* Perform an interrupt acknowledge cycle on controller 1. */
-        outb(0x0C, 0x20);               /* prepare for poll */
-        irq = inb(0x20) & 7;
-        if (irq == 2) {
+        outb(0x0C, PIC_MASTER_CMD);             /* prepare for poll */
+        irq = inb(PIC_MASTER_CMD) & 7;
+        if (irq == PIC_CASCADE_IR) {
                 /*
                  * Interrupt is cascaded so perform interrupt
                  * acknowledge on controller 2.
                  */
-                outb(0x0C, 0xA0);               /* prepare for poll */
-                irq = (inb(0xA0) & 7) + 8;
+                outb(0x0C, PIC_SLAVE_CMD);              /* prepare for poll */
+                irq = (inb(PIC_SLAVE_CMD) & 7) + 8;
         }
 
         if (unlikely(irq == 7)) {
@@ -54,14 +75,14 @@ static inline int i8259_irq(void)
                  * significant bit is not set then there is no valid
                  * interrupt.
                  */
-                outb(0x0B, 0x20);               /* ISR register */
-                if(~inb(0x20) & 0x80)
+                outb(0x0B, PIC_MASTER_ISR);             /* ISR register */
+                if(~inb(PIC_MASTER_ISR) & 0x80)
                         irq = -1;
         }
 
         spin_unlock(&i8259A_lock);
 
-        return irq;
+        return likely(irq >= 0) ? irq + I8259A_IRQ_BASE : irq;
 }
 
 #endif /* _ASM_I8259_H */
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index d20f2e9b28be..2fbd47eba32d 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -156,9 +156,9 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
 #define __pte_offset(address)                                           \
         (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset(dir, address)                                        \
-        ((pte_t *) (pmd_page_vaddr(*dir)) + __pte_offset(address))
-#define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_vaddr(*(dir)) +  __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address))
+#define pte_offset_kernel(dir, address)                                 \
+        ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address))
 
 #define pte_offset_map(dir, address)                                    \
         ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
diff --git a/include/asm-mips/pgtable-64.h b/include/asm-mips/pgtable-64.h
index b9b1e86493ee..a5b18710b6a4 100644
--- a/include/asm-mips/pgtable-64.h
+++ b/include/asm-mips/pgtable-64.h
@@ -212,9 +212,9 @@ static inline pmd_t *pmd_offset(pud_t * pud, unsigned long address)
 #define __pte_offset(address)                                           \
         (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset(dir, address)                                        \
-        ((pte_t *) (pmd_page_vaddr(*dir)) + __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address))
 #define pte_offset_kernel(dir, address)                                 \
-        ((pte_t *) pmd_page_vaddr(*(dir)) +  __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address))
 #define pte_offset_map(dir, address)                                    \
         ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
 #define pte_offset_map_nested(dir, address)                             \
diff --git a/include/asm-mips/setup.h b/include/asm-mips/setup.h
index 737fa4a6912e..70009a902639 100644
--- a/include/asm-mips/setup.h
+++ b/include/asm-mips/setup.h
@@ -1,8 +1,6 @@
-#ifdef __KERNEL__
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
 #define COMMAND_LINE_SIZE       256
 
 #endif /* __SETUP_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index ec56aa52f669..696cff39a1d3 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -933,268 +933,6 @@
 
 #ifndef __ASSEMBLY__
 
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-        register unsigned long __a3 asm("$7"); \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %2\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "=r" (__a3) \
-        : "i" (__NR_##name) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-/*
- * DANGER: This macro isn't usable for the pipe(2) call
- * which has a unusual return convention.
- */
-#define _syscall1(type,name,atype,a) \
-type name(atype a) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a3 asm("$7"); \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %3\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "=r" (__a3) \
-        : "r" (__a0), "i" (__NR_##name) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#define _syscall2(type,name,atype,a,btype,b) \
-type name(atype a, btype b) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a3 asm("$7"); \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %4\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "=r" (__a3) \
-        : "r" (__a0), "r" (__a1), "i" (__NR_##name) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#define _syscall3(type,name,atype,a,btype,b,ctype,c) \
-type name(atype a, btype b, ctype c) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7"); \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %5\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "=r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##name) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \
-type name(atype a, btype b, ctype c, dtype d) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7") = (unsigned long) d; \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %5\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "+r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##name) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#if (_MIPS_SIM == _MIPS_SIM_ABI32)
-
-/*
- * Using those means your brain needs more than an oil change ;-)
- */
-
-#define _syscall5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-type name(atype a, btype b, ctype c, dtype d, etype e) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7") = (unsigned long) d; \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "lw\t$2, %6\n\t" \
-        "subu\t$29, 32\n\t" \
-        "sw\t$2, 16($29)\n\t" \
-        "li\t$2, %5\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        "addiu\t$29, 32\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "+r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##name), \
-          "m" ((unsigned long)e) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-type name(atype a, btype b, ctype c, dtype d, etype e, ftype f) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7") = (unsigned long) d; \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "lw\t$2, %6\n\t" \
-        "lw\t$8, %7\n\t" \
-        "subu\t$29, 32\n\t" \
-        "sw\t$2, 16($29)\n\t" \
-        "sw\t$8, 20($29)\n\t" \
-        "li\t$2, %5\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        "addiu\t$29, 32\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "+r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##name), \
-          "m" ((unsigned long)e), "m" ((unsigned long)f) \
-        : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */
-
-#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64)
-
-#define _syscall5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \
-type name (atype a,btype b,ctype c,dtype d,etype e) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7") = (unsigned long) d; \
-        register unsigned long __a4 asm("$8") = (unsigned long) e; \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %6\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "+r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "i" (__NR_##name) \
-        : "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \
-type name (atype a,btype b,ctype c,dtype d,etype e,ftype f) \
-{ \
-        register unsigned long __a0 asm("$4") = (unsigned long) a; \
-        register unsigned long __a1 asm("$5") = (unsigned long) b; \
-        register unsigned long __a2 asm("$6") = (unsigned long) c; \
-        register unsigned long __a3 asm("$7") = (unsigned long) d; \
-        register unsigned long __a4 asm("$8") = (unsigned long) e; \
-        register unsigned long __a5 asm("$9") = (unsigned long) f; \
-        unsigned long __v0; \
-        \
-        __asm__ volatile ( \
-        ".set\tnoreorder\n\t" \
-        "li\t$2, %7\t\t\t# " #name "\n\t" \
-        "syscall\n\t" \
-        "move\t%0, $2\n\t" \
-        ".set\treorder" \
-        : "=&r" (__v0), "+r" (__a3) \
-        : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "r" (__a5), \
-          "i" (__NR_##name) \
-        : "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
-          "memory"); \
-        \
-        if (__a3 == 0) \
-                return (type) __v0; \
-        errno = __v0; \
-        return (type) -1; \
-}
-
-#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-
-
 #define __ARCH_OMIT_COMPAT_SYS_GETDENTS64
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-parisc/dma-mapping.h b/include/asm-parisc/dma-mapping.h
index 1e387e1dad30..66f0b408c669 100644
--- a/include/asm-parisc/dma-mapping.h
+++ b/include/asm-parisc/dma-mapping.h
@@ -191,13 +191,13 @@ dma_get_cache_alignment(void)
 }
 
 static inline int
-dma_is_consistent(dma_addr_t dma_addr)
+dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
 {
         return (hppa_dma_ops->dma_sync_single_for_cpu == NULL);
 }
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         if(hppa_dma_ops->dma_sync_single_for_cpu)
diff --git a/include/asm-parisc/futex.h b/include/asm-parisc/futex.h
index d84bbb283fd1..dbee6e60aa81 100644
--- a/include/asm-parisc/futex.h
+++ b/include/asm-parisc/futex.h
@@ -21,7 +21,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -33,7 +33,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index 7e38b5fddada..7c7de87bd8ae 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -342,9 +342,9 @@ static inline int dma_mapping_error(dma_addr_t dma_addr)
 #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)
 #ifdef CONFIG_NOT_COHERENT_CACHE
-#define dma_is_consistent(d)    (0)
+#define dma_is_consistent(d, h) (0)
 #else
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 #endif
 
 static inline int dma_get_cache_alignment(void)
@@ -378,7 +378,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
         dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
 }
 
-static inline void dma_cache_sync(void *vaddr, size_t size,
+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                 enum dma_data_direction direction)
 {
         BUG_ON(direction == DMA_NONE);
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h
index b5436642a109..d36426c01b6b 100644
--- a/include/asm-powerpc/elf.h
+++ b/include/asm-powerpc/elf.h
@@ -124,12 +124,10 @@ typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG];
 # define ELF_DATA       ELFDATA2MSB
   typedef elf_greg_t64 elf_greg_t;
   typedef elf_gregset_t64 elf_gregset_t;
-# define elf_addr_t unsigned long
 #else
   /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */
   typedef elf_greg_t32 elf_greg_t;
   typedef elf_gregset_t32 elf_gregset_t;
-# define elf_addr_t __u32
 #endif /* ELF_ARCH */
 
 /* Floating point registers */
diff --git a/include/asm-powerpc/futex.h b/include/asm-powerpc/futex.h
index 936422e54891..3f3673fd3ff3 100644
--- a/include/asm-powerpc/futex.h
+++ b/include/asm-powerpc/futex.h
@@ -43,7 +43,7 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -65,7 +65,7 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h
index ae63db7b3e7d..b0830db68f8a 100644
--- a/include/asm-powerpc/pgalloc.h
+++ b/include/asm-powerpc/pgalloc.h
@@ -11,7 +11,7 @@
 #include <linux/cpumask.h>
 #include <linux/percpu.h>
 
-extern kmem_cache_t *pgtable_cache[];
+extern struct kmem_cache *pgtable_cache[];
 
 #ifdef CONFIG_PPC_64K_PAGES
 #define PTE_CACHE_NUM   0
diff --git a/include/asm-powerpc/setup.h b/include/asm-powerpc/setup.h
index 3d9740aae018..817fac0a0714 100644
--- a/include/asm-powerpc/setup.h
+++ b/include/asm-powerpc/setup.h
@@ -1,9 +1,6 @@
 #ifndef _ASM_POWERPC_SETUP_H
 #define _ASM_POWERPC_SETUP_H
 
-#ifdef __KERNEL__
-
 #define COMMAND_LINE_SIZE       512
 
-#endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_SETUP_H */
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index 04b6c17cc59b..0ae954e3d258 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -334,115 +334,6 @@
 
 #ifndef __ASSEMBLY__
 
-/* On powerpc a system call basically clobbers the same registers like a
- * function call, with the exception of LR (which is needed for the
- * "sc; bnslr" sequence) and CR (where only CR0.SO is clobbered to signal
- * an error return status).
- */
-
-#define __syscall_nr(nr, type, name, args...)                           \
-        unsigned long __sc_ret, __sc_err;                               \
-        {                                                               \
-                register unsigned long __sc_0  __asm__ ("r0");          \
-                register unsigned long __sc_3  __asm__ ("r3");          \
-                register unsigned long __sc_4  __asm__ ("r4");          \
-                register unsigned long __sc_5  __asm__ ("r5");          \
-                register unsigned long __sc_6  __asm__ ("r6");          \
-                register unsigned long __sc_7  __asm__ ("r7");          \
-                register unsigned long __sc_8  __asm__ ("r8");          \
-                                                                        \
-                __sc_loadargs_##nr(name, args);                         \
-                __asm__ __volatile__                                    \
-                        ("sc           \n\t"                            \
-                         "mfcr %0      "                                \
-                        : "=&r" (__sc_0),                               \
-                          "=&r" (__sc_3),  "=&r" (__sc_4),              \
-                          "=&r" (__sc_5),  "=&r" (__sc_6),              \
-                          "=&r" (__sc_7),  "=&r" (__sc_8)               \
-                        : __sc_asm_input_##nr                           \
-                        : "cr0", "ctr", "memory",                       \
-                          "r9", "r10","r11", "r12");                    \
-                __sc_ret = __sc_3;                                      \
-                __sc_err = __sc_0;                                      \
-        }                                                               \
-        if (__sc_err & 0x10000000)                                      \
-        {                                                               \
-                errno = __sc_ret;                                       \
-                __sc_ret = -1;                                          \
-        }                                                               \
-        return (type) __sc_ret
-
-#define __sc_loadargs_0(name, dummy...)                                 \
-        __sc_0 = __NR_##name
-#define __sc_loadargs_1(name, arg1)                                     \
-        __sc_loadargs_0(name);                                          \
-        __sc_3 = (unsigned long) (arg1)
-#define __sc_loadargs_2(name, arg1, arg2)                               \
-        __sc_loadargs_1(name, arg1);                                    \
-        __sc_4 = (unsigned long) (arg2)
-#define __sc_loadargs_3(name, arg1, arg2, arg3)                         \
-        __sc_loadargs_2(name, arg1, arg2);                              \
-        __sc_5 = (unsigned long) (arg3)
-#define __sc_loadargs_4(name, arg1, arg2, arg3, arg4)                   \
-        __sc_loadargs_3(name, arg1, arg2, arg3);                        \
-        __sc_6 = (unsigned long) (arg4)
-#define __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5)             \
-        __sc_loadargs_4(name, arg1, arg2, arg3, arg4);                  \
-        __sc_7 = (unsigned long) (arg5)
-#define __sc_loadargs_6(name, arg1, arg2, arg3, arg4, arg5, arg6)       \
-        __sc_loadargs_5(name, arg1, arg2, arg3, arg4, arg5);            \
-        __sc_8 = (unsigned long) (arg6)
-
-#define __sc_asm_input_0 "0" (__sc_0)
-#define __sc_asm_input_1 __sc_asm_input_0, "1" (__sc_3)
-#define __sc_asm_input_2 __sc_asm_input_1, "2" (__sc_4)
-#define __sc_asm_input_3 __sc_asm_input_2, "3" (__sc_5)
-#define __sc_asm_input_4 __sc_asm_input_3, "4" (__sc_6)
-#define __sc_asm_input_5 __sc_asm_input_4, "5" (__sc_7)
-#define __sc_asm_input_6 __sc_asm_input_5, "6" (__sc_8)
-
-#define _syscall0(type,name)                                            \
-type name(void)                                                         \
-{                                                                       \
-        __syscall_nr(0, type, name);                                    \
-}
-
-#define _syscall1(type,name,type1,arg1)                                 \
-type name(type1 arg1)                                                   \
-{                                                                       \
-        __syscall_nr(1, type, name, arg1);                              \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                      \
-type name(type1 arg1, type2 arg2)                                       \
-{                                                                       \
-        __syscall_nr(2, type, name, arg1, arg2);                        \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)           \
-type name(type1 arg1, type2 arg2, type3 arg3)                           \
-{                                                                       \
-        __syscall_nr(3, type, name, arg1, arg2, arg3);                  \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4)               \
-{                                                                       \
-        __syscall_nr(4, type, name, arg1, arg2, arg3, arg4);            \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)   \
-{                                                                       \
-        __syscall_nr(5, type, name, arg1, arg2, arg3, arg4, arg5);      \
-}
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{                                                                       \
-        __syscall_nr(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6); \
-}
-
-
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/linkage.h>
diff --git a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
index 1d2c4ef81c22..f7b21ee302b4 100644
--- a/include/asm-ppc/highmem.h
+++ b/include/asm-ppc/highmem.h
@@ -79,7 +79,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
         unsigned long vaddr;
 
         /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
-        inc_preempt_count();
+        pagefault_disable();
         if (!PageHighMem(page))
                 return page_address(page);
 
@@ -101,8 +101,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
         unsigned int idx = type + KM_TYPE_NR*smp_processor_id();
 
         if (vaddr < KMAP_FIX_BEGIN) { // FIXME
-                dec_preempt_count();
-                preempt_check_resched();
+                pagefault_enable();
                 return;
         }
 
@@ -115,8 +114,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
         pte_clear(&init_mm, vaddr, kmap_pte+idx);
         flush_tlb_page(NULL, vaddr);
 #endif
-        dec_preempt_count();
-        preempt_check_resched();
+        pagefault_enable();
 }
 
 static inline struct page *kmap_atomic_to_page(void *ptr)
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 7664bacdd832..9574fe80a046 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -8,12 +8,13 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
 
+#define COMMAND_LINE_SIZE       896
+
 #ifdef __KERNEL__
 
 #include <asm/types.h>
 
 #define PARMAREA                0x10400
-#define COMMAND_LINE_SIZE       896
 #define MEMORY_CHUNKS           16      /* max 0x7fff */
 #define IPL_PARMBLOCK_ORIGIN    0x2000
 
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index 71d3c21b84f0..fb6fef97d739 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -345,160 +345,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/err.h>
-
-#define __syscall_return(type, res)                          \
-do {                                                         \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-                errno = -(res);                              \
-                res = -1;                                    \
-        }                                                    \
-        return (type) (res);                                 \
-} while (0)
-
-#define _svc_clobber "1", "cc", "memory"
-
-#define _syscall0(type,name)                                    \
-type name(void) {                                               \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name)                             \
-                : _svc_clobber);                                \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
-#define _syscall1(type,name,type1,arg1)                         \
-type name(type1 arg1) {                                         \
-        register type1 __arg1 asm("2") = arg1;                  \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                            \
-                  "0" (__arg1)                                  \
-                : _svc_clobber);                                \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)              \
-type name(type1 arg1, type2 arg2) {                             \
-        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;                  \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                                 \
-                  "d" (__arg2)                                  \
-                : _svc_clobber );                               \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)   \
-type name(type1 arg1, type2 arg2, type3 arg3) {                 \
-        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;                  \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                                 \
-                  "d" (__arg2),                                 \
-                  "d" (__arg3)                                  \
-                : _svc_clobber);                                \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,   \
-                  type4,name4)                                  \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {     \
-        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;                  \
-        register type4 __arg4 asm("5") = arg4;                  \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                                 \
-                  "d" (__arg2),                                 \
-                  "d" (__arg3),                                 \
-                  "d" (__arg4)                                  \
-                : _svc_clobber);                                \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,   \
-                  type4,name4,type5,name5)                      \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,       \
-          type5 arg5) {                                         \
-        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;                  \
-        register type4 __arg4 asm("5") = arg4;                  \
-        register type5 __arg5 asm("6") = arg5;                  \
-        register long __svcres asm("2");                        \
-        long __res;                                             \
-        asm volatile(                                           \
-                "       .if     %1 < 256\n"                     \
-                "       svc     %b1\n"                          \
-                "       .else\n"                                \
-                "       la      %%r1,%1\n"                      \
-                "       svc     0\n"                            \
-                "       .endif"                                 \
-                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                                 \
-                  "d" (__arg2),                                 \
-                  "d" (__arg3),                                 \
-                  "d" (__arg4),                                 \
-                  "d" (__arg5)                                  \
-                : _svc_clobber);                                \
-        __res = __svcres;                                       \
-        __syscall_return(type,__res);                           \
-}
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_SYS_ALARM
diff --git a/include/asm-sh/atomic.h b/include/asm-sh/atomic.h
index 8bdc1ba56f73..28305c3cbddf 100644
--- a/include/asm-sh/atomic.h
+++ b/include/asm-sh/atomic.h
@@ -28,11 +28,11 @@ static inline void atomic_add(int i, atomic_t *v)
         unsigned long tmp;
 
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_add    \n"
-"       add     %2, %0                          \n"
-"       movco.l %0, @%3                         \n"
+"1:     movli.l @%2, %0         ! atomic_add    \n"
+"       add     %1, %0                          \n"
+"       movco.l %0, @%2                         \n"
 "       bf      1b                              \n"
-        : "=&z" (tmp), "=r" (&v->counter)
+        : "=&z" (tmp)
         : "r" (i), "r" (&v->counter)
         : "t");
 #else
@@ -50,11 +50,11 @@ static inline void atomic_sub(int i, atomic_t *v)
         unsigned long tmp;
 
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_sub    \n"
-"       sub     %2, %0                          \n"
-"       movco.l %0, @%3                         \n"
+"1:     movli.l @%2, %0         ! atomic_sub    \n"
+"       sub     %1, %0                          \n"
+"       movco.l %0, @%2                         \n"
 "       bf      1b                              \n"
-        : "=&z" (tmp), "=r" (&v->counter)
+        : "=&z" (tmp)
         : "r" (i), "r" (&v->counter)
         : "t");
 #else
@@ -80,12 +80,12 @@ static inline int atomic_add_return(int i, atomic_t *v)
 
 #ifdef CONFIG_CPU_SH4A
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_add_return     \n"
-"       add     %2, %0                                  \n"
-"       movco.l %0, @%3                                 \n"
+"1:     movli.l @%2, %0         ! atomic_add_return     \n"
+"       add     %1, %0                                  \n"
+"       movco.l %0, @%2                                 \n"
 "       bf      1b                                      \n"
 "       synco                                           \n"
-        : "=&z" (temp), "=r" (&v->counter)
+        : "=&z" (temp)
         : "r" (i), "r" (&v->counter)
         : "t");
 #else
@@ -109,12 +109,12 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 
 #ifdef CONFIG_CPU_SH4A
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_sub_return     \n"
-"       sub     %2, %0                                  \n"
-"       movco.l %0, @%3                                 \n"
+"1:     movli.l @%2, %0         ! atomic_sub_return     \n"
+"       sub     %1, %0                                  \n"
+"       movco.l %0, @%2                                 \n"
 "       bf      1b                                      \n"
 "       synco                                           \n"
-        : "=&z" (temp), "=r" (&v->counter)
+        : "=&z" (temp)
         : "r" (i), "r" (&v->counter)
         : "t");
 #else
@@ -186,11 +186,11 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
         unsigned long tmp;
 
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_clear_mask     \n"
-"       and     %2, %0                                  \n"
-"       movco.l %0, @%3                                 \n"
+"1:     movli.l @%2, %0         ! atomic_clear_mask     \n"
+"       and     %1, %0                                  \n"
+"       movco.l %0, @%2                                 \n"
 "       bf      1b                                      \n"
-        : "=&z" (tmp), "=r" (&v->counter)
+        : "=&z" (tmp)
         : "r" (~mask), "r" (&v->counter)
         : "t");
 #else
@@ -208,11 +208,11 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
         unsigned long tmp;
 
         __asm__ __volatile__ (
-"1:     movli.l @%3, %0         ! atomic_set_mask       \n"
-"       or      %2, %0                                  \n"
-"       movco.l %0, @%3                                 \n"
+"1:     movli.l @%2, %0         ! atomic_set_mask       \n"
+"       or      %1, %0                                  \n"
+"       movco.l %0, @%2                                 \n"
 "       bf      1b                                      \n"
-        : "=&z" (tmp), "=r" (&v->counter)
+        : "=&z" (tmp)
         : "r" (mask), "r" (&v->counter)
         : "t");
 #else
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index beeea40f549e..795047da5e17 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -23,16 +23,20 @@ static void __init check_bugs(void)
         cpu_data->loops_per_jiffy = loops_per_jiffy;
 
         switch (cpu_data->type) {
-        case CPU_SH7604:
+        case CPU_SH7604 ... CPU_SH7619:
                 *p++ = '2';
                 break;
+        case CPU_SH7206:
+                *p++ = '2';
+                *p++ = 'a';
+                break;
         case CPU_SH7705 ... CPU_SH7300:
                 *p++ = '3';
                 break;
         case CPU_SH7750 ... CPU_SH4_501:
                 *p++ = '4';
                 break;
-        case CPU_SH7770 ... CPU_SH7781:
+        case CPU_SH7770 ... CPU_SH7785:
                 *p++ = '4';
                 *p++ = 'a';
                 break;
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h
index fdfb75b30f0d..1df92807f8c5 100644
--- a/include/asm-sh/clock.h
+++ b/include/asm-sh/clock.h
@@ -4,6 +4,7 @@
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/seq_file.h>
+#include <linux/clk.h>
 
 struct clk;
 
@@ -18,7 +19,7 @@ struct clk_ops {
 struct clk {
         struct list_head        node;
         const char              *name;
-
+        int                     id;
         struct module           *owner;
 
         struct clk              *parent;
@@ -40,22 +41,13 @@ void arch_init_clk_ops(struct clk_ops **, int type);
 int clk_init(void);
 
 int __clk_enable(struct clk *);
-int clk_enable(struct clk *);
-
 void __clk_disable(struct clk *);
-void clk_disable(struct clk *);
 
-int clk_set_rate(struct clk *, unsigned long rate);
-unsigned long clk_get_rate(struct clk *);
 void clk_recalc_rate(struct clk *);
 
-struct clk *clk_get(const char *id);
-void clk_put(struct clk *);
-
 int clk_register(struct clk *);
 void clk_unregister(struct clk *);
 
 int show_clocks(struct seq_file *m);
 
 #endif /* __ASM_SH_CLOCK_H */
-
diff --git a/include/asm-sh/cpu-sh2/cache.h b/include/asm-sh/cpu-sh2/cache.h
index cd96402e8562..20b9796842dc 100644
--- a/include/asm-sh/cpu-sh2/cache.h
+++ b/include/asm-sh/cpu-sh2/cache.h
@@ -12,6 +12,7 @@
 
 #define L1_CACHE_SHIFT  4
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7604)
 #define CCR             0xfffffe92      /* Address of Cache Control Register */
 
 #define CCR_CACHE_CE    0x01    /* Cache enable */
@@ -27,5 +28,26 @@
 #define CCR_CACHE_ORA           CCR_CACHE_TW
 #define CCR_CACHE_WT            0x00    /* SH-2 is _always_ write-through */
 
+#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+#define CCR1            0xffffffec
+#define CCR             CCR1
+
+#define CCR_CACHE_CE    0x01    /* Cache enable */
+#define CCR_CACHE_WT    0x06    /* CCR[bit1=1,bit2=1] */
+                                /* 0x00000000-0x7fffffff: Write-through  */
+                                /* 0x80000000-0x9fffffff: Write-back     */
+                                /* 0xc0000000-0xdfffffff: Write-through  */
+#define CCR_CACHE_CB    0x00    /* CCR[bit1=0,bit2=0] */
+                                /* 0x00000000-0x7fffffff: Write-back     */
+                                /* 0x80000000-0x9fffffff: Write-through  */
+                                /* 0xc0000000-0xdfffffff: Write-back     */
+#define CCR_CACHE_CF    0x08    /* Cache invalidate */
+
+#define CACHE_OC_ADDRESS_ARRAY  0xf0000000
+#define CACHE_OC_DATA_ARRAY     0xf1000000
+
+#define CCR_CACHE_ENABLE        CCR_CACHE_CE
+#define CCR_CACHE_INVALIDATE    CCR_CACHE_CF
+#endif
 #endif /* __ASM_CPU_SH2_CACHE_H */
 
diff --git a/include/asm-sh/cpu-sh2/freq.h b/include/asm-sh/cpu-sh2/freq.h
new file mode 100644
index 000000000000..31de475da70b
--- /dev/null
+++ b/include/asm-sh/cpu-sh2/freq.h
@@ -0,0 +1,18 @@
+/*
+ * include/asm-sh/cpu-sh2/freq.h
+ *
+ * Copyright (C) 2006  Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __ASM_CPU_SH2_FREQ_H
+#define __ASM_CPU_SH2_FREQ_H
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7619)
+#define FREQCR  0xf815ff80
+#endif
+
+#endif /* __ASM_CPU_SH2_FREQ_H */
+
diff --git a/include/asm-sh/cpu-sh2/mmu_context.h b/include/asm-sh/cpu-sh2/mmu_context.h
new file mode 100644
index 000000000000..beeb299e01ec
--- /dev/null
+++ b/include/asm-sh/cpu-sh2/mmu_context.h
@@ -0,0 +1,16 @@
+/*
+ * include/asm-sh/cpu-sh2/mmu_context.h
+ *
+ * Copyright (C) 2003  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __ASM_CPU_SH2_MMU_CONTEXT_H
+#define __ASM_CPU_SH2_MMU_CONTEXT_H
+
+/* No MMU */
+
+#endif /* __ASM_CPU_SH2_MMU_CONTEXT_H */
+
diff --git a/include/asm-sh/cpu-sh2/timer.h b/include/asm-sh/cpu-sh2/timer.h
new file mode 100644
index 000000000000..a39c241e8195
--- /dev/null
+++ b/include/asm-sh/cpu-sh2/timer.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_CPU_SH2_TIMER_H
+#define __ASM_CPU_SH2_TIMER_H
+
+/* Nothing needed yet */
+
+#endif /* __ASM_CPU_SH2_TIMER_H */
diff --git a/include/asm-sh/cpu-sh2a/addrspace.h b/include/asm-sh/cpu-sh2a/addrspace.h
new file mode 100644
index 000000000000..3d2e9aa21522
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/addrspace.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/addrspace.h>
diff --git a/include/asm-sh/cpu-sh2a/cache.h b/include/asm-sh/cpu-sh2a/cache.h
new file mode 100644
index 000000000000..3e4b9e480982
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/cache.h
@@ -0,0 +1,39 @@
+/*
+ * include/asm-sh/cpu-sh2a/cache.h
+ *
+ * Copyright (C) 2004 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __ASM_CPU_SH2A_CACHE_H
+#define __ASM_CPU_SH2A_CACHE_H
+
+#define L1_CACHE_SHIFT  4
+
+#define CCR1            0xfffc1000
+#define CCR2            0xfffc1004
+
+/* CCR1 behaves more like the traditional CCR */
+#define CCR             CCR1
+
+/*
+ * Most of the SH-2A CCR1 definitions resemble the SH-4 ones. All others not
+ * listed here are reserved.
+ */
+#define CCR_CACHE_CB    0x0000  /* Hack */
+#define CCR_CACHE_OCE   0x0001
+#define CCR_CACHE_WT    0x0002
+#define CCR_CACHE_OCI   0x0008  /* OCF */
+#define CCR_CACHE_ICE   0x0100
+#define CCR_CACHE_ICI   0x0800  /* ICF */
+
+#define CACHE_IC_ADDRESS_ARRAY  0xf0000000
+#define CACHE_OC_ADDRESS_ARRAY  0xf0800000
+
+#define CCR_CACHE_ENABLE        (CCR_CACHE_OCE | CCR_CACHE_ICE)
+#define CCR_CACHE_INVALIDATE    (CCR_CACHE_OCI | CCR_CACHE_ICI)
+
+#endif /* __ASM_CPU_SH2A_CACHE_H */
+
diff --git a/include/asm-sh/cpu-sh2a/cacheflush.h b/include/asm-sh/cpu-sh2a/cacheflush.h
new file mode 100644
index 000000000000..fa3186c73350
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/cacheflush.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/cacheflush.h>
diff --git a/include/asm-sh/cpu-sh2a/dma.h b/include/asm-sh/cpu-sh2a/dma.h
new file mode 100644
index 000000000000..0d5ad85c1de8
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/dma.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/dma.h>
diff --git a/include/asm-sh/cpu-sh2a/freq.h b/include/asm-sh/cpu-sh2a/freq.h
new file mode 100644
index 000000000000..e518fff6d10f
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/freq.h
@@ -0,0 +1,18 @@
+/*
+ * include/asm-sh/cpu-sh2a/freq.h
+ *
+ * Copyright (C) 2006  Yoshinori Sato
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __ASM_CPU_SH2A_FREQ_H
+#define __ASM_CPU_SH2A_FREQ_H
+
+#if defined(CONFIG_CPU_SUBTYPE_SH7206)
+#define FREQCR  0xfffe0010
+#endif
+
+#endif /* __ASM_CPU_SH2A_FREQ_H */
+
diff --git a/include/asm-sh/cpu-sh2a/mmu_context.h b/include/asm-sh/cpu-sh2a/mmu_context.h
new file mode 100644
index 000000000000..cd2387f7db9e
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/mmu_context.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/mmu_context.h>
diff --git a/include/asm-sh/cpu-sh2a/timer.h b/include/asm-sh/cpu-sh2a/timer.h
new file mode 100644
index 000000000000..fee504adf11e
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/timer.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/timer.h>
diff --git a/include/asm-sh/cpu-sh2a/ubc.h b/include/asm-sh/cpu-sh2a/ubc.h
new file mode 100644
index 000000000000..cf28062b96a2
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/ubc.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/ubc.h>
diff --git a/include/asm-sh/cpu-sh2a/watchdog.h b/include/asm-sh/cpu-sh2a/watchdog.h
new file mode 100644
index 000000000000..c1b3e2488478
--- /dev/null
+++ b/include/asm-sh/cpu-sh2a/watchdog.h
@@ -0,0 +1 @@
+#include <asm/cpu-sh2/watchdog.h>
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index 56cd4b977232..37ab0c131a4d 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -53,7 +53,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
         consistent_free(vaddr, size);
 }
 
-static inline void dma_cache_sync(void *vaddr, size_t size,
+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                                   enum dma_data_direction dir)
 {
         consistent_sync(vaddr, size, (int)dir);
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index d9daa028689f..faf3051cd429 100644
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -14,9 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/sysdev.h>
-#include <linux/device.h>
 #include <asm/cpu/dma.h>
-#include <asm/semaphore.h>
 
 /* The maximum address that we can perform a DMA transfer to on this platform */
 /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any
@@ -46,16 +44,21 @@
  * DMAC (dma_info) flags
  */
 enum {
-        DMAC_CHANNELS_CONFIGURED        = 0x00,
-        DMAC_CHANNELS_TEI_CAPABLE       = 0x01,
+        DMAC_CHANNELS_CONFIGURED        = 0x01,
+        DMAC_CHANNELS_TEI_CAPABLE       = 0x02, /* Transfer end interrupt */
 };
 
 /*
  * DMA channel capabilities / flags
  */
 enum {
-        DMA_TEI_CAPABLE                 = 0x01,
-        DMA_CONFIGURED                  = 0x02,
+        DMA_CONFIGURED                  = 0x01,
+
+        /*
+         * Transfer end interrupt, inherited from DMAC.
+         * wait_queue used in dma_wait_for_completion.
+         */
+        DMA_TEI_CAPABLE                 = 0x02,
 };
 
 extern spinlock_t dma_spin_lock;
@@ -68,28 +71,31 @@ struct dma_ops {
 
         int (*get_residue)(struct dma_channel *chan);
         int (*xfer)(struct dma_channel *chan);
-        void (*configure)(struct dma_channel *chan, unsigned long flags);
+        int (*configure)(struct dma_channel *chan, unsigned long flags);
+        int (*extend)(struct dma_channel *chan, unsigned long op, void *param);
 };
 
 struct dma_channel {
-        char dev_id[16];
+        char dev_id[16];                /* unique name per DMAC of channel */
 
-        unsigned int chan;              /* Physical channel number */
+        unsigned int chan;              /* DMAC channel number */
         unsigned int vchan;             /* Virtual channel number */
+
         unsigned int mode;
         unsigned int count;
 
         unsigned long sar;
         unsigned long dar;
 
+        const char **caps;
+
         unsigned long flags;
         atomic_t busy;
 
-        struct semaphore sem;
         wait_queue_head_t wait_queue;
 
         struct sys_device dev;
-        char *name;
+        void *priv_data;
 };
 
 struct dma_info {
@@ -103,6 +109,12 @@ struct dma_info {
         struct dma_channel *channels;
 
         struct list_head list;
+        int first_channel_nr;
+};
+
+struct dma_chan_caps {
+        int ch_num;
+        const char **caplist;
 };
 
 #define to_dma_channel(channel) container_of(channel, struct dma_channel, dev)
@@ -121,6 +133,8 @@ extern int dma_xfer(unsigned int chan, unsigned long from,
 #define dma_read_page(chan, from, to)   \
         dma_read(chan, from, to, PAGE_SIZE)
 
+extern int request_dma_bycap(const char **dmac, const char **caps,
+                             const char *dev_id);
 extern int request_dma(unsigned int chan, const char *dev_id);
 extern void free_dma(unsigned int chan);
 extern int get_dma_residue(unsigned int chan);
@@ -131,6 +145,10 @@ extern void dma_configure_channel(unsigned int chan, unsigned long flags);
 
 extern int register_dmac(struct dma_info *info);
 extern void unregister_dmac(struct dma_info *info);
+extern struct dma_info *get_dma_info_by_name(const char *dmac_name);
+
+extern int dma_extend(unsigned int chan, unsigned long op, void *param);
+extern int register_chan_caps(const char *dmac, struct dma_chan_caps *capslist);
 
 #ifdef CONFIG_SYSFS
 /* arch/sh/drivers/dma/dma-sysfs.c */
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h
index fc050fd7645e..43ca244564b1 100644
--- a/include/asm-sh/elf.h
+++ b/include/asm-sh/elf.h
@@ -74,7 +74,7 @@ typedef struct user_fpu_struct elf_fpregset_t;
 #define ELF_ARCH        EM_SH
 
 #define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       4096
+#define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
 /* 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
diff --git a/include/asm-sh/entry-macros.S b/include/asm-sh/entry-macros.S
new file mode 100644
index 000000000000..500030eae7aa
--- /dev/null
+++ b/include/asm-sh/entry-macros.S
@@ -0,0 +1,33 @@
+! entry.S macro define
+        
+        .macro  cli
+        stc     sr, r0
+        or      #0xf0, r0
+        ldc     r0, sr
+        .endm
+
+        .macro  sti
+        mov     #0xf0, r11
+        extu.b  r11, r11
+        not     r11, r11
+        stc     sr, r10
+        and     r11, r10
+#ifdef CONFIG_HAS_SR_RB
+        stc     k_g_imask, r11
+        or      r11, r10
+#endif
+        ldc     r10, sr
+        .endm
+
+        .macro  get_current_thread_info, ti, tmp
+#ifdef CONFIG_HAS_SR_RB
+        stc     r7_bank, \ti
+#else
+        mov     #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp
+        shll8   \tmp
+        shll2   \tmp
+        mov     r15, \ti
+        and     \tmp, \ti
+#endif  
+        .endm
+
diff --git a/include/asm-sh/irq-sh73180.h b/include/asm-sh/irq-sh73180.h
deleted file mode 100644
index b28af9a69d72..000000000000
--- a/include/asm-sh/irq-sh73180.h
+++ /dev/null
@@ -1,314 +0,0 @@
-#ifndef __ASM_SH_IRQ_SH73180_H
-#define __ASM_SH_IRQ_SH73180_H
-
-/*
- * linux/include/asm-sh/irq-sh73180.h
- *
- * Copyright (C) 2004 Takashi SHUDO <shudo@hitachi-ul.co.jp>
- */
-
-#undef INTC_IPRA
-#undef INTC_IPRB
-#undef INTC_IPRC
-#undef INTC_IPRD
-
-#undef DMTE0_IRQ
-#undef DMTE1_IRQ
-#undef DMTE2_IRQ
-#undef DMTE3_IRQ
-#undef DMTE4_IRQ
-#undef DMTE5_IRQ
-#undef DMTE6_IRQ
-#undef DMTE7_IRQ
-#undef DMAE_IRQ
-#undef DMA_IPR_ADDR
-#undef DMA_IPR_POS
-#undef DMA_PRIORITY
-
-#undef INTC_IMCR0
-#undef INTC_IMCR1
-#undef INTC_IMCR2
-#undef INTC_IMCR3
-#undef INTC_IMCR4
-#undef INTC_IMCR5
-#undef INTC_IMCR6
-#undef INTC_IMCR7
-#undef INTC_IMCR8
-#undef INTC_IMCR9
-#undef INTC_IMCR10
-
-
-#define INTC_IPRA       0xA4080000UL
-#define INTC_IPRB       0xA4080004UL
-#define INTC_IPRC       0xA4080008UL
-#define INTC_IPRD       0xA408000CUL
-#define INTC_IPRE       0xA4080010UL
-#define INTC_IPRF       0xA4080014UL
-#define INTC_IPRG       0xA4080018UL
-#define INTC_IPRH       0xA408001CUL
-#define INTC_IPRI       0xA4080020UL
-#define INTC_IPRJ       0xA4080024UL
-#define INTC_IPRK       0xA4080028UL
-
-#define INTC_IMR0       0xA4080080UL
-#define INTC_IMR1       0xA4080084UL
-#define INTC_IMR2       0xA4080088UL
-#define INTC_IMR3       0xA408008CUL
-#define INTC_IMR4       0xA4080090UL
-#define INTC_IMR5       0xA4080094UL
-#define INTC_IMR6       0xA4080098UL
-#define INTC_IMR7       0xA408009CUL
-#define INTC_IMR8       0xA40800A0UL
-#define INTC_IMR9       0xA40800A4UL
-#define INTC_IMR10      0xA40800A8UL
-#define INTC_IMR11      0xA40800ACUL
-
-#define INTC_IMCR0      0xA40800C0UL
-#define INTC_IMCR1      0xA40800C4UL
-#define INTC_IMCR2      0xA40800C8UL
-#define INTC_IMCR3      0xA40800CCUL
-#define INTC_IMCR4      0xA40800D0UL
-#define INTC_IMCR5      0xA40800D4UL
-#define INTC_IMCR6      0xA40800D8UL
-#define INTC_IMCR7      0xA40800DCUL
-#define INTC_IMCR8      0xA40800E0UL
-#define INTC_IMCR9      0xA40800E4UL
-#define INTC_IMCR10     0xA40800E8UL
-#define INTC_IMCR11     0xA40800ECUL
-
-#define INTC_ICR0       0xA4140000UL
-#define INTC_ICR1       0xA414001CUL
-
-#define INTMSK0         0xa4140044
-#define INTMSKCLR0      0xa4140064
-#define INTC_INTPRI0    0xa4140010
-
-/*
-  NOTE:
-
-  *_IRQ = (INTEVT2 - 0x200)/0x20
-*/
-
-/* TMU0 */
-#define TMU0_IRQ        16
-#define TMU0_IPR_ADDR   INTC_IPRA
-#define TMU0_IPR_POS     3
-#define TMU0_PRIORITY    2
-
-#define TIMER_IRQ       16
-#define TIMER_IPR_ADDR  INTC_IPRA
-#define TIMER_IPR_POS    3
-#define TIMER_PRIORITY   2
-
-/* TMU1 */
-#define TMU1_IRQ        17
-#define TMU1_IPR_ADDR   INTC_IPRA
-#define TMU1_IPR_POS     2
-#define TMU1_PRIORITY    2
-
-/* TMU2 */
-#define TMU2_IRQ        18
-#define TMU2_IPR_ADDR   INTC_IPRA
-#define TMU2_IPR_POS     1
-#define TMU2_PRIORITY    2
-
-/* LCDC */
-#define LCDC_IRQ        28
-#define LCDC_IPR_ADDR   INTC_IPRB
-#define LCDC_IPR_POS     2
-#define LCDC_PRIORITY    2
-
-/* VIO (Video I/O) */
-#define CEU_IRQ         52
-#define BEU_IRQ         53
-#define VEU_IRQ         54
-#define VOU_IRQ         55
-#define VIO_IPR_ADDR    INTC_IPRE
-#define VIO_IPR_POS      2
-#define VIO_PRIORITY     2
-
-/* MFI (Multi Functional Interface) */
-#define MFI_IRQ         56
-#define MFI_IPR_ADDR    INTC_IPRE
-#define MFI_IPR_POS      1
-#define MFI_PRIORITY     2
-
-/* VPU (Video Processing Unit) */
-#define VPU_IRQ         60
-#define VPU_IPR_ADDR    INTC_IPRE
-#define VPU_IPR_POS      0
-#define VPU_PRIORITY     2
-
-/* 3DG */
-#define TDG_IRQ         63
-#define TDG_IPR_ADDR    INTC_IPRJ
-#define TDG_IPR_POS      2
-#define TDG_PRIORITY     2
-
-/* DMAC(1) */
-#define DMTE0_IRQ       48
-#define DMTE1_IRQ       49
-#define DMTE2_IRQ       50
-#define DMTE3_IRQ       51
-#define DMA1_IPR_ADDR   INTC_IPRE
-#define DMA1_IPR_POS    3
-#define DMA1_PRIORITY   7
-
-/* DMAC(2) */
-#define DMTE4_IRQ       76
-#define DMTE5_IRQ       77
-#define DMA2_IPR_ADDR   INTC_IPRF
-#define DMA2_IPR_POS    2
-#define DMA2_PRIORITY   7
-
-/* SCIF0 */
-#define SCIF_ERI_IRQ    80
-#define SCIF_RXI_IRQ    81
-#define SCIF_BRI_IRQ    82
-#define SCIF_TXI_IRQ    83
-#define SCIF_IPR_ADDR   INTC_IPRG
-#define SCIF_IPR_POS    3
-#define SCIF_PRIORITY   3
-
-/* SIOF0 */
-#define SIOF0_IRQ       84
-#define SIOF0_IPR_ADDR  INTC_IPRH
-#define SIOF0_IPR_POS   3
-#define SIOF0_PRIORITY  3
-
-/* FLCTL (Flash Memory Controller) */
-#define FLSTE_IRQ       92
-#define FLTEND_IRQ      93
-#define FLTRQ0_IRQ      94
-#define FLTRQ1_IRQ      95
-#define FLCTL_IPR_ADDR  INTC_IPRH
-#define FLCTL_IPR_POS   1
-#define FLCTL_PRIORITY  3
-
-/* IIC(0) (IIC Bus Interface) */
-#define IIC0_ALI_IRQ    96
-#define IIC0_TACKI_IRQ  97
-#define IIC0_WAITI_IRQ  98
-#define IIC0_DTEI_IRQ   99
-#define IIC0_IPR_ADDR   INTC_IPRH
-#define IIC0_IPR_POS    0
-#define IIC0_PRIORITY   3
-
-/* IIC(1) (IIC Bus Interface) */
-#define IIC1_ALI_IRQ    44
-#define IIC1_TACKI_IRQ  45
-#define IIC1_WAITI_IRQ  46
-#define IIC1_DTEI_IRQ   47
-#define IIC1_IPR_ADDR   INTC_IPRG
-#define IIC1_IPR_POS    0
-#define IIC1_PRIORITY   3
-
-/* SIO0 */
-#define SIO0_IRQ        88
-#define SIO0_IPR_ADDR   INTC_IPRI
-#define SIO0_IPR_POS    3
-#define SIO0_PRIORITY   3
-
-/* SDHI */
-#define SDHI_SDHII0_IRQ 100
-#define SDHI_SDHII1_IRQ 101
-#define SDHI_SDHII2_IRQ 102
-#define SDHI_SDHII3_IRQ 103
-#define SDHI_IPR_ADDR   INTC_IPRK
-#define SDHI_IPR_POS    0
-#define SDHI_PRIORITY   3
-
-/* SIU (Sound Interface Unit) */
-#define SIU_IRQ         108
-#define SIU_IPR_ADDR    INTC_IPRJ
-#define SIU_IPR_POS     1
-#define SIU_PRIORITY    3
-
-#define PORT_PACR       0xA4050100UL
-#define PORT_PBCR       0xA4050102UL
-#define PORT_PCCR       0xA4050104UL
-#define PORT_PDCR       0xA4050106UL
-#define PORT_PECR       0xA4050108UL
-#define PORT_PFCR       0xA405010AUL
-#define PORT_PGCR       0xA405010CUL
-#define PORT_PHCR       0xA405010EUL
-#define PORT_PJCR       0xA4050110UL
-#define PORT_PKCR       0xA4050112UL
-#define PORT_PLCR       0xA4050114UL
-#define PORT_SCPCR      0xA4050116UL
-#define PORT_PMCR       0xA4050118UL
-#define PORT_PNCR       0xA405011AUL
-#define PORT_PQCR       0xA405011CUL
-#define PORT_PRCR       0xA405011EUL
-#define PORT_PTCR       0xA405014CUL
-#define PORT_PUCR       0xA405014EUL
-#define PORT_PVCR       0xA4050150UL
-
-#define PORT_PSELA      0xA4050140UL
-#define PORT_PSELB      0xA4050142UL
-#define PORT_PSELC      0xA4050144UL
-#define PORT_PSELE      0xA4050158UL
-
-#define PORT_HIZCRA     0xA4050146UL
-#define PORT_HIZCRB     0xA4050148UL
-#define PORT_DRVCR      0xA405014AUL
-
-#define PORT_PADR       0xA4050120UL
-#define PORT_PBDR       0xA4050122UL
-#define PORT_PCDR       0xA4050124UL
-#define PORT_PDDR       0xA4050126UL
-#define PORT_PEDR       0xA4050128UL
-#define PORT_PFDR       0xA405012AUL
-#define PORT_PGDR       0xA405012CUL
-#define PORT_PHDR       0xA405012EUL
-#define PORT_PJDR       0xA4050130UL
-#define PORT_PKDR       0xA4050132UL
-#define PORT_PLDR       0xA4050134UL
-#define PORT_SCPDR      0xA4050136UL
-#define PORT_PMDR       0xA4050138UL
-#define PORT_PNDR       0xA405013AUL
-#define PORT_PQDR       0xA405013CUL
-#define PORT_PRDR       0xA405013EUL
-#define PORT_PTDR       0xA405016CUL
-#define PORT_PUDR       0xA405016EUL
-#define PORT_PVDR       0xA4050170UL
-
-#define IRQ0_IRQ        32
-#define IRQ1_IRQ        33
-#define IRQ2_IRQ        34
-#define IRQ3_IRQ        35
-#define IRQ4_IRQ        36
-#define IRQ5_IRQ        37
-#define IRQ6_IRQ        38
-#define IRQ7_IRQ        39
-
-#define INTPRI00        0xA4140010UL
-
-#define IRQ0_IPR_ADDR   INTPRI00
-#define IRQ1_IPR_ADDR   INTPRI00
-#define IRQ2_IPR_ADDR   INTPRI00
-#define IRQ3_IPR_ADDR   INTPRI00
-#define IRQ4_IPR_ADDR   INTPRI00
-#define IRQ5_IPR_ADDR   INTPRI00
-#define IRQ6_IPR_ADDR   INTPRI00
-#define IRQ7_IPR_ADDR   INTPRI00
-
-#define IRQ0_IPR_POS    7
-#define IRQ1_IPR_POS    6
-#define IRQ2_IPR_POS    5
-#define IRQ3_IPR_POS    4
-#define IRQ4_IPR_POS    3
-#define IRQ5_IPR_POS    2
-#define IRQ6_IPR_POS    1
-#define IRQ7_IPR_POS    0
-
-#define IRQ0_PRIORITY   1
-#define IRQ1_PRIORITY   1
-#define IRQ2_PRIORITY   1
-#define IRQ3_PRIORITY   1
-#define IRQ4_PRIORITY   1
-#define IRQ5_PRIORITY   1
-#define IRQ6_PRIORITY   1
-#define IRQ7_PRIORITY   1
-
-#endif /* __ASM_SH_IRQ_SH73180_H */
diff --git a/include/asm-sh/irq-sh7343.h b/include/asm-sh/irq-sh7343.h
deleted file mode 100644
index 5d15419b53b0..000000000000
--- a/include/asm-sh/irq-sh7343.h
+++ /dev/null
@@ -1,317 +0,0 @@
-#ifndef __ASM_SH_IRQ_SH7343_H
-#define __ASM_SH_IRQ_SH7343_H
-
-/*
- * linux/include/asm-sh/irq-sh7343.h
- *
- * Copyright (C) 2006 Kenati Technologies Inc.
- * Andre Mccurdy <andre@kenati.com>
- * Ranjit Deshpande <ranjit@kenati.com>
- */
-
-#undef INTC_IPRA
-#undef INTC_IPRB
-#undef INTC_IPRC
-#undef INTC_IPRD
-
-#undef DMTE0_IRQ
-#undef DMTE1_IRQ
-#undef DMTE2_IRQ
-#undef DMTE3_IRQ
-#undef DMTE4_IRQ
-#undef DMTE5_IRQ
-#undef DMTE6_IRQ
-#undef DMTE7_IRQ
-#undef DMAE_IRQ
-#undef DMA_IPR_ADDR
-#undef DMA_IPR_POS
-#undef DMA_PRIORITY
-
-#undef INTC_IMCR0
-#undef INTC_IMCR1
-#undef INTC_IMCR2
-#undef INTC_IMCR3
-#undef INTC_IMCR4
-#undef INTC_IMCR5
-#undef INTC_IMCR6
-#undef INTC_IMCR7
-#undef INTC_IMCR8
-#undef INTC_IMCR9
-#undef INTC_IMCR10
-
-
-#define INTC_IPRA       0xA4080000UL
-#define INTC_IPRB       0xA4080004UL
-#define INTC_IPRC       0xA4080008UL
-#define INTC_IPRD       0xA408000CUL
-#define INTC_IPRE       0xA4080010UL
-#define INTC_IPRF       0xA4080014UL
-#define INTC_IPRG       0xA4080018UL
-#define INTC_IPRH       0xA408001CUL
-#define INTC_IPRI       0xA4080020UL
-#define INTC_IPRJ       0xA4080024UL
-#define INTC_IPRK       0xA4080028UL
-#define INTC_IPRL       0xA408002CUL
-
-#define INTC_IMR0       0xA4080080UL
-#define INTC_IMR1       0xA4080084UL
-#define INTC_IMR2       0xA4080088UL
-#define INTC_IMR3       0xA408008CUL
-#define INTC_IMR4       0xA4080090UL
-#define INTC_IMR5       0xA4080094UL
-#define INTC_IMR6       0xA4080098UL
-#define INTC_IMR7       0xA408009CUL
-#define INTC_IMR8       0xA40800A0UL
-#define INTC_IMR9       0xA40800A4UL
-#define INTC_IMR10      0xA40800A8UL
-#define INTC_IMR11      0xA40800ACUL
-
-#define INTC_IMCR0      0xA40800C0UL
-#define INTC_IMCR1      0xA40800C4UL
-#define INTC_IMCR2      0xA40800C8UL
-#define INTC_IMCR3      0xA40800CCUL
-#define INTC_IMCR4      0xA40800D0UL
-#define INTC_IMCR5      0xA40800D4UL
-#define INTC_IMCR6      0xA40800D8UL
-#define INTC_IMCR7      0xA40800DCUL
-#define INTC_IMCR8      0xA40800E0UL
-#define INTC_IMCR9      0xA40800E4UL
-#define INTC_IMCR10     0xA40800E8UL
-#define INTC_IMCR11     0xA40800ECUL
-
-#define INTC_ICR0       0xA4140000UL
-#define INTC_ICR1       0xA414001CUL
-
-#define INTMSK0         0xa4140044
-#define INTMSKCLR0      0xa4140064
-#define INTC_INTPRI0    0xa4140010
-
-/*
-  NOTE:
-
-  *_IRQ = (INTEVT2 - 0x200)/0x20
-*/
-
-/* TMU0 */
-#define TMU0_IRQ        16
-#define TMU0_IPR_ADDR   INTC_IPRA
-#define TMU0_IPR_POS     3
-#define TMU0_PRIORITY    2
-
-#define TIMER_IRQ       16
-#define TIMER_IPR_ADDR  INTC_IPRA
-#define TIMER_IPR_POS    3
-#define TIMER_PRIORITY   2
-
-/* TMU1 */
-#define TMU1_IRQ        17
-#define TMU1_IPR_ADDR   INTC_IPRA
-#define TMU1_IPR_POS     2
-#define TMU1_PRIORITY    2
-
-/* TMU2 */
-#define TMU2_IRQ        18
-#define TMU2_IPR_ADDR   INTC_IPRA
-#define TMU2_IPR_POS     1
-#define TMU2_PRIORITY    2
-
-/* LCDC */
-#define LCDC_IRQ        28
-#define LCDC_IPR_ADDR   INTC_IPRB
-#define LCDC_IPR_POS     2
-#define LCDC_PRIORITY    2
-
-/* VIO (Video I/O) */
-#define CEU_IRQ         52
-#define BEU_IRQ         53
-#define VEU_IRQ         54
-#define VOU_IRQ         55
-#define VIO_IPR_ADDR    INTC_IPRE
-#define VIO_IPR_POS      2
-#define VIO_PRIORITY     2
-
-/* MFI (Multi Functional Interface) */
-#define MFI_IRQ         56
-#define MFI_IPR_ADDR    INTC_IPRE
-#define MFI_IPR_POS      1
-#define MFI_PRIORITY     2
-
-/* VPU (Video Processing Unit) */
-#define VPU_IRQ         60
-#define VPU_IPR_ADDR    INTC_IPRE
-#define VPU_IPR_POS      0
-#define VPU_PRIORITY     2
-
-/* 3DG */
-#define TDG_IRQ         63
-#define TDG_IPR_ADDR    INTC_IPRJ
-#define TDG_IPR_POS      2
-#define TDG_PRIORITY     2
-
-/* DMAC(1) */
-#define DMTE0_IRQ       48
-#define DMTE1_IRQ       49
-#define DMTE2_IRQ       50
-#define DMTE3_IRQ       51
-#define DMA1_IPR_ADDR   INTC_IPRE
-#define DMA1_IPR_POS    3
-#define DMA1_PRIORITY   7
-
-/* DMAC(2) */
-#define DMTE4_IRQ       76
-#define DMTE5_IRQ       77
-#define DMA2_IPR_ADDR   INTC_IPRF
-#define DMA2_IPR_POS    2
-#define DMA2_PRIORITY   7
-
-/* SCIF0 */
-#define SCIF_ERI_IRQ    80
-#define SCIF_RXI_IRQ    81
-#define SCIF_BRI_IRQ    82
-#define SCIF_TXI_IRQ    83
-#define SCIF_IPR_ADDR   INTC_IPRG
-#define SCIF_IPR_POS    3
-#define SCIF_PRIORITY   3
-
-/* SIOF0 */
-#define SIOF0_IRQ       84
-#define SIOF0_IPR_ADDR  INTC_IPRH
-#define SIOF0_IPR_POS   3
-#define SIOF0_PRIORITY  3
-
-/* FLCTL (Flash Memory Controller) */
-#define FLSTE_IRQ       92
-#define FLTEND_IRQ      93
-#define FLTRQ0_IRQ      94
-#define FLTRQ1_IRQ      95
-#define FLCTL_IPR_ADDR  INTC_IPRH
-#define FLCTL_IPR_POS   1
-#define FLCTL_PRIORITY  3
-
-/* IIC(0) (IIC Bus Interface) */
-#define IIC0_ALI_IRQ    96
-#define IIC0_TACKI_IRQ  97
-#define IIC0_WAITI_IRQ  98
-#define IIC0_DTEI_IRQ   99
-#define IIC0_IPR_ADDR   INTC_IPRH
-#define IIC0_IPR_POS    0
-#define IIC0_PRIORITY   3
-
-/* IIC(1) (IIC Bus Interface) */
-#define IIC1_ALI_IRQ    44
-#define IIC1_TACKI_IRQ  45
-#define IIC1_WAITI_IRQ  46
-#define IIC1_DTEI_IRQ   47
-#define IIC1_IPR_ADDR   INTC_IPRI
-#define IIC1_IPR_POS    0
-#define IIC1_PRIORITY   3
-
-/* SIO0 */
-#define SIO0_IRQ        88
-#define SIO0_IPR_ADDR   INTC_IPRI
-#define SIO0_IPR_POS    3
-#define SIO0_PRIORITY   3
-
-/* SDHI */
-#define SDHI_SDHII0_IRQ 100
-#define SDHI_SDHII1_IRQ 101
-#define SDHI_SDHII2_IRQ 102
-#define SDHI_SDHII3_IRQ 103
-#define SDHI_IPR_ADDR   INTC_IPRK
-#define SDHI_IPR_POS    0
-#define SDHI_PRIORITY   3
-
-/* SIU (Sound Interface Unit) */
-#define SIU_IRQ         108
-#define SIU_IPR_ADDR    INTC_IPRJ
-#define SIU_IPR_POS     1
-#define SIU_PRIORITY    3
-
-#define PORT_PACR       0xA4050100UL
-#define PORT_PBCR       0xA4050102UL
-#define PORT_PCCR       0xA4050104UL
-#define PORT_PDCR       0xA4050106UL
-#define PORT_PECR       0xA4050108UL
-#define PORT_PFCR       0xA405010AUL
-#define PORT_PGCR       0xA405010CUL
-#define PORT_PHCR       0xA405010EUL
-#define PORT_PJCR       0xA4050110UL
-#define PORT_PKCR       0xA4050112UL
-#define PORT_PLCR       0xA4050114UL
-#define PORT_SCPCR      0xA4050116UL
-#define PORT_PMCR       0xA4050118UL
-#define PORT_PNCR       0xA405011AUL
-#define PORT_PQCR       0xA405011CUL
-#define PORT_PRCR       0xA405011EUL
-#define PORT_PTCR       0xA405014CUL
-#define PORT_PUCR       0xA405014EUL
-#define PORT_PVCR       0xA4050150UL
-
-#define PORT_PSELA      0xA4050140UL
-#define PORT_PSELB      0xA4050142UL
-#define PORT_PSELC      0xA4050144UL
-#define PORT_PSELE      0xA4050158UL
-
-#define PORT_HIZCRA     0xA4050146UL
-#define PORT_HIZCRB     0xA4050148UL
-#define PORT_DRVCR      0xA405014AUL
-
-#define PORT_PADR       0xA4050120UL
-#define PORT_PBDR       0xA4050122UL
-#define PORT_PCDR       0xA4050124UL
-#define PORT_PDDR       0xA4050126UL
-#define PORT_PEDR       0xA4050128UL
-#define PORT_PFDR       0xA405012AUL
-#define PORT_PGDR       0xA405012CUL
-#define PORT_PHDR       0xA405012EUL
-#define PORT_PJDR       0xA4050130UL
-#define PORT_PKDR       0xA4050132UL
-#define PORT_PLDR       0xA4050134UL
-#define PORT_SCPDR      0xA4050136UL
-#define PORT_PMDR       0xA4050138UL
-#define PORT_PNDR       0xA405013AUL
-#define PORT_PQDR       0xA405013CUL
-#define PORT_PRDR       0xA405013EUL
-#define PORT_PTDR       0xA405016CUL
-#define PORT_PUDR       0xA405016EUL
-#define PORT_PVDR       0xA4050170UL
-
-#define IRQ0_IRQ        32
-#define IRQ1_IRQ        33
-#define IRQ2_IRQ        34
-#define IRQ3_IRQ        35
-#define IRQ4_IRQ        36
-#define IRQ5_IRQ        37
-#define IRQ6_IRQ        38
-#define IRQ7_IRQ        39
-
-#define INTPRI00        0xA4140010UL
-
-#define IRQ0_IPR_ADDR   INTPRI00
-#define IRQ1_IPR_ADDR   INTPRI00
-#define IRQ2_IPR_ADDR   INTPRI00
-#define IRQ3_IPR_ADDR   INTPRI00
-#define IRQ4_IPR_ADDR   INTPRI00
-#define IRQ5_IPR_ADDR   INTPRI00
-#define IRQ6_IPR_ADDR   INTPRI00
-#define IRQ7_IPR_ADDR   INTPRI00
-
-#define IRQ0_IPR_POS    7
-#define IRQ1_IPR_POS    6
-#define IRQ2_IPR_POS    5
-#define IRQ3_IPR_POS    4
-#define IRQ4_IPR_POS    3
-#define IRQ5_IPR_POS    2
-#define IRQ6_IPR_POS    1
-#define IRQ7_IPR_POS    0
-
-#define IRQ0_PRIORITY   1
-#define IRQ1_PRIORITY   1
-#define IRQ2_PRIORITY   1
-#define IRQ3_PRIORITY   1
-#define IRQ4_PRIORITY   1
-#define IRQ5_PRIORITY   1
-#define IRQ6_PRIORITY   1
-#define IRQ7_PRIORITY   1
-
-#endif /* __ASM_SH_IRQ_SH7343_H */
diff --git a/include/asm-sh/irq-sh7780.h b/include/asm-sh/irq-sh7780.h
deleted file mode 100644
index 19912ae6a7f7..000000000000
--- a/include/asm-sh/irq-sh7780.h
+++ /dev/null
@@ -1,311 +0,0 @@
-#ifndef __ASM_SH_IRQ_SH7780_H
-#define __ASM_SH_IRQ_SH7780_H
-
-/*
- * linux/include/asm-sh/irq-sh7780.h
- *
- * Copyright (C) 2004 Takashi SHUDO <shudo@hitachi-ul.co.jp>
- */
-#define INTC_BASE       0xffd00000
-#define INTC_ICR0       (INTC_BASE+0x0)
-#define INTC_ICR1       (INTC_BASE+0x1c)
-#define INTC_INTPRI     (INTC_BASE+0x10)
-#define INTC_INTREQ     (INTC_BASE+0x24)
-#define INTC_INTMSK0    (INTC_BASE+0x44)
-#define INTC_INTMSK1    (INTC_BASE+0x48)
-#define INTC_INTMSK2    (INTC_BASE+0x40080)
-#define INTC_INTMSKCLR0 (INTC_BASE+0x64)
-#define INTC_INTMSKCLR1 (INTC_BASE+0x68)
-#define INTC_INTMSKCLR2 (INTC_BASE+0x40084)
-#define INTC_NMIFCR     (INTC_BASE+0xc0)
-#define INTC_USERIMASK  (INTC_BASE+0x30000)
-
-#define INTC_INT2PRI0   (INTC_BASE+0x40000)
-#define INTC_INT2PRI1   (INTC_BASE+0x40004)
-#define INTC_INT2PRI2   (INTC_BASE+0x40008)
-#define INTC_INT2PRI3   (INTC_BASE+0x4000c)
-#define INTC_INT2PRI4   (INTC_BASE+0x40010)
-#define INTC_INT2PRI5   (INTC_BASE+0x40014)
-#define INTC_INT2PRI6   (INTC_BASE+0x40018)
-#define INTC_INT2PRI7   (INTC_BASE+0x4001c)
-#define INTC_INT2A0     (INTC_BASE+0x40030)
-#define INTC_INT2A1     (INTC_BASE+0x40034)
-#define INTC_INT2MSKR   (INTC_BASE+0x40038)
-#define INTC_INT2MSKCR  (INTC_BASE+0x4003c)
-#define INTC_INT2B0     (INTC_BASE+0x40040)
-#define INTC_INT2B1     (INTC_BASE+0x40044)
-#define INTC_INT2B2     (INTC_BASE+0x40048)
-#define INTC_INT2B3     (INTC_BASE+0x4004c)
-#define INTC_INT2B4     (INTC_BASE+0x40050)
-#define INTC_INT2B5     (INTC_BASE+0x40054)
-#define INTC_INT2B6     (INTC_BASE+0x40058)
-#define INTC_INT2B7     (INTC_BASE+0x4005c)
-#define INTC_INT2GPIC   (INTC_BASE+0x40090)
-/*
-  NOTE:
-  *_IRQ = (INTEVT2 - 0x200)/0x20
-*/
-/* IRQ 0-7 line external int*/
-#define IRQ0_IRQ        2
-#define IRQ0_IPR_ADDR   INTC_INTPRI
-#define IRQ0_IPR_POS    7
-#define IRQ0_PRIORITY   2
-
-#define IRQ1_IRQ        4
-#define IRQ1_IPR_ADDR   INTC_INTPRI
-#define IRQ1_IPR_POS    6
-#define IRQ1_PRIORITY   2
-
-#define IRQ2_IRQ        6
-#define IRQ2_IPR_ADDR   INTC_INTPRI
-#define IRQ2_IPR_POS    5
-#define IRQ2_PRIORITY   2
-
-#define IRQ3_IRQ        8
-#define IRQ3_IPR_ADDR   INTC_INTPRI
-#define IRQ3_IPR_POS    4
-#define IRQ3_PRIORITY   2
-
-#define IRQ4_IRQ        10
-#define IRQ4_IPR_ADDR   INTC_INTPRI
-#define IRQ4_IPR_POS    3
-#define IRQ4_PRIORITY   2
-
-#define IRQ5_IRQ        12
-#define IRQ5_IPR_ADDR   INTC_INTPRI
-#define IRQ5_IPR_POS    2
-#define IRQ5_PRIORITY   2
-
-#define IRQ6_IRQ        14
-#define IRQ6_IPR_ADDR   INTC_INTPRI
-#define IRQ6_IPR_POS    1
-#define IRQ6_PRIORITY   2
-
-#define IRQ7_IRQ        0
-#define IRQ7_IPR_ADDR   INTC_INTPRI
-#define IRQ7_IPR_POS    0
-#define IRQ7_PRIORITY   2
-
-/* TMU */
-/* ch0 */
-#define TMU_IRQ         28
-#define TMU_IPR_ADDR    INTC_INT2PRI0
-#define TMU_IPR_POS     3
-#define TMU_PRIORITY    2
-
-#define TIMER_IRQ       28
-#define TIMER_IPR_ADDR  INTC_INT2PRI0
-#define TIMER_IPR_POS   3
-#define TIMER_PRIORITY  2
-
-/* ch 1*/
-#define TMU_CH1_IRQ             29
-#define TMU_CH1_IPR_ADDR        INTC_INT2PRI0
-#define TMU_CH1_IPR_POS         2
-#define TMU_CH1_PRIORITY        2
-
-#define TIMER1_IRQ      29
-#define TIMER1_IPR_ADDR INTC_INT2PRI0
-#define TIMER1_IPR_POS  2
-#define TIMER1_PRIORITY 2
-
-/* ch 2*/
-#define TMU_CH2_IRQ             30
-#define TMU_CH2_IPR_ADDR        INTC_INT2PRI0
-#define TMU_CH2_IPR_POS         1
-#define TMU_CH2_PRIORITY        2
-/* ch 2 Input capture */
-#define TMU_CH2IC_IRQ           31
-#define TMU_CH2IC_IPR_ADDR      INTC_INT2PRI0
-#define TMU_CH2IC_IPR_POS       0
-#define TMU_CH2IC_PRIORITY      2
-/* ch 3 */
-#define TMU_CH3_IRQ             96
-#define TMU_CH3_IPR_ADDR        INTC_INT2PRI1
-#define TMU_CH3_IPR_POS         3
-#define TMU_CH3_PRIORITY        2
-/* ch 4 */
-#define TMU_CH4_IRQ             97
-#define TMU_CH4_IPR_ADDR        INTC_INT2PRI1
-#define TMU_CH4_IPR_POS         2
-#define TMU_CH4_PRIORITY        2
-/* ch 5*/
-#define TMU_CH5_IRQ             98
-#define TMU_CH5_IPR_ADDR        INTC_INT2PRI1
-#define TMU_CH5_IPR_POS         1
-#define TMU_CH5_PRIORITY        2
-
-/* SCIF0 */
-#define SCIF0_ERI_IRQ   40
-#define SCIF0_RXI_IRQ   41
-#define SCIF0_BRI_IRQ   42
-#define SCIF0_TXI_IRQ   43
-#define SCIF0_IPR_ADDR  INTC_INT2PRI2
-#define SCIF0_IPR_POS   3
-#define SCIF0_PRIORITY  3
-
-/* SCIF1 */
-#define SCIF1_ERI_IRQ   76
-#define SCIF1_RXI_IRQ   77
-#define SCIF1_BRI_IRQ   78
-#define SCIF1_TXI_IRQ   79
-#define SCIF1_IPR_ADDR  INTC_INT2PRI2
-#define SCIF1_IPR_POS   2
-#define SCIF1_PRIORITY  3
-
-#define WDT_IRQ         27
-#define WDT_IPR_ADDR    INTC_INT2PRI2
-#define WDT_IPR_POS     1
-#define WDT_PRIORITY    2
-
-/* DMAC(0) */
-#define DMINT0_IRQ      34
-#define DMINT1_IRQ      35
-#define DMINT2_IRQ      36
-#define DMINT3_IRQ      37
-#define DMINT4_IRQ      44
-#define DMINT5_IRQ      45
-#define DMINT6_IRQ      46
-#define DMINT7_IRQ      47
-#define DMAE_IRQ        38
-#define DMA0_IPR_ADDR   INTC_INT2PRI3
-#define DMA0_IPR_POS    2
-#define DMA0_PRIORITY   7
-
-/* DMAC(1) */
-#define DMINT8_IRQ      92
-#define DMINT9_IRQ      93
-#define DMINT10_IRQ     94
-#define DMINT11_IRQ     95
-#define DMA1_IPR_ADDR   INTC_INT2PRI3
-#define DMA1_IPR_POS    1
-#define DMA1_PRIORITY   7
-
-#define DMTE0_IRQ       DMINT0_IRQ
-#define DMTE4_IRQ       DMINT4_IRQ
-#define DMA_IPR_ADDR    DMA0_IPR_ADDR
-#define DMA_IPR_POS     DMA0_IPR_POS
-#define DMA_PRIORITY    DMA0_PRIORITY
-
-/* CMT */
-#define CMT_IRQ         56
-#define CMT_IPR_ADDR    INTC_INT2PRI4
-#define CMT_IPR_POS     3
-#define CMT_PRIORITY    0
-
-/* HAC */
-#define HAC_IRQ         60
-#define HAC_IPR_ADDR    INTC_INT2PRI4
-#define HAC_IPR_POS     2
-#define CMT_PRIORITY    0
-
-/* PCIC(0) */
-#define PCIC0_IRQ       64
-#define PCIC0_IPR_ADDR  INTC_INT2PRI4
-#define PCIC0_IPR_POS   1
-#define PCIC0_PRIORITY  2
-
-/* PCIC(1) */
-#define PCIC1_IRQ       65
-#define PCIC1_IPR_ADDR  INTC_INT2PRI4
-#define PCIC1_IPR_POS   0
-#define PCIC1_PRIORITY  2
-
-/* PCIC(2) */
-#define PCIC2_IRQ       66
-#define PCIC2_IPR_ADDR  INTC_INT2PRI5
-#define PCIC2_IPR_POS   3
-#define PCIC2_PRIORITY  2
-
-/* PCIC(3) */
-#define PCIC3_IRQ       67
-#define PCIC3_IPR_ADDR  INTC_INT2PRI5
-#define PCIC3_IPR_POS   2
-#define PCIC3_PRIORITY  2
-
-/* PCIC(4) */
-#define PCIC4_IRQ       68
-#define PCIC4_IPR_ADDR  INTC_INT2PRI5
-#define PCIC4_IPR_POS   1
-#define PCIC4_PRIORITY  2
-
-/* PCIC(5) */
-#define PCICERR_IRQ     69
-#define PCICPWD3_IRQ    70
-#define PCICPWD2_IRQ    71
-#define PCICPWD1_IRQ    72
-#define PCICPWD0_IRQ    73
-#define PCIC5_IPR_ADDR  INTC_INT2PRI5
-#define PCIC5_IPR_POS   0
-#define PCIC5_PRIORITY  2
-
-/* SIOF */
-#define SIOF_IRQ        80
-#define SIOF_IPR_ADDR   INTC_INT2PRI6
-#define SIOF_IPR_POS    3
-#define SIOF_PRIORITY   3
-
-/* HSPI */
-#define HSPI_IRQ        84
-#define HSPI_IPR_ADDR   INTC_INT2PRI6
-#define HSPI_IPR_POS    2
-#define HSPI_PRIORITY   3
-
-/* MMCIF */
-#define MMCIF_FSTAT_IRQ 88
-#define MMCIF_TRAN_IRQ  89
-#define MMCIF_ERR_IRQ   90
-#define MMCIF_FRDY_IRQ  91
-#define MMCIF_IPR_ADDR  INTC_INT2PRI6
-#define MMCIF_IPR_POS   1
-#define HSPI_PRIORITY   3
-
-/* SSI */
-#define SSI_IRQ         100
-#define SSI_IPR_ADDR    INTC_INT2PRI6
-#define SSI_IPR_POS     0
-#define SSI_PRIORITY    3
-
-/* FLCTL */
-#define FLCTL_FLSTE_IRQ         104
-#define FLCTL_FLTEND_IRQ        105
-#define FLCTL_FLTRQ0_IRQ        106
-#define FLCTL_FLTRQ1_IRQ        107
-#define FLCTL_IPR_ADDR          INTC_INT2PRI7
-#define FLCTL_IPR_POS           3
-#define FLCTL_PRIORITY          3
-
-/* GPIO */
-#define GPIO0_IRQ       108
-#define GPIO1_IRQ       109
-#define GPIO2_IRQ       110
-#define GPIO3_IRQ       111
-#define GPIO_IPR_ADDR   INTC_INT2PRI7
-#define GPIO_IPR_POS    2
-#define GPIO_PRIORITY   3
-
-#define INTC_TMU0_MSK   0
-#define INTC_TMU3_MSK   1
-#define INTC_RTC_MSK    2
-#define INTC_SCIF0_MSK  3
-#define INTC_SCIF1_MSK  4
-#define INTC_WDT_MSK    5
-#define INTC_HUID_MSK   7
-#define INTC_DMAC0_MSK  8
-#define INTC_DMAC1_MSK  9
-#define INTC_CMT_MSK    12
-#define INTC_HAC_MSK    13
-#define INTC_PCIC0_MSK  14
-#define INTC_PCIC1_MSK  15
-#define INTC_PCIC2_MSK  16
-#define INTC_PCIC3_MSK  17
-#define INTC_PCIC4_MSK  18
-#define INTC_PCIC5_MSK  19
-#define INTC_SIOF_MSK   20
-#define INTC_HSPI_MSK   21
-#define INTC_MMCIF_MSK  22
-#define INTC_SSI_MSK    23
-#define INTC_FLCTL_MSK  24
-#define INTC_GPIO_MSK   25
-
-#endif /* __ASM_SH_IRQ_SH7780_H */
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h
index 6cd3e9e2a76a..fd576088e47e 100644
--- a/include/asm-sh/irq.h
+++ b/include/asm-sh/irq.h
@@ -1,233 +1,9 @@
 #ifndef __ASM_SH_IRQ_H
 #define __ASM_SH_IRQ_H
 
-/*
- *
- * linux/include/asm-sh/irq.h
- *
- * Copyright (C) 1999  Niibe Yutaka & Takeshi Yaegashi
- * Copyright (C) 2000  Kazumoto Kojima
- * Copyright (C) 2003  Paul Mundt
- *
- */
-
 #include <asm/machvec.h>
 #include <asm/ptrace.h>         /* for pt_regs */
 
-#ifndef CONFIG_CPU_SUBTYPE_SH7780
-
-#define INTC_DMAC0_MSK  0
-
-#if defined(CONFIG_CPU_SH3)
-#define INTC_IPRA       0xfffffee2UL
-#define INTC_IPRB       0xfffffee4UL
-#elif defined(CONFIG_CPU_SH4)
-#define INTC_IPRA       0xffd00004UL
-#define INTC_IPRB       0xffd00008UL
-#define INTC_IPRC       0xffd0000cUL
-#define INTC_IPRD       0xffd00010UL
-#endif
-
-#define TIMER_IRQ       16
-#define TIMER_IPR_ADDR  INTC_IPRA
-#define TIMER_IPR_POS    3
-#define TIMER_PRIORITY   2
-
-#define TIMER1_IRQ      17
-#define TIMER1_IPR_ADDR INTC_IPRA
-#define TIMER1_IPR_POS   2
-#define TIMER1_PRIORITY  4
-
-#define RTC_IRQ         22
-#define RTC_IPR_ADDR    INTC_IPRA
-#define RTC_IPR_POS      0
-#define RTC_PRIORITY    TIMER_PRIORITY
-
-#if defined(CONFIG_CPU_SH3)
-#define DMTE0_IRQ       48
-#define DMTE1_IRQ       49
-#define DMTE2_IRQ       50
-#define DMTE3_IRQ       51
-#define DMA_IPR_ADDR    INTC_IPRE
-#define DMA_IPR_POS     3
-#define DMA_PRIORITY    7
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-/* TMU2 */
-#define TIMER2_IRQ      18
-#define TIMER2_IPR_ADDR INTC_IPRA
-#define TIMER2_IPR_POS   1
-#define TIMER2_PRIORITY  2
-
-/* WDT */
-#define WDT_IRQ         27
-#define WDT_IPR_ADDR    INTC_IPRB
-#define WDT_IPR_POS      3
-#define WDT_PRIORITY     2
-
-/* SIM (SIM Card Module) */
-#define SIM_ERI_IRQ     23
-#define SIM_RXI_IRQ     24
-#define SIM_TXI_IRQ     25
-#define SIM_TEND_IRQ    26
-#define SIM_IPR_ADDR    INTC_IPRB
-#define SIM_IPR_POS      1
-#define SIM_PRIORITY     2
-
-/* VIO (Video I/O) */
-#define VIO_IRQ         52
-#define VIO_IPR_ADDR    INTC_IPRE
-#define VIO_IPR_POS      2
-#define VIO_PRIORITY     2
-
-/* MFI (Multi Functional Interface) */
-#define MFI_IRQ         56
-#define MFI_IPR_ADDR    INTC_IPRE
-#define MFI_IPR_POS      1
-#define MFI_PRIORITY     2
-
-/* VPU (Video Processing Unit) */
-#define VPU_IRQ         60
-#define VPU_IPR_ADDR    INTC_IPRE
-#define VPU_IPR_POS      0
-#define VPU_PRIORITY     2
-
-/* KEY (Key Scan Interface) */
-#define KEY_IRQ         79
-#define KEY_IPR_ADDR    INTC_IPRF
-#define KEY_IPR_POS      3
-#define KEY_PRIORITY     2
-
-/* CMT (Compare Match Timer) */
-#define CMT_IRQ         104
-#define CMT_IPR_ADDR    INTC_IPRF
-#define CMT_IPR_POS      0
-#define CMT_PRIORITY     2
-
-/* DMAC(1) */
-#define DMTE0_IRQ       48
-#define DMTE1_IRQ       49
-#define DMTE2_IRQ       50
-#define DMTE3_IRQ       51
-#define DMA1_IPR_ADDR   INTC_IPRE
-#define DMA1_IPR_POS    3
-#define DMA1_PRIORITY   7
-
-/* DMAC(2) */
-#define DMTE4_IRQ       76
-#define DMTE5_IRQ       77
-#define DMA2_IPR_ADDR   INTC_IPRF
-#define DMA2_IPR_POS    2
-#define DMA2_PRIORITY   7
-
-/* SIOF0 */
-#define SIOF0_IRQ       84
-#define SIOF0_IPR_ADDR  INTC_IPRH
-#define SIOF0_IPR_POS   3
-#define SIOF0_PRIORITY  3
-
-/* FLCTL (Flash Memory Controller) */
-#define FLSTE_IRQ       92
-#define FLTEND_IRQ      93
-#define FLTRQ0_IRQ      94
-#define FLTRQ1_IRQ      95
-#define FLCTL_IPR_ADDR  INTC_IPRH
-#define FLCTL_IPR_POS   1
-#define FLCTL_PRIORITY  3
-
-/* IIC (IIC Bus Interface) */
-#define IIC_ALI_IRQ     96
-#define IIC_TACKI_IRQ   97
-#define IIC_WAITI_IRQ   98
-#define IIC_DTEI_IRQ    99
-#define IIC_IPR_ADDR    INTC_IPRH
-#define IIC_IPR_POS     0
-#define IIC_PRIORITY    3
-
-/* SIO0 */
-#define SIO0_IRQ        88
-#define SIO0_IPR_ADDR   INTC_IPRI
-#define SIO0_IPR_POS    3
-#define SIO0_PRIORITY   3
-
-/* SIU (Sound Interface Unit) */
-#define SIU_IRQ         108
-#define SIU_IPR_ADDR    INTC_IPRJ
-#define SIU_IPR_POS     1
-#define SIU_PRIORITY    3
-
-#endif
-#elif defined(CONFIG_CPU_SH4)
-#define DMTE0_IRQ       34
-#define DMTE1_IRQ       35
-#define DMTE2_IRQ       36
-#define DMTE3_IRQ       37
-#define DMTE4_IRQ       44      /* 7751R only */
-#define DMTE5_IRQ       45      /* 7751R only */
-#define DMTE6_IRQ       46      /* 7751R only */
-#define DMTE7_IRQ       47      /* 7751R only */
-#define DMAE_IRQ        38
-#define DMA_IPR_ADDR    INTC_IPRC
-#define DMA_IPR_POS     2
-#define DMA_PRIORITY    7
-#endif
-
-#if defined (CONFIG_CPU_SUBTYPE_SH7707) || defined (CONFIG_CPU_SUBTYPE_SH7708) || \
-    defined (CONFIG_CPU_SUBTYPE_SH7709) || defined (CONFIG_CPU_SUBTYPE_SH7750) || \
-    defined (CONFIG_CPU_SUBTYPE_SH7751) || defined (CONFIG_CPU_SUBTYPE_SH7706)
-#define SCI_ERI_IRQ     23
-#define SCI_RXI_IRQ     24
-#define SCI_TXI_IRQ     25
-#define SCI_IPR_ADDR    INTC_IPRB
-#define SCI_IPR_POS     1
-#define SCI_PRIORITY    3
-#endif
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-#define SCIF0_IRQ       80
-#define SCIF0_IPR_ADDR  INTC_IPRG
-#define SCIF0_IPR_POS   3
-#define SCIF0_PRIORITY  3
-#elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709)
-#define SCIF_ERI_IRQ    56
-#define SCIF_RXI_IRQ    57
-#define SCIF_BRI_IRQ    58
-#define SCIF_TXI_IRQ    59
-#define SCIF_IPR_ADDR   INTC_IPRE
-#define SCIF_IPR_POS    1
-#define SCIF_PRIORITY   3
-
-#define IRDA_ERI_IRQ    52
-#define IRDA_RXI_IRQ    53
-#define IRDA_BRI_IRQ    54
-#define IRDA_TXI_IRQ    55
-#define IRDA_IPR_ADDR   INTC_IPRE
-#define IRDA_IPR_POS    2
-#define IRDA_PRIORITY   3
-#elif defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) || \
-      defined(CONFIG_CPU_SUBTYPE_ST40STB1) || defined(CONFIG_CPU_SUBTYPE_SH4_202)
-#define SCIF_ERI_IRQ    40
-#define SCIF_RXI_IRQ    41
-#define SCIF_BRI_IRQ    42
-#define SCIF_TXI_IRQ    43
-#define SCIF_IPR_ADDR   INTC_IPRC
-#define SCIF_IPR_POS    1
-#define SCIF_PRIORITY   3
-#if defined(CONFIG_CPU_SUBTYPE_ST40STB1)
-#define SCIF1_ERI_IRQ   23
-#define SCIF1_RXI_IRQ   24
-#define SCIF1_BRI_IRQ   25
-#define SCIF1_TXI_IRQ   26
-#define SCIF1_IPR_ADDR  INTC_IPRB
-#define SCIF1_IPR_POS   1
-#define SCIF1_PRIORITY  3
-#endif /* ST40STB1 */
-
-#endif /* 775x / SH4-202 / ST40STB1 */
-#endif /* 7780 */
-
 /* NR_IRQS is made from three components:
  *   1. ONCHIP_NR_IRQS - number of IRLS + on-chip peripherial modules
  *   2. PINT_NR_IRQS   - number of PINT interrupts
@@ -265,6 +41,10 @@
 # define ONCHIP_NR_IRQS 109
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
 # define ONCHIP_NR_IRQS 111
+#elif defined(CONFIG_CPU_SUBTYPE_SH7206)
+# define ONCHIP_NR_IRQS 256
+#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+# define ONCHIP_NR_IRQS 128
 #elif defined(CONFIG_SH_UNKNOWN)        /* Most be last */
 # define ONCHIP_NR_IRQS 144
 #endif
@@ -312,9 +92,11 @@
 /* NR_IRQS. 1+2+3 */
 #define NR_IRQS (ONCHIP_NR_IRQS + PINT_NR_IRQS + OFFCHIP_NR_IRQS)
 
-extern void disable_irq(unsigned int);
-extern void disable_irq_nosync(unsigned int);
-extern void enable_irq(unsigned int);
+/*
+ * Convert back and forth between INTEVT and IRQ values.
+ */
+#define evt2irq(evt)            (((evt) >> 5) - 16)
+#define irq2evt(irq)            (((irq) + 16) << 5)
 
 /*
  * Simple Mask Register Support
@@ -327,362 +109,36 @@ extern unsigned short *irq_mask_register;
  */
 void init_IRQ_pint(void);
 
+/*
+ * The shift value is now the number of bits to shift, not the number of
+ * bits/4. This is to make it easier to read the value directly from the
+ * datasheets. The IPR address, addr, will be set from ipr_idx via the
+ * map_ipridx_to_addr function.
+ */
 struct ipr_data {
         unsigned int irq;
-        unsigned int addr;      /* Address of Interrupt Priority Register */
-        int shift;              /* Shifts of the 16-bit data */
+        int ipr_idx;            /* Index for the IPR registered */
+        int shift;              /* Number of bits to shift the data */
         int priority;           /* The priority */
+        unsigned int addr;      /* Address of Interrupt Priority Register */
 };
 
 /*
- * Function for "on chip support modules".
+ * Given an IPR IDX, map the value to an IPR register address.
  */
-extern void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs);
-extern void make_imask_irq(unsigned int irq);
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-#undef INTC_IPRA
-#undef INTC_IPRB
-#define INTC_IPRA       0xA414FEE2UL
-#define INTC_IPRB       0xA414FEE4UL
-#define INTC_IPRC       0xA4140016UL
-#define INTC_IPRD       0xA4140018UL
-#define INTC_IPRE       0xA414001AUL
-#define INTC_IPRF       0xA4080000UL
-#define INTC_IPRG       0xA4080002UL
-#define INTC_IPRH       0xA4080004UL
-#define INTC_IPRI       0xA4080006UL
-#define INTC_IPRJ       0xA4080008UL
-
-#define INTC_IMR0       0xA4080040UL
-#define INTC_IMR1       0xA4080042UL
-#define INTC_IMR2       0xA4080044UL
-#define INTC_IMR3       0xA4080046UL
-#define INTC_IMR4       0xA4080048UL
-#define INTC_IMR5       0xA408004AUL
-#define INTC_IMR6       0xA408004CUL
-#define INTC_IMR7       0xA408004EUL
-#define INTC_IMR8       0xA4080050UL
-#define INTC_IMR9       0xA4080052UL
-#define INTC_IMR10      0xA4080054UL
-
-#define INTC_IMCR0      0xA4080060UL
-#define INTC_IMCR1      0xA4080062UL
-#define INTC_IMCR2      0xA4080064UL
-#define INTC_IMCR3      0xA4080066UL
-#define INTC_IMCR4      0xA4080068UL
-#define INTC_IMCR5      0xA408006AUL
-#define INTC_IMCR6      0xA408006CUL
-#define INTC_IMCR7      0xA408006EUL
-#define INTC_IMCR8      0xA4080070UL
-#define INTC_IMCR9      0xA4080072UL
-#define INTC_IMCR10     0xA4080074UL
-
-#define INTC_ICR0       0xA414FEE0UL
-#define INTC_ICR1       0xA4140010UL
-
-#define INTC_IRR0       0xA4140004UL
-
-#define PORT_PACR       0xA4050100UL
-#define PORT_PBCR       0xA4050102UL
-#define PORT_PCCR       0xA4050104UL
-#define PORT_PDCR       0xA4050106UL
-#define PORT_PECR       0xA4050108UL
-#define PORT_PFCR       0xA405010AUL
-#define PORT_PGCR       0xA405010CUL
-#define PORT_PHCR       0xA405010EUL
-#define PORT_PJCR       0xA4050110UL
-#define PORT_PKCR       0xA4050112UL
-#define PORT_PLCR       0xA4050114UL
-#define PORT_SCPCR      0xA4050116UL
-#define PORT_PMCR       0xA4050118UL
-#define PORT_PNCR       0xA405011AUL
-#define PORT_PQCR       0xA405011CUL
-
-#define PORT_PSELA      0xA4050140UL
-#define PORT_PSELB      0xA4050142UL
-#define PORT_PSELC      0xA4050144UL
-
-#define PORT_HIZCRA     0xA4050146UL
-#define PORT_HIZCRB     0xA4050148UL
-#define PORT_DRVCR      0xA4050150UL
-
-#define PORT_PADR       0xA4050120UL
-#define PORT_PBDR       0xA4050122UL
-#define PORT_PCDR       0xA4050124UL
-#define PORT_PDDR       0xA4050126UL
-#define PORT_PEDR       0xA4050128UL
-#define PORT_PFDR       0xA405012AUL
-#define PORT_PGDR       0xA405012CUL
-#define PORT_PHDR       0xA405012EUL
-#define PORT_PJDR       0xA4050130UL
-#define PORT_PKDR       0xA4050132UL
-#define PORT_PLDR       0xA4050134UL
-#define PORT_SCPDR      0xA4050136UL
-#define PORT_PMDR       0xA4050138UL
-#define PORT_PNDR       0xA405013AUL
-#define PORT_PQDR       0xA405013CUL
-
-#define IRQ0_IRQ        32
-#define IRQ1_IRQ        33
-#define IRQ2_IRQ        34
-#define IRQ3_IRQ        35
-#define IRQ4_IRQ        36
-#define IRQ5_IRQ        37
-
-#define IRQ0_IPR_ADDR   INTC_IPRC
-#define IRQ1_IPR_ADDR   INTC_IPRC
-#define IRQ2_IPR_ADDR   INTC_IPRC
-#define IRQ3_IPR_ADDR   INTC_IPRC
-#define IRQ4_IPR_ADDR   INTC_IPRD
-#define IRQ5_IPR_ADDR   INTC_IPRD
-
-#define IRQ0_IPR_POS    0
-#define IRQ1_IPR_POS    1
-#define IRQ2_IPR_POS    2
-#define IRQ3_IPR_POS    3
-#define IRQ4_IPR_POS    0
-#define IRQ5_IPR_POS    1
+unsigned int map_ipridx_to_addr(int idx);
 
-#define IRQ0_PRIORITY   1
-#define IRQ1_PRIORITY   1
-#define IRQ2_PRIORITY   1
-#define IRQ3_PRIORITY   1
-#define IRQ4_PRIORITY   1
-#define IRQ5_PRIORITY   1
-
-extern int ipr_irq_demux(int irq);
-#define __irq_demux(irq) ipr_irq_demux(irq)
-
-#elif defined(CONFIG_CPU_SUBTYPE_SH7604)
-#define INTC_IPRA       0xfffffee2UL
-#define INTC_IPRB       0xfffffe60UL
-
-#define INTC_VCRA       0xfffffe62UL
-#define INTC_VCRB       0xfffffe64UL
-#define INTC_VCRC       0xfffffe66UL
-#define INTC_VCRD       0xfffffe68UL
-
-#define INTC_VCRWDT     0xfffffee4UL
-#define INTC_VCRDIV     0xffffff0cUL
-#define INTC_VCRDMA0    0xffffffa0UL
-#define INTC_VCRDMA1    0xffffffa8UL
-
-#define INTC_ICR        0xfffffee0UL
-#elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7710)
-#define INTC_IRR0       0xa4000004UL
-#define INTC_IRR1       0xa4000006UL
-#define INTC_IRR2       0xa4000008UL
-
-#define INTC_ICR0       0xfffffee0UL
-#define INTC_ICR1       0xa4000010UL
-#define INTC_ICR2       0xa4000012UL
-#define INTC_INTER      0xa4000014UL
-
-#define INTC_IPRC       0xa4000016UL
-#define INTC_IPRD       0xa4000018UL
-#define INTC_IPRE       0xa400001aUL
-#if defined(CONFIG_CPU_SUBTYPE_SH7707)
-#define INTC_IPRF       0xa400001cUL
-#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
-#define INTC_IPRF       0xa4080000UL
-#define INTC_IPRG       0xa4080002UL
-#define INTC_IPRH       0xa4080004UL
-#elif defined(CONFIG_CPU_SUBTYPE_SH7710)
-/* Interrupt Controller Registers */
-#undef INTC_IPRA
-#undef INTC_IPRB
-#define INTC_IPRA       0xA414FEE2UL
-#define INTC_IPRB       0xA414FEE4UL
-#define INTC_IPRF       0xA4080000UL
-#define INTC_IPRG       0xA4080002UL
-#define INTC_IPRH       0xA4080004UL
-#define INTC_IPRI       0xA4080006UL
-
-#undef INTC_ICR0
-#undef INTC_ICR1
-#define INTC_ICR0       0xA414FEE0UL
-#define INTC_ICR1       0xA4140010UL
-
-#define INTC_IRR0       0xa4000004UL
-#define INTC_IRR1       0xa4000006UL
-#define INTC_IRR2       0xa4000008UL
-#define INTC_IRR3       0xa400000AUL
-#define INTC_IRR4       0xa400000CUL
-#define INTC_IRR5       0xa4080020UL
-#define INTC_IRR7       0xa4080024UL
-#define INTC_IRR8       0xa4080026UL
-
-/* Interrupt numbers */
-#define TIMER2_IRQ      18
-#define TIMER2_IPR_ADDR INTC_IPRA
-#define TIMER2_IPR_POS   1
-#define TIMER2_PRIORITY  2
-
-/* WDT */
-#define WDT_IRQ         27
-#define WDT_IPR_ADDR    INTC_IPRB
-#define WDT_IPR_POS      3
-#define WDT_PRIORITY     2
-
-#define SCIF0_ERI_IRQ   52
-#define SCIF0_RXI_IRQ   53
-#define SCIF0_BRI_IRQ   54
-#define SCIF0_TXI_IRQ   55
-#define SCIF0_IPR_ADDR  INTC_IPRE
-#define SCIF0_IPR_POS   2
-#define SCIF0_PRIORITY  3
-
-#define DMTE4_IRQ       76
-#define DMTE5_IRQ       77
-#define DMA2_IPR_ADDR   INTC_IPRF
-#define DMA2_IPR_POS    2
-#define DMA2_PRIORITY   7
-
-#define IPSEC_IRQ       79
-#define IPSEC_IPR_ADDR  INTC_IPRF
-#define IPSEC_IPR_POS   3
-#define IPSEC_PRIORITY  3
-
-/* EDMAC */
-#define EDMAC0_IRQ      80
-#define EDMAC0_IPR_ADDR INTC_IPRG
-#define EDMAC0_IPR_POS  3
-#define EDMAC0_PRIORITY 3
-
-#define EDMAC1_IRQ      81
-#define EDMAC1_IPR_ADDR INTC_IPRG
-#define EDMAC1_IPR_POS  2
-#define EDMAC1_PRIORITY 3
-
-#define EDMAC2_IRQ      82
-#define EDMAC2_IPR_ADDR INTC_IPRG
-#define EDMAC2_IPR_POS  1
-#define EDMAC2_PRIORITY 3
-
-/* SIOF */
-#define SIOF0_ERI_IRQ   96
-#define SIOF0_TXI_IRQ   97
-#define SIOF0_RXI_IRQ   98
-#define SIOF0_CCI_IRQ   99
-#define SIOF0_IPR_ADDR  INTC_IPRH
-#define SIOF0_IPR_POS   0
-#define SIOF0_PRIORITY  7
-
-#define SIOF1_ERI_IRQ   100
-#define SIOF1_TXI_IRQ   101
-#define SIOF1_RXI_IRQ   102
-#define SIOF1_CCI_IRQ   103
-#define SIOF1_IPR_ADDR  INTC_IPRI
-#define SIOF1_IPR_POS   1
-#define SIOF1_PRIORITY  7
-#endif /* CONFIG_CPU_SUBTYPE_SH7710 */
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7710)
-#define PORT_PACR       0xa4050100UL
-#define PORT_PBCR       0xa4050102UL
-#define PORT_PCCR       0xa4050104UL
-#define PORT_PETCR      0xa4050106UL
-#define PORT_PADR       0xa4050120UL
-#define PORT_PBDR       0xa4050122UL
-#define PORT_PCDR       0xa4050124UL
-#else
-#define PORT_PACR       0xa4000100UL
-#define PORT_PBCR       0xa4000102UL
-#define PORT_PCCR       0xa4000104UL
-#define PORT_PFCR       0xa400010aUL
-#define PORT_PADR       0xa4000120UL
-#define PORT_PBDR       0xa4000122UL
-#define PORT_PCDR       0xa4000124UL
-#define PORT_PFDR       0xa400012aUL
-#endif
-
-#define IRQ0_IRQ        32
-#define IRQ1_IRQ        33
-#define IRQ2_IRQ        34
-#define IRQ3_IRQ        35
-#define IRQ4_IRQ        36
-#define IRQ5_IRQ        37
-
-#define IRQ0_IPR_ADDR   INTC_IPRC
-#define IRQ1_IPR_ADDR   INTC_IPRC
-#define IRQ2_IPR_ADDR   INTC_IPRC
-#define IRQ3_IPR_ADDR   INTC_IPRC
-#define IRQ4_IPR_ADDR   INTC_IPRD
-#define IRQ5_IPR_ADDR   INTC_IPRD
-
-#define IRQ0_IPR_POS    0
-#define IRQ1_IPR_POS    1
-#define IRQ2_IPR_POS    2
-#define IRQ3_IPR_POS    3
-#define IRQ4_IPR_POS    0
-#define IRQ5_IPR_POS    1
-
-#define IRQ0_PRIORITY   1
-#define IRQ1_PRIORITY   1
-#define IRQ2_PRIORITY   1
-#define IRQ3_PRIORITY   1
-#define IRQ4_PRIORITY   1
-#define IRQ5_PRIORITY   1
-
-#define PINT0_IRQ       40
-#define PINT8_IRQ       41
-
-#define PINT0_IPR_ADDR  INTC_IPRD
-#define PINT8_IPR_ADDR  INTC_IPRD
-
-#define PINT0_IPR_POS   3
-#define PINT8_IPR_POS   2
-#define PINT0_PRIORITY  2
-#define PINT8_PRIORITY  2
-
-extern int ipr_irq_demux(int irq);
-#define __irq_demux(irq) ipr_irq_demux(irq)
-#endif /* CONFIG_CPU_SUBTYPE_SH7707 || CONFIG_CPU_SUBTYPE_SH7709 */
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) || \
-    defined(CONFIG_CPU_SUBTYPE_ST40STB1) || defined(CONFIG_CPU_SUBTYPE_SH4_202)
-#define INTC_ICR        0xffd00000
-#define INTC_ICR_NMIL   (1<<15)
-#define INTC_ICR_MAI    (1<<14)
-#define INTC_ICR_NMIB   (1<<9)
-#define INTC_ICR_NMIE   (1<<8)
-#define INTC_ICR_IRLM   (1<<7)
-#endif
-
-#ifdef CONFIG_CPU_SUBTYPE_SH7780
-#include <asm/irq-sh7780.h>
-#endif
-
-/* SH with INTC2-style interrupts */
-#ifdef CONFIG_CPU_HAS_INTC2_IRQ
-#if defined(CONFIG_CPU_SUBTYPE_ST40STB1)
-#define INTC2_BASE      0xfe080000
-#define INTC2_FIRST_IRQ 64
-#define INTC2_INTREQ_OFFSET     0x20
-#define INTC2_INTMSK_OFFSET     0x40
-#define INTC2_INTMSKCLR_OFFSET  0x60
-#define NR_INTC2_IRQS   25
-#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
-#define INTC2_BASE      0xfe080000
-#define INTC2_FIRST_IRQ 48      /* INTEVT 0x800 */
-#define INTC2_INTREQ_OFFSET     0x20
-#define INTC2_INTMSK_OFFSET     0x40
-#define INTC2_INTMSKCLR_OFFSET  0x60
-#define NR_INTC2_IRQS   64
-#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
-#define INTC2_BASE      0xffd40000
-#define INTC2_FIRST_IRQ 21
-#define INTC2_INTMSK_OFFSET     (0x38)
-#define INTC2_INTMSKCLR_OFFSET  (0x3c)
-#define NR_INTC2_IRQS   60
-#endif
+/*
+ * Enable individual interrupt mode for external IPR IRQs.
+ */
+void ipr_irq_enable_irlm(void);
 
-#define INTC2_INTPRI_OFFSET     0x00
+/*
+ * Function for "on chip support modules".
+ */
+void make_ipr_irq(struct ipr_data *table, unsigned int nr_irqs);
+void make_imask_irq(unsigned int irq);
+void init_IRQ_ipr(void);
 
 struct intc2_data {
         unsigned short irq;
@@ -693,20 +149,14 @@ struct intc2_data {
 
 void make_intc2_irq(struct intc2_data *, unsigned int nr_irqs);
 void init_IRQ_intc2(void);
-#endif
-
-extern int shmse_irq_demux(int irq);
 
 static inline int generic_irq_demux(int irq)
 {
         return irq;
 }
 
-#ifndef __irq_demux
-#define __irq_demux(irq)        (irq)
-#endif
 #define irq_canonicalize(irq)   (irq)
-#define irq_demux(irq)          __irq_demux(sh_mv.mv_irq_demux(irq))
+#define irq_demux(irq)          sh_mv.mv_irq_demux(irq)
 
 #ifdef CONFIG_4KSTACKS
 extern void irq_ctx_init(int cpu);
@@ -717,12 +167,4 @@ extern void irq_ctx_exit(int cpu);
 # define irq_ctx_exit(cpu) do { } while (0)
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH73180)
-#include <asm/irq-sh73180.h>
-#endif
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7343)
-#include <asm/irq-sh7343.h>
-#endif
-
 #endif /* __ASM_SH_IRQ_H */
diff --git a/include/asm-sh/irqflags.h b/include/asm-sh/irqflags.h
new file mode 100644
index 000000000000..9dedc1b693e3
--- /dev/null
+++ b/include/asm-sh/irqflags.h
@@ -0,0 +1,123 @@
+#ifndef __ASM_SH_IRQFLAGS_H
+#define __ASM_SH_IRQFLAGS_H
+
+static inline void raw_local_irq_enable(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    %1, %0\n\t"
+#ifdef CONFIG_CPU_HAS_SR_RB
+                "stc    r6_bank, %1\n\t"
+                "or     %1, %0\n\t"
+#endif
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "1" (~0x000000f0)
+                : "memory"
+        );
+}
+
+static inline void raw_local_irq_disable(void)
+{
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "or     #0xf0, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&z" (flags)
+                : /* no inputs */
+                : "memory"
+        );
+}
+
+static inline void set_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "or     %2, %0\n\t"
+                "and    %3, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "r" (0x10000000), "r" (0xffffff0f)
+                : "memory"
+        );
+}
+
+static inline void clear_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    %2, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "1" (~0x10000000)
+                : "memory"
+        );
+}
+
+static inline unsigned long __raw_local_save_flags(void)
+{
+        unsigned long flags;
+
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    #0xf0, %0\n\t"
+                : "=&z" (flags)
+                : /* no inputs */
+                : "memory"
+        );
+
+        return flags;
+}
+
+#define raw_local_save_flags(flags) \
+                do { (flags) = __raw_local_save_flags(); } while (0)
+
+static inline int raw_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags != 0);
+}
+
+static inline int raw_irqs_disabled(void)
+{
+        unsigned long flags = __raw_local_save_flags();
+
+        return raw_irqs_disabled_flags(flags);
+}
+
+static inline unsigned long __raw_local_irq_save(void)
+{
+        unsigned long flags, __dummy;
+
+        __asm__ __volatile__ (
+                "stc    sr, %1\n\t"
+                "mov    %1, %0\n\t"
+                "or     #0xf0, %0\n\t"
+                "ldc    %0, sr\n\t"
+                "mov    %1, %0\n\t"
+                "and    #0xf0, %0\n\t"
+                : "=&z" (flags), "=&r" (__dummy)
+                : /* no inputs */
+                : "memory"
+        );
+
+        return flags;
+}
+
+#define raw_local_irq_save(flags) \
+                do { (flags) = __raw_local_irq_save(); } while (0)
+
+static inline void raw_local_irq_restore(unsigned long flags)
+{
+        if ((flags & 0xf0) != 0xf0)
+                raw_local_irq_enable();
+}
+
+#endif /* __ASM_SH_IRQFLAGS_H */
diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h
index c7088efe579a..46f04e23bd45 100644
--- a/include/asm-sh/mmu_context.h
+++ b/include/asm-sh/mmu_context.h
@@ -10,7 +10,6 @@
 
 #include <asm/cpu/mmu_context.h>
 #include <asm/tlbflush.h>
-#include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -42,10 +41,8 @@ extern unsigned long mmu_context_cache;
 /*
  * Get MMU context if needed.
  */
-static __inline__ void
-get_mmu_context(struct mm_struct *mm)
+static inline void get_mmu_context(struct mm_struct *mm)
 {
-        extern void flush_tlb_all(void);
         unsigned long mc = mmu_context_cache;
 
         /* Check if we have old version of context. */
@@ -61,6 +58,7 @@ get_mmu_context(struct mm_struct *mm)
                  * Flush all TLB and start new cycle.
                  */
                 flush_tlb_all();
+
                 /*
                  * Fix version; Note that we avoid version #0
                  * to distingush NO_CONTEXT.
@@ -75,11 +73,10 @@ get_mmu_context(struct mm_struct *mm)
  * Initialize the context related info for a new mm_struct
  * instance.
  */
-static __inline__ int init_new_context(struct task_struct *tsk,
+static inline int init_new_context(struct task_struct *tsk,
                                        struct mm_struct *mm)
 {
         mm->context.id = NO_CONTEXT;
-
         return 0;
 }
 
@@ -87,12 +84,12 @@ static __inline__ int init_new_context(struct task_struct *tsk,
  * Destroy context related info for an mm_struct that is about
  * to be put to rest.
  */
-static __inline__ void destroy_context(struct mm_struct *mm)
+static inline void destroy_context(struct mm_struct *mm)
 {
         /* Do nothing */
 }
 
-static __inline__ void set_asid(unsigned long asid)
+static inline void set_asid(unsigned long asid)
 {
         unsigned long __dummy;
 
@@ -105,7 +102,7 @@ static __inline__ void set_asid(unsigned long asid)
                                 "r" (0xffffff00));
 }
 
-static __inline__ unsigned long get_asid(void)
+static inline unsigned long get_asid(void)
 {
         unsigned long asid;
 
@@ -120,24 +117,29 @@ static __inline__ unsigned long get_asid(void)
  * 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)
+static inline void activate_context(struct mm_struct *mm)
 {
         get_mmu_context(mm);
         set_asid(mm->context.id & MMU_CONTEXT_ASID_MASK);
 }
 
-/* MMU_TTB can be used for optimizing the fault handling.
-   (Currently not used) */
-static __inline__ void switch_mm(struct mm_struct *prev,
-                                 struct mm_struct *next,
-                                 struct task_struct *tsk)
+/* MMU_TTB is used for optimizing the fault handling. */
+static inline void set_TTB(pgd_t *pgd)
 {
-        if (likely(prev != next)) {
-                unsigned long __pgdir = (unsigned long)next->pgd;
+        ctrl_outl((unsigned long)pgd, MMU_TTB);
+}
 
-                __asm__ __volatile__("mov.l     %0, %1"
-                                     : /* no output */
-                                     : "r" (__pgdir), "m" (__m(MMU_TTB)));
+static inline pgd_t *get_TTB(void)
+{
+        return (pgd_t *)ctrl_inl(MMU_TTB);
+}
+
+static inline void switch_mm(struct mm_struct *prev,
+                             struct mm_struct *next,
+                             struct task_struct *tsk)
+{
+        if (likely(prev != next)) {
+                set_TTB(next->pgd);
                 activate_context(next);
         }
 }
@@ -147,7 +149,7 @@ static __inline__ void switch_mm(struct mm_struct *prev,
 #define activate_mm(prev, next) \
         switch_mm((prev),(next),NULL)
 
-static __inline__ void
+static inline void
 enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 {
 }
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index ca8b26d90475..380fd62dd05a 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -13,9 +13,16 @@
    [ P4 control   ]             0xE0000000
  */
 
-
 /* PAGE_SHIFT determines the page size */
-#define PAGE_SHIFT      12
+#if defined(CONFIG_PAGE_SIZE_4KB)
+# define PAGE_SHIFT     12
+#elif defined(CONFIG_PAGE_SIZE_8KB)
+# define PAGE_SHIFT     13
+#elif defined(CONFIG_PAGE_SIZE_64KB)
+# define PAGE_SHIFT     16
+#else
+# error "Bogus kernel page size?"
+#endif
 
 #ifdef __ASSEMBLY__
 #define PAGE_SIZE       (1 << PAGE_SHIFT)
@@ -28,8 +35,14 @@
 
 #if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
 #define HPAGE_SHIFT     16
+#elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
+#define HPAGE_SHIFT     18
 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
 #define HPAGE_SHIFT     20
+#elif defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
+#define HPAGE_SHIFT     22
+#elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
+#define HPAGE_SHIFT     26
 #endif
 
 #ifdef CONFIG_HUGETLB_PAGE
@@ -69,15 +82,25 @@ extern void __copy_user_page(void *to, void *from, void *orig_to);
 /*
  * These are used to make use of C type-checking..
  */
-typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pgd; } pgd_t;
+#ifdef CONFIG_X2TLB
+typedef struct { unsigned long pte_low, pte_high; } pte_t;
+typedef struct { unsigned long long pgprot; } pgprot_t;
+#define pte_val(x) \
+        ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
+#define __pte(x) \
+        ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
+#else
+typedef struct { unsigned long pte_low; } pte_t;
 typedef struct { unsigned long pgprot; } pgprot_t;
+#define pte_val(x)      ((x).pte_low)
+#define __pte(x) ((pte_t) { (x) } )
+#endif
+
+typedef struct { unsigned long pgd; } pgd_t;
 
-#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) } )
 
diff --git a/include/asm-sh/pgalloc.h b/include/asm-sh/pgalloc.h
index e841465ab4d2..888e4529e6fe 100644
--- a/include/asm-sh/pgalloc.h
+++ b/include/asm-sh/pgalloc.h
@@ -1,13 +1,16 @@
 #ifndef __ASM_SH_PGALLOC_H
 #define __ASM_SH_PGALLOC_H
 
-#define pmd_populate_kernel(mm, pmd, pte) \
-                set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
+static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
+                                       pte_t *pte)
+{
+        set_pmd(pmd, __pmd((unsigned long)pte));
+}
 
 static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
                                 struct page *pte)
 {
-        set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte)));
+        set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
 }
 
 /*
@@ -15,7 +18,16 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
  */
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        return (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
+
+        if (pgd) {
+                memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
+                memcpy(pgd + USER_PTRS_PER_PGD,
+                       swapper_pg_dir + USER_PTRS_PER_PGD,
+                       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+        }
+
+        return pgd;
 }
 
 static inline void pgd_free(pgd_t *pgd)
diff --git a/include/asm-sh/pgtable-2level.h b/include/asm-sh/pgtable-2level.h
deleted file mode 100644
index b525db6f61c6..000000000000
--- a/include/asm-sh/pgtable-2level.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef __ASM_SH_PGTABLE_2LEVEL_H
-#define __ASM_SH_PGTABLE_2LEVEL_H
-
-/*
- * traditional two-level paging structure:
- */
-
-#define PGDIR_SHIFT     22
-#define PTRS_PER_PGD    1024
-
-/*
- * this is two-level, so we don't really have any
- * PMD directory physically.
- */
-#define PMD_SHIFT       22
-#define PTRS_PER_PMD    1
-
-#define PTRS_PER_PTE    1024
-
-#ifndef __ASSEMBLY__
-#define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
-#define pmd_ERROR(e) \
-        printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
-#define pgd_ERROR(e) \
-        printk("%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)
- */
-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 * pgdp)     { }
-
-/*
- * 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)
-
-/*
- * (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 set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
-
-#define pgd_page_vaddr(pgd) \
-((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
-
-#define pgd_page(pgd) \
-        (phys_to_page(pgd_val(pgd)))
-
-static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
-{
-        return (pmd_t *) dir;
-}
-
-#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))
-
-#endif /* !__ASSEMBLY__ */
-
-#endif /* __ASM_SH_PGTABLE_2LEVEL_H */
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index 2c8682ad1012..c84901dbd8e5 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -15,15 +15,10 @@
 #include <asm-generic/pgtable-nopmd.h>
 #include <asm/page.h>
 
-#define PTRS_PER_PGD            1024
-
 #ifndef __ASSEMBLY__
 #include <asm/addrspace.h>
 #include <asm/fixmap.h>
 
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-extern void paging_init(void);
-
 /*
  * ZERO_PAGE is a global shared page that is always zero: used
  * for zero-mapped memory areas etc..
@@ -33,15 +28,28 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 
 #endif /* !__ASSEMBLY__ */
 
-/* traditional two-level paging structure */
-#define PGDIR_SHIFT     22
-#define PTRS_PER_PMD    1
-#define PTRS_PER_PTE    1024
-#define PMD_SIZE        (1UL << PMD_SHIFT)
-#define PMD_MASK        (~(PMD_SIZE-1))
-#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
+/*
+ * traditional two-level paging structure
+ */
+/* PTE bits */
+#ifdef CONFIG_X2TLB
+# define PTE_MAGNITUDE  3       /* 64-bit PTEs on extended mode SH-X2 TLB */
+#else
+# define PTE_MAGNITUDE  2       /* 32-bit PTEs */
+#endif
+#define PTE_SHIFT       PAGE_SHIFT
+#define PTE_BITS        (PTE_SHIFT - PTE_MAGNITUDE)
+
+/* PGD bits */
+#define PGDIR_SHIFT     (PTE_SHIFT + PTE_BITS)
+#define PGDIR_BITS      (32 - PGDIR_SHIFT)
+#define PGDIR_SIZE      (1 << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
 
+/* Entries per level */
+#define PTRS_PER_PTE    (PAGE_SIZE / 4)
+#define PTRS_PER_PGD    (PAGE_SIZE / 4)
+
 #define USER_PTRS_PER_PGD       (TASK_SIZE/PGDIR_SIZE)
 #define FIRST_USER_ADDRESS      0
 
@@ -49,7 +57,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 
 /*
  * First 1MB map is used by fixed purpose.
- * Currently only 4-enty (16kB) is used (see arch/sh/mm/cache.c)
+ * Currently only 4-entry (16kB) is used (see arch/sh/mm/cache.c)
  */
 #define VMALLOC_START   (P3SEG+0x00100000)
 #define VMALLOC_END     (FIXADDR_START-2*PAGE_SIZE)
@@ -57,7 +65,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 /*
  * Linux PTEL encoding.
  *
- * Hardware and software bit definitions for the PTEL value:
+ * Hardware and software bit definitions for the PTEL value (see below for
+ * notes on SH-X2 MMUs and 64-bit PTEs):
  *
  * - Bits 0 and 7 are reserved on SH-3 (_PAGE_WT and _PAGE_SZ1 on SH-4).
  *
@@ -76,20 +85,57 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
  *
  * - Bits 31, 30, and 29 remain unused by everyone and can be used for future
  *   software flags, although care must be taken to update _PAGE_CLEAR_FLAGS.
+ *
+ * XXX: Leave the _PAGE_FILE and _PAGE_WT overhaul for a rainy day.
+ *
+ * SH-X2 MMUs and extended PTEs
+ *
+ * SH-X2 supports an extended mode TLB with split data arrays due to the
+ * number of bits needed for PR and SZ (now EPR and ESZ) encodings. The PR and
+ * SZ bit placeholders still exist in data array 1, but are implemented as
+ * reserved bits, with the real logic existing in data array 2.
+ *
+ * The downside to this is that we can no longer fit everything in to a 32-bit
+ * PTE encoding, so a 64-bit pte_t is necessary for these parts. On the plus
+ * side, this gives us quite a few spare bits to play with for future usage.
  */
+/* Legacy and compat mode bits */
 #define _PAGE_WT        0x001           /* WT-bit on SH-4, 0 on SH-3 */
 #define _PAGE_HW_SHARED 0x002           /* SH-bit  : shared among processes */
 #define _PAGE_DIRTY     0x004           /* D-bit   : page changed */
 #define _PAGE_CACHABLE  0x008           /* C-bit   : cachable */
-#define _PAGE_SZ0       0x010           /* SZ0-bit : Size of page */
-#define _PAGE_RW        0x020           /* PR0-bit : write access allowed */
-#define _PAGE_USER      0x040           /* PR1-bit : user space access allowed */
-#define _PAGE_SZ1       0x080           /* SZ1-bit : Size of page (on SH-4) */
+#ifndef CONFIG_X2TLB
+# define _PAGE_SZ0      0x010           /* SZ0-bit : Size of page */
+# define _PAGE_RW       0x020           /* PR0-bit : write access allowed */
+# define _PAGE_USER     0x040           /* PR1-bit : user space access allowed*/
+# define _PAGE_SZ1      0x080           /* SZ1-bit : Size of page (on SH-4) */
+#endif
 #define _PAGE_PRESENT   0x100           /* V-bit   : page is valid */
 #define _PAGE_PROTNONE  0x200           /* software: if not present  */
 #define _PAGE_ACCESSED  0x400           /* software: page referenced */
 #define _PAGE_FILE      _PAGE_WT        /* software: pagecache or swap? */
 
+/* Extended mode bits */
+#define _PAGE_EXT_ESZ0          0x0010  /* ESZ0-bit: Size of page */
+#define _PAGE_EXT_ESZ1          0x0020  /* ESZ1-bit: Size of page */
+#define _PAGE_EXT_ESZ2          0x0040  /* ESZ2-bit: Size of page */
+#define _PAGE_EXT_ESZ3          0x0080  /* ESZ3-bit: Size of page */
+
+#define _PAGE_EXT_USER_EXEC     0x0100  /* EPR0-bit: User space executable */
+#define _PAGE_EXT_USER_WRITE    0x0200  /* EPR1-bit: User space writable */
+#define _PAGE_EXT_USER_READ     0x0400  /* EPR2-bit: User space readable */
+
+#define _PAGE_EXT_KERN_EXEC     0x0800  /* EPR3-bit: Kernel space executable */
+#define _PAGE_EXT_KERN_WRITE    0x1000  /* EPR4-bit: Kernel space writable */
+#define _PAGE_EXT_KERN_READ     0x2000  /* EPR5-bit: Kernel space readable */
+
+/* Wrapper for extended mode pgprot twiddling */
+#ifdef CONFIG_X2TLB
+# define _PAGE_EXT(x)           ((unsigned long long)(x) << 32)
+#else
+# define _PAGE_EXT(x)           (0)
+#endif
+
 /* software: moves to PTEA.TC (Timing Control) */
 #define _PAGE_PCC_AREA5 0x00000000      /* use BSC registers for area5 */
 #define _PAGE_PCC_AREA6 0x80000000      /* use BSC registers for area6 */
@@ -114,37 +160,160 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 
 #define _PAGE_FLAGS_HARDWARE_MASK       (0x1fffffff & ~(_PAGE_CLEAR_FLAGS))
 
-/* Hardware flags: SZ0=1 (4k-byte) */
-#define _PAGE_FLAGS_HARD        _PAGE_SZ0
+/* Hardware flags, page size encoding */
+#if defined(CONFIG_X2TLB)
+# if defined(CONFIG_PAGE_SIZE_4KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ0)
+# elif defined(CONFIG_PAGE_SIZE_8KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ1)
+# elif defined(CONFIG_PAGE_SIZE_64KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_EXT(_PAGE_EXT_ESZ2)
+# endif
+#else
+# if defined(CONFIG_PAGE_SIZE_4KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_SZ0
+# elif defined(CONFIG_PAGE_SIZE_64KB)
+#  define _PAGE_FLAGS_HARD      _PAGE_SZ1
+# endif
+#endif
 
-#if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#define _PAGE_SZHUGE    (_PAGE_SZ1)
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
-#define _PAGE_SZHUGE    (_PAGE_SZ0 | _PAGE_SZ1)
+#if defined(CONFIG_X2TLB)
+# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_256K)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ0 | _PAGE_EXT_ESZ1 | _PAGE_EXT_ESZ2)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ3)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB)
+#  define _PAGE_SZHUGE  (_PAGE_EXT_ESZ2 | _PAGE_EXT_ESZ3)
+# endif
+#else
+# if defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
+#  define _PAGE_SZHUGE  (_PAGE_SZ1)
+# elif defined(CONFIG_HUGETLB_PAGE_SIZE_1MB)
+#  define _PAGE_SZHUGE  (_PAGE_SZ0 | _PAGE_SZ1)
+# endif
+#endif
+
+/*
+ * Stub out _PAGE_SZHUGE if we don't have a good definition for it,
+ * to make pte_mkhuge() happy.
+ */
+#ifndef _PAGE_SZHUGE
+# define _PAGE_SZHUGE   (_PAGE_FLAGS_HARD)
 #endif
 
-#define _PAGE_TABLE     (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _KERNPG_TABLE   (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)
+#define _PAGE_CHG_MASK \
+        (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)
 
 #ifndef __ASSEMBLY__
 
-#ifdef CONFIG_MMU
-#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE |_PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_CACHABLE |_PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_CACHABLE | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+#if defined(CONFIG_X2TLB) /* SH-X2 TLB */
+#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_USER_READ | \
+                                           _PAGE_EXT_USER_WRITE))
+
+#define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_USER_EXEC | \
+                                           _PAGE_EXT_USER_READ))
+
+#define PAGE_COPY       PAGE_EXECREAD
+
+#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_USER_READ))
+
+#define PAGE_WRITEONLY  __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_USER_WRITE))
+
+#define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
+                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_USER_WRITE | \
+                                           _PAGE_EXT_USER_READ  | \
+                                           _PAGE_EXT_USER_EXEC))
+
+#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC))
+
 #define PAGE_KERNEL_NOCACHE \
-                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
-#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
+                                 _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC))
+
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_EXEC))
+
+#define PAGE_KERNEL_PCC(slot, type) \
+                        __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_EXEC) \
+                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
+                                 (type))
+
+#elif defined(CONFIG_MMU) /* SH-X TLB */
+#define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | \
+                                 _PAGE_CACHABLE | _PAGE_ACCESSED | \
+                                 _PAGE_FLAGS_HARD)
+
+#define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
+
+#define PAGE_EXECREAD   PAGE_READONLY
+#define PAGE_RWX        PAGE_SHARED
+#define PAGE_WRITEONLY  PAGE_SHARED
+
+#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+
+#define PAGE_KERNEL_NOCACHE \
+                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_HW_SHARED | \
+                                 _PAGE_FLAGS_HARD)
+
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_CACHABLE | \
+                                 _PAGE_DIRTY | _PAGE_ACCESSED | \
+                                 _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
+
 #define PAGE_KERNEL_PCC(slot, type) \
-                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_FLAGS_HARD | (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | (type))
+                        __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | \
+                                 _PAGE_ACCESSED | _PAGE_FLAGS_HARD | \
+                                 (slot ? _PAGE_PCC_AREA5 : _PAGE_PCC_AREA6) | \
+                                 (type))
 #else /* no mmu */
 #define PAGE_NONE               __pgprot(0)
 #define PAGE_SHARED             __pgprot(0)
 #define PAGE_COPY               __pgprot(0)
+#define PAGE_EXECREAD           __pgprot(0)
+#define PAGE_RWX                __pgprot(0)
 #define PAGE_READONLY           __pgprot(0)
+#define PAGE_WRITEONLY          __pgprot(0)
 #define PAGE_KERNEL             __pgprot(0)
 #define PAGE_KERNEL_NOCACHE     __pgprot(0)
 #define PAGE_KERNEL_RO          __pgprot(0)
@@ -154,27 +323,32 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #endif /* __ASSEMBLY__ */
 
 /*
- * As i386 and MIPS, SuperH can't do page protection for execute, and
- * considers that the same as a read.  Also, write permissions imply
- * read permissions. This is the closest we can get..
+ * SH-X and lower (legacy) SuperH parts (SH-3, SH-4, some SH-4A) can't do page
+ * protection for execute, and considers it the same as a read. Also, write
+ * permission implies read permission. This is the closest we can get..
+ *
+ * SH-X2 (SH7785) and later parts take this to the opposite end of the extreme,
+ * not only supporting separate execute, read, and write bits, but having
+ * completely separate permission bits for user and kernel space.
  */
+         /*xwr*/
 #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 __P100  PAGE_EXECREAD
+#define __P101  PAGE_EXECREAD
 #define __P110  PAGE_COPY
 #define __P111  PAGE_COPY
 
 #define __S000  PAGE_NONE
 #define __S001  PAGE_READONLY
-#define __S010  PAGE_SHARED
+#define __S010  PAGE_WRITEONLY
 #define __S011  PAGE_SHARED
-#define __S100  PAGE_READONLY
-#define __S101  PAGE_READONLY
-#define __S110  PAGE_SHARED
-#define __S111  PAGE_SHARED
+#define __S100  PAGE_EXECREAD
+#define __S101  PAGE_EXECREAD
+#define __S110  PAGE_RWX
+#define __S111  PAGE_RWX
 
 #ifndef __ASSEMBLY__
 
@@ -183,7 +357,17 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
  * within a page table are directly modified.  Thus, the following
  * hook is made available.
  */
+#ifdef CONFIG_X2TLB
+static inline void set_pte(pte_t *ptep, pte_t pte)
+{
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
+#else
 #define set_pte(pteptr, pteval) (*(pteptr) = pteval)
+#endif
+
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
 
 /*
@@ -192,18 +376,18 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
  */
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 
-#define pte_pfn(x)              ((unsigned long)(((x).pte >> PAGE_SHIFT)))
+#define pte_pfn(x)              ((unsigned long)(((x).pte_low >> 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 pte_none(x)     (!pte_val(x))
 #define pte_present(x)  (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
-#define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
+#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_present(x)  (pmd_val(x))
 #define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
-#define pmd_bad(x)      ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+#define pmd_bad(x)      (pmd_val(x) & ~PAGE_MASK)
 
 #define pages_to_mb(x)  ((x) >> (20-PAGE_SHIFT))
 #define pte_page(x)     phys_to_page(pte_val(x)&PTE_PHYS_MASK)
@@ -212,28 +396,52 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
  * The following only work if pte_present() is true.
  * Undefined behaviour if not..
  */
-static inline int pte_read(pte_t pte) { return pte_val(pte) & _PAGE_USER; }
-static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_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_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
-static inline int pte_write(pte_t pte){ return pte_val(pte) & _PAGE_RW; }
-static inline int pte_not_present(pte_t pte){ return !(pte_val(pte) & _PAGE_PRESENT); }
-
-static inline pte_t pte_rdprotect(pte_t pte)    { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_USER)); return pte; }
-static inline pte_t pte_exprotect(pte_t pte)    { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_USER)); return pte; }
-static inline pte_t pte_mkclean(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_DIRTY)); return pte; }
-static inline pte_t pte_mkold(pte_t pte)        { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_ACCESSED)); return pte; }
-static inline pte_t pte_wrprotect(pte_t pte)    { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_RW)); return pte; }
-static inline pte_t pte_mkread(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER)); return pte; }
-static inline pte_t pte_mkexec(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER)); return pte; }
-static inline pte_t pte_mkdirty(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY)); return pte; }
-static inline pte_t pte_mkyoung(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_ACCESSED)); return pte; }
-static inline pte_t pte_mkwrite(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_RW)); return pte; }
-#ifdef CONFIG_HUGETLB_PAGE
-static inline pte_t pte_mkhuge(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_SZHUGE)); return pte; }
+#define pte_not_present(pte)    (!(pte_val(pte) & _PAGE_PRESENT))
+#define pte_dirty(pte)          (pte_val(pte) & _PAGE_DIRTY)
+#define pte_young(pte)          (pte_val(pte) & _PAGE_ACCESSED)
+#define pte_file(pte)           (pte_val(pte) & _PAGE_FILE)
+
+#ifdef CONFIG_X2TLB
+#define pte_read(pte)           ((pte).pte_high & _PAGE_EXT_USER_READ)
+#define pte_exec(pte)           ((pte).pte_high & _PAGE_EXT_USER_EXEC)
+#define pte_write(pte)          ((pte).pte_high & _PAGE_EXT_USER_WRITE)
+#else
+#define pte_read(pte)           (pte_val(pte) & _PAGE_USER)
+#define pte_exec(pte)           (pte_val(pte) & _PAGE_USER)
+#define pte_write(pte)          (pte_val(pte) & _PAGE_RW)
 #endif
 
+#define PTE_BIT_FUNC(h,fn,op) \
+static inline pte_t pte_##fn(pte_t pte) { pte.pte_##h op; return pte; }
+
+#ifdef CONFIG_X2TLB
+/*
+ * We cheat a bit in the SH-X2 TLB case. As the permission bits are
+ * individually toggled (and user permissions are entirely decoupled from
+ * kernel permissions), we attempt to couple them a bit more sanely here.
+ */
+PTE_BIT_FUNC(high, rdprotect, &= ~_PAGE_EXT_USER_READ);
+PTE_BIT_FUNC(high, mkread, |= _PAGE_EXT_USER_READ | _PAGE_EXT_KERN_READ);
+PTE_BIT_FUNC(high, wrprotect, &= ~_PAGE_EXT_USER_WRITE);
+PTE_BIT_FUNC(high, mkwrite, |= _PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE);
+PTE_BIT_FUNC(high, exprotect, &= ~_PAGE_EXT_USER_EXEC);
+PTE_BIT_FUNC(high, mkexec, |= _PAGE_EXT_USER_EXEC | _PAGE_EXT_KERN_EXEC);
+PTE_BIT_FUNC(high, mkhuge, |= _PAGE_SZHUGE);
+#else
+PTE_BIT_FUNC(low, rdprotect, &= ~_PAGE_USER);
+PTE_BIT_FUNC(low, mkread, |= _PAGE_USER);
+PTE_BIT_FUNC(low, wrprotect, &= ~_PAGE_RW);
+PTE_BIT_FUNC(low, mkwrite, |= _PAGE_RW);
+PTE_BIT_FUNC(low, exprotect, &= ~_PAGE_USER);
+PTE_BIT_FUNC(low, mkexec, |= _PAGE_USER);
+PTE_BIT_FUNC(low, mkhuge, |= _PAGE_SZHUGE);
+#endif
+
+PTE_BIT_FUNC(low, mkclean, &= ~_PAGE_DIRTY);
+PTE_BIT_FUNC(low, mkdirty, |= _PAGE_DIRTY);
+PTE_BIT_FUNC(low, mkold, &= ~_PAGE_ACCESSED);
+PTE_BIT_FUNC(low, mkyoung, |= _PAGE_ACCESSED);
+
 /*
  * Macro and implementation to make a page protection as uncachable.
  */
@@ -258,13 +466,14 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
 #define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
 
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
-{ set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
-
-#define pmd_page_vaddr(pmd) \
-((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+{
+        set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) |
+                            pgprot_val(newprot)));
+        return pte;
+}
 
-#define pmd_page(pmd) \
-        (phys_to_page(pmd_val(pmd)))
+#define pmd_page_vaddr(pmd)     pmd_val(pmd)
+#define pmd_page(pmd)           (virt_to_page(pmd_val(pmd)))
 
 /* to find an entry in a page-table-directory. */
 #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
@@ -283,8 +492,15 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_unmap(pte)          do { } while (0)
 #define pte_unmap_nested(pte)   do { } while (0)
 
+#ifdef CONFIG_X2TLB
+#define pte_ERROR(e) \
+        printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
+               &(e), (e).pte_high, (e).pte_low)
+#else
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+#endif
+
 #define pgd_ERROR(e) \
         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 
@@ -337,6 +553,9 @@ extern unsigned int kobjsize(const void *objp);
 extern pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 #endif
 
+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
+extern void paging_init(void);
+
 #include <asm-generic/pgtable.h>
 
 #endif /* !__ASSEMBLY__ */
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 45bb74e35d32..6f1dd7ca1b1d 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -36,7 +36,10 @@
  */
 enum cpu_type {
         /* SH-2 types */
-        CPU_SH7604,
+        CPU_SH7604, CPU_SH7619,
+
+        /* SH-2A types */
+        CPU_SH7206,
 
         /* SH-3 types */
         CPU_SH7705, CPU_SH7706, CPU_SH7707,
@@ -47,7 +50,10 @@ enum cpu_type {
         /* SH-4 types */
         CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
         CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501,
+
+        /* SH-4A types */
         CPU_SH73180, CPU_SH7343, CPU_SH7770, CPU_SH7780, CPU_SH7781,
+        CPU_SH7785,
 
         /* Unknown subtype */
         CPU_SH_NONE
@@ -130,12 +136,11 @@ union sh_fpu_union {
 };
 
 struct thread_struct {
+        /* Saved registers when thread is descheduled */
         unsigned long sp;
         unsigned long pc;
 
-        unsigned long trap_no, error_code;
-        unsigned long address;
-        /* Hardware debugging registers may come here */
+        /* Hardware debugging registers */
         unsigned long ubc_pc;
 
         /* floating point info */
@@ -150,12 +155,7 @@ typedef struct {
 extern int ubc_usercnt;
 
 #define INIT_THREAD  {                                          \
-        sizeof(init_stack) + (long) &init_stack, /* sp */       \
-        0,                                       /* pc */       \
-        0, 0,                                                   \
-        0,                                                      \
-        0,                                                      \
-        {{{0,}},}                               /* fpu state */ \
+        .sp = sizeof(init_stack) + (long) &init_stack,          \
 }
 
 /*
@@ -259,8 +259,8 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
                 struct pt_regs *regs);
 extern unsigned long get_wchan(struct task_struct *p);
 
-#define KSTK_EIP(tsk)  ((tsk)->thread.pc)
-#define KSTK_ESP(tsk)  ((tsk)->thread.sp)
+#define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)
+#define KSTK_ESP(tsk)  (task_pt_regs(tsk)->regs[15])
 
 #define cpu_sleep()     __asm__ __volatile__ ("sleep" : : : "memory")
 #define cpu_relax()     barrier()
diff --git a/include/asm-sh/push-switch.h b/include/asm-sh/push-switch.h
new file mode 100644
index 000000000000..dfc6bad567f0
--- /dev/null
+++ b/include/asm-sh/push-switch.h
@@ -0,0 +1,28 @@
+#ifndef __ASM_SH_PUSH_SWITCH_H
+#define __ASM_SH_PUSH_SWITCH_H
+
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+
+struct push_switch {
+        /* switch state */
+        unsigned int            state:1;
+        /* debounce timer */
+        struct timer_list       debounce;
+        /* workqueue */
+        struct work_struct      work;
+};
+
+struct push_switch_platform_info {
+        /* IRQ handler */
+        irqreturn_t             (*irq_handler)(int irq, void *data);
+        /* Special IRQ flags */
+        unsigned int            irq_flags;
+        /* Bit location of switch */
+        unsigned int            bit;
+        /* Symbolic switch name */
+        const char              *name;
+};
+
+#endif /* __ASM_SH_PUSH_SWITCH_H */
diff --git a/include/asm-sh/rwsem.h b/include/asm-sh/rwsem.h
index 9d2aea5e8488..4931ba817d73 100644
--- a/include/asm-sh/rwsem.h
+++ b/include/asm-sh/rwsem.h
@@ -25,11 +25,21 @@ struct rw_semaphore {
 #define RWSEM_ACTIVE_WRITE_BIAS         (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
         spinlock_t              wait_lock;
         struct list_head        wait_list;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map      dep_map;
+#endif
 };
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }
+#else
+# define __RWSEM_DEP_MAP_INIT(lockname)
+#endif
+
 #define __RWSEM_INITIALIZER(name) \
         { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \
-          LIST_HEAD_INIT((name).wait_list) }
+          LIST_HEAD_INIT((name).wait_list) \
+          __RWSEM_DEP_MAP_INIT(name) }
 
 #define DECLARE_RWSEM(name)             \
         struct rw_semaphore name = __RWSEM_INITIALIZER(name)
@@ -39,6 +49,16 @@ extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);
 extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
 extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
 
+extern void __init_rwsem(struct rw_semaphore *sem, const char *name,
+                         struct lock_class_key *key);
+
+#define init_rwsem(sem)                         \
+do {                                            \
+        static struct lock_class_key __key;     \
+                                                \
+        __init_rwsem((sem), #sem, &__key);      \
+} while (0)
+
 static inline void init_rwsem(struct rw_semaphore *sem)
 {
         sem->count = RWSEM_UNLOCKED_VALUE;
@@ -141,6 +161,11 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
                 rwsem_downgrade_wake(sem);
 }
 
+static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
+{
+        __down_write(sem);
+}
+
 /*
  * implement exchange and add functionality
  */
diff --git a/include/asm-sh/se7206.h b/include/asm-sh/se7206.h
new file mode 100644
index 000000000000..698eb80389ab
--- /dev/null
+++ b/include/asm-sh/se7206.h
@@ -0,0 +1,13 @@
+#ifndef __ASM_SH_SE7206_H
+#define __ASM_SH_SE7206_H
+
+#define PA_SMSC         0x30000000
+#define PA_MRSHPC       0x34000000
+#define PA_LED          0x31400000
+
+void init_se7206_IRQ(void);
+
+#define __IO_PREFIX     se7206
+#include <asm/io_generic.h>
+
+#endif /* __ASM_SH_SE7206_H */
diff --git a/include/asm-sh/setup.h b/include/asm-sh/setup.h
index 34ca8a7f06ba..1583c6b7bdaa 100644
--- a/include/asm-sh/setup.h
+++ b/include/asm-sh/setup.h
@@ -1,10 +1,12 @@
-#ifdef __KERNEL__
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
 #define COMMAND_LINE_SIZE 256
 
+#ifdef __KERNEL__
+
 int setup_early_printk(char *);
 
-#endif /* _SH_SETUP_H */
 #endif /* __KERNEL__ */
+
+#endif /* _SH_SETUP_H */
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 3340126f4e0f..b1e42e7f998b 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -6,6 +6,7 @@
  * Copyright (C) 2002 Paul Mundt
  */
 
+#include <linux/irqflags.h>
 #include <asm/types.h>
 
 /*
@@ -131,103 +132,6 @@ static inline unsigned long tas(volatile int *m)
 
 #define set_mb(var, value) do { xchg(&var, value); } while (0)
 
-/* Interrupt Control */
-#ifdef CONFIG_CPU_HAS_SR_RB
-static inline void local_irq_enable(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__("stc       sr, %0\n\t"
-                             "and       %1, %0\n\t"
-                             "stc       r6_bank, %1\n\t"
-                             "or        %1, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&r" (__dummy0), "=r" (__dummy1)
-                             : "1" (~0x000000f0)
-                             : "memory");
-}
-#else
-static inline void local_irq_enable(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ (
-                "stc    sr, %0\n\t"
-                "and    %1, %0\n\t"
-                "ldc    %0, sr\n\t"
-                : "=&r" (__dummy0), "=r" (__dummy1)
-                : "1" (~0x000000f0)
-                : "memory");
-}
-#endif
-
-static inline void local_irq_disable(void)
-{
-        unsigned long __dummy;
-        __asm__ __volatile__("stc       sr, %0\n\t"
-                             "or        #0xf0, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&z" (__dummy)
-                             : /* no inputs */
-                             : "memory");
-}
-
-static inline void set_bl_bit(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ ("stc      sr, %0\n\t"
-                             "or        %2, %0\n\t"
-                             "and       %3, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&r" (__dummy0), "=r" (__dummy1)
-                             : "r" (0x10000000), "r" (0xffffff0f)
-                             : "memory");
-}
-
-static inline void clear_bl_bit(void)
-{
-        unsigned long __dummy0, __dummy1;
-
-        __asm__ __volatile__ ("stc      sr, %0\n\t"
-                             "and       %2, %0\n\t"
-                             "ldc       %0, sr"
-                             : "=&r" (__dummy0), "=r" (__dummy1)
-                             : "1" (~0x10000000)
-                             : "memory");
-}
-
-#define local_save_flags(x) \
-        __asm__("stc sr, %0; and #0xf0, %0" : "=&z" (x) :/**/: "memory" )
-
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        (flags != 0);                   \
-})
-
-static inline unsigned long local_irq_save(void)
-{
-        unsigned long flags, __dummy;
-
-        __asm__ __volatile__("stc       sr, %1\n\t"
-                             "mov       %1, %0\n\t"
-                             "or        #0xf0, %0\n\t"
-                             "ldc       %0, sr\n\t"
-                             "mov       %1, %0\n\t"
-                             "and       #0xf0, %0"
-                             : "=&z" (flags), "=&r" (__dummy)
-                             :/**/
-                             : "memory" );
-        return flags;
-}
-
-#define local_irq_restore(x) do {                       \
-        if ((x & 0x000000f0) != 0x000000f0)             \
-                local_irq_enable();                     \
-} while (0)
-
 /*
  * Jump to P2 area.
  * When handling TLB or caches, we need to do it from P2 area.
@@ -264,9 +168,6 @@ do {							\
                 : "=&r" (__dummy));                     \
 } while (0)
 
-/* For spinlocks etc */
-#define local_irq_save(x)       x = local_irq_save()
-
 static inline unsigned long xchg_u32(volatile u32 *m, unsigned long val)
 {
         unsigned long flags, retval;
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 3ebc3f9039eb..0c01dc550819 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -90,13 +90,7 @@ static inline struct thread_info *current_thread_info(void)
 #endif
 #define free_thread_info(ti)    kfree(ti)
 
-#else /* !__ASSEMBLY__ */
-
-/* how to get the thread information struct from ASM */
-#define GET_THREAD_INFO(reg) \
-        stc     r7_bank, reg
-
-#endif
+#endif /* __ASSEMBLY__ */
 
 /*
  * thread information flags
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index 5df842bcf7b6..17b5e76a4c31 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -18,11 +18,32 @@ struct sys_timer {
 
         struct sys_device       dev;
         struct sys_timer_ops    *ops;
+
+#ifdef CONFIG_NO_IDLE_HZ
+        struct dyn_tick_timer   *dyn_tick;
+#endif
 };
 
+#ifdef CONFIG_NO_IDLE_HZ
+#define DYN_TICK_ENABLED        (1 << 1)
+
+struct dyn_tick_timer {
+        spinlock_t      lock;
+        unsigned int    state;                  /* Current state */
+        int             (*enable)(void);        /* Enables dynamic tick */
+        int             (*disable)(void);       /* Disables dynamic tick */
+        void            (*reprogram)(unsigned long); /* Reprograms the timer */
+        int             (*handler)(int, void *);
+};
+
+void timer_dyn_reprogram(void);
+#else
+#define timer_dyn_reprogram()   do { } while (0)
+#endif
+
 #define TICK_SIZE (tick_nsec / 1000)
 
-extern struct sys_timer tmu_timer;
+extern struct sys_timer tmu_timer, cmt_timer, mtu2_timer;
 extern struct sys_timer *sys_timer;
 
 #ifndef CONFIG_GENERIC_TIME
diff --git a/include/asm-sh/titan.h b/include/asm-sh/titan.h
index 270a4f4bc8a9..03f3583c8918 100644
--- a/include/asm-sh/titan.h
+++ b/include/asm-sh/titan.h
@@ -1,9 +1,8 @@
 /*
  * Platform defintions for Titan
  */
-
-#ifndef _ASM_SH_TITAN_TITAN_H
-#define _ASM_SH_TITAN_TITAN_H
+#ifndef _ASM_SH_TITAN_H
+#define _ASM_SH_TITAN_H
 
 #define __IO_PREFIX titan
 #include <asm/io_generic.h>
@@ -15,29 +14,4 @@
 #define TITAN_IRQ_MPCIB         11      /* mPCI B */
 #define TITAN_IRQ_USB           11      /* USB */
 
-/*
- * The external interrupt lines, these take up ints 0 - 15 inclusive
- * depending on the priority for the interrupt.  In fact the priority
- * is the interrupt :-)
- */
-#define IRL0_IRQ        0
-#define IRL0_IPR_ADDR   INTC_IPRD
-#define IRL0_IPR_POS    3
-#define IRL0_PRIORITY   8
-
-#define IRL1_IRQ        1
-#define IRL1_IPR_ADDR   INTC_IPRD
-#define IRL1_IPR_POS    2
-#define IRL1_PRIORITY   8
-
-#define IRL2_IRQ        2
-#define IRL2_IPR_ADDR   INTC_IPRD
-#define IRL2_IPR_POS    1
-#define IRL2_PRIORITY   8
-
-#define IRL3_IRQ        3
-#define IRL3_IPR_ADDR   INTC_IPRD
-#define IRL3_IPR_POS    0
-#define IRL3_PRIORITY   8
-
-#endif
+#endif /* __ASM_SH_TITAN_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 1c2abde122cd..f982073dc6c6 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -332,125 +332,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
- * see <asm-sh/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-        /* Avoid using "res" which is declared to be in register r0; \
-           errno might expand to a function call and clobber it.  */ \
-                int __err = -(res); \
-                errno = __err; \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register long __sc0 __asm__ ("r3") = __NR_##name; \
-__asm__ __volatile__ ("trapa    #0x10" \
-        : "=z" (__sc0) \
-        : "0" (__sc0) \
-        : "memory" ); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-register long __sc0 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-__asm__ __volatile__ ("trapa    #0x11" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4) \
-        : "memory"); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-register long __sc0 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-__asm__ __volatile__ ("trapa    #0x12" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4), "r" (__sc5) \
-        : "memory"); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-register long __sc0 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-__asm__ __volatile__ ("trapa    #0x13" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6) \
-        : "memory"); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-register long __sc0 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-register long __sc7 __asm__ ("r7") = (long) arg4; \
-__asm__ __volatile__ ("trapa    #0x14" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6),  \
-          "r" (__sc7) \
-        : "memory" ); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-{ \
-register long __sc3 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-register long __sc7 __asm__ ("r7") = (long) arg4; \
-register long __sc0 __asm__ ("r0") = (long) arg5; \
-__asm__ __volatile__ ("trapa    #0x15" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7),  \
-          "r" (__sc3) \
-        : "memory" ); \
-__syscall_return(type,__sc0); \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register long __sc3 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-register long __sc7 __asm__ ("r7") = (long) arg4; \
-register long __sc0 __asm__ ("r0") = (long) arg5; \
-register long __sc1 __asm__ ("r1") = (long) arg6; \
-__asm__ __volatile__ ("trapa    #0x16" \
-        : "=z" (__sc0) \
-        : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7),  \
-          "r" (__sc3), "r" (__sc1) \
-        : "memory" ); \
-__syscall_return(type,__sc0); \
-}
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_OLD_STAT
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index 68e27a8fca31..5efe906c59f7 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -35,7 +35,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
         consistent_free(NULL, size, vaddr, dma_handle);
 }
 
-static inline void dma_cache_sync(void *vaddr, size_t size,
+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                                   enum dma_data_direction dir)
 {
         dma_cache_wback_inv((unsigned long)vaddr, size);
diff --git a/include/asm-sh64/setup.h b/include/asm-sh64/setup.h
index ebd42eb1b709..5b07b14c2927 100644
--- a/include/asm-sh64/setup.h
+++ b/include/asm-sh64/setup.h
@@ -1,6 +1,10 @@
 #ifndef __ASM_SH64_SETUP_H
 #define __ASM_SH64_SETUP_H
 
+#define COMMAND_LINE_SIZE 256
+
+#ifdef __KERNEL__
+
 #define PARAM ((unsigned char *)empty_zero_page)
 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
 #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
@@ -12,5 +16,7 @@
 #define COMMAND_LINE ((char *) (PARAM+256))
 #define COMMAND_LINE_SIZE 256
 
+#endif  /*  __KERNEL__  */
+
 #endif /* __ASM_SH64_SETUP_H */
 
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
index ee7828b27ad1..1f38a7aacaaf 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh64/unistd.h
@@ -347,148 +347,6 @@
 #ifdef __KERNEL__ 
 
 #define NR_syscalls 321
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
- * see <asm-sh64/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        /* Note: when returning from kernel the return value is in r9       \
-        **       This prevents conflicts between return value and arg1      \
-        **       when dispatching signal handler, in other words makes      \
-        **       life easier in the system call epilogue (see entry.S)      \
-        */                                                                  \
-        register unsigned long __sr2 __asm__ ("r2") = res;                  \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) {          \
-                errno = -(res);                                             \
-                __sr2 = -1;                                                 \
-        } \
-        return (type) (__sr2);                                              \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x10 << 16) | __NR_##name); \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "()"                      \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0) );                                                    \
-__syscall_return(type,__sc0);                                               \
-}
-
-        /*
-         * The apparent spurious "dummy" assembler comment is *needed*,
-         * as without it, the compiler treats the arg<n> variables
-         * as no longer live just before the asm. The compiler can
-         * then optimize the storage into any registers it wishes.
-         * The additional dummy statement forces the compiler to put
-         * the arguments into the correct registers before the TRAPA.
-         */
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x11 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2)"                    \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2));                                        \
-__asm__ __volatile__ ("!dummy   %0 %1"                                      \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2));                                        \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x12 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3)"                 \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__asm__ __volatile__ ("!dummy   %0 %1 %2"                                   \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x13 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4)"              \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3"                                \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x14 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5)"           \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4"                             \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x15 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5,%6)"        \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6));                                                     \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4 %5"                          \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6));                                                     \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6, arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x16 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;         \
-register unsigned long __sc7 __asm__ ("r7") = (unsigned long) arg6;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5,%6,%7)"     \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6), "r" (__sc7));                                        \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4 %5 %6"                       \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6), "r" (__sc7));                                        \
-__syscall_return(type,__sc0);                                               \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index f7827fa4cd5e..d5b2f8053b3b 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -329,136 +329,6 @@
  *          find a free slot in the 0-302 range.
  */
 
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res)\
-                      : "r" (__g1) \
-                      : "o0", "cc"); \
-if (__res < -255 || __res >= 0) \
-    return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__g1) \
-                      : "cc"); \
-if (__res < -255 || __res >= 0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__g1) \
-                      : "cc"); \
-if (__res < -255 || __res >= 0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \
-                      : "cc"); \
-if (__res < -255 || __res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-register long __o3 __asm__ ("o3") = (long)(arg4); \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \
-                      : "cc"); \
-if (__res < -255 || __res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-register long __o3 __asm__ ("o3") = (long)(arg4); \
-register long __o4 __asm__ ("o4") = (long)(arg5); \
-__asm__ __volatile__ ("t 0x10\n\t" \
-                      "bcc 1f\n\t" \
-                      "mov %%o0, %0\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "1:\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \
-                      : "cc"); \
-if (__res < -255 || __res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 27c46fbeebd6..2f858a2df94a 100644
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -181,7 +181,7 @@ dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t siz
 
 #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)
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline int
 dma_get_cache_alignment(void)
@@ -210,7 +210,7 @@ dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
 }
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         /* could define this in terms of the dma_cache ... operations,
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h
index 7392fc4a954e..876312fe82cc 100644
--- a/include/asm-sparc64/futex.h
+++ b/include/asm-sparc64/futex.h
@@ -45,7 +45,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
         if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
                 oparg = 1 << oparg;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -67,7 +67,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h
index 010f9cd0a672..5891ff7ba760 100644
--- a/include/asm-sparc64/pgalloc.h
+++ b/include/asm-sparc64/pgalloc.h
@@ -13,7 +13,7 @@
 #include <asm/page.h>
 
 /* Page table allocation/freeing. */
-extern kmem_cache_t *pgtable_cache;
+extern struct kmem_cache *pgtable_cache;
 
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 63669dad0d72..47047536f261 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -332,124 +332,6 @@
  *          find a free slot in the 0-302 range.
  */
 
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res)\
-                      : "r" (__g1) \
-                      : "o0", "cc"); \
-if (__res >= 0) \
-    return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__g1) \
-                      : "cc"); \
-if (__res >= 0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__g1) \
-                      : "cc"); \
-if (__res >= 0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \
-                      : "cc"); \
-if (__res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-register long __o3 __asm__ ("o3") = (long)(arg4); \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \
-                      : "cc"); \
-if (__res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-register long __g1 __asm__ ("g1") = __NR_##name; \
-register long __o0 __asm__ ("o0") = (long)(arg1); \
-register long __o1 __asm__ ("o1") = (long)(arg2); \
-register long __o2 __asm__ ("o2") = (long)(arg3); \
-register long __o3 __asm__ ("o3") = (long)(arg4); \
-register long __o4 __asm__ ("o4") = (long)(arg5); \
-__asm__ __volatile__ ("t 0x6d\n\t" \
-                      "sub %%g0, %%o0, %0\n\t" \
-                      "movcc %%xcc, %%o0, %0\n\t" \
-                      : "=r" (__res), "=&r" (__o0) \
-                      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \
-                      : "cc"); \
-if (__res>=0) \
-        return (type) __res; \
-errno = -__res; \
-return -1; \
-}
-
 /* sysconf options, for SunOS compatibility */
 #define   _SC_ARG_MAX             1
 #define   _SC_CHILD_MAX           2
diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h
index babd29895114..f0ee4fb55911 100644
--- a/include/asm-um/dma-mapping.h
+++ b/include/asm-um/dma-mapping.h
@@ -94,7 +94,7 @@ dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
 
 #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)
-#define dma_is_consistent(d) (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline int
 dma_get_cache_alignment(void)
@@ -112,7 +112,7 @@ dma_sync_single_range(struct device *dev, dma_addr_t dma_handle,
 }
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         BUG();
diff --git a/include/asm-v850/irq.h b/include/asm-v850/irq.h
index 1bf096db8f4c..88687c181f01 100644
--- a/include/asm-v850/irq.h
+++ b/include/asm-v850/irq.h
@@ -46,8 +46,6 @@ extern void
 init_irq_handlers (int base_irq, int num, int interval,
                    struct hw_interrupt_type *irq_type);
 
-typedef void (*irq_handler_t)(int irq, void *data, struct pt_regs *regs);
-
 /* Handle interrupt IRQ.  REGS are the registers at the time of ther
    interrupt.  */
 extern unsigned int handle_irq (int irq, struct pt_regs *regs);
diff --git a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h
index 737401e7d3ad..2241ed45ecfe 100644
--- a/include/asm-v850/unistd.h
+++ b/include/asm-v850/unistd.h
@@ -204,168 +204,8 @@
 #define __NR_gettid             201
 #define __NR_tkill              202
 
-
-/* Syscall protocol:
-   Syscall number in r12, args in r6-r9, r13-r14
-   Return value in r10
-   Trap 0 for `short' syscalls, where all the args can fit in function
-   call argument registers, and trap 1 when there are additional args in
-   r13-r14.  */
-
-#define SYSCALL_NUM     "r12"
-#define SYSCALL_ARG0    "r6"
-#define SYSCALL_ARG1    "r7"
-#define SYSCALL_ARG2    "r8"
-#define SYSCALL_ARG3    "r9"
-#define SYSCALL_ARG4    "r13"
-#define SYSCALL_ARG5    "r14"
-#define SYSCALL_RET     "r10"
-
-#define SYSCALL_SHORT_TRAP      "0"
-#define SYSCALL_LONG_TRAP       "1"
-
-/* Registers clobbered by any syscall.  This _doesn't_ include the syscall
-   number (r12) or the `extended arg' registers (r13, r14), even though
-   they are actually clobbered too (this is because gcc's `asm' statement
-   doesn't allow a clobber to be used as an input or output).  */
-#define SYSCALL_CLOBBERS        "r1", "r5", "r11", "r15", "r16", \
-                                "r17", "r18", "r19"
-
-/* Registers clobbered by a `short' syscall.  This includes all clobbers
-   except the syscall number (r12).  */
-#define SYSCALL_SHORT_CLOBBERS  SYSCALL_CLOBBERS, "r13", "r14"
-
 #ifdef __KERNEL__
 
-#include <asm/clinkage.h>
-#include <linux/err.h>
-
-#define __syscall_return(type, res)                                           \
-  do {                                                                        \
-          /* user-visible error numbers are in the range -1 - -MAX_ERRNO:      \
-             see <asm-v850/errno.h> */                                        \
-          if (__builtin_expect ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO), 0)) { \
-                  errno = -(res);                                             \
-                  res = -1;                                                   \
-          }                                                                   \
-          return (type) (res);                                                \
-  } while (0)
-
-
-#define _syscall0(type, name)                                                 \
-type name (void)                                                              \
-{                                                                             \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_SHORT_TRAP                            \
-                        : "=r" (__ret), "=r" (__syscall)                      \
-                        : "1" (__syscall)                                     \
-                        : SYSCALL_SHORT_CLOBBERS);                            \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define _syscall1(type, name, atype, a)                                       \
-type name (atype a)                                                           \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_SHORT_TRAP                            \
-                        : "=r" (__ret), "=r" (__syscall)                      \
-                        : "1" (__syscall), "r" (__a)                          \
-                        : SYSCALL_SHORT_CLOBBERS);                            \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define _syscall2(type, name, atype, a, btype, b)                             \
-type name (atype a, btype b)                                                  \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register btype __b __asm__ (SYSCALL_ARG1) = b;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_SHORT_TRAP                            \
-                        : "=r" (__ret), "=r" (__syscall)                      \
-                        : "1" (__syscall), "r" (__a), "r" (__b)               \
-                        : SYSCALL_SHORT_CLOBBERS);                            \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define _syscall3(type, name, atype, a, btype, b, ctype, c)                   \
-type name (atype a, btype b, ctype c)                                         \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register btype __b __asm__ (SYSCALL_ARG1) = b;                              \
-  register ctype __c __asm__ (SYSCALL_ARG2) = c;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_SHORT_TRAP                            \
-                        : "=r" (__ret), "=r" (__syscall)                      \
-                        : "1" (__syscall), "r" (__a), "r" (__b), "r" (__c)    \
-                        : SYSCALL_SHORT_CLOBBERS);                            \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define _syscall4(type, name, atype, a, btype, b, ctype, c, dtype, d)         \
-type name (atype a, btype b, ctype c, dtype d)                                \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register btype __b __asm__ (SYSCALL_ARG1) = b;                              \
-  register ctype __c __asm__ (SYSCALL_ARG2) = c;                              \
-  register dtype __d __asm__ (SYSCALL_ARG3) = d;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_SHORT_TRAP                            \
-                        : "=r" (__ret), "=r" (__syscall)                      \
-                        : "1" (__syscall),                                    \
-                        "r" (__a), "r" (__b), "r" (__c), "r" (__d)            \
-                        : SYSCALL_SHORT_CLOBBERS);                            \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define _syscall5(type, name, atype, a, btype, b, ctype, c, dtype, d, etype,e)\
-type name (atype a, btype b, ctype c, dtype d, etype e)                       \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register btype __b __asm__ (SYSCALL_ARG1) = b;                              \
-  register ctype __c __asm__ (SYSCALL_ARG2) = c;                              \
-  register dtype __d __asm__ (SYSCALL_ARG3) = d;                              \
-  register etype __e __asm__ (SYSCALL_ARG4) = e;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __asm__ __volatile__ ("trap " SYSCALL_LONG_TRAP                             \
-                        : "=r" (__ret), "=r" (__syscall), "=r" (__e)          \
-                        : "1" (__syscall),                                    \
-                        "r" (__a), "r" (__b), "r" (__c), "r" (__d), "2" (__e) \
-                        : SYSCALL_CLOBBERS);                                  \
-  __syscall_return (type, __ret);                                             \
-}
-
-#define __SYSCALL6_TRAP(syscall, ret, a, b, c, d, e, f)                       \
-  __asm__ __volatile__ ("trap " SYSCALL_LONG_TRAP                             \
-                        : "=r" (ret), "=r" (syscall),                         \
-                        "=r" (e), "=r" (f)                                    \
-                        : "1" (syscall),                                      \
-                        "r" (a), "r" (b), "r" (c), "r" (d),                   \
-                        "2" (e), "3" (f)                                      \
-                        : SYSCALL_CLOBBERS);
-
-#define _syscall6(type, name, atype, a, btype, b, ctype, c, dtype, d, etype, e, ftype, f) \
-type name (atype a, btype b, ctype c, dtype d, etype e, ftype f)              \
-{                                                                             \
-  register atype __a __asm__ (SYSCALL_ARG0) = a;                              \
-  register btype __b __asm__ (SYSCALL_ARG1) = b;                              \
-  register ctype __c __asm__ (SYSCALL_ARG2) = c;                              \
-  register dtype __d __asm__ (SYSCALL_ARG3) = d;                              \
-  register etype __e __asm__ (SYSCALL_ARG4) = e;                              \
-  register etype __f __asm__ (SYSCALL_ARG5) = f;                              \
-  register unsigned long __syscall __asm__ (SYSCALL_NUM) = __NR_##name;       \
-  register unsigned long __ret __asm__ (SYSCALL_RET);                         \
-  __SYSCALL6_TRAP(__syscall, __ret, __a, __b, __c, __d, __e, __f);            \
-  __syscall_return (type, __ret);                                             \
-}
-                
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
index 6c455b4068c0..ebd7117782a6 100644
--- a/include/asm-x86_64/Kbuild
+++ b/include/asm-x86_64/Kbuild
@@ -11,7 +11,6 @@ header-y += ldt.h
 header-y += msr.h
 header-y += prctl.h
 header-y += ptrace-abi.h
-header-y += setup.h
 header-y += sigcontext32.h
 header-y += ucontext.h
 header-y += vsyscall32.h
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86_64/atomic.h
index 626d3715fbb5..706ca4b60000 100644
--- a/include/asm-x86_64/atomic.h
+++ b/include/asm-x86_64/atomic.h
@@ -21,7 +21,7 @@
  * on us. We need to use _exactly_ the address the user gave us,
  * not some alias that contains the same information.
  */
-typedef struct { volatile int counter; } atomic_t;
+typedef struct { int counter; } atomic_t;
 
 #define ATOMIC_INIT(i)  { (i) }
 
diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86_64/dma-mapping.h
index 10174b110a5c..be9ec6890723 100644
--- a/include/asm-x86_64/dma-mapping.h
+++ b/include/asm-x86_64/dma-mapping.h
@@ -180,12 +180,13 @@ static inline int dma_get_cache_alignment(void)
         return boot_cpu_data.x86_clflush_size;
 }
 
-#define dma_is_consistent(h) 1
+#define dma_is_consistent(d, h) 1
 
 extern int dma_set_mask(struct device *dev, u64 mask);
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size, enum dma_data_direction dir)
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+        enum dma_data_direction dir)
 {
         flush_write_buffers();
 }
diff --git a/include/asm-x86_64/futex.h b/include/asm-x86_64/futex.h
index 9804bf07b092..5cdfb08013c3 100644
--- a/include/asm-x86_64/futex.h
+++ b/include/asm-x86_64/futex.h
@@ -55,7 +55,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
         if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                 return -EFAULT;
 
-        inc_preempt_count();
+        pagefault_disable();
 
         switch (op) {
         case FUTEX_OP_SET:
@@ -78,7 +78,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
                 ret = -ENOSYS;
         }
 
-        dec_preempt_count();
+        pagefault_enable();
 
         if (!ret) {
                 switch (cmp) {
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
index 7ae7e7d89d16..e17b9ec42e98 100644
--- a/include/asm-x86_64/smp.h
+++ b/include/asm-x86_64/smp.h
@@ -113,13 +113,6 @@ static __inline int logical_smp_processor_id(void)
 #define cpu_physical_id(cpu)            x86_cpu_to_apicid[cpu]
 #else
 #define cpu_physical_id(cpu)            boot_cpu_id
-static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
-                                void *info, int retry, int wait)
-{
-        /* Disable interrupts here? */
-        func(info);
-        return 0;
-}
 #endif /* !CONFIG_SMP */
 #endif
 
diff --git a/include/asm-x86_64/spinlock_types.h b/include/asm-x86_64/spinlock_types.h
index 59efe849f351..4da9345c1500 100644
--- a/include/asm-x86_64/spinlock_types.h
+++ b/include/asm-x86_64/spinlock_types.h
@@ -6,13 +6,13 @@
 #endif
 
 typedef struct {
-        volatile unsigned int slock;
+        unsigned int slock;
 } raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED        { 1 }
 
 typedef struct {
-        volatile unsigned int lock;
+        unsigned int lock;
 } raw_rwlock_t;
 
 #define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 777288eb7e75..c5f596e71faa 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -622,25 +622,7 @@ __SYSCALL(__NR_move_pages, sys_move_pages)
 
 #define __NR_syscall_max __NR_move_pages
 
-#ifdef __KERNEL__
-#include <linux/err.h>
-#endif
-
 #ifndef __NO_STUBS
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO */
-
-#define __syscall_clobber "r11","rcx","memory" 
-
-#define __syscall_return(type, res) \
-do { \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
-                errno = -(res); \
-                res = -1; \
-        } \
-        return (type) (res); \
-} while (0)
-
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_OLD_STAT
 #define __ARCH_WANT_SYS_ALARM
@@ -664,87 +646,6 @@ do { \
 #define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_TIME
 
-#define __syscall "syscall"
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ volatile (__syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name) : __syscall_clobber ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-long __res; \
-__asm__ volatile (__syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)) : __syscall_clobber ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ volatile (__syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ volatile (__syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-                  "d" ((long)(arg3)) : __syscall_clobber); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__asm__ volatile ("movq %5,%%r10 ;" __syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-          "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
-__syscall_return(type,__res); \
-} 
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-          "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \
-        __syscall_clobber,"r8","r10" ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
-{ \
-long __res; \
-__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; movq %7,%%r9 ; " __syscall \
-        : "=a" (__res) \
-        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-          "d" ((long)(arg3)), "g" ((long)(arg4)), "g" ((long)(arg5)), \
-          "g" ((long)(arg6)) : \
-        __syscall_clobber,"r8","r10","r9" ); \
-__syscall_return(type,__res); \
-}
-
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
diff --git a/include/asm-xtensa/dma-mapping.h b/include/asm-xtensa/dma-mapping.h
index c39c91dfcc69..82b03b3a2ee6 100644
--- a/include/asm-xtensa/dma-mapping.h
+++ b/include/asm-xtensa/dma-mapping.h
@@ -170,10 +170,10 @@ dma_get_cache_alignment(void)
         return L1_CACHE_BYTES;
 }
 
-#define dma_is_consistent(d)    (1)
+#define dma_is_consistent(d, h) (1)
 
 static inline void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 {
         consistent_sync(vaddr, size, direction);
diff --git a/include/asm-xtensa/unistd.h b/include/asm-xtensa/unistd.h
index 411f810a55c6..2e1a1b997e7d 100644
--- a/include/asm-xtensa/unistd.h
+++ b/include/asm-xtensa/unistd.h
@@ -218,190 +218,6 @@
 
 #define SYSXTENSA_COUNT            5    /* count of syscall0 functions*/
 
-#ifdef __KERNEL__
-#include <linux/linkage.h>
-
-#define __syscall_return(type, res) return ((type)(res))
-
-/* Tensilica's xt-xcc compiler is much more agressive at code
- * optimization than gcc.  Multiple __asm__ statements are
- * insufficient for xt-xcc because subsequent optimization passes
- * (beyond the front-end that knows of __asm__ statements and other
- * such GNU Extensions to C) can modify the register selection for
- * containment of C variables.
- *
- * xt-xcc cannot modify the contents of a single __asm__ statement, so
- * we create single-asm versions of the syscall macros that are
- * suitable and optimal for both xt-xcc and gcc.
- *
- * Linux takes system-call arguments in registers.  The following
- * design is optimized for user-land apps (e.g., glibc) which
- * typically have a function wrapper around the "syscall" assembly
- * instruction.  It satisfies the Xtensa ABI while minizing argument
- * shifting.
- *
- * The Xtensa ABI and software conventions require the system-call
- * number in a2.  If an argument exists in a2, we move it to the next
- * available register.  Note that for improved efficiency, we do NOT
- * shift all parameters down one register to maintain the original
- * order.
- *
- * At best case (zero arguments), we just write the syscall number to
- * a2.  At worst case (1 to 6 arguments), we move the argument in a2
- * to the next available register, then write the syscall number to
- * a2.
- *
- * For clarity, the following truth table enumerates all possibilities.
- *
- * arguments    syscall number  arg0, arg1, arg2, arg3, arg4, arg5
- * ---------    --------------  ----------------------------------
- *      0             a2
- *      1             a2        a3
- *      2             a2        a4,   a3
- *      3             a2        a5,   a3,   a4
- *      4             a2        a6,   a3,   a4,   a5
- *      5             a2        a7,   a3,   a4,   a5,   a6
- *      6             a2        a8,   a3,   a4,   a5,   a6,   a7
- */
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name) \
-        : "a2" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall1(type,name,type0,arg0) \
-type name(type0 arg0) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a3, %2 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0) \
-        : "a2", "a3" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall2(type,name,type0,arg0,type1,arg1) \
-type name(type0 arg0,type1 arg1) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a4, %2 \n" \
-        "  mov   a3, %3 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0), "a" (arg1) \
-        : "a2", "a3", "a4" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall3(type,name,type0,arg0,type1,arg1,type2,arg2) \
-type name(type0 arg0,type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a5, %2 \n" \
-        "  mov   a4, %4 \n" \
-        "  mov   a3, %3 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0), "a" (arg1), "a" (arg2) \
-        : "a2", "a3", "a4", "a5" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-#define _syscall4(type,name,type0,arg0,type1,arg1,type2,arg2,type3,arg3) \
-type name(type0 arg0,type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a6, %2 \n" \
-        "  mov   a5, %5 \n" \
-        "  mov   a4, %4 \n" \
-        "  mov   a3, %3 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0), "a" (arg1), "a" (arg2), "a" (arg3) \
-        : "a2", "a3", "a4", "a5", "a6" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-/* Note that we save and restore the a7 frame pointer.
- * Including a7 in the clobber list doesn't do what you'd expect.
- */
-#define _syscall5(type,name,type0,arg0,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name(type0 arg0,type1 arg1,type2 arg2,type3 arg3,type4 arg4) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a9, a7 \n" \
-        "  mov   a7, %2 \n" \
-        "  mov   a6, %6 \n" \
-        "  mov   a5, %5 \n" \
-        "  mov   a4, %4 \n" \
-        "  mov   a3, %3 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   a7, a9 \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0), "a" (arg1), "a" (arg2), \
-                             "a" (arg3), "a" (arg4) \
-        : "a2", "a3", "a4", "a5", "a6", "a9" \
-        ); \
-__syscall_return(type,__res); \
-}
-
-/* Note that we save and restore the a7 frame pointer.
- * Including a7 in the clobber list doesn't do what you'd expect.
- */
-#define _syscall6(type,name,type0,arg0,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name(type0 arg0,type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__asm__ __volatile__ ( \
-        "  mov   a9, a7 \n" \
-        "  mov   a8, %2 \n" \
-        "  mov   a7, %7 \n" \
-        "  mov   a6, %6 \n" \
-        "  mov   a5, %5 \n" \
-        "  mov   a4, %4 \n" \
-        "  mov   a3, %3 \n" \
-        "  movi  a2, %1 \n" \
-        "  syscall      \n" \
-        "  mov   a7, a9 \n" \
-        "  mov   %0, a2 \n" \
-        : "=a" (__res) \
-        : "i" (__NR_##name), "a" (arg0), "a" (arg1), "a" (arg2), \
-                             "a" (arg3), "a" (arg4), "a" (arg5)  \
-        : "a2", "a3", "a4", "a5", "a6", "a8", "a9" \
-        ); \
-__syscall_return(type,__res); \
-}
-
 /*
  * "Conditional" syscalls
  *
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ff433126361f..e618b25b5add 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -221,6 +221,7 @@ unifdef-y += if_bridge.h
 unifdef-y += if_ec.h
 unifdef-y += if_eql.h
 unifdef-y += if_ether.h
+unifdef-y += if_fddi.h
 unifdef-y += if_frad.h
 unifdef-y += if_ltalk.h
 unifdef-y += if_pppox.h
@@ -282,6 +283,7 @@ unifdef-y += nvram.h
 unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
+unifdef-y += personality.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
@@ -337,6 +339,7 @@ unifdef-y += videodev.h
 unifdef-y += wait.h
 unifdef-y += wanrouter.h
 unifdef-y += watchdog.h
+unifdef-y += wireless.h
 unifdef-y += xfrm.h
 
 objhdr-y += version.h
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 0d71c0041f13..3372ec6bf53a 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -111,7 +111,6 @@ struct kiocb {
         size_t                  ki_nbytes;      /* copy of iocb->aio_nbytes */
         char                    __user *ki_buf; /* remaining iocb->aio_buf */
         size_t                  ki_left;        /* remaining bytes */
-        long                    ki_retried;     /* just for testing */
         struct iovec            ki_inline_vec;  /* inline vector */
         struct iovec            *ki_iovec;
         unsigned long           ki_nr_segs;
@@ -194,7 +193,7 @@ struct kioctx {
 
         struct aio_ring_info    ring_info;
 
-        struct work_struct      wq;
+        struct delayed_work     wq;
 };
 
 /* prototypes */
@@ -238,7 +237,6 @@ do {									\
 } while (0)
 
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
-#define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1)
 
 #include <linux/aio_abi.h>
 
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 31e9abb6d977..2275f2748708 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -119,8 +119,7 @@ extern void *alloc_large_system_hash(const char *tablename,
                                      unsigned int *_hash_mask,
                                      unsigned long limit);
 
-#define HASH_HIGHMEM    0x00000001      /* Consider highmem? */
-#define HASH_EARLY      0x00000002      /* Allocating during early boot? */
+#define HASH_EARLY      0x00000001      /* Allocating during early boot? */
 
 /* Only NUMA needs hash distribution.
  * IA64 is known to have sufficient vmalloc space.
diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
new file mode 100644
index 000000000000..777dbf695d44
--- /dev/null
+++ b/include/linux/bottom_half.h
@@ -0,0 +1,10 @@
+#ifndef _LINUX_BH_H
+#define _LINUX_BH_H
+
+extern void local_bh_disable(void);
+extern void __local_bh_enable(void);
+extern void _local_bh_enable(void);
+extern void local_bh_enable(void);
+extern void local_bh_enable_ip(unsigned long ip);
+
+#endif /* _LINUX_BH_H */
diff --git a/include/linux/carta_random32.h b/include/linux/carta_random32.h
deleted file mode 100644
index f6f3bd9f20b5..000000000000
--- a/include/linux/carta_random32.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Fast, simple, yet decent quality random number generator based on
- * a paper by David G. Carta ("Two Fast Implementations of the
- * `Minimal Standard' Random Number Generator," Communications of the
- * ACM, January, 1990).
- *
- * Copyright (c) 2002-2006 Hewlett-Packard Development Company, L.P.
- *      Contributed by Stephane Eranian <eranian@hpl.hp.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- */
-#ifndef _LINUX_CARTA_RANDOM32_H_
-#define _LINUX_CARTA_RANDOM32_H_
-
-u64 carta_random32(u64 seed);
-
-#endif /* _LINUX_CARTA_RANDOM32_H_ */
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index 6e27f42e3a57..cb57c30081a8 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -80,7 +80,7 @@ typedef __u32 DriverVer_type;
 #define HWORD __u16
 #define DWORD __u32
 
-#define CISS_MAX_LUN    16      
+#define CISS_MAX_LUN    1024
 
 #define LEVEL2LUN   1   // index into Target(x) structure, due to byte swapping
 #define LEVEL3LUN   0
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index ee5f53f2ca15..f309b00e986e 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -2,6 +2,10 @@
 #define _LINUX_CDEV_H
 #ifdef __KERNEL__
 
+#include <linux/kobject.h>
+#include <linux/kdev_t.h>
+#include <linux/list.h>
+
 struct cdev {
         struct kobject kobj;
         struct module *owner;
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 4c02119c6ab9..3ea1cd58de97 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -133,7 +133,7 @@ struct cn_callback_data {
 struct cn_callback_entry {
         struct list_head callback_entry;
         struct cn_callback *cb;
-        struct work_struct work;
+        struct delayed_work work;
         struct cn_queue_dev *pdev;
 
         struct cn_callback_id id;
@@ -170,7 +170,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
 
-void cn_queue_wrapper(void *data);
+void cn_queue_wrapper(struct work_struct *work);
 
 extern int cn_already_initialized;
 
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ad90340e7dba..bfb520212d71 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/cpumask.h>
 #include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 struct cpu {
         int node_id;            /* The node which contains the CPU */
@@ -74,6 +75,17 @@ extern struct sysdev_class cpu_sysdev_class;
 
 #ifdef CONFIG_HOTPLUG_CPU
 /* Stop CPUs going up and down. */
+
+static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
+{
+        mutex_lock(cpu_hp_mutex);
+}
+
+static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
+{
+        mutex_unlock(cpu_hp_mutex);
+}
+
 extern void lock_cpu_hotplug(void);
 extern void unlock_cpu_hotplug(void);
 #define hotcpu_notifier(fn, pri) {                              \
@@ -85,17 +97,24 @@ extern void unlock_cpu_hotplug(void);
 #define unregister_hotcpu_notifier(nb)  unregister_cpu_notifier(nb)
 int cpu_down(unsigned int cpu);
 #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
-#else
+
+#else           /* CONFIG_HOTPLUG_CPU */
+
+static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
+{ }
+static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
+{ }
+
 #define lock_cpu_hotplug()      do { } while (0)
 #define unlock_cpu_hotplug()    do { } while (0)
 #define lock_cpu_hotplug_interruptible() 0
-#define hotcpu_notifier(fn, pri)        do { } while (0)
-#define register_hotcpu_notifier(nb)    do { } while (0)
-#define unregister_hotcpu_notifier(nb)  do { } while (0)
+#define hotcpu_notifier(fn, pri)        do { (void)(fn); } while (0)
+#define register_hotcpu_notifier(nb)    do { (void)(nb); } while (0)
+#define unregister_hotcpu_notifier(nb)  do { (void)(nb); } while (0)
 
 /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */
 static inline int cpu_is_offline(int cpu) { return 0; }
-#endif
+#endif          /* CONFIG_HOTPLUG_CPU */
 
 #ifdef CONFIG_SUSPEND_SMP
 extern int disable_nonboot_cpus(void);
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 4d8adf663681..8821e1f75b44 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -23,6 +23,7 @@ extern void cpuset_fork(struct task_struct *p);
 extern void cpuset_exit(struct task_struct *p);
 extern cpumask_t cpuset_cpus_allowed(struct task_struct *p);
 extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
+#define cpuset_current_mems_allowed (current->mems_allowed)
 void cpuset_init_current_mems_allowed(void);
 void cpuset_update_task_memory_state(void);
 #define cpuset_nodes_subset_current_mems_allowed(nodes) \
@@ -45,7 +46,7 @@ extern int cpuset_excl_nodes_overlap(const struct task_struct *p);
 extern int cpuset_memory_pressure_enabled;
 extern void __cpuset_memory_pressure_bump(void);
 
-extern struct file_operations proc_cpuset_operations;
+extern const struct file_operations proc_cpuset_operations;
 extern char *cpuset_task_status_allowed(struct task_struct *task, char *buffer);
 
 extern void cpuset_lock(void);
@@ -83,6 +84,7 @@ static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)
         return node_possible_map;
 }
 
+#define cpuset_current_mems_allowed (node_online_map)
 static inline void cpuset_init_current_mems_allowed(void) {}
 static inline void cpuset_update_task_memory_state(void) {}
 #define cpuset_nodes_subset_current_mems_allowed(nodes) (1)
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 952bee79a8f3..a1c10b0c4cf0 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -24,7 +24,7 @@ extern int debug_locks_off(void);
         int __ret = 0;                                                  \
                                                                         \
         if (unlikely(c)) {                                              \
-                if (debug_locks_off())                                  \
+                if (debug_locks_silent || debug_locks_off())            \
                         WARN_ON(1);                                     \
                 __ret = 1;                                              \
         }                                                               \
diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h
index 561e2a77805c..55d1ca5e60f5 100644
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
@@ -30,7 +30,7 @@
 #ifdef CONFIG_TASK_DELAY_ACCT
 
 extern int delayacct_on;        /* Delay accounting turned on/off */
-extern kmem_cache_t *delayacct_cache;
+extern struct kmem_cache *delayacct_cache;
 extern void delayacct_init(void);
 extern void __delayacct_tsk_init(struct task_struct *);
 extern void __delayacct_tsk_exit(struct task_struct *);
diff --git a/include/linux/device.h b/include/linux/device.h
index 583a341e016c..49ab53ce92dc 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -371,6 +371,9 @@ struct device {
                                            core doesn't touch it */
         struct dev_pm_info      power;
 
+#ifdef CONFIG_NUMA
+        int             numa_node;      /* NUMA node this device is close to */
+#endif
         u64             *dma_mask;      /* dma mask (if dma'able device) */
         u64             coherent_dma_mask;/* Like dma_mask, but for
                                              alloc_coherent mappings as
@@ -394,6 +397,25 @@ struct device {
         void    (*release)(struct device * dev);
 };
 
+#ifdef CONFIG_NUMA
+static inline int dev_to_node(struct device *dev)
+{
+        return dev->numa_node;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+        dev->numa_node = node;
+}
+#else
+static inline int dev_to_node(struct device *dev)
+{
+        return -1;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+}
+#endif
+
 static inline void *
 dev_get_drvdata (struct device *dev)
 {
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 743d5c8e6d36..60713e6ea297 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -6,6 +6,8 @@
 #include <linux/elf-em.h>
 #include <asm/elf.h>
 
+struct file;
+
 #ifndef elf_read_implies_exec
   /* Executables for which elf_read_implies_exec() returns TRUE will
      have the READ_IMPLIES_EXEC personality flag set automatically.
@@ -358,6 +360,7 @@ extern Elf32_Dyn _DYNAMIC [];
 #define elfhdr          elf32_hdr
 #define elf_phdr        elf32_phdr
 #define elf_note        elf32_note
+#define elf_addr_t      Elf32_Off
 
 #else
 
@@ -365,6 +368,7 @@ extern Elf64_Dyn _DYNAMIC [];
 #define elfhdr          elf64_hdr
 #define elf_phdr        elf64_phdr
 #define elf_note        elf64_note
+#define elf_addr_t      Elf64_Off
 
 #endif
 
diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
index ce0e6109aff0..8c43b13a02fe 100644
--- a/include/linux/ext3_jbd.h
+++ b/include/linux/ext3_jbd.h
@@ -109,74 +109,32 @@ int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode);
  * been done yet.
  */
 
-void ext3_journal_abort_handle(const char *caller, const char *err_fn,
-                struct buffer_head *bh, handle_t *handle, int err);
-
-static inline int
-__ext3_journal_get_undo_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
+static inline void ext3_journal_release_buffer(handle_t *handle,
+                                                struct buffer_head *bh)
 {
-        int err = journal_get_undo_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
+        journal_release_buffer(handle, bh);
 }
 
-static inline int
-__ext3_journal_get_write_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
-{
-        int err = journal_get_write_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+void ext3_journal_abort_handle(const char *caller, const char *err_fn,
+                struct buffer_head *bh, handle_t *handle, int err);
 
-static inline void
-ext3_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
-{
-        journal_release_buffer(handle, bh);
-}
+int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_forget(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_get_write_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_revoke(const char *where, handle_t *handle,
-                      unsigned long blocknr, struct buffer_head *bh)
-{
-        int err = journal_revoke(handle, blocknr, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_forget(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_get_create_access(const char *where,
-                                 handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_get_create_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_revoke(const char *where, handle_t *handle,
+                                unsigned long blocknr, struct buffer_head *bh);
 
-static inline int
-__ext3_journal_dirty_metadata(const char *where,
-                              handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_dirty_metadata(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_get_create_access(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
+int __ext3_journal_dirty_metadata(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
 #define ext3_journal_get_undo_access(handle, bh) \
         __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh))
diff --git a/include/linux/ext4_jbd2.h b/include/linux/ext4_jbd2.h
index 72dd631912e4..d716e6392cf6 100644
--- a/include/linux/ext4_jbd2.h
+++ b/include/linux/ext4_jbd2.h
@@ -114,74 +114,32 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode);
  * been done yet.
  */
 
-void ext4_journal_abort_handle(const char *caller, const char *err_fn,
-                struct buffer_head *bh, handle_t *handle, int err);
-
-static inline int
-__ext4_journal_get_undo_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
+static inline void ext4_journal_release_buffer(handle_t *handle,
+                                                struct buffer_head *bh)
 {
-        int err = jbd2_journal_get_undo_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
+        jbd2_journal_release_buffer(handle, bh);
 }
 
-static inline int
-__ext4_journal_get_write_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
-{
-        int err = jbd2_journal_get_write_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+void ext4_journal_abort_handle(const char *caller, const char *err_fn,
+                struct buffer_head *bh, handle_t *handle, int err);
 
-static inline void
-ext4_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
-{
-        jbd2_journal_release_buffer(handle, bh);
-}
+int __ext4_journal_get_undo_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_forget(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_get_write_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_revoke(const char *where, handle_t *handle,
-                      ext4_fsblk_t blocknr, struct buffer_head *bh)
-{
-        int err = jbd2_journal_revoke(handle, blocknr, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_forget(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_get_create_access(const char *where,
-                                 handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_get_create_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_revoke(const char *where, handle_t *handle,
+                                ext4_fsblk_t blocknr, struct buffer_head *bh);
 
-static inline int
-__ext4_journal_dirty_metadata(const char *where,
-                              handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_dirty_metadata(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_get_create_access(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
+int __ext4_journal_dirty_metadata(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
 #define ext4_journal_get_undo_access(handle, bh) \
         __ext4_journal_get_undo_access(__FUNCTION__, (handle), (bh))
diff --git a/include/linux/file.h b/include/linux/file.h
index 74183e6f7f45..6e77b9177f9e 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -64,6 +64,8 @@ struct files_struct {
 
 #define files_fdtable(files) (rcu_dereference((files)->fdt))
 
+extern struct kmem_cache *filp_cachep;
+
 extern void FASTCALL(__fput(struct file *));
 extern void FASTCALL(fput(struct file *));
 
@@ -114,4 +116,6 @@ struct files_struct *get_files_struct(struct task_struct *);
 void FASTCALL(put_files_struct(struct files_struct *fs));
 void reset_files_struct(struct task_struct *, struct files_struct *);
 
+extern struct kmem_cache *files_cachep;
+
 #endif /* __LINUX_FILE_H */
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
new file mode 100644
index 000000000000..6e05e3e7ce39
--- /dev/null
+++ b/include/linux/freezer.h
@@ -0,0 +1,87 @@
+/* Freezer declarations */
+
+#ifdef CONFIG_PM
+/*
+ * Check if a process has been frozen
+ */
+static inline int frozen(struct task_struct *p)
+{
+        return p->flags & PF_FROZEN;
+}
+
+/*
+ * Check if there is a request to freeze a process
+ */
+static inline int freezing(struct task_struct *p)
+{
+        return p->flags & PF_FREEZE;
+}
+
+/*
+ * Request that a process be frozen
+ * FIXME: SMP problem. We may not modify other process' flags!
+ */
+static inline void freeze(struct task_struct *p)
+{
+        p->flags |= PF_FREEZE;
+}
+
+/*
+ * Sometimes we may need to cancel the previous 'freeze' request
+ */
+static inline void do_not_freeze(struct task_struct *p)
+{
+        p->flags &= ~PF_FREEZE;
+}
+
+/*
+ * Wake up a frozen process
+ */
+static inline int thaw_process(struct task_struct *p)
+{
+        if (frozen(p)) {
+                p->flags &= ~PF_FROZEN;
+                wake_up_process(p);
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * freezing is complete, mark process as frozen
+ */
+static inline void frozen_process(struct task_struct *p)
+{
+        p->flags = (p->flags & ~PF_FREEZE) | PF_FROZEN;
+}
+
+extern void refrigerator(void);
+extern int freeze_processes(void);
+extern void thaw_processes(void);
+
+static inline int try_to_freeze(void)
+{
+        if (freezing(current)) {
+                refrigerator();
+                return 1;
+        } else
+                return 0;
+}
+
+extern void thaw_some_processes(int all);
+
+#else
+static inline int frozen(struct task_struct *p) { return 0; }
+static inline int freezing(struct task_struct *p) { return 0; }
+static inline void freeze(struct task_struct *p) { BUG(); }
+static inline int thaw_process(struct task_struct *p) { return 1; }
+static inline void frozen_process(struct task_struct *p) { BUG(); }
+
+static inline void refrigerator(void) {}
+static inline int freeze_processes(void) { BUG(); return 0; }
+static inline void thaw_processes(void) {}
+
+static inline int try_to_freeze(void) { return 0; }
+
+
+#endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cac7b1ef9543..70b99fbb560b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -543,19 +543,22 @@ struct inode {
         struct list_head        i_dentry;
         unsigned long           i_ino;
         atomic_t                i_count;
-        umode_t                 i_mode;
         unsigned int            i_nlink;
         uid_t                   i_uid;
         gid_t                   i_gid;
         dev_t                   i_rdev;
+        unsigned long           i_version;
         loff_t                  i_size;
+#ifdef __NEED_I_SIZE_ORDERED
+        seqcount_t              i_size_seqcount;
+#endif
         struct timespec         i_atime;
         struct timespec         i_mtime;
         struct timespec         i_ctime;
         unsigned int            i_blkbits;
-        unsigned long           i_version;
         blkcnt_t                i_blocks;
         unsigned short          i_bytes;
+        umode_t                 i_mode;
         spinlock_t              i_lock; /* i_blocks, i_bytes, maybe i_size */
         struct mutex            i_mutex;
         struct rw_semaphore     i_alloc_sem;
@@ -598,9 +601,6 @@ struct inode {
         void                    *i_security;
 #endif
         void                    *i_private; /* fs or device private pointer */
-#ifdef __NEED_I_SIZE_ORDERED
-        seqcount_t              i_size_seqcount;
-#endif
 };
 
 /*
@@ -636,7 +636,7 @@ extern void inode_double_unlock(struct inode *inode1, struct inode *inode2);
  * cmpxchg8b without the need of the lock prefix). For SMP compiles
  * and 64bit archs it makes no difference if preempt is enabled or not.
  */
-static inline loff_t i_size_read(struct inode *inode)
+static inline loff_t i_size_read(const struct inode *inode)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
         loff_t i_size;
@@ -679,12 +679,12 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
 #endif
 }
 
-static inline unsigned iminor(struct inode *inode)
+static inline unsigned iminor(const struct inode *inode)
 {
         return MINOR(inode->i_rdev);
 }
 
-static inline unsigned imajor(struct inode *inode)
+static inline unsigned imajor(const struct inode *inode)
 {
         return MAJOR(inode->i_rdev);
 }
@@ -1481,7 +1481,9 @@ extern char * getname(const char __user *);
 extern void __init vfs_caches_init_early(void);
 extern void __init vfs_caches_init(unsigned long);
 
-#define __getname()     kmem_cache_alloc(names_cachep, SLAB_KERNEL)
+extern struct kmem_cache *names_cachep;
+
+#define __getname()     kmem_cache_alloc(names_cachep, GFP_KERNEL)
 #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
 #define putname(name)   __putname(name)
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index c623d12a486e..11a36ceddf73 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -18,6 +18,8 @@ struct fs_struct {
         .umask          = 0022, \
 }
 
+extern struct kmem_cache *fs_cachep;
+
 extern void exit_fs(struct task_struct *);
 extern void set_fs_altroot(void);
 extern void set_fs_root(struct fs_struct *, struct vfsmount *, struct dentry *);
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 9fc48a674b82..534744efe30d 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -15,7 +15,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 7
+#define FUSE_KERNEL_MINOR_VERSION 8
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -92,6 +92,11 @@ struct fuse_file_lock {
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
 
+/**
+ * Release flags
+ */
+#define FUSE_RELEASE_FLUSH      (1 << 0)
+
 enum fuse_opcode {
         FUSE_LOOKUP        = 1,
         FUSE_FORGET        = 2,  /* no reply */
@@ -127,6 +132,8 @@ enum fuse_opcode {
         FUSE_ACCESS        = 34,
         FUSE_CREATE        = 35,
         FUSE_INTERRUPT     = 36,
+        FUSE_BMAP          = 37,
+        FUSE_DESTROY       = 38,
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
@@ -205,12 +212,13 @@ struct fuse_open_out {
 struct fuse_release_in {
         __u64   fh;
         __u32   flags;
-        __u32   padding;
+        __u32   release_flags;
+        __u64   lock_owner;
 };
 
 struct fuse_flush_in {
         __u64   fh;
-        __u32   flush_flags;
+        __u32   unused;
         __u32   padding;
         __u64   lock_owner;
 };
@@ -296,6 +304,16 @@ struct fuse_interrupt_in {
         __u64   unique;
 };
 
+struct fuse_bmap_in {
+        __u64   block;
+        __u32   blocksize;
+        __u32   padding;
+};
+
+struct fuse_bmap_out {
+        __u64   block;
+};
+
 struct fuse_in_header {
         __u32   len;
         __u32   opcode;
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index bf2b6bc3f6fd..00c314aedab7 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -116,6 +116,9 @@ static inline enum zone_type gfp_zone(gfp_t flags)
 #ifndef HAVE_ARCH_FREE_PAGE
 static inline void arch_free_page(struct page *page, int order) { }
 #endif
+#ifndef HAVE_ARCH_ALLOC_PAGE
+static inline void arch_alloc_page(struct page *page, int order) { }
+#endif
 
 extern struct page *
 FASTCALL(__alloc_pages(gfp_t, unsigned int, struct zonelist *));
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index fd7d12daa94f..3d8768b619e9 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -3,6 +3,7 @@
 
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/uaccess.h>
 
 #include <asm/cacheflush.h>
 
@@ -41,9 +42,10 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#define kmap_atomic(page, idx)          page_address(page)
-#define kunmap_atomic(addr, idx)        do { } while (0)
-#define kmap_atomic_pfn(pfn, idx)       page_address(pfn_to_page(pfn))
+#define kmap_atomic(page, idx) \
+        ({ pagefault_disable(); page_address(page); })
+#define kunmap_atomic(addr, idx)        do { pagefault_enable(); } while (0)
+#define kmap_atomic_pfn(pfn, idx)       kmap_atomic(pfn_to_page(pfn), (idx))
 #define kmap_atomic_to_page(ptr)        virt_to_page(ptr)
 #endif
 
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index ace64e57e17f..a60995afe334 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -35,6 +35,7 @@ extern int sysctl_hugetlb_shm_group;
 
 pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr);
 pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr);
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep);
 struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
                               int write);
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index c115e9e840b4..52f53e2e70c3 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -461,7 +461,7 @@ struct i2o_driver {
         int (*reply) (struct i2o_controller *, u32, struct i2o_message *);
 
         /* Event handler */
-        void (*event) (struct i2o_event *);
+        work_func_t event;
 
         struct workqueue_struct *event_queue;   /* Event queue */
 
@@ -490,7 +490,7 @@ struct i2o_dma {
  */
 struct i2o_pool {
         char *name;
-        kmem_cache_t *slab;
+        struct kmem_cache *slab;
         mempool_t *mempool;
 };
 
@@ -986,7 +986,8 @@ extern void i2o_driver_unregister(struct i2o_driver *);
 
 /**
  *      i2o_driver_notify_controller_add - Send notification of added controller
- *                                         to a single I2O driver
+ *      @drv: I2O driver
+ *      @c: I2O controller
  *
  *      Send notification of added controller to a single registered driver.
  */
@@ -998,8 +999,9 @@ static inline void i2o_driver_notify_controller_add(struct i2o_driver *drv,
 };
 
 /**
- *      i2o_driver_notify_controller_remove - Send notification of removed
- *                                            controller to a single I2O driver
+ *      i2o_driver_notify_controller_remove - Send notification of removed controller
+ *      @drv: I2O driver
+ *      @c: I2O controller
  *
  *      Send notification of removed controller to a single registered driver.
  */
@@ -1011,8 +1013,9 @@ static inline void i2o_driver_notify_controller_remove(struct i2o_driver *drv,
 };
 
 /**
- *      i2o_driver_notify_device_add - Send notification of added device to a
- *                                     single I2O driver
+ *      i2o_driver_notify_device_add - Send notification of added device
+ *      @drv: I2O driver
+ *      @i2o_dev: the added i2o_device
  *
  *      Send notification of added device to a single registered driver.
  */
@@ -1025,7 +1028,8 @@ static inline void i2o_driver_notify_device_add(struct i2o_driver *drv,
 
 /**
  *      i2o_driver_notify_device_remove - Send notification of removed device
- *                                        to a single I2O driver
+ *      @drv: I2O driver
+ *      @i2o_dev: the added i2o_device
  *
  *      Send notification of removed device to a single registered driver.
  */
@@ -1148,7 +1152,7 @@ static inline void i2o_msg_post(struct i2o_controller *c,
 /**
  *      i2o_msg_post_wait - Post and wait a message and wait until return
  *      @c: controller
- *      @m: message to post
+ *      @msg: message to post
  *      @timeout: time in seconds to wait
  *
  *      This API allows an OSM to post a message and then be told whether or
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 33c5daacc743..733790d4f7db 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -73,7 +73,7 @@
 extern struct nsproxy init_nsproxy;
 #define INIT_NSPROXY(nsproxy) {                                         \
         .count          = ATOMIC_INIT(1),                               \
-        .nslock         = SPIN_LOCK_UNLOCKED,                           \
+        .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
         .uts_ns         = &init_uts_ns,                                 \
         .namespace      = NULL,                                         \
         INIT_IPC_NS(ipc_ns)                                             \
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5b83e7b59621..de7593f4e895 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -11,6 +11,7 @@
 #include <linux/hardirq.h>
 #include <linux/sched.h>
 #include <linux/irqflags.h>
+#include <linux/bottom_half.h>
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -217,12 +218,6 @@ static inline void __deprecated save_and_cli(unsigned long *x)
 #define save_and_cli(x) save_and_cli(&x)
 #endif /* CONFIG_SMP */
 
-extern void local_bh_disable(void);
-extern void __local_bh_enable(void);
-extern void _local_bh_enable(void);
-extern void local_bh_enable(void);
-extern void local_bh_enable_ip(unsigned long ip);
-
 /* PLEASE, avoid to allocate new softirqs, if you need not _really_ high
    frequency threaded job scheduling. For almost all the purposes
    tasklets are more than enough. F.e. all serial device BHs et
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 796ca009fd46..7a9db390c56a 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -208,6 +208,15 @@ struct kernel_ipmi_msg
    code as the first byte of the incoming data, unlike a response. */
 
 
+/*
+ * Modes for ipmi_set_maint_mode() and the userland IOCTL.  The AUTO
+ * setting is the default and means it will be set on certain
+ * commands.  Hard setting it on and off will override automatic
+ * operation.
+ */
+#define IPMI_MAINTENANCE_MODE_AUTO      0
+#define IPMI_MAINTENANCE_MODE_OFF       1
+#define IPMI_MAINTENANCE_MODE_ON        2
 
 #ifdef __KERNEL__
 
@@ -374,6 +383,35 @@ int ipmi_unregister_for_cmd(ipmi_user_t   user,
                             unsigned int  chans);
 
 /*
+ * Go into a mode where the driver will not autonomously attempt to do
+ * things with the interface.  It will still respond to attentions and
+ * interrupts, and it will expect that commands will complete.  It
+ * will not automatcially check for flags, events, or things of that
+ * nature.
+ *
+ * This is primarily used for firmware upgrades.  The idea is that
+ * when you go into firmware upgrade mode, you do this operation
+ * and the driver will not attempt to do anything but what you tell
+ * it or what the BMC asks for.
+ *
+ * Note that if you send a command that resets the BMC, the driver
+ * will still expect a response from that command.  So the BMC should
+ * reset itself *after* the response is sent.  Resetting before the
+ * response is just silly.
+ *
+ * If in auto maintenance mode, the driver will automatically go into
+ * maintenance mode for 30 seconds if it sees a cold reset, a warm
+ * reset, or a firmware NetFN.  This means that code that uses only
+ * firmware NetFN commands to do upgrades will work automatically
+ * without change, assuming it sends a message every 30 seconds or
+ * less.
+ *
+ * See the IPMI_MAINTENANCE_MODE_xxx defines for what the mode means.
+ */
+int ipmi_get_maintenance_mode(ipmi_user_t user);
+int ipmi_set_maintenance_mode(ipmi_user_t user, int mode);
+
+/*
  * Allow run-to-completion mode to be set for the interface of
  * a specific user.
  */
@@ -656,4 +694,11 @@ struct ipmi_timing_parms
 #define IPMICTL_GET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 23, \
                                              struct ipmi_timing_parms)
 
+/*
+ * Set the maintenance mode.  See ipmi_set_maintenance_mode() above
+ * for a description of what this does.
+ */
+#define IPMICTL_GET_MAINTENANCE_MODE_CMD        _IOR(IPMI_IOC_MAGIC, 30, int)
+#define IPMICTL_SET_MAINTENANCE_MODE_CMD        _IOW(IPMI_IOC_MAGIC, 31, int)
+
 #endif /* __LINUX_IPMI_H */
diff --git a/include/linux/ipmi_msgdefs.h b/include/linux/ipmi_msgdefs.h
index 4d04d8b58a0a..b56a158d587a 100644
--- a/include/linux/ipmi_msgdefs.h
+++ b/include/linux/ipmi_msgdefs.h
@@ -46,6 +46,8 @@
 #define IPMI_NETFN_APP_REQUEST                  0x06
 #define IPMI_NETFN_APP_RESPONSE                 0x07
 #define IPMI_GET_DEVICE_ID_CMD          0x01
+#define IPMI_COLD_RESET_CMD             0x02
+#define IPMI_WARM_RESET_CMD             0x03
 #define IPMI_CLEAR_MSG_FLAGS_CMD        0x30
 #define IPMI_GET_DEVICE_GUID_CMD        0x08
 #define IPMI_GET_MSG_FLAGS_CMD          0x31
@@ -60,20 +62,27 @@
 #define IPMI_NETFN_STORAGE_RESPONSE             0x0b
 #define IPMI_ADD_SEL_ENTRY_CMD          0x44
 
+#define IPMI_NETFN_FIRMWARE_REQUEST             0x08
+#define IPMI_NETFN_FIRMWARE_RESPONSE            0x09
+
 /* The default slave address */
 #define IPMI_BMC_SLAVE_ADDR     0x20
 
 /* The BT interface on high-end HP systems supports up to 255 bytes in
  * one transfer.  Its "virtual" BMC supports some commands that are longer
  * than 128 bytes.  Use the full 256, plus NetFn/LUN, Cmd, cCode, plus
- * some overhead.  It would be nice to base this on the "BT Capabilities"
- * but that's too hard to propagate to the rest of the driver. */
+ * some overhead; it's not worth the effort to dynamically size this based
+ * on the results of the "Get BT Capabilities" command. */
 #define IPMI_MAX_MSG_LENGTH     272     /* multiple of 16 */
 
 #define IPMI_CC_NO_ERROR                0x00
 #define IPMI_NODE_BUSY_ERR              0xc0
 #define IPMI_INVALID_COMMAND_ERR        0xc1
+#define IPMI_TIMEOUT_ERR                0xc3
 #define IPMI_ERR_MSG_TRUNCATED          0xc6
+#define IPMI_REQ_LEN_INVALID_ERR        0xc7
+#define IPMI_REQ_LEN_EXCEEDED_ERR       0xc8
+#define IPMI_NOT_IN_MY_STATE_ERR        0xd5    /* IPMI 2.0 */
 #define IPMI_LOST_ARBITRATION_ERR       0x81
 #define IPMI_BUS_ERR                    0x82
 #define IPMI_NAK_ON_WRITE_ERR           0x83
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 6d9c7e4da472..c0633108d05d 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -115,6 +115,13 @@ struct ipmi_smi_handlers
            poll for operations during things like crash dumps. */
         void (*poll)(void *send_info);
 
+        /* Enable/disable firmware maintenance mode.  Note that this
+           is *not* the modes defined, this is simply an on/off
+           setting.  The message handler does the mode handling.  Note
+           that this is called from interupt context, so it cannot
+           block. */
+        void (*set_maintenance_mode)(void *send_info, int enable);
+
         /* Tell the handler that we are using it/not using it.  The
            message handler get the modules that this handler belongs
            to; this function lets the SMI claim any modules that it
@@ -173,6 +180,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                       void                     *send_info,
                       struct ipmi_device_id    *device_id,
                       struct device            *dev,
+                      const char               *sysfs_name,
                       unsigned char            slave_addr);
 
 /*
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index fe89444b1c6f..452737551260 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -839,7 +839,6 @@ struct journal_s
  */
 
 /* Filing buffers */
-extern void __journal_temp_unlink_buffer(struct journal_head *jh);
 extern void journal_unfile_buffer(journal_t *, struct journal_head *);
 extern void __journal_unfile_buffer(struct journal_head *);
 extern void __journal_refile_buffer(struct journal_head *);
@@ -949,7 +948,7 @@ void journal_put_journal_head(struct journal_head *jh);
 /*
  * handle management
  */
-extern kmem_cache_t *jbd_handle_cache;
+extern struct kmem_cache *jbd_handle_cache;
 
 static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
 {
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index ddb128795781..0e0fedd2039a 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -848,7 +848,6 @@ struct journal_s
  */
 
 /* Filing buffers */
-extern void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh);
 extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *);
 extern void __jbd2_journal_unfile_buffer(struct journal_head *);
 extern void __jbd2_journal_refile_buffer(struct journal_head *);
@@ -958,7 +957,7 @@ void jbd2_journal_put_journal_head(struct journal_head *jh);
 /*
  * handle management
  */
-extern kmem_cache_t *jbd2_handle_cache;
+extern struct kmem_cache *jbd2_handle_cache;
 
 static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
 {
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index efe0ee4cc80b..06c58c423fe1 100644
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -158,7 +158,7 @@ static inline void con_schedule_flip(struct tty_struct *t)
         if (t->buf.tail != NULL)
                 t->buf.tail->commit = t->buf.tail->used;
         spin_unlock_irqrestore(&t->buf.lock, flags);
-        schedule_work(&t->buf.work);
+        schedule_delayed_work(&t->buf.work, 0);
 }
 
 #endif
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index a4ede62b339d..e3abcec6c51c 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -105,6 +105,7 @@ extern struct page *kimage_alloc_control_pages(struct kimage *image,
                                                 unsigned int order);
 extern void crash_kexec(struct pt_regs *);
 int kexec_should_crash(struct task_struct *);
+void crash_save_cpu(struct pt_regs *regs, int cpu);
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
 
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index ac4c0559f751..769be39b9681 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -165,7 +165,7 @@ extern void arch_disarm_kprobe(struct kprobe *p);
 extern int arch_init_kprobes(void);
 extern void show_registers(struct pt_regs *regs);
 extern kprobe_opcode_t *get_insn_slot(void);
-extern void free_insn_slot(kprobe_opcode_t *slot);
+extern void free_insn_slot(kprobe_opcode_t *slot, int dirty);
 extern void kprobes_inc_nmissed_count(struct kprobe *p);
 
 /* Get the kprobe at this addr (if any) - called with preemption disabled */
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 84eeecd60a02..611f17f79eef 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -248,9 +248,9 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
  *
  * Returns the scalar nanoseconds representation of kt
  */
-static inline u64 ktime_to_ns(const ktime_t kt)
+static inline s64 ktime_to_ns(const ktime_t kt)
 {
-        return (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
+        return (s64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
 }
 
 #endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 202283b5df96..ab2754830322 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -575,8 +575,9 @@ struct ata_port {
         struct ata_host         *host;
         struct device           *dev;
 
-        struct work_struct      port_task;
-        struct work_struct      hotplug_task;
+        void                    *port_task_data;
+        struct delayed_work     port_task;
+        struct delayed_work     hotplug_task;
         struct work_struct      scsi_rescan_task;
 
         unsigned int            hsm_task_state;
@@ -755,7 +756,7 @@ extern void ata_host_resume(struct ata_host *host);
 extern int ata_ratelimit(void);
 extern int ata_busy_sleep(struct ata_port *ap,
                           unsigned long timeout_pat, unsigned long timeout);
-extern void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *),
+extern void ata_port_queue_task(struct ata_port *ap, work_func_t fn,
                                 void *data, unsigned long delay);
 extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
                              unsigned long interval_msec,
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 862d9730a60d..8c39654549d8 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -164,14 +164,12 @@ void		  nlmclnt_next_cookie(struct nlm_cookie *);
  */
 struct nlm_host * nlmclnt_lookup_host(const struct sockaddr_in *, int, int, const char *, int);
 struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *, const char *, int);
-struct nlm_host * nlm_lookup_host(int server, const struct sockaddr_in *, int, int, const char *, int);
 struct rpc_clnt * nlm_bind_host(struct nlm_host *);
 void              nlm_rebind_host(struct nlm_host *);
 struct nlm_host * nlm_get_host(struct nlm_host *);
 void              nlm_release_host(struct nlm_host *);
 void              nlm_shutdown_hosts(void);
 extern void       nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32);
-struct nsm_handle *nsm_find(const struct sockaddr_in *, const char *, int);
 void              nsm_release(struct nsm_handle *);
 
 
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 819f08f1310d..498bfbd3b4e1 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void *start, unsigned long size);
 
 extern void lockdep_off(void);
 extern void lockdep_on(void);
-extern int lockdep_internal(void);
 
 /*
  * These methods are used by specific locking variants (spinlocks,
@@ -243,6 +242,8 @@ extern void lock_release(struct lockdep_map *lock, int nested,
 
 # define INIT_LOCKDEP                           .lockdep_recursion = 0,
 
+#define lockdep_depth(tsk)      ((tsk)->lockdep_depth)
+
 #else /* !LOCKDEP */
 
 static inline void lockdep_off(void)
@@ -253,11 +254,6 @@ static inline void lockdep_on(void)
 {
 }
 
-static inline int lockdep_internal(void)
-{
-        return 0;
-}
-
 # define lock_acquire(l, s, t, r, c, i)         do { } while (0)
 # define lock_release(l, n, i)                  do { } while (0)
 # define lockdep_init()                         do { } while (0)
@@ -277,6 +273,9 @@ static inline int lockdep_internal(void)
  * The class key takes no space if lockdep is disabled:
  */
 struct lock_class_key { };
+
+#define lockdep_depth(tsk)      (0)
+
 #endif /* !LOCKDEP */
 
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index d538de901965..a17b147c61e7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -114,6 +114,8 @@ struct vm_area_struct {
 #endif
 };
 
+extern struct kmem_cache *vm_area_cachep;
+
 /*
  * This struct defines the per-mm list of VMAs for uClinux. If CONFIG_MMU is
  * disabled, then there's a single shared list of VMAs maintained by the
@@ -294,6 +296,24 @@ void put_pages_list(struct list_head *pages);
 void split_page(struct page *page, unsigned int order);
 
 /*
+ * Compound pages have a destructor function.  Provide a
+ * prototype for that function and accessor functions.
+ * These are _only_ valid on the head of a PG_compound page.
+ */
+typedef void compound_page_dtor(struct page *);
+
+static inline void set_compound_page_dtor(struct page *page,
+                                                compound_page_dtor *dtor)
+{
+        page[1].lru.next = (void *)dtor;
+}
+
+static inline compound_page_dtor *get_compound_page_dtor(struct page *page)
+{
+        return (compound_page_dtor *)page[1].lru.next;
+}
+
+/*
  * Multiple processes may "see" the same page. E.g. for untouched
  * mappings of /dev/null, all processes see the same page full of
  * zeroes, and text pages of executables and shared libraries have
@@ -396,7 +416,9 @@ void split_page(struct page *page, unsigned int order);
  * We are going to use the flags for the page to node mapping if its in
  * there.  This includes the case where there is no node, so it is implicit.
  */
-#define FLAGS_HAS_NODE          (NODES_WIDTH > 0 || NODES_SHIFT == 0)
+#if !(NODES_WIDTH > 0 || NODES_SHIFT == 0)
+#define NODE_NOT_IN_PAGE_FLAGS
+#endif
 
 #ifndef PFN_SECTION_SHIFT
 #define PFN_SECTION_SHIFT 0
@@ -411,13 +433,18 @@ void split_page(struct page *page, unsigned int order);
 #define NODES_PGSHIFT           (NODES_PGOFF * (NODES_WIDTH != 0))
 #define ZONES_PGSHIFT           (ZONES_PGOFF * (ZONES_WIDTH != 0))
 
-/* NODE:ZONE or SECTION:ZONE is used to lookup the zone from a page. */
-#if FLAGS_HAS_NODE
-#define ZONETABLE_SHIFT         (NODES_SHIFT + ZONES_SHIFT)
+/* NODE:ZONE or SECTION:ZONE is used to ID a zone for the buddy allcator */
+#ifdef NODE_NOT_IN_PAGEFLAGS
+#define ZONEID_SHIFT            (SECTIONS_SHIFT + ZONES_SHIFT)
+#else
+#define ZONEID_SHIFT            (NODES_SHIFT + ZONES_SHIFT)
+#endif
+
+#if ZONES_WIDTH > 0
+#define ZONEID_PGSHIFT          ZONES_PGSHIFT
 #else
-#define ZONETABLE_SHIFT         (SECTIONS_SHIFT + ZONES_SHIFT)
+#define ZONEID_PGSHIFT          NODES_PGOFF
 #endif
-#define ZONETABLE_PGSHIFT       ZONES_PGSHIFT
 
 #if SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
 #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
@@ -426,26 +453,28 @@ void split_page(struct page *page, unsigned int order);
 #define ZONES_MASK              ((1UL << ZONES_WIDTH) - 1)
 #define NODES_MASK              ((1UL << NODES_WIDTH) - 1)
 #define SECTIONS_MASK           ((1UL << SECTIONS_WIDTH) - 1)
-#define ZONETABLE_MASK          ((1UL << ZONETABLE_SHIFT) - 1)
+#define ZONEID_MASK             ((1UL << ZONEID_SHIFT) - 1)
 
 static inline enum zone_type page_zonenum(struct page *page)
 {
         return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK;
 }
 
-struct zone;
-extern struct zone *zone_table[];
-
+/*
+ * The identification function is only used by the buddy allocator for
+ * determining if two pages could be buddies. We are not really
+ * identifying a zone since we could be using a the section number
+ * id if we have not node id available in page flags.
+ * We guarantee only that it will return the same value for two
+ * combinable pages in a zone.
+ */
 static inline int page_zone_id(struct page *page)
 {
-        return (page->flags >> ZONETABLE_PGSHIFT) & ZONETABLE_MASK;
-}
-static inline struct zone *page_zone(struct page *page)
-{
-        return zone_table[page_zone_id(page)];
+        BUILD_BUG_ON(ZONEID_PGSHIFT == 0 && ZONEID_MASK);
+        return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK;
 }
 
-static inline unsigned long zone_to_nid(struct zone *zone)
+static inline int zone_to_nid(struct zone *zone)
 {
 #ifdef CONFIG_NUMA
         return zone->node;
@@ -454,13 +483,20 @@ static inline unsigned long zone_to_nid(struct zone *zone)
 #endif
 }
 
-static inline unsigned long page_to_nid(struct page *page)
+#ifdef NODE_NOT_IN_PAGE_FLAGS
+extern int page_to_nid(struct page *page);
+#else
+static inline int page_to_nid(struct page *page)
+{
+        return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
+}
+#endif
+
+static inline struct zone *page_zone(struct page *page)
 {
-        if (FLAGS_HAS_NODE)
-                return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
-        else
-                return zone_to_nid(page_zone(page));
+        return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)];
 }
+
 static inline unsigned long page_to_section(struct page *page)
 {
         return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
@@ -477,6 +513,7 @@ static inline void set_page_node(struct page *page, unsigned long node)
         page->flags &= ~(NODES_MASK << NODES_PGSHIFT);
         page->flags |= (node & NODES_MASK) << NODES_PGSHIFT;
 }
+
 static inline void set_page_section(struct page *page, unsigned long section)
 {
         page->flags &= ~(SECTIONS_MASK << SECTIONS_PGSHIFT);
@@ -947,8 +984,6 @@ extern void mem_init(void);
 extern void show_mem(void);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
-extern void zonetable_add(struct zone *zone, int nid, enum zone_type zid,
-                                        unsigned long pfn, unsigned long size);
 
 #ifdef CONFIG_NUMA
 extern void setup_per_cpu_pageset(void);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 528e7d3fecb1..c15ae1986b98 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -110,7 +110,7 @@ struct mmc_host {
         struct mmc_card         *card_busy;     /* the MMC card claiming host */
         struct mmc_card         *card_selected; /* the selected MMC card */
 
-        struct work_struct      detect;
+        struct delayed_work     detect;
 
         unsigned long           private[0] ____cacheline_aligned;
 };
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e06683e2bea3..e339a7345f25 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -278,7 +278,7 @@ struct zone {
         /*
          * rarely used fields:
          */
-        char                    *name;
+        const char              *name;
 } ____cacheline_internodealigned_in_smp;
 
 /*
@@ -288,19 +288,94 @@ struct zone {
  */
 #define DEF_PRIORITY 12
 
+/* Maximum number of zones on a zonelist */
+#define MAX_ZONES_PER_ZONELIST (MAX_NUMNODES * MAX_NR_ZONES)
+
+#ifdef CONFIG_NUMA
+/*
+ * We cache key information from each zonelist for smaller cache
+ * footprint when scanning for free pages in get_page_from_freelist().
+ *
+ * 1) The BITMAP fullzones tracks which zones in a zonelist have come
+ *    up short of free memory since the last time (last_fullzone_zap)
+ *    we zero'd fullzones.
+ * 2) The array z_to_n[] maps each zone in the zonelist to its node
+ *    id, so that we can efficiently evaluate whether that node is
+ *    set in the current tasks mems_allowed.
+ *
+ * Both fullzones and z_to_n[] are one-to-one with the zonelist,
+ * indexed by a zones offset in the zonelist zones[] array.
+ *
+ * The get_page_from_freelist() routine does two scans.  During the
+ * first scan, we skip zones whose corresponding bit in 'fullzones'
+ * is set or whose corresponding node in current->mems_allowed (which
+ * comes from cpusets) is not set.  During the second scan, we bypass
+ * this zonelist_cache, to ensure we look methodically at each zone.
+ *
+ * Once per second, we zero out (zap) fullzones, forcing us to
+ * reconsider nodes that might have regained more free memory.
+ * The field last_full_zap is the time we last zapped fullzones.
+ *
+ * This mechanism reduces the amount of time we waste repeatedly
+ * reexaming zones for free memory when they just came up low on
+ * memory momentarilly ago.
+ *
+ * The zonelist_cache struct members logically belong in struct
+ * zonelist.  However, the mempolicy zonelists constructed for
+ * MPOL_BIND are intentionally variable length (and usually much
+ * shorter).  A general purpose mechanism for handling structs with
+ * multiple variable length members is more mechanism than we want
+ * here.  We resort to some special case hackery instead.
+ *
+ * The MPOL_BIND zonelists don't need this zonelist_cache (in good
+ * part because they are shorter), so we put the fixed length stuff
+ * at the front of the zonelist struct, ending in a variable length
+ * zones[], as is needed by MPOL_BIND.
+ *
+ * Then we put the optional zonelist cache on the end of the zonelist
+ * struct.  This optional stuff is found by a 'zlcache_ptr' pointer in
+ * the fixed length portion at the front of the struct.  This pointer
+ * both enables us to find the zonelist cache, and in the case of
+ * MPOL_BIND zonelists, (which will just set the zlcache_ptr to NULL)
+ * to know that the zonelist cache is not there.
+ *
+ * The end result is that struct zonelists come in two flavors:
+ *  1) The full, fixed length version, shown below, and
+ *  2) The custom zonelists for MPOL_BIND.
+ * The custom MPOL_BIND zonelists have a NULL zlcache_ptr and no zlcache.
+ *
+ * Even though there may be multiple CPU cores on a node modifying
+ * fullzones or last_full_zap in the same zonelist_cache at the same
+ * time, we don't lock it.  This is just hint data - if it is wrong now
+ * and then, the allocator will still function, perhaps a bit slower.
+ */
+
+
+struct zonelist_cache {
+        unsigned short z_to_n[MAX_ZONES_PER_ZONELIST];          /* zone->nid */
+        DECLARE_BITMAP(fullzones, MAX_ZONES_PER_ZONELIST);      /* zone full? */
+        unsigned long last_full_zap;            /* when last zap'd (jiffies) */
+};
+#else
+struct zonelist_cache;
+#endif
+
 /*
  * One allocation request operates on a zonelist. A zonelist
  * is a list of zones, the first one is the 'goal' of the
  * allocation, the other zones are fallback zones, in decreasing
  * priority.
  *
- * Right now a zonelist takes up less than a cacheline. We never
- * modify it apart from boot-up, and only a few indices are used,
- * so despite the zonelist table being relatively big, the cache
- * footprint of this construct is very small.
+ * If zlcache_ptr is not NULL, then it is just the address of zlcache,
+ * as explained above.  If zlcache_ptr is NULL, there is no zlcache.
  */
+
 struct zonelist {
-        struct zone *zones[MAX_NUMNODES * MAX_NR_ZONES + 1]; // NULL delimited
+        struct zonelist_cache *zlcache_ptr;                  // NULL or &zlcache
+        struct zone *zones[MAX_ZONES_PER_ZONELIST + 1];      // NULL delimited
+#ifdef CONFIG_NUMA
+        struct zonelist_cache zlcache;                       // optional ...
+#endif
 };
 
 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 7c0c2c198f1f..4a189dadb160 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -63,6 +63,9 @@ struct kparam_array
    not there, read bits mean it's readable, write bits mean it's
    writable. */
 #define __module_param_call(prefix, name, set, get, arg, perm)          \
+        /* Default value instead of permissions? */                     \
+        static int __param_perm_check_##name __attribute__((unused)) =  \
+        BUILD_BUG_ON_ZERO((perm) < 0 || (perm) > 0777 || ((perm) & 2)); \
         static char __param_str_##name[] = prefix #name;                \
         static struct kernel_param const __param_##name                 \
         __attribute_used__                                              \
diff --git a/include/linux/msg.h b/include/linux/msg.h
index acc7c174ff00..f1b60740d641 100644
--- a/include/linux/msg.h
+++ b/include/linux/msg.h
@@ -92,6 +92,12 @@ struct msg_queue {
         struct list_head q_senders;
 };
 
+/* Helper routines for sys_msgsnd and sys_msgrcv */
+extern long do_msgsnd(int msqid, long mtype, void __user *mtext,
+                        size_t msgsz, int msgflg);
+extern long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
+                        size_t msgsz, long msgtyp, int msgflg);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_MSG_H */
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 27c48daa3183..b2b91c477563 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -94,7 +94,7 @@ do {							\
 
 #define __MUTEX_INITIALIZER(lockname) \
                 { .count = ATOMIC_INIT(1) \
-                , .wait_lock = SPIN_LOCK_UNLOCKED \
+                , .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
                 , .wait_list = LIST_HEAD_INIT(lockname.wait_list) \
                 __DEBUG_MUTEX_INITIALIZER(lockname) \
                 __DEP_MAP_MUTEX_INITIALIZER(lockname) }
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d6b6dc09ad97..0f3e69302540 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -64,6 +64,7 @@ struct nbd_device {
         struct gendisk *disk;
         int blksize;
         u64 bytesize;
+        pid_t pid; /* pid of nbd-client, if attached */
 };
 
 #endif
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index b089d9506283..a503052138bd 100644
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -127,10 +127,10 @@ struct ncp_server {
         } unexpected_packet;
 };
 
-extern void ncp_tcp_rcv_proc(void *server);
-extern void ncp_tcp_tx_proc(void *server);
-extern void ncpdgram_rcv_proc(void *server);
-extern void ncpdgram_timeout_proc(void *server);
+extern void ncp_tcp_rcv_proc(struct work_struct *work);
+extern void ncp_tcp_tx_proc(struct work_struct *work);
+extern void ncpdgram_rcv_proc(struct work_struct *work);
+extern void ncpdgram_timeout_proc(struct work_struct *work);
 extern void ncpdgram_timeout_call(unsigned long server);
 extern void ncp_tcp_data_ready(struct sock* sk, int len);
 extern void ncp_tcp_write_space(struct sock* sk);
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 2cc9867b1626..29930b71a9aa 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -32,7 +32,7 @@ struct netpoll_info {
         struct netpoll *rx_np; /* netpoll that registered an rx_hook */
         struct sk_buff_head arp_tx; /* list of arp requests to reply to */
         struct sk_buff_head txq;
-        struct work_struct tx_work;
+        struct delayed_work tx_work;
 };
 
 void netpoll_poll(struct netpoll *np);
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 7ccfc7ef0a83..95796e6924f1 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -51,7 +51,7 @@ struct nfs_client {
 
         unsigned long           cl_lease_time;
         unsigned long           cl_last_renewal;
-        struct work_struct      cl_renewd;
+        struct delayed_work     cl_renewd;
 
         struct rpc_wait_queue   cl_rpcwaitq;
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c09da1e30c54..ff2dcb436cd0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -390,7 +390,7 @@
 #define PCI_DEVICE_ID_NS_CS5535_IDE     0x002d
 #define PCI_DEVICE_ID_NS_CS5535_AUDIO   0x002e
 #define PCI_DEVICE_ID_NS_CS5535_USB     0x002f
-#define PCI_DEVICE_ID_NS_CS5535_VIDEO   0x0030
+#define PCI_DEVICE_ID_NS_GX_VIDEO       0x0030
 #define PCI_DEVICE_ID_NS_SATURN         0x0035
 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE  0x0500
 #define PCI_DEVICE_ID_NS_SCx200_SMI     0x0501
@@ -403,8 +403,7 @@
 #define PCI_DEVICE_ID_NS_SC1100_XBUS    0x0515
 #define PCI_DEVICE_ID_NS_87410          0xd001
 
-#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
-#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE  0x0028
 
 #define PCI_VENDOR_ID_TSENG             0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2      0x3202
@@ -1864,6 +1863,7 @@
 #define PCI_DEVICE_ID_OXSEMI_16PCI95N   0x9511
 #define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513
 #define PCI_DEVICE_ID_OXSEMI_16PCI952   0x9521
+#define PCI_DEVICE_ID_OXSEMI_16PCI952PP 0x9523
 
 #define PCI_VENDOR_ID_SAMSUNG           0x144d
 
diff --git a/include/linux/profile.h b/include/linux/profile.h
index acce53fd38b6..5670b340c4ef 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -6,10 +6,15 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/cpumask.h>
+#include <linux/cache.h>
+
 #include <asm/errno.h>
 
+extern int prof_on __read_mostly;
+
 #define CPU_PROFILING   1
 #define SCHED_PROFILING 2
+#define SLEEP_PROFILING 3
 
 struct proc_dir_entry;
 struct pt_regs;
@@ -18,7 +23,24 @@ struct notifier_block;
 /* init basic kernel profiler */
 void __init profile_init(void);
 void profile_tick(int);
-void profile_hit(int, void *);
+
+/*
+ * Add multiple profiler hits to a given address:
+ */
+void profile_hits(int, void *ip, unsigned int nr_hits);
+
+/*
+ * Single profiler hit:
+ */
+static inline void profile_hit(int type, void *ip)
+{
+        /*
+         * Speedup for the common (no profiling enabled) case:
+         */
+        if (unlikely(prof_on == type))
+                profile_hits(type, ip, 1);
+}
+
 #ifdef CONFIG_PROC_FS
 void create_prof_cpu_mask(struct proc_dir_entry *);
 #else
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 5110201a4159..90c23f690c0d 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -37,6 +37,9 @@ extern int dquot_release(struct dquot *dquot);
 extern int dquot_commit_info(struct super_block *sb, int type);
 extern int dquot_mark_dquot_dirty(struct dquot *dquot);
 
+int remove_inode_dquot_ref(struct inode *inode, int type,
+                           struct list_head *tofree_head);
+
 extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path);
 extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
                 int format_id, int type);
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index cbfa11537421..0deb842541ac 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2001 Momchil Velikov
  * Portions Copyright (C) 2001 Christoph Hellwig
+ * Copyright (C) 2006 Nick Piggin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,6 +22,35 @@
 
 #include <linux/preempt.h>
 #include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/rcupdate.h>
+
+/*
+ * A direct pointer (root->rnode pointing directly to a data item,
+ * rather than another radix_tree_node) is signalled by the low bit
+ * set in the root->rnode pointer.
+ *
+ * In this case root->height is also NULL, but the direct pointer tests are
+ * needed for RCU lookups when root->height is unreliable.
+ */
+#define RADIX_TREE_DIRECT_PTR   1
+
+static inline void *radix_tree_ptr_to_direct(void *ptr)
+{
+        return (void *)((unsigned long)ptr | RADIX_TREE_DIRECT_PTR);
+}
+
+static inline void *radix_tree_direct_to_ptr(void *ptr)
+{
+        return (void *)((unsigned long)ptr & ~RADIX_TREE_DIRECT_PTR);
+}
+
+static inline int radix_tree_is_direct_ptr(void *ptr)
+{
+        return (int)((unsigned long)ptr & RADIX_TREE_DIRECT_PTR);
+}
+
+/*** radix-tree API starts here ***/
 
 #define RADIX_TREE_MAX_TAGS 2
 
@@ -47,6 +77,77 @@ do {									\
         (root)->rnode = NULL;                                           \
 } while (0)
 
+/**
+ * Radix-tree synchronization
+ *
+ * The radix-tree API requires that users provide all synchronisation (with
+ * specific exceptions, noted below).
+ *
+ * Synchronization of access to the data items being stored in the tree, and
+ * management of their lifetimes must be completely managed by API users.
+ *
+ * For API usage, in general,
+ * - any function _modifying_ the the tree or tags (inserting or deleting
+ *   items, setting or clearing tags must exclude other modifications, and
+ *   exclude any functions reading the tree.
+ * - any function _reading_ the the tree or tags (looking up items or tags,
+ *   gang lookups) must exclude modifications to the tree, but may occur
+ *   concurrently with other readers.
+ *
+ * The notable exceptions to this rule are the following functions:
+ * radix_tree_lookup
+ * radix_tree_tag_get
+ * radix_tree_gang_lookup
+ * radix_tree_gang_lookup_tag
+ * radix_tree_tagged
+ *
+ * The first 4 functions are able to be called locklessly, using RCU. The
+ * caller must ensure calls to these functions are made within rcu_read_lock()
+ * regions. Other readers (lock-free or otherwise) and modifications may be
+ * running concurrently.
+ *
+ * It is still required that the caller manage the synchronization and lifetimes
+ * of the items. So if RCU lock-free lookups are used, typically this would mean
+ * that the items have their own locks, or are amenable to lock-free access; and
+ * that the items are freed by RCU (or only freed after having been deleted from
+ * the radix tree *and* a synchronize_rcu() grace period).
+ *
+ * (Note, rcu_assign_pointer and rcu_dereference are not needed to control
+ * access to data items when inserting into or looking up from the radix tree)
+ *
+ * radix_tree_tagged is able to be called without locking or RCU.
+ */
+
+/**
+ * radix_tree_deref_slot        - dereference a slot
+ * @pslot:      pointer to slot, returned by radix_tree_lookup_slot
+ * Returns:     item that was stored in that slot with any direct pointer flag
+ *              removed.
+ *
+ * For use with radix_tree_lookup_slot().  Caller must hold tree at least read
+ * locked across slot lookup and dereference.  More likely, will be used with
+ * radix_tree_replace_slot(), as well, so caller will hold tree write locked.
+ */
+static inline void *radix_tree_deref_slot(void **pslot)
+{
+        return radix_tree_direct_to_ptr(*pslot);
+}
+/**
+ * radix_tree_replace_slot      - replace item in a slot
+ * @pslot:      pointer to slot, returned by radix_tree_lookup_slot
+ * @item:       new item to store in the slot.
+ *
+ * For use with radix_tree_lookup_slot().  Caller must hold tree write locked
+ * across slot lookup and replacement.
+ */
+static inline void radix_tree_replace_slot(void **pslot, void *item)
+{
+        BUG_ON(radix_tree_is_direct_ptr(item));
+        rcu_assign_pointer(*pslot,
+                (void *)((unsigned long)item |
+                        ((unsigned long)*pslot & RADIX_TREE_DIRECT_PTR)));
+}
+
 int radix_tree_insert(struct radix_tree_root *, unsigned long, void *);
 void *radix_tree_lookup(struct radix_tree_root *, unsigned long);
 void **radix_tree_lookup_slot(struct radix_tree_root *, unsigned long);
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index f13299a15591..03636d7918fe 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -235,7 +235,7 @@ struct raid5_private_data {
          */
         int                     active_name;
         char                    cache_name[2][20];
-        kmem_cache_t            *slab_cache; /* for allocating stripes */
+        struct kmem_cache               *slab_cache; /* for allocating stripes */
 
         int                     seq_flush, seq_write;
         int                     quiesce;
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 7bc6bfb86253..d0e4dce33ad5 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -739,7 +739,7 @@ struct block_head {
 #define PUT_B_FREE_SPACE(p_s_bh,val)  do { set_blkh_free_space(B_BLK_HEAD(p_s_bh),val); } while (0)
 
 /* Get right delimiting key. -- little endian */
-#define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))
+#define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))))
 
 /* Does the buffer contain a disk leaf. */
 #define B_IS_ITEMS_LEVEL(p_s_bh)     (B_LEVEL(p_s_bh) == DISK_LEAF_NODE_LEVEL)
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 62a7169aed8b..3a28742d86f9 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -249,7 +249,8 @@ struct reiserfs_journal {
         int j_errno;
 
         /* when flushing ordered buffers, throttle new ordered writers */
-        struct work_struct j_work;
+        struct delayed_work j_work;
+        struct super_block *j_work_sb;
         atomic_t j_async_throttle;
 };
 
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 24accb483849..c6a48bfc8b14 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -38,7 +38,7 @@ struct rchan_buf
         size_t subbufs_consumed;        /* count of sub-buffers consumed */
         struct rchan *chan;             /* associated channel */
         wait_queue_head_t read_wait;    /* reader wait queue */
-        struct work_struct wake_readers; /* reader wake-up work struct */
+        struct delayed_work wake_readers; /* reader wake-up work struct */
         struct dentry *dentry;          /* channel file dentry */
         struct kref kref;               /* channel buffer refcount */
         struct page **page_array;       /* array of current buffer pages */
@@ -274,7 +274,7 @@ static inline void subbuf_start_reserve(struct rchan_buf *buf,
 /*
  * exported relay file operations, kernel/relay.c
  */
-extern struct file_operations relay_file_operations;
+extern const struct file_operations relay_file_operations;
 
 #endif /* _LINUX_RELAY_H */
 
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index db2c1df4fef9..36f850373d2c 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -30,11 +30,11 @@ struct anon_vma {
 
 #ifdef CONFIG_MMU
 
-extern kmem_cache_t *anon_vma_cachep;
+extern struct kmem_cache *anon_vma_cachep;
 
 static inline struct anon_vma *anon_vma_alloc(void)
 {
-        return kmem_cache_alloc(anon_vma_cachep, SLAB_KERNEL);
+        return kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL);
 }
 
 static inline void anon_vma_free(struct anon_vma *anon_vma)
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 5d41dee82f80..b0090e9f7884 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -63,7 +63,7 @@ struct hrtimer_sleeper;
 #endif
 
 #define __RT_MUTEX_INITIALIZER(mutexname) \
-        { .wait_lock = SPIN_LOCK_UNLOCKED \
+        { .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
         , .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
         , .owner = NULL \
         __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
diff --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h
index ae1fcadd598e..813cee13da0d 100644
--- a/include/linux/rwsem-spinlock.h
+++ b/include/linux/rwsem-spinlock.h
@@ -44,7 +44,8 @@ struct rw_semaphore {
 #endif
 
 #define __RWSEM_INITIALIZER(name) \
-{ 0, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
+{ 0, __SPIN_LOCK_UNLOCKED(name.wait_lock), LIST_HEAD_INIT((name).wait_list) \
+  __RWSEM_DEP_MAP_INIT(name) }
 
 #define DECLARE_RWSEM(name) \
         struct rw_semaphore name = __RWSEM_INITIALIZER(name)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index eafe4a7b8237..dede82c63445 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -194,7 +194,16 @@ extern void init_idle(struct task_struct *idle, int cpu);
 
 extern cpumask_t nohz_cpu_mask;
 
-extern void show_state(void);
+/*
+ * Only dump TASK_* tasks. (-1 for all tasks)
+ */
+extern void show_state_filter(unsigned long state_filter);
+
+static inline void show_state(void)
+{
+        show_state_filter(-1);
+}
+
 extern void show_regs(struct pt_regs *);
 
 /*
@@ -338,15 +347,23 @@ struct mm_struct {
 
         unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
 
-        unsigned dumpable:2;
         cpumask_t cpu_vm_mask;
 
         /* Architecture-specific MM context */
         mm_context_t context;
 
-        /* Token based thrashing protection. */
-        unsigned long swap_token_time;
-        char recent_pagein;
+        /* Swap token stuff */
+        /*
+         * Last value of global fault stamp as seen by this process.
+         * In other words, this value gives an indication of how long
+         * it has been since this task got the token.
+         * Look at mm/thrash.c
+         */
+        unsigned int faultstamp;
+        unsigned int token_priority;
+        unsigned int last_interval;
+
+        unsigned char dumpable:2;
 
         /* coredumping support */
         int core_waiters;
@@ -556,7 +573,7 @@ struct sched_info {
 #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */
 
 #ifdef CONFIG_SCHEDSTATS
-extern struct file_operations proc_schedstat_operations;
+extern const struct file_operations proc_schedstat_operations;
 #endif /* CONFIG_SCHEDSTATS */
 
 #ifdef CONFIG_TASK_DELAY_ACCT
@@ -1288,7 +1305,6 @@ extern int kill_pgrp(struct pid *pid, int sig, int priv);
 extern int kill_pid(struct pid *pid, int sig, int priv);
 extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
 extern int kill_pg_info(int, struct siginfo *, pid_t);
-extern int kill_proc_info(int, struct siginfo *, pid_t);
 extern void do_notify_parent(struct task_struct *, int);
 extern void force_sig(int, struct task_struct *);
 extern void force_sig_specific(int, struct task_struct *);
@@ -1610,87 +1626,6 @@ extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 extern void normalize_rt_tasks(void);
 
-#ifdef CONFIG_PM
-/*
- * Check if a process has been frozen
- */
-static inline int frozen(struct task_struct *p)
-{
-        return p->flags & PF_FROZEN;
-}
-
-/*
- * Check if there is a request to freeze a process
- */
-static inline int freezing(struct task_struct *p)
-{
-        return p->flags & PF_FREEZE;
-}
-
-/*
- * Request that a process be frozen
- * FIXME: SMP problem. We may not modify other process' flags!
- */
-static inline void freeze(struct task_struct *p)
-{
-        p->flags |= PF_FREEZE;
-}
-
-/*
- * Sometimes we may need to cancel the previous 'freeze' request
- */
-static inline void do_not_freeze(struct task_struct *p)
-{
-        p->flags &= ~PF_FREEZE;
-}
-
-/*
- * Wake up a frozen process
- */
-static inline int thaw_process(struct task_struct *p)
-{
-        if (frozen(p)) {
-                p->flags &= ~PF_FROZEN;
-                wake_up_process(p);
-                return 1;
-        }
-        return 0;
-}
-
-/*
- * freezing is complete, mark process as frozen
- */
-static inline void frozen_process(struct task_struct *p)
-{
-        p->flags = (p->flags & ~PF_FREEZE) | PF_FROZEN;
-}
-
-extern void refrigerator(void);
-extern int freeze_processes(void);
-extern void thaw_processes(void);
-
-static inline int try_to_freeze(void)
-{
-        if (freezing(current)) {
-                refrigerator();
-                return 1;
-        } else
-                return 0;
-}
-#else
-static inline int frozen(struct task_struct *p) { return 0; }
-static inline int freezing(struct task_struct *p) { return 0; }
-static inline void freeze(struct task_struct *p) { BUG(); }
-static inline int thaw_process(struct task_struct *p) { return 1; }
-static inline void frozen_process(struct task_struct *p) { BUG(); }
-
-static inline void refrigerator(void) {}
-static inline int freeze_processes(void) { BUG(); return 0; }
-static inline void thaw_processes(void) {}
-
-static inline int try_to_freeze(void) { return 0; }
-
-#endif /* CONFIG_PM */
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index b95f6eb7254c..3e3cccbb1cac 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -20,7 +20,7 @@ struct seq_file {
         loff_t index;
         loff_t version;
         struct mutex lock;
-        struct seq_operations *op;
+        const struct seq_operations *op;
         void *private;
 };
 
@@ -31,7 +31,7 @@ struct seq_operations {
         int (*show) (struct seq_file *m, void *v);
 };
 
-int seq_open(struct file *, struct seq_operations *);
+int seq_open(struct file *, const struct seq_operations *);
 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
 loff_t seq_lseek(struct file *, loff_t, int);
 int seq_release(struct inode *, struct file *);
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 8e9681413726..71310d80c09a 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -41,6 +41,7 @@ enum {
         PLAT8250_DEV_FOURPORT,
         PLAT8250_DEV_ACCENT,
         PLAT8250_DEV_BOCA,
+        PLAT8250_DEV_EXAR_ST16C554,
         PLAT8250_DEV_HUB6,
         PLAT8250_DEV_MCA,
         PLAT8250_DEV_AU1X00,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 463ab953b092..827672136646 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -132,6 +132,8 @@
 
 #define PORT_S3C2412    73
 
+/* Xilinx uartlite */
+#define PORT_UARTLITE   74
 
 #ifdef __KERNEL__
 
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 117135e33d67..14749056dd63 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -241,6 +241,8 @@ extern int sigprocmask(int, sigset_t *, sigset_t *);
 struct pt_regs;
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
 
+extern struct kmem_cache *sighand_cachep;
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_SIGNAL_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a05a5f7c0b73..4ff3940210d8 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -332,20 +332,20 @@ struct sk_buff {
 extern void kfree_skb(struct sk_buff *skb);
 extern void            __kfree_skb(struct sk_buff *skb);
 extern struct sk_buff *__alloc_skb(unsigned int size,
-                                   gfp_t priority, int fclone);
+                                   gfp_t priority, int fclone, int node);
 static inline struct sk_buff *alloc_skb(unsigned int size,
                                         gfp_t priority)
 {
-        return __alloc_skb(size, priority, 0);
+        return __alloc_skb(size, priority, 0, -1);
 }
 
 static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
                                                gfp_t priority)
 {
-        return __alloc_skb(size, priority, 1);
+        return __alloc_skb(size, priority, 1, -1);
 }
 
-extern struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
+extern struct sk_buff *alloc_skb_from_cache(struct kmem_cache *cp,
                                             unsigned int size,
                                             gfp_t priority);
 extern void            kfree_skbmem(struct sk_buff *skb);
diff --git a/include/linux/slab.h b/include/linux/slab.h
index c4947b8a2c03..2271886744f8 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -7,27 +7,17 @@
 #ifndef _LINUX_SLAB_H
 #define _LINUX_SLAB_H
 
-#if     defined(__KERNEL__)
+#ifdef __KERNEL__
 
-typedef struct kmem_cache kmem_cache_t;
+#include <linux/gfp.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
+#include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
+#include <linux/compiler.h>
 
-#include        <linux/gfp.h>
-#include        <linux/init.h>
-#include        <linux/types.h>
-#include        <asm/page.h>            /* kmalloc_sizes.h needs PAGE_SIZE */
-#include        <asm/cache.h>           /* kmalloc_sizes.h needs L1_CACHE_BYTES */
-
-/* flags for kmem_cache_alloc() */
-#define SLAB_NOFS               GFP_NOFS
-#define SLAB_NOIO               GFP_NOIO
-#define SLAB_ATOMIC             GFP_ATOMIC
-#define SLAB_USER               GFP_USER
-#define SLAB_KERNEL             GFP_KERNEL
-#define SLAB_DMA                GFP_DMA
-
-#define SLAB_LEVEL_MASK         GFP_LEVEL_MASK
-
-#define SLAB_NO_GROW            __GFP_NO_GROW   /* don't grow a cache */
+/* kmem_cache_t exists for legacy reasons and is not used by code in mm */
+typedef struct kmem_cache kmem_cache_t __deprecated;
 
 /* flags to pass to kmem_cache_create().
  * The first 3 are only valid when the allocator as been build
@@ -57,22 +47,23 @@ typedef struct kmem_cache kmem_cache_t;
 /* prototypes */
 extern void __init kmem_cache_init(void);
 
-extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long,
-                                       void (*)(void *, kmem_cache_t *, unsigned long),
-                                       void (*)(void *, kmem_cache_t *, unsigned long));
-extern void kmem_cache_destroy(kmem_cache_t *);
-extern int kmem_cache_shrink(kmem_cache_t *);
-extern void *kmem_cache_alloc(kmem_cache_t *, gfp_t);
+extern struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
+                        unsigned long,
+                        void (*)(void *, struct kmem_cache *, unsigned long),
+                        void (*)(void *, struct kmem_cache *, unsigned long));
+extern void kmem_cache_destroy(struct kmem_cache *);
+extern int kmem_cache_shrink(struct kmem_cache *);
+extern void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
-extern void kmem_cache_free(kmem_cache_t *, void *);
-extern unsigned int kmem_cache_size(kmem_cache_t *);
-extern const char *kmem_cache_name(kmem_cache_t *);
+extern void kmem_cache_free(struct kmem_cache *, void *);
+extern unsigned int kmem_cache_size(struct kmem_cache *);
+extern const char *kmem_cache_name(struct kmem_cache *);
 
 /* Size description struct for general caches. */
 struct cache_sizes {
-        size_t           cs_size;
-        kmem_cache_t    *cs_cachep;
-        kmem_cache_t    *cs_dmacachep;
+        size_t                  cs_size;
+        struct kmem_cache       *cs_cachep;
+        struct kmem_cache       *cs_dmacachep;
 };
 extern struct cache_sizes malloc_sizes[];
 
@@ -211,7 +202,7 @@ extern unsigned int ksize(const void *);
 extern int slab_is_available(void);
 
 #ifdef CONFIG_NUMA
-extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node);
+extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
 
 static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
@@ -236,8 +227,27 @@ found:
         }
         return __kmalloc_node(size, flags, node);
 }
+
+/*
+ * kmalloc_node_track_caller is a special version of kmalloc_node that
+ * records the calling function of the routine calling it for slab leak
+ * tracking instead of just the calling function (confusing, eh?).
+ * It's useful when the call to kmalloc_node comes from a widely-used
+ * standard allocator where we care about the real place the memory
+ * allocation request comes from.
+ */
+#ifndef CONFIG_DEBUG_SLAB
+#define kmalloc_node_track_caller(size, flags, node) \
+        __kmalloc_node(size, flags, node)
 #else
-static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node)
+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
+#define kmalloc_node_track_caller(size, flags, node) \
+        __kmalloc_node_track_caller(size, flags, node, \
+                        __builtin_return_address(0))
+#endif
+#else /* CONFIG_NUMA */
+static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
+                                        gfp_t flags, int node)
 {
         return kmem_cache_alloc(cachep, flags);
 }
@@ -245,10 +255,13 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
         return kmalloc(size, flags);
 }
+
+#define kmalloc_node_track_caller(size, flags, node) \
+        kmalloc_track_caller(size, flags)
 #endif
 
 extern int FASTCALL(kmem_cache_reap(int));
-extern int FASTCALL(kmem_ptr_validate(kmem_cache_t *cachep, void *ptr));
+extern int FASTCALL(kmem_ptr_validate(struct kmem_cache *cachep, void *ptr));
 
 #else /* CONFIG_SLOB */
 
@@ -283,16 +296,9 @@ static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
 #define kzalloc(s, f) __kzalloc(s, f)
 #define kmalloc_track_caller kmalloc
 
-#endif /* CONFIG_SLOB */
+#define kmalloc_node_track_caller kmalloc_node
 
-/* System wide caches */
-extern kmem_cache_t     *vm_area_cachep;
-extern kmem_cache_t     *names_cachep;
-extern kmem_cache_t     *files_cachep;
-extern kmem_cache_t     *filp_cachep;
-extern kmem_cache_t     *fs_cachep;
-extern kmem_cache_t     *sighand_cachep;
-extern kmem_cache_t     *bio_cachep;
+#endif /* CONFIG_SLOB */
 
 #endif  /* __KERNEL__ */
 
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 51649987f691..7ba23ec8211b 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -99,6 +99,13 @@ static inline int up_smp_call_function(void)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                      1
 #define smp_prepare_boot_cpu()                  do {} while (0)
+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
+                                void *info, int retry, int wait)
+{
+        /* Disable interrupts here? */
+        func(info);
+        return 0;
+}
 
 #endif /* !SMP */
 
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 8451052ca66f..94b767d64275 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -52,6 +52,7 @@
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
+#include <linux/bottom_half.h>
 
 #include <asm/system.h>
 
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index a2eb9b4a9de3..4a68125b6de6 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -30,7 +30,7 @@ struct rpc_inode {
 #define RPC_PIPE_WAIT_FOR_OPEN  1
         int flags;
         struct rpc_pipe_ops *ops;
-        struct work_struct queue_timeout;
+        struct delayed_work queue_timeout;
 };
 
 static inline struct rpc_inode *
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index f399c138f79d..0746c3b16f3a 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -222,7 +222,7 @@ struct rpc_wait_queue {
 
 #ifndef RPC_DEBUG
 # define RPC_WAITQ_INIT(var,qname) { \
-                .lock = SPIN_LOCK_UNLOCKED, \
+                .lock = __SPIN_LOCK_UNLOCKED(var.lock), \
                 .tasks = { \
                         [0] = LIST_HEAD_INIT(var.tasks[0]), \
                         [1] = LIST_HEAD_INIT(var.tasks[1]), \
@@ -231,7 +231,7 @@ struct rpc_wait_queue {
         }
 #else
 # define RPC_WAITQ_INIT(var,qname) { \
-                .lock = SPIN_LOCK_UNLOCKED, \
+                .lock = __SPIN_LOCK_UNLOCKED(var.lock), \
                 .tasks = { \
                         [0] = LIST_HEAD_INIT(var.tasks[0]), \
                         [1] = LIST_HEAD_INIT(var.tasks[1]), \
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 60394fbc4c70..3e04c1512fc4 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -177,7 +177,7 @@ struct rpc_xprt {
         unsigned long           connect_timeout,
                                 bind_timeout,
                                 reestablish_timeout;
-        struct work_struct      connect_worker;
+        struct delayed_work     connect_worker;
         unsigned short          port;
 
         /*
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index b1237f16ecde..bf99bd49f8ef 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -9,10 +9,13 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 
-/* page backup entry */
+/* struct pbe is used for creating lists of pages that should be restored
+ * atomically during the resume from disk, because the page frames they have
+ * occupied before the suspend are in use.
+ */
 struct pbe {
-        unsigned long address;          /* address of the copy */
-        unsigned long orig_address;     /* original address of page */
+        void *address;          /* address of the copy */
+        void *orig_address;     /* original address of a page */
         struct pbe *next;
 };
 
diff --git a/include/linux/swap.h b/include/linux/swap.h
index e7c36ba2a2db..add51cebc8d9 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -218,8 +218,6 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
-                                struct bio **bio_chain);
 extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
 
 /* linux/mm/swap_state.c */
@@ -247,9 +245,10 @@ extern int swap_duplicate(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
 extern void swap_free(swp_entry_t);
 extern void free_swap_and_cache(swp_entry_t);
-extern int swap_type_of(dev_t);
+extern int swap_type_of(dev_t, sector_t);
 extern unsigned int count_swap_pages(int, int);
 extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t);
+extern sector_t swapdev_block(int, pgoff_t);
 extern struct swap_info_struct *get_swap_info_struct(unsigned);
 extern int can_share_swap_page(struct page *);
 extern int remove_exclusive_swap_page(struct page *);
@@ -259,7 +258,6 @@ extern spinlock_t swap_lock;
 
 /* linux/mm/thrash.c */
 extern struct mm_struct * swap_token_mm;
-extern unsigned long swap_token_default_timeout;
 extern void grab_swap_token(void);
 extern void __put_swap_token(struct mm_struct *);
 
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index 6562a2050a25..7e9680f4afdd 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -12,64 +12,27 @@
 #include <net/genetlink.h>
 
 #ifdef CONFIG_TASKSTATS
-extern kmem_cache_t *taskstats_cache;
+extern struct kmem_cache *taskstats_cache;
 extern struct mutex taskstats_exit_mutex;
 
-static inline void taskstats_exit_free(struct taskstats *tidstats)
-{
-        if (tidstats)
-                kmem_cache_free(taskstats_cache, tidstats);
-}
-
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {
         sig->stats = NULL;
 }
 
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
-{
-        struct signal_struct *sig = tsk->signal;
-        struct taskstats *stats;
-
-        if (sig->stats != NULL)
-                return;
-
-        /* No problem if kmem_cache_zalloc() fails */
-        stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
-
-        spin_lock_irq(&tsk->sighand->siglock);
-        if (!sig->stats) {
-                sig->stats = stats;
-                stats = NULL;
-        }
-        spin_unlock_irq(&tsk->sighand->siglock);
-
-        if (stats)
-                kmem_cache_free(taskstats_cache, stats);
-}
-
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {
         if (sig->stats)
                 kmem_cache_free(taskstats_cache, sig->stats);
 }
 
-extern void taskstats_exit_alloc(struct taskstats **, unsigned int *);
-extern void taskstats_exit_send(struct task_struct *, struct taskstats *, int, unsigned int);
+extern void taskstats_exit(struct task_struct *, int group_dead);
 extern void taskstats_init_early(void);
 #else
-static inline void taskstats_exit_alloc(struct taskstats **ptidstats, unsigned int *mycpu)
-{}
-static inline void taskstats_exit_free(struct taskstats *ptidstats)
-{}
-static inline void taskstats_exit_send(struct task_struct *tsk,
-                                       struct taskstats *tidstats,
-                                       int group_dead, unsigned int cpu)
+static inline void taskstats_exit(struct task_struct *tsk, int group_dead)
 {}
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {}
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
-{}
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {}
 static inline void taskstats_init_early(void)
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 65321f911c1e..f717f0898238 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -53,7 +53,7 @@ struct tty_buffer {
 };
 
 struct tty_bufhead {
-        struct work_struct              work;
+        struct delayed_work work;
         struct semaphore pty_sem;
         spinlock_t lock;
         struct tty_buffer *head;        /* Queue head */
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 65a68da8bd5d..975c963e5789 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -1,8 +1,43 @@
 #ifndef __LINUX_UACCESS_H__
 #define __LINUX_UACCESS_H__
 
+#include <linux/preempt.h>
 #include <asm/uaccess.h>
 
+/*
+ * These routines enable/disable the pagefault handler in that
+ * it will not take any locks and go straight to the fixup table.
+ *
+ * They have great resemblance to the preempt_disable/enable calls
+ * and in fact they are identical; this is because currently there is
+ * no other way to make the pagefault handlers do this. So we do
+ * disable preemption but we don't necessarily care about that.
+ */
+static inline void pagefault_disable(void)
+{
+        inc_preempt_count();
+        /*
+         * make sure to have issued the store before a pagefault
+         * can hit.
+         */
+        barrier();
+}
+
+static inline void pagefault_enable(void)
+{
+        /*
+         * make sure to issue those last loads/stores before enabling
+         * the pagefault handler again.
+         */
+        barrier();
+        dec_preempt_count();
+        /*
+         * make sure we do..
+         */
+        barrier();
+        preempt_check_resched();
+}
+
 #ifndef ARCH_HAS_NOCACHE_UACCESS
 
 static inline unsigned long __copy_from_user_inatomic_nocache(void *to,
@@ -30,14 +65,22 @@ static inline unsigned long __copy_from_user_nocache(void *to,
  * do_page_fault() doesn't attempt to take mmap_sem.  This makes
  * probe_kernel_address() suitable for use within regions where the caller
  * already holds mmap_sem, or other locks which nest inside mmap_sem.
+ * This must be a macro because __get_user() needs to know the types of the
+ * args.
+ *
+ * We don't include enough header files to be able to do the set_fs().  We
+ * require that the probe_kernel_address() caller will do that.
  */
 #define probe_kernel_address(addr, retval)              \
         ({                                              \
                 long ret;                               \
+                mm_segment_t old_fs = get_fs();         \
                                                         \
-                inc_preempt_count();                    \
-                ret = __get_user(retval, (__force typeof(*addr) __user *)addr);\
-                dec_preempt_count();                    \
+                set_fs(KERNEL_DS);                      \
+                pagefault_disable();                    \
+                ret = __get_user(retval, (__force typeof(retval) __user *)(addr));              \
+                pagefault_enable();                     \
+                set_fs(old_fs);                         \
                 ret;                                    \
         })
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 0cd73edeef13..aab5b1b72021 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -388,7 +388,7 @@ struct usb_device {
 
         int pm_usage_cnt;               /* usage counter for autosuspend */
 #ifdef CONFIG_PM
-        struct work_struct autosuspend; /* for delayed autosuspends */
+        struct delayed_work autosuspend; /* for delayed autosuspends */
         struct mutex pm_mutex;          /* protects PM operations */
 
         unsigned auto_pm:1;             /* autosuspend/resume in progress */
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 9bca3539a1e5..f0cb1df7b475 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -11,12 +11,23 @@
 
 struct workqueue_struct;
 
+struct work_struct;
+typedef void (*work_func_t)(struct work_struct *work);
+
 struct work_struct {
-        unsigned long pending;
+        /* the first word is the work queue pointer and the flags rolled into
+         * one */
+        unsigned long management;
+#define WORK_STRUCT_PENDING 0           /* T if work item pending execution */
+#define WORK_STRUCT_NOAUTOREL 1         /* F if work item automatically released on exec */
+#define WORK_STRUCT_FLAG_MASK (3UL)
+#define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK)
         struct list_head entry;
-        void (*func)(void *);
-        void *data;
-        void *wq_data;
+        work_func_t func;
+};
+
+struct delayed_work {
+        struct work_struct work;
         struct timer_list timer;
 };
 
@@ -24,77 +35,159 @@ struct execute_work {
         struct work_struct work;
 };
 
-#define __WORK_INITIALIZER(n, f, d) {                           \
+#define __WORK_INITIALIZER(n, f) {                              \
+        .management = 0,                                        \
+        .entry  = { &(n).entry, &(n).entry },                   \
+        .func = (f),                                            \
+        }
+
+#define __WORK_INITIALIZER_NAR(n, f) {                          \
+        .management = (1 << WORK_STRUCT_NOAUTOREL),             \
         .entry  = { &(n).entry, &(n).entry },                   \
         .func = (f),                                            \
-        .data = (d),                                            \
+        }
+
+#define __DELAYED_WORK_INITIALIZER(n, f) {                      \
+        .work = __WORK_INITIALIZER((n).work, (f)),              \
+        .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
+        }
+
+#define __DELAYED_WORK_INITIALIZER_NAR(n, f) {                  \
+        .work = __WORK_INITIALIZER_NAR((n).work, (f)),          \
         .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
         }
 
-#define DECLARE_WORK(n, f, d)                                   \
-        struct work_struct n = __WORK_INITIALIZER(n, f, d)
+#define DECLARE_WORK(n, f)                                      \
+        struct work_struct n = __WORK_INITIALIZER(n, f)
+
+#define DECLARE_WORK_NAR(n, f)                                  \
+        struct work_struct n = __WORK_INITIALIZER_NAR(n, f)
+
+#define DECLARE_DELAYED_WORK(n, f)                              \
+        struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
+
+#define DECLARE_DELAYED_WORK_NAR(n, f)                  \
+        struct dwork_struct n = __DELAYED_WORK_INITIALIZER_NAR(n, f)
 
 /*
- * initialize a work-struct's func and data pointers:
+ * initialize a work item's function pointer
  */
-#define PREPARE_WORK(_work, _func, _data)                       \
+#define PREPARE_WORK(_work, _func)                              \
         do {                                                    \
-                (_work)->func = _func;                          \
-                (_work)->data = _data;                          \
+                (_work)->func = (_func);                        \
         } while (0)
 
+#define PREPARE_DELAYED_WORK(_work, _func)                      \
+        PREPARE_WORK(&(_work)->work, (_func))
+
 /*
- * initialize all of a work-struct:
+ * initialize all of a work item in one go
  */
-#define INIT_WORK(_work, _func, _data)                          \
+#define INIT_WORK(_work, _func)                                 \
         do {                                                    \
+                (_work)->management = 0;                        \
                 INIT_LIST_HEAD(&(_work)->entry);                \
-                (_work)->pending = 0;                           \
-                PREPARE_WORK((_work), (_func), (_data));        \
+                PREPARE_WORK((_work), (_func));                 \
+        } while (0)
+
+#define INIT_WORK_NAR(_work, _func)                                     \
+        do {                                                            \
+                (_work)->management = (1 << WORK_STRUCT_NOAUTOREL);     \
+                INIT_LIST_HEAD(&(_work)->entry);                        \
+                PREPARE_WORK((_work), (_func));                         \
+        } while (0)
+
+#define INIT_DELAYED_WORK(_work, _func)                         \
+        do {                                                    \
+                INIT_WORK(&(_work)->work, (_func));             \
+                init_timer(&(_work)->timer);                    \
+        } while (0)
+
+#define INIT_DELAYED_WORK_NAR(_work, _func)                     \
+        do {                                                    \
+                INIT_WORK_NAR(&(_work)->work, (_func));         \
                 init_timer(&(_work)->timer);                    \
         } while (0)
 
+/**
+ * work_pending - Find out whether a work item is currently pending
+ * @work: The work item in question
+ */
+#define work_pending(work) \
+        test_bit(WORK_STRUCT_PENDING, &(work)->management)
+
+/**
+ * delayed_work_pending - Find out whether a delayable work item is currently
+ * pending
+ * @work: The work item in question
+ */
+#define delayed_work_pending(work) \
+        test_bit(WORK_STRUCT_PENDING, &(work)->work.management)
+
+/**
+ * work_release - Release a work item under execution
+ * @work: The work item to release
+ *
+ * This is used to release a work item that has been initialised with automatic
+ * release mode disabled (WORK_STRUCT_NOAUTOREL is set).  This gives the work
+ * function the opportunity to grab auxiliary data from the container of the
+ * work_struct before clearing the pending bit as the work_struct may be
+ * subject to deallocation the moment the pending bit is cleared.
+ *
+ * In such a case, this should be called in the work function after it has
+ * fetched any data it may require from the containter of the work_struct.
+ * After this function has been called, the work_struct may be scheduled for
+ * further execution or it may be deallocated unless other precautions are
+ * taken.
+ *
+ * This should also be used to release a delayed work item.
+ */
+#define work_release(work) \
+        clear_bit(WORK_STRUCT_PENDING, &(work)->management)
+
+
 extern struct workqueue_struct *__create_workqueue(const char *name,
-                                                    int singlethread);
-#define create_workqueue(name) __create_workqueue((name), 0)
-#define create_singlethread_workqueue(name) __create_workqueue((name), 1)
+                                                    int singlethread,
+                                                    int freezeable);
+#define create_workqueue(name) __create_workqueue((name), 0, 0)
+#define create_freezeable_workqueue(name) __create_workqueue((name), 0, 1)
+#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)
 
 extern void destroy_workqueue(struct workqueue_struct *wq);
 
 extern int FASTCALL(queue_work(struct workqueue_struct *wq, struct work_struct *work));
-extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct work_struct *work, unsigned long delay));
+extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *work, unsigned long delay));
 extern int queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
-        struct work_struct *work, unsigned long delay);
+        struct delayed_work *work, unsigned long delay);
 extern void FASTCALL(flush_workqueue(struct workqueue_struct *wq));
 
 extern int FASTCALL(schedule_work(struct work_struct *work));
-extern int FASTCALL(schedule_delayed_work(struct work_struct *work, unsigned long delay));
+extern int FASTCALL(schedule_delayed_work(struct delayed_work *work, unsigned long delay));
 
-extern int schedule_delayed_work_on(int cpu, struct work_struct *work, unsigned long delay);
-extern int schedule_on_each_cpu(void (*func)(void *info), void *info);
+extern int schedule_delayed_work_on(int cpu, struct delayed_work *work, unsigned long delay);
+extern int schedule_on_each_cpu(work_func_t func);
 extern void flush_scheduled_work(void);
 extern int current_is_keventd(void);
 extern int keventd_up(void);
 
 extern void init_workqueues(void);
-void cancel_rearming_delayed_work(struct work_struct *work);
+void cancel_rearming_delayed_work(struct delayed_work *work);
 void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
-                                       struct work_struct *);
-int execute_in_process_context(void (*fn)(void *), void *,
-                               struct execute_work *);
+                                       struct delayed_work *);
+int execute_in_process_context(work_func_t fn, struct execute_work *);
 
 /*
  * Kill off a pending schedule_delayed_work().  Note that the work callback
  * function may still be running on return from cancel_delayed_work().  Run
  * flush_scheduled_work() to wait on it.
  */
-static inline int cancel_delayed_work(struct work_struct *work)
+static inline int cancel_delayed_work(struct delayed_work *work)
 {
         int ret;
 
         ret = del_timer_sync(&work->timer);
         if (ret)
-                clear_bit(0, &work->pending);
+                clear_bit(WORK_STRUCT_PENDING, &work->work.management);
         return ret;
 }
 
diff --git a/include/net/dst.h b/include/net/dst.h
index e156e38e4ac3..62b7e7598e9a 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -98,7 +98,7 @@ struct dst_ops
         int                     entry_size;
 
         atomic_t                entries;
-        kmem_cache_t            *kmem_cachep;
+        struct kmem_cache               *kmem_cachep;
 };
 
 #ifdef __KERNEL__
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 617b672b1132..89119277553d 100644
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -108,8 +108,8 @@ struct ieee80211softmac_assoc_info {
         /* Scan retries remaining */
         int scan_retry;
 
-        struct work_struct work;
-        struct work_struct timeout;
+        struct delayed_work work;
+        struct delayed_work timeout;
 };
 
 struct ieee80211softmac_bss_info {
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index a9eb2eaf094e..34cc76e3ddb4 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -125,7 +125,7 @@ struct inet_hashinfo {
         rwlock_t                        lhash_lock ____cacheline_aligned;
         atomic_t                        lhash_users;
         wait_queue_head_t               lhash_wait;
-        kmem_cache_t                    *bind_bucket_cachep;
+        struct kmem_cache                       *bind_bucket_cachep;
 };
 
 static inline struct inet_ehash_bucket *inet_ehash_bucket(
@@ -136,10 +136,10 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket(
 }
 
 extern struct inet_bind_bucket *
-                    inet_bind_bucket_create(kmem_cache_t *cachep,
+                    inet_bind_bucket_create(struct kmem_cache *cachep,
                                             struct inet_bind_hashbucket *head,
                                             const unsigned short snum);
-extern void inet_bind_bucket_destroy(kmem_cache_t *cachep,
+extern void inet_bind_bucket_destroy(struct kmem_cache *cachep,
                                      struct inet_bind_bucket *tb);
 
 static inline int inet_bhashfn(const __u16 lport, const int bhash_size)
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 5f48748fe017..f7be1ac73601 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -84,7 +84,7 @@ struct inet_timewait_death_row {
 };
 
 extern void inet_twdr_hangman(unsigned long data);
-extern void inet_twdr_twkill_work(void *data);
+extern void inet_twdr_twkill_work(struct work_struct *work);
 extern void inet_twdr_twcal_tick(unsigned long data);
 
 #if (BITS_PER_LONG == 64)
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index c8aacbd2e333..23967031ddb7 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -160,7 +160,7 @@ struct neigh_table
         atomic_t                entries;
         rwlock_t                lock;
         unsigned long           last_rand;
-        kmem_cache_t            *kmem_cachep;
+        struct kmem_cache               *kmem_cachep;
         struct neigh_statistics *stats;
         struct neighbour        **hash_buckets;
         unsigned int            hash_mask;
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index cef3136e22a3..41bcc9eb4206 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -7,7 +7,7 @@
 #include <net/netfilter/nf_conntrack.h>
 
 extern struct list_head nf_conntrack_expect_list;
-extern kmem_cache_t *nf_conntrack_expect_cachep;
+extern struct kmem_cache *nf_conntrack_expect_cachep;
 extern struct file_operations exp_file_ops;
 
 struct nf_conntrack_expect
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index e37baaf2080b..7aed02ce2b65 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -29,7 +29,7 @@ struct proto;
 struct request_sock_ops {
         int             family;
         int             obj_size;
-        kmem_cache_t    *slab;
+        struct kmem_cache       *slab;
         int             (*rtx_syn_ack)(struct sock *sk,
                                        struct request_sock *req,
                                        struct dst_entry *dst);
@@ -60,7 +60,7 @@ struct request_sock {
 
 static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops)
 {
-        struct request_sock *req = kmem_cache_alloc(ops->slab, SLAB_ATOMIC);
+        struct request_sock *req = kmem_cache_alloc(ops->slab, GFP_ATOMIC);
 
         if (req != NULL)
                 req->rsk_ops = ops;
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index f8cbe40f52c0..c089f93ba591 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1030,7 +1030,7 @@ void sctp_inq_init(struct sctp_inq *);
 void sctp_inq_free(struct sctp_inq *);
 void sctp_inq_push(struct sctp_inq *, struct sctp_chunk *packet);
 struct sctp_chunk *sctp_inq_pop(struct sctp_inq *);
-void sctp_inq_set_th_handler(struct sctp_inq *, void (*)(void *), void *);
+void sctp_inq_set_th_handler(struct sctp_inq *, work_func_t);
 
 /* This is the structure we use to hold outbound chunks.  You push
  * chunks in and they automatically pop out the other end as bundled
diff --git a/include/net/sock.h b/include/net/sock.h
index fe3a33fad03f..03684e702d13 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -571,7 +571,7 @@ struct proto {
         int                     *sysctl_rmem;
         int                     max_header;
 
-        kmem_cache_t            *slab;
+        struct kmem_cache               *slab;
         unsigned int            obj_size;
 
         atomic_t                *orphan_count;
@@ -746,6 +746,25 @@ static inline int sk_stream_wmem_schedule(struct sock *sk, int size)
  */
 #define sock_owned_by_user(sk)  ((sk)->sk_lock.owner)
 
+/*
+ * Macro so as to not evaluate some arguments when
+ * lockdep is not enabled.
+ *
+ * Mark both the sk_lock and the sk_lock.slock as a
+ * per-address-family lock class.
+ */
+#define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
+do {                                                                    \
+        sk->sk_lock.owner = NULL;                                       \
+        init_waitqueue_head(&sk->sk_lock.wq);                           \
+        spin_lock_init(&(sk)->sk_lock.slock);                           \
+        debug_check_no_locks_freed((void *)&(sk)->sk_lock,              \
+                        sizeof((sk)->sk_lock));                         \
+        lockdep_set_class_and_name(&(sk)->sk_lock.slock,                \
+                        (skey), (sname));                               \
+        lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0);     \
+} while (0)
+
 extern void FASTCALL(lock_sock_nested(struct sock *sk, int subclass));
 
 static inline void lock_sock(struct sock *sk)
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h
index d7a306ea560d..1e1ee3253fd8 100644
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
@@ -15,7 +15,7 @@
 #include <net/sock.h>
 
 struct timewait_sock_ops {
-        kmem_cache_t    *twsk_slab;
+        struct kmem_cache       *twsk_slab;
         unsigned int    twsk_obj_size;
         int             (*twsk_unique)(struct sock *sk,
                                        struct sock *sktw, void *twp);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 44b2f82a6eec..0c775fceb675 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -201,9 +201,14 @@ struct domain_device {
         void *lldd_dev;
 };
 
+struct sas_discovery_event {
+        struct work_struct work;
+        struct asd_sas_port *port;
+};
+
 struct sas_discovery {
         spinlock_t disc_event_lock;
-        struct work_struct disc_work[DISC_NUM_EVENTS];
+        struct sas_discovery_event disc_work[DISC_NUM_EVENTS];
         unsigned long    pending;
         u8     fanout_sas_addr[8];
         u8     eeds_a[8];
@@ -249,14 +254,19 @@ struct asd_sas_port {
         void *lldd_port;          /* not touched by the sas class code */
 };
 
+struct asd_sas_event {
+        struct work_struct work;
+        struct asd_sas_phy *phy;
+};
+
 /* The phy pretty much is controlled by the LLDD.
  * The class only reads those fields.
  */
 struct asd_sas_phy {
 /* private: */
         /* protected by ha->event_lock */
-        struct work_struct   port_events[PORT_NUM_EVENTS];
-        struct work_struct   phy_events[PHY_NUM_EVENTS];
+        struct asd_sas_event   port_events[PORT_NUM_EVENTS];
+        struct asd_sas_event   phy_events[PHY_NUM_EVENTS];
 
         unsigned long port_events_pending;
         unsigned long phy_events_pending;
@@ -308,10 +318,15 @@ struct scsi_core {
         int               queue_thread_kill;
 };
 
+struct sas_ha_event {
+        struct work_struct work;
+        struct sas_ha_struct *ha;
+};
+
 struct sas_ha_struct {
 /* private: */
         spinlock_t       event_lock;
-        struct work_struct ha_events[HA_NUM_EVENTS];
+        struct sas_ha_event ha_events[HA_NUM_EVENTS];
         unsigned long    pending;
 
         struct scsi_core core;
@@ -542,7 +557,7 @@ struct sas_task {
 
 static inline struct sas_task *sas_alloc_task(gfp_t flags)
 {
-        extern kmem_cache_t *sas_task_cache;
+        extern struct kmem_cache *sas_task_cache;
         struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags);
 
         if (task) {
@@ -560,7 +575,7 @@ static inline struct sas_task *sas_alloc_task(gfp_t flags)
 static inline void sas_free_task(struct sas_task *task)
 {
         if (task) {
-                extern kmem_cache_t *sas_task_cache;
+                extern struct kmem_cache *sas_task_cache;
                 BUG_ON(!list_empty(&task->list));
                 kmem_cache_free(sas_task_cache, task);
         }
@@ -631,6 +646,6 @@ void sas_unregister_dev(struct domain_device *);
 
 void sas_init_dev(struct domain_device *);
 
-void sas_task_abort(struct sas_task *task);
+void sas_task_abort(struct work_struct *);
 
 #endif /* _SASLIB_H_ */
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index fd352323378b..798f7c7ee426 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -206,9 +206,9 @@ struct fc_rport {	/* aka fc_starget_attrs */
         u8 flags;
         struct list_head peers;
         struct device dev;
-        struct work_struct dev_loss_work;
+        struct delayed_work dev_loss_work;
         struct work_struct scan_work;
-        struct work_struct fail_io_work;
+        struct delayed_work fail_io_work;
         struct work_struct stgt_delete_work;
         struct work_struct rport_delete_work;
 } __attribute__((aligned(sizeof(unsigned long))));
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 4b95c89c95c9..d5c218ddc527 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -176,7 +176,7 @@ struct iscsi_cls_session {
 
         /* recovery fields */
         int recovery_tmo;
-        struct work_struct recovery_work;
+        struct delayed_work recovery_work;
 
         int target_id;
 
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 4c43521cc493..33720397a904 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -511,7 +511,7 @@ struct snd_ac97 {
 #ifdef CONFIG_SND_AC97_POWER_SAVE
         unsigned int power_up;  /* power states */
         struct workqueue_struct *power_workq;
-        struct work_struct power_work;
+        struct delayed_work power_work;
 #endif
         struct device dev;
 };
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index 11702aa0bea9..2ee061625fd0 100644
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -182,7 +182,7 @@ struct ak4114 {
         unsigned char rcs0;
         unsigned char rcs1;
         struct workqueue_struct *workqueue;
-        struct work_struct work;
+        struct delayed_work work;
         void *change_callback_private;
         void (*change_callback)(struct ak4114 *ak4114, unsigned char c0, unsigned char c1);
 };