128 files changed, 2010 insertions, 685 deletions
diff --git a/include/asm-arm/arch-davinci/i2c.h b/include/asm-arm/arch-davinci/i2c.h
new file mode 100644
index 000000000000..e2f54168abd1
--- /dev/null
+++ b/include/asm-arm/arch-davinci/i2c.h
@@ -0,0 +1,21 @@
+/*
+ * DaVinci I2C controller platfrom_device info
+ *
+ * Author: Vladimir Barinov, MontaVista Software, Inc. <source@mvista.com>
+ *
+ * 2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+*/
+#ifndef __ASM_ARCH_I2C_H
+#define __ASM_ARCH_I2C_H
+/* All frequencies are expressed in kHz */
+struct davinci_i2c_platform_data {
+        unsigned int    bus_freq;       /* standard bus frequency */
+        unsigned int    bus_delay;      /* transaction delay */
+};
+#endif /* __ASM_ARCH_I2C_H */
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 1d3caa42a386..eebe56e74d6d 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -228,12 +228,12 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
 */
 #ifndef ioread8
 #define ioread8(p)      ({ unsigned int __v = __raw_readb(p); __v; })
-#define ioread16(p)     ({ unsigned int __v = le16_to_cpu(__raw_readw(p)); __v; })
+#define ioread16(p)     ({ unsigned int __v = le16_to_cpu((__force __le16)__raw_readw(p)); __v; })
-#define ioread32(p)     ({ unsigned int __v = le32_to_cpu(__raw_readl(p)); __v; })
+#define ioread32(p)     ({ unsigned int __v = le32_to_cpu((__force __le32)__raw_readl(p)); __v; })
 #define iowrite8(v,p)   __raw_writeb(v, p)
-#define iowrite16(v,p)  __raw_writew(cpu_to_le16(v), p)
+#define iowrite16(v,p)  __raw_writew((__force __u16)cpu_to_le16(v), p)
-#define iowrite32(v,p)  __raw_writel(cpu_to_le32(v), p)
+#define iowrite32(v,p)  __raw_writel((__force __u32)cpu_to_le32(v), p)
 #define ioread8_rep(p,d,c)      __raw_readsb(p,d,c)
 #define ioread16_rep(p,d,c)     __raw_readsw(p,d,c)
diff --git a/include/asm-blackfin/mach-bf548/dma.h b/include/asm-blackfin/mach-bf548/dma.h
index fcc8b4c34c6a..14cb10cc24ae 100644
--- a/include/asm-blackfin/mach-bf548/dma.h
+++ b/include/asm-blackfin/mach-bf548/dma.h
@@ -55,6 +55,7 @@
 #define CH_SPORT3_RX            20
 #define CH_SPORT3_TX            21
 #define CH_SDH                  22
+#define CH_NFC                  22
 #define CH_SPI2                 23
 #define CH_MEM_STREAM0_DEST     24
diff --git a/include/asm-blackfin/nand.h b/include/asm-blackfin/nand.h
new file mode 100644
index 000000000000..afbaafa793f1
--- /dev/null
+++ b/include/asm-blackfin/nand.h
@@ -0,0 +1,47 @@
+/* linux/include/asm-blackfin/nand.h
+ *
+ * Copyright (c) 2007 Analog Devices, Inc.
+ *      Bryan Wu <bryan.wu@analog.com>
+ *
+ * BF5XX - NAND flash controller platfrom_device info
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/* struct bf5xx_nand_platform
+ *
+ * define a interface between platfrom board specific code and
+ * bf54x NFC driver.
+ *
+ * nr_partitions = number of partitions pointed to be partitoons (or zero)
+ * partitions    = mtd partition list
+ */
+#define NFC_PG_SIZE_256         0
+#define NFC_PG_SIZE_512         1
+#define NFC_PG_SIZE_OFFSET      9
+#define NFC_NWIDTH_8            0
+#define NFC_NWIDTH_16           1
+#define NFC_NWIDTH_OFFSET       8
+#define NFC_RDDLY_OFFSET        4
+#define NFC_WRDLY_OFFSET        0
+#define NFC_STAT_NBUSY          1
+struct bf5xx_nand_platform {
+        /* NAND chip information */
+        unsigned short          page_size;
+        unsigned short          data_width;
+        /* RD/WR strobe delay timing information, all times in SCLK cycles */
+        unsigned short          rd_dly;
+        unsigned short          wr_dly;
+        /* NAND MTD partition information */
+        int                     nr_partitions;
+        struct mtd_partition    *partitions;
+};
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index 6931af525da3..9f5663ba19f8 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -253,7 +253,10 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
        __typeof__(*(ptr)) __xg_new = (new);                                    \
                                                                                \
        switch (sizeof(__xg_orig)) {                                            \
-        case 4: __xg_orig = __cmpxchg_32(__xg_ptr, __xg_test, __xg_new); break; \
+        case 4: __xg_orig = (__force __typeof__(*ptr))                          \
+                        __cmpxchg_32((__force uint32_t *)__xg_ptr,              \
+                                         (__force uint32_t)__xg_test,           \
+                                         (__force uint32_t)__xg_new); break;    \
        default:                                                                \
                __xg_orig = 0;                                                  \
                asm volatile("break");                                          \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 0240e0506a07..5615440027ec 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -153,7 +153,8 @@
 #define TEXT_TEXT                                                       \
                ALIGN_FUNCTION();                                       \
                *(.text)                                                \
-                *(.text.init.refok)
+                *(.text.init.refok)                                     \
+                *(.exit.text.refok)
 /* sched.text is aling to function alignment to secure we have same
 * address even at second ld pass when generating System.map */
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index edd5d01028df..823553bf12e6 100644
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -151,6 +151,8 @@ extern void ia64_mca_cmc_vector_setup(void);
 extern int  ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *));
 extern void ia64_unreg_MCA_extension(void);
 extern u64 ia64_get_rnat(u64 *);
+extern void ia64_mca_printk(const char * fmt, ...)
+         __attribute__ ((format (printf, 1, 2)));
 struct ia64_mca_notify_die {
        struct ia64_sal_os_state *sos;
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index 46cadf5aaac5..1f5412d6f9bb 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -46,25 +46,28 @@
 extern spinlock_t sal_lock;
 /* SAL spec _requires_ eight args for each call. */
-#define __SAL_CALL(result,a0,a1,a2,a3,a4,a5,a6,a7)      \
+#define __IA64_FW_CALL(entry,result,a0,a1,a2,a3,a4,a5,a6,a7)    \
-        result = (*ia64_sal)(a0,a1,a2,a3,a4,a5,a6,a7)
+        result = (*entry)(a0,a1,a2,a3,a4,a5,a6,a7)
-# define SAL_CALL(result,args...) do {                          \
+# define IA64_FW_CALL(entry,result,args...) do {                \
        unsigned long __ia64_sc_flags;                          \
        struct ia64_fpreg __ia64_sc_fr[6];                      \
        ia64_save_scratch_fpregs(__ia64_sc_fr);                 \
        spin_lock_irqsave(&sal_lock, __ia64_sc_flags);          \
-        __SAL_CALL(result, args);                               \
+        __IA64_FW_CALL(entry, result, args);                    \
        spin_unlock_irqrestore(&sal_lock, __ia64_sc_flags);     \
        ia64_load_scratch_fpregs(__ia64_sc_fr);                 \
 } while (0)
+# define SAL_CALL(result,args...)                       \
+        IA64_FW_CALL(ia64_sal, result, args);
 # define SAL_CALL_NOLOCK(result,args...) do {           \
        unsigned long __ia64_scn_flags;                 \
        struct ia64_fpreg __ia64_scn_fr[6];             \
        ia64_save_scratch_fpregs(__ia64_scn_fr);        \
        local_irq_save(__ia64_scn_flags);               \
-        __SAL_CALL(result, args);                       \
+        __IA64_FW_CALL(ia64_sal, result, args);         \
        local_irq_restore(__ia64_scn_flags);            \
        ia64_load_scratch_fpregs(__ia64_scn_fr);        \
 } while (0)
@@ -73,7 +76,7 @@ extern spinlock_t sal_lock;
        struct ia64_fpreg __ia64_scs_fr[6];             \
        ia64_save_scratch_fpregs(__ia64_scs_fr);        \
        preempt_disable();                              \
-        __SAL_CALL(result, args);                       \
+        __IA64_FW_CALL(ia64_sal, result, args);         \
        preempt_enable();                               \
        ia64_load_scratch_fpregs(__ia64_scs_fr);        \
 } while (0)
diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild
index c68e1680da01..1a922fad76f7 100644
--- a/include/asm-m68k/Kbuild
+++ b/include/asm-m68k/Kbuild
@@ -1 +1,2 @@
 include include/asm-generic/Kbuild.asm
+header-y += cachectl.h
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index a30fe9c64143..87f77b119317 100644
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -351,6 +351,9 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+/* whitelist for checksyscalls */
+#define __IGNORE_restart_syscall
 /*
 * "Conditional" syscalls
 *
diff --git a/include/asm-mips/fw/cfe/cfe_api.h b/include/asm-mips/fw/cfe/cfe_api.h
index 41cf050b6810..1003e7156bfc 100644
--- a/include/asm-mips/fw/cfe/cfe_api.h
+++ b/include/asm-mips/fw/cfe/cfe_api.h
@@ -154,7 +154,7 @@ int64_t cfe_getticks(void);
 #define cfe_readblk(a, b, c, d)         __cfe_readblk(a, b, c, d)
 #define cfe_setenv(a, b)                __cfe_setenv(a, b)
 #define cfe_write(a, b, c)              __cfe_write(a, b, c)
-#define cfe_writeblk(a, b, c, d         __cfe_writeblk(a, b, c, d)
+#define cfe_writeblk(a, b, c, d)        __cfe_writeblk(a, b, c, d)
 #endif                          /* CFE_API_IMPL_NAMESPACE */
 int cfe_close(int handle);
diff --git a/include/asm-mips/mach-au1x00/prom.h b/include/asm-mips/mach-au1x00/prom.h
new file mode 100644
index 000000000000..e38715577c51
--- /dev/null
+++ b/include/asm-mips/mach-au1x00/prom.h
@@ -0,0 +1,13 @@
+#ifndef __AU1X00_PROM_H
+#define __AU1X00_PROM_H
+extern int prom_argc;
+extern char **prom_argv;
+extern char **prom_envp;
+extern void prom_init_cmdline(void);
+extern char *prom_getcmdline(void);
+extern char *prom_getenv(char *envname);
+extern int prom_get_ethernet_addr(char *ethernet_addr);
+#endif
diff --git a/include/asm-powerpc/dcr-mmio.h b/include/asm-powerpc/dcr-mmio.h
index 6b82c3ba495a..08532ff1899c 100644
--- a/include/asm-powerpc/dcr-mmio.h
+++ b/include/asm-powerpc/dcr-mmio.h
@@ -33,16 +33,16 @@ typedef struct {
 extern dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
                          unsigned int dcr_c);
-extern void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c);
+extern void dcr_unmap(dcr_host_t host, unsigned int dcr_c);
 static inline u32 dcr_read(dcr_host_t host, unsigned int dcr_n)
 {
-        return in_be32(host.token + dcr_n * host.stride);
+        return in_be32(host.token + ((host.base + dcr_n) * host.stride));
 }
 static inline void dcr_write(dcr_host_t host, unsigned int dcr_n, u32 value)
 {
-        out_be32(host.token + dcr_n * host.stride, value);
+        out_be32(host.token + ((host.base + dcr_n) * host.stride), value);
 }
 extern u64 of_translate_dcr_address(struct device_node *dev,
diff --git a/include/asm-powerpc/dcr-native.h b/include/asm-powerpc/dcr-native.h
index f41058c0f6cb..8dbb1ab0aa04 100644
--- a/include/asm-powerpc/dcr-native.h
+++ b/include/asm-powerpc/dcr-native.h
@@ -29,9 +29,9 @@ typedef struct {
 #define DCR_MAP_OK(host)        (1)
 #define dcr_map(dev, dcr_n, dcr_c)      ((dcr_host_t){ .base = (dcr_n) })
-#define dcr_unmap(host, dcr_n, dcr_c)   do {} while (0)
+#define dcr_unmap(host, dcr_c)          do {} while (0)
-#define dcr_read(host, dcr_n)           mfdcr(dcr_n)
+#define dcr_read(host, dcr_n)           mfdcr(dcr_n + host.base)
-#define dcr_write(host, dcr_n, value)   mtdcr(dcr_n, value)
+#define dcr_write(host, dcr_n, value)   mtdcr(dcr_n + host.base, value)
 /* Device Control Registers */
 void __mtdcr(int reg, unsigned int val);
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index affba7052fb6..0d0589ef8ea6 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -138,12 +138,12 @@ DEF_MMIO_IN_BE(in_be64, 64, ld);
 /* There is no asm instructions for 64 bits reverse loads and stores */
 static inline u64 in_le64(const volatile u64 __iomem *addr)
 {
-        return le64_to_cpu(in_be64(addr));
+        return swab64(in_be64(addr));
 }
 static inline void out_le64(volatile u64 __iomem *addr, u64 val)
 {
-        out_be64(addr, cpu_to_le64(val));
+        out_be64(addr, swab64(val));
 }
 #endif /* __powerpc64__ */
diff --git a/include/asm-sh/cacheflush.h b/include/asm-sh/cacheflush.h
index 07f62ec9ff0c..aa558da08471 100644
--- a/include/asm-sh/cacheflush.h
+++ b/include/asm-sh/cacheflush.h
@@ -1,16 +1,47 @@
 #ifndef __ASM_SH_CACHEFLUSH_H
 #define __ASM_SH_CACHEFLUSH_H
 #ifdef __KERNEL__
-#include <linux/mm.h>
+#ifdef CONFIG_CACHE_OFF
+/*
+ * Nothing to do when the cache is disabled, initial flush and explicit
+ * disabling is handled at CPU init time.
+ *
+ * See arch/sh/kernel/cpu/init.c:cache_init().
+ */
+#define p3_cache_init()                         do { } while (0)
+#define flush_cache_all()                       do { } while (0)
+#define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_dup_mm(mm)                  do { } while (0)
+#define flush_cache_range(vma, start, end)      do { } while (0)
+#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
+#define flush_dcache_page(page)                 do { } while (0)
+#define flush_icache_range(start, end)          do { } while (0)
+#define flush_icache_page(vma,pg)               do { } while (0)
+#define flush_dcache_mmap_lock(mapping)         do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
+#define flush_cache_sigtramp(vaddr)             do { } while (0)
+#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
+#define __flush_wback_region(start, size)       do { (void)(start); } while (0)
+#define __flush_purge_region(start, size)       do { (void)(start); } while (0)
+#define __flush_invalidate_region(start, size)  do { (void)(start); } while (0)
+#else
 #include <asm/cpu/cacheflush.h>
+/*
+ * Consistent DMA requires that the __flush_xxx() primitives must be set
+ * for any of the enabled non-coherent caches (most of the UP CPUs),
+ * regardless of PIPT or VIPT cache configurations.
+ */
 /* Flush (write-back only) a region (smaller than a page) */
 extern void __flush_wback_region(void *start, int size);
 /* Flush (write-back & invalidate) a region (smaller than a page) */
 extern void __flush_purge_region(void *start, int size);
 /* Flush (invalidate only) a region (smaller than a page) */
 extern void __flush_invalidate_region(void *start, int size);
+#endif
 #define flush_cache_vmap(start, end)            flush_cache_all()
 #define flush_cache_vunmap(start, end)          flush_cache_all()
diff --git a/include/asm-sh/cpu-sh3/cache.h b/include/asm-sh/cpu-sh3/cache.h
index ffe08d2813f9..255016fc91f0 100644
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
@@ -26,7 +26,9 @@
 #define CCR_CACHE_ENABLE        CCR_CACHE_CE
 #define CCR_CACHE_INVALIDATE    CCR_CACHE_CF
-#if defined(CONFIG_CPU_SUBTYPE_SH7705) || defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7710) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7720)
 #define CCR3    0xa40000b4
 #define CCR_CACHE_16KB  0x00010000
 #define CCR_CACHE_32KB  0x00020000
diff --git a/include/asm-sh/cpu-sh3/dma.h b/include/asm-sh/cpu-sh3/dma.h
index 3a66dc458023..54bfece328c2 100644
--- a/include/asm-sh/cpu-sh3/dma.h
+++ b/include/asm-sh/cpu-sh3/dma.h
@@ -1,7 +1,20 @@
 #ifndef __ASM_CPU_SH3_DMA_H
 #define __ASM_CPU_SH3_DMA_H
+#if defined(CONFIG_CPU_SUBTYPE_SH7720) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+#define SH_DMAC_BASE    0xa4010020
+#define DMTE0_IRQ       48
+#define DMTE1_IRQ       49
+#define DMTE2_IRQ       50
+#define DMTE3_IRQ       51
+#define DMTE4_IRQ       76
+#define DMTE5_IRQ       77
+#else
 #define SH_DMAC_BASE    0xa4000020
+#endif
 /* Definitions for the SuperH DMAC */
 #define TM_BURST        0x00000020
diff --git a/include/asm-sh/cpu-sh3/gpio.h b/include/asm-sh/cpu-sh3/gpio.h
new file mode 100644
index 000000000000..48770c1c7bdf
--- /dev/null
+++ b/include/asm-sh/cpu-sh3/gpio.h
@@ -0,0 +1,66 @@
+/*
+ *  include/asm-sh/cpu-sh3/gpio.h
+ *
+ *  Copyright (C) 2007  Markus Brunner, Mark Jonas
+ *
+ *  Addresses for the Pin Function Controller
+ *
+ * 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 _CPU_SH3_GPIO_H
+#define _CPU_SH3_GPIO_H
+#if defined(CONFIG_CPU_SUBTYPE_SH7720)
+/* Control registers */
+#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_PMCR       0xA4050116UL
+#define PORT_PPCR       0xA4050118UL
+#define PORT_PRCR       0xA405011AUL
+#define PORT_PSCR       0xA405011CUL
+#define PORT_PTCR       0xA405011EUL
+#define PORT_PUCR       0xA4050120UL
+#define PORT_PVCR       0xA4050122UL
+/* Data registers */
+#define PORT_PADR       0xA4050140UL
+/* Address of PORT_PBDR is wrong in the datasheet, see errata 2005-09-21 */
+#define PORT_PBDR       0xA4050142UL
+#define PORT_PCDR       0xA4050144UL
+#define PORT_PDDR       0xA4050146UL
+#define PORT_PEDR       0xA4050148UL
+#define PORT_PFDR       0xA405014AUL
+#define PORT_PGDR       0xA405014CUL
+#define PORT_PHDR       0xA405014EUL
+#define PORT_PJDR       0xA4050150UL
+#define PORT_PKDR       0xA4050152UL
+#define PORT_PLDR       0xA4050154UL
+#define PORT_PMDR       0xA4050156UL
+#define PORT_PPDR       0xA4050158UL
+#define PORT_PRDR       0xA405015AUL
+#define PORT_PSDR       0xA405015CUL
+#define PORT_PTDR       0xA405015EUL
+#define PORT_PUDR       0xA4050160UL
+#define PORT_PVDR       0xA4050162UL
+/* Pin Select Registers */
+#define PORT_PSELA      0xA4050124UL
+#define PORT_PSELB      0xA4050126UL
+#define PORT_PSELC      0xA4050128UL
+#define PORT_PSELD      0xA405012AUL
+#endif
+#endif
diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/include/asm-sh/cpu-sh3/mmu_context.h
index b20786d42d09..16c2d63b7e39 100644
--- a/include/asm-sh/cpu-sh3/mmu_context.h
+++ b/include/asm-sh/cpu-sh3/mmu_context.h
@@ -27,12 +27,13 @@
 #define TRA     0xffffffd0
 #define EXPEVT  0xffffffd4
-#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+#if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7709) || \
    defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7707) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7710) || \
    defined(CONFIG_CPU_SUBTYPE_SH7712) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7710)
+    defined(CONFIG_CPU_SUBTYPE_SH7720)
 #define INTEVT  0xa4000000      /* INTEVTE2(0xa4000000) */
 #else
 #define INTEVT  0xffffffd8
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index b6c2020a2ad3..3880ce047fe0 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -23,11 +23,13 @@
 * ---------------------------------------------------------------------------
 */
-#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
+#if  !defined(CONFIG_CPU_SUBTYPE_SH7720) && \
+     !defined(CONFIG_CPU_SUBTYPE_SH7727)
 #define TMU_TOCR        0xfffffe90      /* Byte access */
 #endif
-#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7720)
 #define TMU_012_TSTR    0xa412fe92      /* Byte access */
 #define TMU0_TCOR       0xa412fe94      /* Long access */
@@ -56,7 +58,8 @@
 #define TMU2_TCOR       0xfffffeac      /* Long access */
 #define TMU2_TCNT       0xfffffeb0      /* Long access */
 #define TMU2_TCR        0xfffffeb4      /* Word access */
-#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
+#if !defined(CONFIG_CPU_SUBTYPE_SH7720) && \
+    !defined(CONFIG_CPU_SUBTYPE_SH7727)
 #define TMU2_TCPR2      0xfffffeb8      /* Long access */
 #endif
 #endif
diff --git a/include/asm-sh/cpu-sh3/ubc.h b/include/asm-sh/cpu-sh3/ubc.h
index 9d308cbe9b29..18467c574534 100644
--- a/include/asm-sh/cpu-sh3/ubc.h
+++ b/include/asm-sh/cpu-sh3/ubc.h
@@ -11,7 +11,8 @@
 #ifndef __ASM_CPU_SH3_UBC_H
 #define __ASM_CPU_SH3_UBC_H
-#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7720)
 #define UBC_BARA                0xa4ffffb0
 #define UBC_BAMRA               0xa4ffffb4
 #define UBC_BBRA                0xa4ffffb8
diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index 36e26a964765..aaf71b018c28 100644
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -31,7 +31,7 @@
 #define TS_32           0x00000030
 #define TS_64           0x00000000
-#define CHCR_TS_MASK    0x30
+#define CHCR_TS_MASK    0x70
 #define CHCR_TS_SHIFT   4
 #define DMAOR_COD       0x00000008
diff --git a/include/asm-sh/cpu-sh4/mmu_context.h b/include/asm-sh/cpu-sh4/mmu_context.h
index ff4c5fbbfaf0..979acddc0f8e 100644
--- a/include/asm-sh/cpu-sh4/mmu_context.h
+++ b/include/asm-sh/cpu-sh4/mmu_context.h
@@ -22,13 +22,21 @@
 #define MMU_UTLB_ADDRESS_ARRAY  0xF6000000
 #define MMU_PAGE_ASSOC_BIT      0x80
-#define MMU_NTLB_ENTRIES        64      /* for 7750 */
+#ifdef CONFIG_X2TLB
+#define MMUCR_ME                (1 << 7)
+#else
+#define MMUCR_ME                (0)
+#endif
 #ifdef CONFIG_SH_STORE_QUEUES
-#define MMU_CONTROL_INIT        0x05    /* SQMD=0, SV=0, TI=1, AT=1 */
+#define MMUCR_SQMD              (1 << 9)
 #else
-#define MMU_CONTROL_INIT        0x205   /* SQMD=1, SV=0, TI=1, AT=1 */
+#define MMUCR_SQMD              (0)
 #endif
+#define MMU_NTLB_ENTRIES        64
+#define MMU_CONTROL_INIT        (0x05|MMUCR_SQMD|MMUCR_ME)
 #define MMU_ITLB_DATA_ARRAY     0xF3000000
 #define MMU_UTLB_DATA_ARRAY     0xF7000000
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index 4c75b70b6414..a65b02fd186e 100644
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -152,14 +152,9 @@ 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 */
 extern int dma_create_sysfs_files(struct dma_channel *, struct dma_info *);
 extern void dma_remove_sysfs_files(struct dma_channel *, struct dma_info *);
-#else
-#define dma_create_sysfs_file(channel, info)            do { } while (0)
-#define dma_remove_sysfs_file(channel, info)            do { } while (0)
-#endif
 #ifdef CONFIG_PCI
 extern int isa_dma_bridge_buggy;
diff --git a/include/asm-sh/dreamcast/maple.h b/include/asm-sh/dreamcast/maple.h
new file mode 100644
index 000000000000..51f6a87f1f11
--- /dev/null
+++ b/include/asm-sh/dreamcast/maple.h
@@ -0,0 +1,37 @@
+#ifndef __ASM_MAPLE_H
+#define __ASM_MAPLE_H
+#define MAPLE_PORTS 4
+#define MAPLE_PNP_INTERVAL HZ
+#define MAPLE_MAXPACKETS 8
+#define MAPLE_DMA_ORDER 14
+#define MAPLE_DMA_SIZE (1 << MAPLE_DMA_ORDER)
+#define MAPLE_DMA_PAGES ((MAPLE_DMA_ORDER > PAGE_SHIFT) ? \
+                          MAPLE_DMA_ORDER - PAGE_SHIFT : 0)
+/* Maple Bus registers */
+#define MAPLE_BASE     0xa05f6c00
+#define MAPLE_DMAADDR  (MAPLE_BASE+0x04)
+#define MAPLE_TRIGTYPE (MAPLE_BASE+0x10)
+#define MAPLE_ENABLE   (MAPLE_BASE+0x14)
+#define MAPLE_STATE    (MAPLE_BASE+0x18)
+#define MAPLE_SPEED    (MAPLE_BASE+0x80)
+#define MAPLE_RESET    (MAPLE_BASE+0x8c)
+#define MAPLE_MAGIC    0x6155404f
+#define MAPLE_2MBPS    0
+#define MAPLE_TIMEOUT(n) ((n)<<15)
+/* Function codes */
+#define MAPLE_FUNC_CONTROLLER 0x001
+#define MAPLE_FUNC_MEMCARD    0x002
+#define MAPLE_FUNC_LCD        0x004
+#define MAPLE_FUNC_CLOCK      0x008
+#define MAPLE_FUNC_MICROPHONE 0x010
+#define MAPLE_FUNC_ARGUN      0x020
+#define MAPLE_FUNC_KEYBOARD   0x040
+#define MAPLE_FUNC_LIGHTGUN   0x080
+#define MAPLE_FUNC_PURUPURU   0x100
+#define MAPLE_FUNC_MOUSE      0x200
+#endif /* __ASM_MAPLE_H */
diff --git a/include/asm-sh/gpio.h b/include/asm-sh/gpio.h
new file mode 100644
index 000000000000..9bb27e0f11a4
--- /dev/null
+++ b/include/asm-sh/gpio.h
@@ -0,0 +1,19 @@
+/*
+ *  include/asm-sh/gpio.h
+ *
+ *  Copyright (C) 2007 Markus Brunner, Mark Jonas
+ *
+ *  Addresses for the Pin Function Controller
+ *
+ * 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_SH_GPIO_H
+#define __ASM_SH_GPIO_H
+#if defined(CONFIG_CPU_SH3)
+#include <asm/cpu/gpio.h>
+#endif
+#endif /* __ASM_SH_GPIO_H */
diff --git a/include/asm-sh/hd64461.h b/include/asm-sh/hd64461.h
index 4dd8592ca014..342ca55a266a 100644
--- a/include/asm-sh/hd64461.h
+++ b/include/asm-sh/hd64461.h
@@ -226,6 +226,7 @@
 #define HD64461_NIMR            (CONFIG_HD64461_IOBASE + 0x5002)
 #define HD64461_IRQBASE         OFFCHIP_IRQ_BASE
+#define OFFCHIP_IRQ_BASE        64
 #define HD64461_IRQ_NUM         16
 #define HD64461_IRQ_UART        (HD64461_IRQBASE+5)
diff --git a/include/asm-sh/heartbeat.h b/include/asm-sh/heartbeat.h
new file mode 100644
index 000000000000..724a43ed245e
--- /dev/null
+++ b/include/asm-sh/heartbeat.h
@@ -0,0 +1,17 @@
+#ifndef __ASM_SH_HEARTBEAT_H
+#define __ASM_SH_HEARTBEAT_H
+#include <linux/timer.h>
+#define HEARTBEAT_INVERTED      (1 << 0)
+struct heartbeat_data {
+        void __iomem *base;
+        unsigned char *bit_pos;
+        unsigned int nr_bits;
+        struct timer_list timer;
+        unsigned int regsize;
+        unsigned long flags;
+};
+#endif /* __ASM_SH_HEARTBEAT_H */
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index 20d42959f52a..cb0b6c9f7020 100644
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -6,24 +6,6 @@
 extern atomic_t irq_err_count;
-struct intc2_data {
-        unsigned short irq;
-        unsigned char ipr_offset, ipr_shift;
-        unsigned char msk_offset, msk_shift;
-        unsigned char priority;
-};
-struct intc2_desc {
-        unsigned long prio_base;
-        unsigned long msk_base;
-        unsigned long mskclr_base;
-        struct intc2_data *intc2_data;
-        unsigned int nr_irqs;
-        struct irq_chip chip;
-};
-void register_intc2_controller(struct intc2_desc *);
 struct ipr_data {
        unsigned char irq;
        unsigned char ipr_idx;          /* Index for the IPR registered */
@@ -41,11 +23,6 @@ struct ipr_desc {
 void register_ipr_controller(struct ipr_desc *);
-/*
- * Enable individual interrupt mode for external IPR IRQs.
- */
-void __init ipr_irq_enable_irlm(void);
 typedef unsigned char intc_enum;
 struct intc_vect {
@@ -54,6 +31,7 @@ struct intc_vect {
 };
 #define INTC_VECT(enum_id, vect) { enum_id, vect }
+#define INTC_IRQ(enum_id, irq) INTC_VECT(enum_id, irq2evt(irq))
 struct intc_prio {
        intc_enum enum_id;
@@ -64,19 +42,25 @@ struct intc_prio {
 struct intc_group {
        intc_enum enum_id;
-        intc_enum *enum_ids;
+        intc_enum enum_ids[32];
 };
-#define INTC_GROUP(enum_id, ids...) { enum_id, (intc_enum []) { ids, 0 } }
+#define INTC_GROUP(enum_id, ids...) { enum_id, { ids } }
 struct intc_mask_reg {
        unsigned long set_reg, clr_reg, reg_width;
        intc_enum enum_ids[32];
+#ifdef CONFIG_SMP
+        unsigned long smp;
+#endif
 };
 struct intc_prio_reg {
-        unsigned long reg, reg_width, field_width;
+        unsigned long set_reg, clr_reg, reg_width, field_width;
        intc_enum enum_ids[16];
+#ifdef CONFIG_SMP
+        unsigned long smp;
+#endif
 };
 struct intc_sense_reg {
@@ -84,6 +68,12 @@ struct intc_sense_reg {
        intc_enum enum_ids[16];
 };
+#ifdef CONFIG_SMP
+#define INTC_SMP(stride, nr) .smp = (stride) | ((nr) << 8)
+#else
+#define INTC_SMP(stride, nr)
+#endif
 struct intc_desc {
        struct intc_vect *vectors;
        unsigned int nr_vectors;
@@ -97,25 +87,28 @@ struct intc_desc {
        unsigned int nr_prio_regs;
        struct intc_sense_reg *sense_regs;
        unsigned int nr_sense_regs;
-        struct irq_chip chip;
+        char *name;
 };
 #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
 #define DECLARE_INTC_DESC(symbol, chipname, vectors, groups,            \
        priorities, mask_regs, prio_regs, sense_regs)                   \
-struct intc_desc symbol = {                                             \
+struct intc_desc symbol __initdata = {                                  \
        _INTC_ARRAY(vectors), _INTC_ARRAY(groups),                      \
        _INTC_ARRAY(priorities),                                        \
        _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),                 \
        _INTC_ARRAY(sense_regs),                                        \
-        .chip.name = chipname,                                          \
+        chipname,                                                       \
 }
 void __init register_intc_controller(struct intc_desc *desc);
+int intc_set_priority(unsigned int irq, unsigned int prio);
 void __init plat_irq_setup(void);
-enum { IRQ_MODE_IRQ, IRQ_MODE_IRL7654, IRQ_MODE_IRL3210 };
+enum { IRQ_MODE_IRQ, IRQ_MODE_IRQ7654, IRQ_MODE_IRQ3210,
+       IRQ_MODE_IRL7654_MASK, IRQ_MODE_IRL3210_MASK,
+       IRQ_MODE_IRL7654, IRQ_MODE_IRL3210 };
 void __init plat_irq_setup_pins(int mode);
 #endif /* __ASM_SH_HW_IRQ_H */
diff --git a/include/asm-sh/ilsel.h b/include/asm-sh/ilsel.h
new file mode 100644
index 000000000000..e3d304b280f6
--- /dev/null
+++ b/include/asm-sh/ilsel.h
@@ -0,0 +1,45 @@
+#ifndef __ASM_SH_ILSEL_H
+#define __ASM_SH_ILSEL_H
+typedef enum {
+        ILSEL_NONE,
+        ILSEL_LAN,
+        ILSEL_USBH_I,
+        ILSEL_USBH_S,
+        ILSEL_USBH_V,
+        ILSEL_RTC,
+        ILSEL_USBP_I,
+        ILSEL_USBP_S,
+        ILSEL_USBP_V,
+        ILSEL_KEY,
+        /*
+         * ILSEL Aliases - corner cases for interleaved level tables.
+         *
+         * Someone thought this was a good idea and less hassle than
+         * demuxing a shared vector, really.
+         */
+        /* ILSEL0 and 2 */
+        ILSEL_FPGA0,
+        ILSEL_FPGA1,
+        ILSEL_EX1,
+        ILSEL_EX2,
+        ILSEL_EX3,
+        ILSEL_EX4,
+        /* ILSEL1 and 3 */
+        ILSEL_FPGA2 = ILSEL_FPGA0,
+        ILSEL_FPGA3 = ILSEL_FPGA1,
+        ILSEL_EX5 = ILSEL_EX1,
+        ILSEL_EX6 = ILSEL_EX2,
+        ILSEL_EX7 = ILSEL_EX3,
+        ILSEL_EX8 = ILSEL_EX4,
+} ilsel_source_t;
+/* arch/sh/boards/renesas/x3proto/ilsel.c */
+int ilsel_enable(ilsel_source_t set);
+int ilsel_enable_fixed(ilsel_source_t set, unsigned int level);
+void ilsel_disable(unsigned int irq);
+#endif /* __ASM_SH_ILSEL_H */
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index e6a1877dcb20..1a336cdc75fe 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -135,6 +135,32 @@ void __raw_readsl(unsigned long addr, void *data, int longlen);
 # define writel(v,a)    ({ __raw_writel((v),(a)); mb(); })
 #endif
+#define __BUILD_MEMORY_STRING(bwlq, type)                               \
+                                                                        \
+static inline void writes##bwlq(volatile void __iomem *mem,             \
+                                const void *addr, unsigned int count)   \
+{                                                                       \
+        const volatile type *__addr = addr;                             \
+                                                                        \
+        while (count--) {                                               \
+                __raw_write##bwlq(*__addr, mem);                        \
+                __addr++;                                               \
+        }                                                               \
+}                                                                       \
+                                                                        \
+static inline void reads##bwlq(volatile void __iomem *mem, void *addr,  \
+                               unsigned int count)                      \
+{                                                                       \
+        volatile type *__addr = addr;                                   \
+                                                                        \
+        while (count--) {                                               \
+                *__addr = __raw_read##bwlq(mem);                        \
+                __addr++;                                               \
+        }                                                               \
+}
+__BUILD_MEMORY_STRING(b, u8)
+__BUILD_MEMORY_STRING(w, u16)
 #define writesl __raw_writesl
 #define readsl  __raw_readsl
diff --git a/include/asm-sh/kgdb.h b/include/asm-sh/kgdb.h
index 74bd0953e5ce..4bc8cb187d11 100644
--- a/include/asm-sh/kgdb.h
+++ b/include/asm-sh/kgdb.h
@@ -17,9 +17,6 @@
 #define __KGDB_H
 #include <asm/ptrace.h>
-#include <asm/cacheflush.h>
-struct console;
 /* Same as pt_regs but has vbr in place of syscall_nr */
 struct kgdb_regs {
@@ -35,10 +32,7 @@ struct kgdb_regs {
 /* State info */
 extern char kgdb_in_gdb_mode;
-extern int kgdb_done_init;
-extern int kgdb_enabled;
 extern int kgdb_nofault;        /* Ignore bus errors (in gdb mem access) */
-extern int kgdb_halt;           /* Execute initial breakpoint at startup */
 extern char in_nmi;             /* Debounce flag to prevent NMI reentry*/
 /* SCI */
@@ -59,6 +53,7 @@ extern kgdb_debug_hook_t  *kgdb_debug_hook;
 extern kgdb_bus_error_hook_t *kgdb_bus_err_hook;
 /* Console */
+struct console;
 void kgdb_console_write(struct console *co, const char *s, unsigned count);
 extern int kgdb_console_setup(struct console *, char *);
@@ -69,22 +64,7 @@ extern void    longjmp(jmp_buf __jmpb, int __retval);
 extern int     setjmp(jmp_buf __jmpb);
 /* Forced breakpoint */
-#define breakpoint()                                    \
+#define breakpoint()    __asm__ __volatile__("trapa   #0x3c")
-do {                                                    \
-        if (kgdb_enabled)                               \
-                __asm__ __volatile__("trapa   #0x3c");  \
-} while (0)
-/* KGDB should be able to flush all kernel text space */
-#if defined(CONFIG_CPU_SH4)
-#define kgdb_flush_icache_range(start, end) \
-{                                                                       \
-        __flush_purge_region((void*)(start), (int)(end) - (int)(start));\
-        flush_icache_range((start), (end));                             \
-}
-#else
-#define kgdb_flush_icache_range(start, end)     do { } while (0)
-#endif
 /* Taken from sh-stub.c of GDB 4.18 */
 static const char hexchars[] = "0123456789abcdef";
diff --git a/include/asm-sh/magicpanelr2.h b/include/asm-sh/magicpanelr2.h
new file mode 100644
index 000000000000..c644a77ee357
--- /dev/null
+++ b/include/asm-sh/magicpanelr2.h
@@ -0,0 +1,67 @@
+/*
+ *  include/asm-sh/magicpanelr2.h
+ *
+ *  Copyright (C) 2007  Markus Brunner, Mark Jonas
+ *
+ *  I/O addresses and bitmasks for Magic Panel Release 2 board
+ *
+ * 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_SH_MAGICPANELR2_H
+#define __ASM_SH_MAGICPANELR2_H
+#include <asm/gpio.h>
+#define __IO_PREFIX mpr2
+#include <asm/io_generic.h>
+#define SETBITS_OUTB(mask, reg)   ctrl_outb(ctrl_inb(reg) | mask, reg)
+#define SETBITS_OUTW(mask, reg)   ctrl_outw(ctrl_inw(reg) | mask, reg)
+#define SETBITS_OUTL(mask, reg)   ctrl_outl(ctrl_inl(reg) | mask, reg)
+#define CLRBITS_OUTB(mask, reg)   ctrl_outb(ctrl_inb(reg) & ~mask, reg)
+#define CLRBITS_OUTW(mask, reg)   ctrl_outw(ctrl_inw(reg) & ~mask, reg)
+#define CLRBITS_OUTL(mask, reg)   ctrl_outl(ctrl_inl(reg) & ~mask, reg)
+#define PA_LED          PORT_PADR      /* LED */
+/* BSC */
+#define CMNCR           0xA4FD0000UL
+#define CS0BCR          0xA4FD0004UL
+#define CS2BCR          0xA4FD0008UL
+#define CS3BCR          0xA4FD000CUL
+#define CS4BCR          0xA4FD0010UL
+#define CS5ABCR         0xA4FD0014UL
+#define CS5BBCR         0xA4FD0018UL
+#define CS6ABCR         0xA4FD001CUL
+#define CS6BBCR         0xA4FD0020UL
+#define CS0WCR          0xA4FD0024UL
+#define CS2WCR          0xA4FD0028UL
+#define CS3WCR          0xA4FD002CUL
+#define CS4WCR          0xA4FD0030UL
+#define CS5AWCR         0xA4FD0034UL
+#define CS5BWCR         0xA4FD0038UL
+#define CS6AWCR         0xA4FD003CUL
+#define CS6BWCR         0xA4FD0040UL
+/* usb */
+#define PORT_UTRCTL             0xA405012CUL
+#define PORT_UCLKCR_W           0xA40A0008UL
+#define INTC_ICR0               0xA414FEE0UL
+#define INTC_ICR1               0xA4140010UL
+#define INTC_ICR2               0xA4140012UL
+/* MTD */
+#define MPR2_MTD_BOOTLOADER_SIZE        0x00060000UL
+#define MPR2_MTD_KERNEL_SIZE            0x00200000UL
+#endif  /* __ASM_SH_MAGICPANELR2_H */
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index 6bc9bba10105..cb3d46c59eab 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -70,14 +70,14 @@ extern void clear_page_nommu(void *to);
 extern void copy_page_nommu(void *to, void *from);
 #endif
-#if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \
+#if !defined(CONFIG_CACHE_OFF) && defined(CONFIG_MMU) && \
-        defined(CONFIG_SH7705_CACHE_32KB))
+        (defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB))
 struct page;
 extern void clear_user_page(void *to, unsigned long address, struct page *pg);
 extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
 extern void __clear_user_page(void *to, void *orig_to);
 extern void __copy_user_page(void *to, void *from, void *orig_to);
-#elif defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH3) || !defined(CONFIG_MMU)
+#else
 #define clear_user_page(page, vaddr, pg)        clear_page(page)
 #define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
 #endif
@@ -88,6 +88,7 @@ extern void __copy_user_page(void *to, void *from, void *orig_to);
 #ifdef CONFIG_X2TLB
 typedef struct { unsigned long pte_low, pte_high; } pte_t;
 typedef struct { unsigned long long pgprot; } pgprot_t;
+typedef struct { unsigned long long pgd; } pgd_t;
 #define pte_val(x) \
        ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
 #define __pte(x) \
@@ -95,12 +96,11 @@ typedef struct { unsigned long long pgprot; } pgprot_t;
 #else
 typedef struct { unsigned long pte_low; } pte_t;
 typedef struct { unsigned long pgprot; } pgprot_t;
+typedef struct { unsigned long pgd; } pgd_t;
 #define pte_val(x)      ((x).pte_low)
 #define __pte(x) ((pte_t) { (x) } )
 #endif
-typedef struct { unsigned long pgd; } pgd_t;
 #define pgd_val(x)      ((x).pgd)
 #define pgprot_val(x)   ((x).pgprot)
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index e3fae12c0e49..cf0dd2b648c2 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -42,13 +42,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 /* PGD bits */
 #define PGDIR_SHIFT     (PTE_SHIFT + PTE_BITS)
-#define PGDIR_BITS      (32 - PGDIR_SHIFT)
 #define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
 /* Entries per level */
 #define PTRS_PER_PTE    (PAGE_SIZE / (1 << PTE_MAGNITUDE))
-#define PTRS_PER_PGD    (PAGE_SIZE / 4)
+#define PTRS_PER_PGD    (PAGE_SIZE / sizeof(pgd_t))
 #define USER_PTRS_PER_PGD       (TASK_SIZE/PGDIR_SIZE)
 #define FIRST_USER_ADDRESS      0
@@ -100,17 +99,18 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #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 */
-#ifndef CONFIG_X2TLB
+#define _PAGE_SZ0       0x010           /* SZ0-bit : Size of page */
-# define _PAGE_SZ0      0x010           /* SZ0-bit : Size of page */
+#define _PAGE_RW        0x020           /* PR0-bit : write access allowed */
-# define _PAGE_RW       0x020           /* PR0-bit : write access allowed */
+#define _PAGE_USER      0x040           /* PR1-bit : user space access allowed*/
-# define _PAGE_USER     0x040           /* PR1-bit : user space access allowed*/
+#define _PAGE_SZ1       0x080           /* SZ1-bit : Size of page (on SH-4) */
-# 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? */
+#define _PAGE_SZ_MASK   (_PAGE_SZ0 | _PAGE_SZ1)
+#define _PAGE_PR_MASK   (_PAGE_RW | _PAGE_USER)
 /* Extended mode bits */
 #define _PAGE_EXT_ESZ0          0x0010  /* ESZ0-bit: Size of page */
 #define _PAGE_EXT_ESZ1          0x0020  /* ESZ1-bit: Size of page */
@@ -126,11 +126,7 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #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)
-# 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 */
@@ -146,10 +142,14 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #define _PAGE_PCC_ATR16 0x60000001      /* Attribute Memory space, 6 bit bus */
 /* Mask which drops unused bits from the PTEL value */
-#ifdef CONFIG_CPU_SH3
+#if defined(CONFIG_CPU_SH3)
 #define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED| \
                                 _PAGE_FILE     | _PAGE_SZ1     | \
                                 _PAGE_HW_SHARED)
+#elif defined(CONFIG_X2TLB)
+/* Get rid of the legacy PR/SZ bits when using extended mode */
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | \
+                                 _PAGE_FILE | _PAGE_PR_MASK | _PAGE_SZ_MASK)
 #else
 #define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)
 #endif
@@ -212,27 +212,36 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_USER_READ | \
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ  | \
+                                           _PAGE_EXT_KERN_WRITE | \
+                                           _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(_PAGE_EXT_KERN_EXEC | \
+                                           _PAGE_EXT_KERN_READ | \
+                                           _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))
+                                 _PAGE_EXT(_PAGE_EXT_KERN_READ | \
+                                           _PAGE_EXT_USER_READ))
 #define PAGE_WRITEONLY  __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | \
                                 _PAGE_CACHABLE | _PAGE_FLAGS_HARD | \
-                                 _PAGE_EXT(_PAGE_EXT_USER_WRITE))
+                                 _PAGE_EXT(_PAGE_EXT_KERN_WRITE | \
+                                           _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(_PAGE_EXT_KERN_WRITE | \
+                                           _PAGE_EXT_KERN_READ  | \
+                                           _PAGE_EXT_KERN_EXEC  | \
+                                           _PAGE_EXT_USER_WRITE | \
                                           _PAGE_EXT_USER_READ  | \
                                           _PAGE_EXT_USER_EXEC))
@@ -373,11 +382,15 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 #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 pfn_pte(pfn, prot) \
-#define pte_present(x)  (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
+        __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pfn_pmd(pfn, prot) \
+        __pmd(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pte_none(x)             (!pte_val(x))
+#define pte_present(x)          ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))
 #define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
 #define pmd_none(x)     (!pmd_val(x))
@@ -392,15 +405,15 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
 * The following only work if pte_present() is true.
 * Undefined behaviour if not..
 */
-#define pte_not_present(pte)    (!(pte_val(pte) & _PAGE_PRESENT))
+#define pte_not_present(pte)    (!((pte).pte_low & _PAGE_PRESENT))
-#define pte_dirty(pte)          (pte_val(pte) & _PAGE_DIRTY)
+#define pte_dirty(pte)          ((pte).pte_low & _PAGE_DIRTY)
-#define pte_young(pte)          (pte_val(pte) & _PAGE_ACCESSED)
+#define pte_young(pte)          ((pte).pte_low & _PAGE_ACCESSED)
-#define pte_file(pte)           (pte_val(pte) & _PAGE_FILE)
+#define pte_file(pte)           ((pte).pte_low & _PAGE_FILE)
 #ifdef CONFIG_X2TLB
 #define pte_write(pte)          ((pte).pte_high & _PAGE_EXT_USER_WRITE)
 #else
-#define pte_write(pte)          (pte_val(pte) & _PAGE_RW)
+#define pte_write(pte)          ((pte).pte_low & _PAGE_RW)
 #endif
 #define PTE_BIT_FUNC(h,fn,op) \
@@ -429,17 +442,10 @@ PTE_BIT_FUNC(low, mkyoung, |= _PAGE_ACCESSED);
 /*
 * Macro and implementation to make a page protection as uncachable.
 */
-#define pgprot_noncached pgprot_noncached
+#define pgprot_writecombine(prot) \
+        __pgprot(pgprot_val(prot) & ~_PAGE_CACHABLE)
-static inline pgprot_t pgprot_noncached(pgprot_t _prot)
+#define pgprot_noncached         pgprot_writecombine
-{
-        unsigned long prot = pgprot_val(_prot);
-        prot &= ~_PAGE_CACHABLE;
-        return __pgprot(prot);
-}
-#define pgprot_writecombine(prot) __pgprot(pgprot_val(prot) & ~_PAGE_CACHABLE)
 /*
 * Conversion functions: convert a page and protection to a page entry,
@@ -451,28 +457,33 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
-        set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) |
+        pte.pte_low &= _PAGE_CHG_MASK;
-                            pgprot_val(newprot)));
+        pte.pte_low |= pgprot_val(newprot);
+#ifdef CONFIG_X2TLB
+        pte.pte_high |= pgprot_val(newprot) >> 32;
+#endif
        return pte;
 }
-#define pmd_page_vaddr(pmd)     pmd_val(pmd)
+#define pmd_page_vaddr(pmd)     ((unsigned long)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))
+#define pgd_index(address)      (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
+#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
 /* to find an entry in a kernel page-table-directory */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
+#define pgd_offset_k(address)   pgd_offset(&init_mm, address)
 /* Find an entry in the third-level page table.. */
-#define pte_index(address) \
+#define pte_index(address)      ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-                ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
-#define pte_offset_map(dir, address) pte_offset_kernel(dir, address)
+#define pte_offset_map(dir, address)            pte_offset_kernel(dir, address)
-#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address)
+#define pte_offset_map_nested(dir, address)     pte_offset_kernel(dir, address)
 #define pte_unmap(pte)          do { } while (0)
 #define pte_unmap_nested(pte)   do { } while (0)
@@ -480,13 +491,14 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_ERROR(e) \
        printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
               &(e), (e).pte_high, (e).pte_low)
+#define pgd_ERROR(e) \
+        printk("%s:%d: bad pgd %016llx.\n", __FILE__, __LINE__, pgd_val(e))
 #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))
+#endif
 struct vm_area_struct;
 extern void update_mmu_cache(struct vm_area_struct * vma,
@@ -563,7 +575,8 @@ struct mm_struct;
 extern unsigned int kobjsize(const void *objp);
 #endif /* !CONFIG_MMU */
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
+#if !defined(CONFIG_CACHE_OFF) && (defined(CONFIG_CPU_SH4) || \
+        defined(CONFIG_SH7705_CACHE_32KB))
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
 extern pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 #endif
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 26d52174f4b4..4f2922a1979c 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -45,7 +45,7 @@ enum cpu_type {
        CPU_SH7705, CPU_SH7706, CPU_SH7707,
        CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
        CPU_SH7709, CPU_SH7709A, CPU_SH7710, CPU_SH7712,
-        CPU_SH7729,
+        CPU_SH7720, CPU_SH7729,
        /* SH-4 types */
        CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
@@ -73,15 +73,10 @@ struct sh_cpuinfo {
        unsigned long flags;
 } __attribute__ ((aligned(SMP_CACHE_BYTES)));
-extern struct sh_cpuinfo boot_cpu_data;
-#ifdef CONFIG_SMP
 extern struct sh_cpuinfo cpu_data[];
+#define boot_cpu_data cpu_data[0]
 #define current_cpu_data cpu_data[smp_processor_id()]
-#else
+#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
-#endif
 /*
 * User space process size: 2GB.
diff --git a/include/asm-sh/r7780rp.h b/include/asm-sh/r7780rp.h
index 4083b5949928..de37f933aa42 100644
--- a/include/asm-sh/r7780rp.h
+++ b/include/asm-sh/r7780rp.h
@@ -65,24 +65,6 @@
 #define PA_PMR          (PA_BCR+0x0900) /*  */
 #define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
-#define IRQ_PCISLOT1    65              /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2    66              /* PCI Slot #2 IRQ */
-#define IRQ_PCISLOT3    67              /* PCI Slot #3 IRQ */
-#define IRQ_PCISLOT4    68              /* PCI Slot #4 IRQ */
-#define IRQ_TP          2               /* Touch Panel IRQ */
-#define IRQ_SCI1        3               /* SCI1 IRQ */
-#define IRQ_SCI0        4               /* SCI0 IRQ */
-#define IRQ_2SERIAL     5               /* Serial IRQ */
-#define IRQ_RTC         6               /* RTC A / B IRQ */
-#define IRQ_EXTENTION6  7               /* EXT6n IRQ */
-#define IRQ_EXTENTION5  8               /* EXT5n IRQ */
-#define IRQ_EXTENTION4  9               /* EXT4n IRQ */
-#define IRQ_EXTENTION2  10              /* EXT2n IRQ */
-#define IRQ_EXTENTION1  11              /* EXT1n IRQ */
-#define IRQ_ONETH       13              /* On board Ethernet IRQ */
-#define IRQ_PSW         14              /* Push Switch IRQ */
 #define IVDR_CK_ON      8               /* iVDR Clock ON */
 #elif defined(CONFIG_SH_R7780RP)
@@ -203,11 +185,24 @@
 #define PA_MMSR         (PA_BCR+0x0400)
 #define IVDR_CK_ON      4               /* iVDR Clock ON */
+#endif
+#define HL_FPGA_IRQ_BASE        200
+#define HL_NR_IRL               15
+#define IRQ_AX88796             (HL_FPGA_IRQ_BASE + 0)
+#define IRQ_CF                  (HL_FPGA_IRQ_BASE + 1)
+#ifndef IRQ_PSW
+#define IRQ_PSW                 (HL_FPGA_IRQ_BASE + 2)
 #endif
+#define IRQ_EXT1                (HL_FPGA_IRQ_BASE + 3)
+#define IRQ_EXT4                (HL_FPGA_IRQ_BASE + 4)
 void make_r7780rp_irq(unsigned int irq);
-void highlander_init_irq(void);
+unsigned char *highlander_init_irq_r7780mp(void);
+unsigned char *highlander_init_irq_r7780rp(void);
+unsigned char *highlander_init_irq_r7785rp(void);
 #define __IO_PREFIX     r7780rp
 #include <asm/io_generic.h>
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index 91aacc96151b..858da99d37e0 100644
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -5,4 +5,10 @@ extern void (*board_time_init)(void);
 extern void (*rtc_sh_get_time)(struct timespec *);
 extern int (*rtc_sh_set_time)(const time_t);
+#define RTC_CAP_4_DIGIT_YEAR    (1 << 0)
+struct sh_rtc_platform_info {
+        unsigned long capabilities;
+};
 #endif /* _ASM_RTC_H */
diff --git a/include/asm-sh/rts7751r2d.h b/include/asm-sh/rts7751r2d.h
index 5d7800aa31b5..83b9c111f171 100644
--- a/include/asm-sh/rts7751r2d.h
+++ b/include/asm-sh/rts7751r2d.h
@@ -9,7 +9,7 @@
 * Renesas Technology Sales RTS7751R2D support
 */
-/* Box specific addresses.  */
+/* Board specific addresses.  */
 #define PA_BCR          0xa4000000      /* FPGA */
 #define PA_IRLMON       0xa4000002      /* Interrupt Status control */
@@ -20,19 +20,19 @@
 #define PA_RTCCE        0xa400000c      /* RTC(9701) Enable control */
 #define PA_PCICD        0xa400000e      /* PCI Extention detect control */
 #define PA_VOYAGERRTS   0xa4000020      /* VOYAGER Reset control */
-#if defined(CONFIG_RTS7751R2D_REV11)
-#define PA_AXRST        0xa4000022      /* AX_LAN Reset control */
+#define PA_R2D1_AXRST           0xa4000022      /* AX_LAN Reset control */
-#define PA_CFRST        0xa4000024      /* CF Reset control */
+#define PA_R2D1_CFRST           0xa4000024      /* CF Reset control */
-#define PA_ADMRTS       0xa4000026      /* SD Reset control */
+#define PA_R2D1_ADMRTS          0xa4000026      /* SD Reset control */
-#define PA_EXTRST       0xa4000028      /* Extention Reset control */
+#define PA_R2D1_EXTRST          0xa4000028      /* Extention Reset control */
-#define PA_CFCDINTCLR   0xa400002a      /* CF Insert Interrupt clear */
+#define PA_R2D1_CFCDINTCLR      0xa400002a      /* CF Insert Interrupt clear */
-#else
-#define PA_CFRST        0xa4000022      /* CF Reset control */
+#define PA_R2DPLUS_CFRST        0xa4000022      /* CF Reset control */
-#define PA_ADMRTS       0xa4000024      /* SD Reset control */
+#define PA_R2DPLUS_ADMRTS       0xa4000024      /* SD Reset control */
-#define PA_EXTRST       0xa4000026      /* Extention Reset control */
+#define PA_R2DPLUS_EXTRST       0xa4000026      /* Extention Reset control */
-#define PA_CFCDINTCLR   0xa4000028      /* CF Insert Interrupt clear */
+#define PA_R2DPLUS_CFCDINTCLR   0xa4000028      /* CF Insert Interrupt clear */
-#define PA_KEYCTLCLR    0xa400002a      /* Key Interrupt clear */
+#define PA_R2DPLUS_KEYCTLCLR    0xa400002a      /* Key Interrupt clear */
-#endif
 #define PA_POWOFF       0xa4000030      /* Board Power OFF control */
 #define PA_VERREG       0xa4000032      /* FPGA Version Register */
 #define PA_INPORT       0xa4000034      /* KEY Input Port control */
@@ -46,27 +46,22 @@
 #define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
-#if defined(CONFIG_RTS7751R2D_REV11)
+#define R2D_FPGA_IRQ_BASE       100
-#define IRQ_PCIETH      0               /* PCI Ethernet IRQ */
-#define IRQ_CFCARD      1               /* CF Card IRQ */
+#define IRQ_VOYAGER             (R2D_FPGA_IRQ_BASE + 0)
-#define IRQ_CFINST      2               /* CF Card Insert IRQ */
+#define IRQ_EXT                 (R2D_FPGA_IRQ_BASE + 1)
-#define IRQ_PCMCIA      3               /* PCMCIA IRQ */
+#define IRQ_TP                  (R2D_FPGA_IRQ_BASE + 2)
-#define IRQ_VOYAGER     4               /* VOYAGER IRQ */
+#define IRQ_RTC_T               (R2D_FPGA_IRQ_BASE + 3)
-#define IRQ_ONETH       5               /* On board Ethernet IRQ */
+#define IRQ_RTC_A               (R2D_FPGA_IRQ_BASE + 4)
-#else
+#define IRQ_SDCARD              (R2D_FPGA_IRQ_BASE + 5)
-#define IRQ_KEYIN       0               /* Key Input IRQ */
+#define IRQ_CF_CD               (R2D_FPGA_IRQ_BASE + 6)
-#define IRQ_PCIETH      1               /* PCI Ethernet IRQ */
+#define IRQ_CF_IDE              (R2D_FPGA_IRQ_BASE + 7)
-#define IRQ_CFCARD      2               /* CF Card IRQ */
+#define IRQ_AX88796             (R2D_FPGA_IRQ_BASE + 8)
-#define IRQ_CFINST      3               /* CF Card Insert IRQ */
+#define IRQ_KEY                 (R2D_FPGA_IRQ_BASE + 9)
-#define IRQ_PCMCIA      4               /* PCMCIA IRQ */
+#define IRQ_PCI_INTA            (R2D_FPGA_IRQ_BASE + 10)
-#define IRQ_VOYAGER     5               /* VOYAGER IRQ */
+#define IRQ_PCI_INTB            (R2D_FPGA_IRQ_BASE + 11)
-#endif
+#define IRQ_PCI_INTC            (R2D_FPGA_IRQ_BASE + 12)
-#define IRQ_RTCALM      6               /* RTC Alarm IRQ */
+#define IRQ_PCI_INTD            (R2D_FPGA_IRQ_BASE + 13)
-#define IRQ_RTCTIME     7               /* RTC Timer IRQ */
-#define IRQ_SDCARD      8               /* SD Card IRQ */
-#define IRQ_PCISLOT1    9               /* PCI Slot #1 IRQ */
-#define IRQ_PCISLOT2    10              /* PCI Slot #2 IRQ */
-#define IRQ_EXTENTION   11              /* EXTn IRQ */
 /* arch/sh/boards/renesas/rts7751r2d/irq.c */
 void init_rts7751r2d_IRQ(void);
diff --git a/include/asm-sh/sections.h b/include/asm-sh/sections.h
index 2a696b8ee4f5..bd9cbc967c2a 100644
--- a/include/asm-sh/sections.h
+++ b/include/asm-sh/sections.h
@@ -4,6 +4,7 @@
 #include <asm-generic/sections.h>
 extern long __machvec_start, __machvec_end;
+extern char _ebss[];
 #endif /* __ASM_SH_SECTIONS_H */
diff --git a/include/asm-sh/sh03/io.h b/include/asm-sh/sh03/io.h
index 4ff1eb900301..c39c785bba94 100644
--- a/include/asm-sh/sh03/io.h
+++ b/include/asm-sh/sh03/io.h
@@ -11,22 +11,13 @@
 #include <linux/time.h>
-#define INTC_IPRD       0xffd00010UL
 #define IRL0_IRQ        2
-#define IRL0_IPR_POS    3
 #define IRL0_PRIORITY   13
 #define IRL1_IRQ        5
-#define IRL1_IPR_POS    2
 #define IRL1_PRIORITY   10
 #define IRL2_IRQ        8
-#define IRL2_IPR_POS    1
 #define IRL2_PRIORITY   7
 #define IRL3_IRQ        11
-#define IRL3_IPR_POS    0
 #define IRL3_PRIORITY   4
 void heartbeat_sh03(void);
diff --git a/include/asm-sh/smp.h b/include/asm-sh/smp.h
index b99ca786c0c1..9c8d34b07ebf 100644
--- a/include/asm-sh/smp.h
+++ b/include/asm-sh/smp.h
@@ -1,12 +1,3 @@
-/*
- * include/asm-sh/smp.h
- *
- * Copyright (C) 2002, 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_SH_SMP_H
 #define __ASM_SH_SMP_H
@@ -20,6 +11,15 @@
 #include <asm/current.h>
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
+#define hard_smp_processor_id() plat_smp_processor_id()
+/* Map from cpu id to sequential logical cpu number. */
+extern int __cpu_number_map[NR_CPUS];
+#define cpu_number_map(cpu)  __cpu_number_map[cpu]
+/* The reverse map from sequential logical cpu number to cpu id.  */
+extern int __cpu_logical_map[NR_CPUS];
+#define cpu_logical_map(cpu)  __cpu_logical_map[cpu]
 /* I've no idea what the real meaning of this is */
 #define PROC_CHANGE_PENALTY     20
@@ -35,10 +35,22 @@ struct smp_fn_call_struct {
 extern struct smp_fn_call_struct smp_fn_call;
-#define SMP_MSG_RESCHEDULE      0x0001
+#define SMP_MSG_FUNCTION        0
+#define SMP_MSG_RESCHEDULE      1
+#define SMP_MSG_NR              2
-#endif /* CONFIG_SMP */
+void plat_smp_setup(void);
+void plat_prepare_cpus(unsigned int max_cpus);
+int plat_smp_processor_id(void);
+void plat_start_cpu(unsigned int cpu, unsigned long entry_point);
+void plat_send_ipi(unsigned int cpu, unsigned int message);
+int plat_register_ipi_handler(unsigned int message,
+                              void (*handler)(void *), void *arg);
+#else
 #define hard_smp_processor_id() (0)
+#endif /* CONFIG_SMP */
 #endif /* __ASM_SH_SMP_H */
diff --git a/include/asm-sh/snapgear.h b/include/asm-sh/snapgear.h
index 3554e3a74e99..042d95f51c4d 100644
--- a/include/asm-sh/snapgear.h
+++ b/include/asm-sh/snapgear.h
@@ -19,20 +19,16 @@
 * is the interrupt :-)
 */
-#define IRL0_IRQ                2
+#define IRL0_IRQ        2
-#define IRL0_IPR_POS    3
 #define IRL0_PRIORITY   13
-#define IRL1_IRQ                5
+#define IRL1_IRQ        5
-#define IRL1_IPR_POS    2
 #define IRL1_PRIORITY   10
-#define IRL2_IRQ                8
+#define IRL2_IRQ        8
-#define IRL2_IPR_POS    1
 #define IRL2_PRIORITY   7
-#define IRL3_IRQ                11
+#define IRL3_IRQ        11
-#define IRL3_IPR_POS    0
 #define IRL3_PRIORITY   4
 #endif
diff --git a/include/asm-sh/spinlock.h b/include/asm-sh/spinlock.h
index 92f6e2008b2e..e793181d64da 100644
--- a/include/asm-sh/spinlock.h
+++ b/include/asm-sh/spinlock.h
@@ -2,6 +2,7 @@
 * include/asm-sh/spinlock.h
 *
 * Copyright (C) 2002, 2003 Paul Mundt
+ * Copyright (C) 2006, 2007 Akio Idehara
 *
 * 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
@@ -10,17 +11,22 @@
 #ifndef __ASM_SH_SPINLOCK_H
 #define __ASM_SH_SPINLOCK_H
-#include <asm/atomic.h>
+/*
-#include <asm/spinlock_types.h>
+ * The only locking implemented here uses SH-4A opcodes. For others,
+ * split this out as per atomic-*.h.
+ */
+#ifndef CONFIG_CPU_SH4A
+#error "Need movli.l/movco.l for spinlocks"
+#endif
 /*
 * Your basic SMP spinlocks, allowing only a single CPU anywhere
 */
-#define __raw_spin_is_locked(x) ((x)->lock != 0)
+#define __raw_spin_is_locked(x)         ((x)->lock <= 0)
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
 #define __raw_spin_unlock_wait(x) \
-        do { cpu_relax(); } while (__raw_spin_is_locked(x))
+        do { cpu_relax(); } while ((x)->lock)
 /*
 * Simple spin lock operations.  There are two variants, one clears IRQ's
@@ -30,12 +36,19 @@
 */
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
+        unsigned long tmp;
+        unsigned long oldval;
        __asm__ __volatile__ (
-                "1:\n\t"
+                "1:                                             \n\t"
-                "tas.b @%0\n\t"
+                "movli.l        @%2, %0 ! __raw_spin_lock       \n\t"
-                "bf/s 1b\n\t"
+                "mov            %0, %1                          \n\t"
-                "nop\n\t"
+                "mov            #0, %0                          \n\t"
-                : "=r" (lock->lock)
+                "movco.l        %0, @%2                         \n\t"
+                "bf             1b                              \n\t"
+                "cmp/pl         %1                              \n\t"
+                "bf             1b                              \n\t"
+                : "=&z" (tmp), "=&r" (oldval)
                : "r" (&lock->lock)
                : "t", "memory"
        );
@@ -43,12 +56,36 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
-        //assert_spin_locked(lock);
+        unsigned long tmp;
-        lock->lock = 0;
+        __asm__ __volatile__ (
+                "mov            #1, %0 ! __raw_spin_unlock      \n\t"
+                "mov.l          %0, @%1                         \n\t"
+                : "=&z" (tmp)
+                : "r" (&lock->lock)
+                : "t", "memory"
+        );
 }
-#define __raw_spin_trylock(x) (!test_and_set_bit(0, &(x)->lock))
+static inline int __raw_spin_trylock(raw_spinlock_t *lock)
+{
+        unsigned long tmp, oldval;
+        __asm__ __volatile__ (
+                "1:                                             \n\t"
+                "movli.l        @%2, %0 ! __raw_spin_trylock    \n\t"
+                "mov            %0, %1                          \n\t"
+                "mov            #0, %0                          \n\t"
+                "movco.l        %0, @%2                         \n\t"
+                "bf             1b                              \n\t"
+                "synco                                          \n\t"
+                : "=&z" (tmp), "=&r" (oldval)
+                : "r" (&lock->lock)
+                : "t", "memory"
+        );
+        return oldval;
+}
 /*
 * Read-write spinlocks, allowing multiple readers but only one writer.
@@ -59,58 +96,124 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 * read-locks.
 */
+/**
+ * read_can_lock - would read_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define __raw_read_can_lock(x)  ((x)->lock > 0)
+/**
+ * write_can_lock - would write_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define __raw_write_can_lock(x) ((x)->lock == RW_LOCK_BIAS)
 static inline void __raw_read_lock(raw_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->lock);
+        unsigned long tmp;
-        atomic_inc(&rw->counter);
-        __raw_spin_unlock(&rw->lock);
+        __asm__ __volatile__ (
+                "1:                                             \n\t"
+                "movli.l        @%1, %0 ! __raw_read_lock       \n\t"
+                "cmp/pl         %0                              \n\t"
+                "bf             1b                              \n\t"
+                "add            #-1, %0                         \n\t"
+                "movco.l        %0, @%1                         \n\t"
+                "bf             1b                              \n\t"
+                : "=&z" (tmp)
+                : "r" (&rw->lock)
+                : "t", "memory"
+        );
 }
 static inline void __raw_read_unlock(raw_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->lock);
+        unsigned long tmp;
-        atomic_dec(&rw->counter);
-        __raw_spin_unlock(&rw->lock);
+        __asm__ __volatile__ (
+                "1:                                             \n\t"
+                "movli.l        @%1, %0 ! __raw_read_unlock     \n\t"
+                "add            #1, %0                          \n\t"
+                "movco.l        %0, @%1                         \n\t"
+                "bf             1b                              \n\t"
+                : "=&z" (tmp)
+                : "r" (&rw->lock)
+                : "t", "memory"
+        );
 }
 static inline void __raw_write_lock(raw_rwlock_t *rw)
 {
-        __raw_spin_lock(&rw->lock);
+        unsigned long tmp;
-        atomic_set(&rw->counter, -1);
+        __asm__ __volatile__ (
+                "1:                                             \n\t"
+                "movli.l        @%1, %0 ! __raw_write_lock      \n\t"
+                "cmp/hs         %2, %0                          \n\t"
+                "bf             1b                              \n\t"
+                "sub            %2, %0                          \n\t"
+                "movco.l        %0, @%1                         \n\t"
+                "bf             1b                              \n\t"
+                : "=&z" (tmp)
+                : "r" (&rw->lock), "r" (RW_LOCK_BIAS)
+                : "t", "memory"
+        );
 }
 static inline void __raw_write_unlock(raw_rwlock_t *rw)
 {
-        atomic_set(&rw->counter, 0);
+        __asm__ __volatile__ (
-        __raw_spin_unlock(&rw->lock);
+                "mov.l          %1, @%0 ! __raw_write_unlock    \n\t"
+                :
+                : "r" (&rw->lock), "r" (RW_LOCK_BIAS)
+                : "t", "memory"
+        );
 }
-static inline int __raw_write_can_lock(raw_rwlock_t *rw)
+static inline int __raw_read_trylock(raw_rwlock_t *rw)
 {
-        return (atomic_read(&rw->counter) == RW_LOCK_BIAS);
+        unsigned long tmp, oldval;
-}
-static inline int __raw_read_trylock(raw_rwlock_t *lock)
+        __asm__ __volatile__ (
-{
+                "1:                                             \n\t"
-        atomic_t *count = (atomic_t*)lock;
+                "movli.l        @%2, %0 ! __raw_read_trylock    \n\t"
-        if (atomic_dec_return(count) >= 0)
+                "mov            %0, %1                          \n\t"
-                return 1;
+                "cmp/pl         %0                              \n\t"
-        atomic_inc(count);
+                "bf             2f                              \n\t"
-        return 0;
+                "add            #-1, %0                         \n\t"
+                "movco.l        %0, @%2                         \n\t"
+                "bf             1b                              \n\t"
+                "2:                                             \n\t"
+                "synco                                          \n\t"
+                : "=&z" (tmp), "=&r" (oldval)
+                : "r" (&rw->lock)
+                : "t", "memory"
+        );
+        return (oldval > 0);
 }
 static inline int __raw_write_trylock(raw_rwlock_t *rw)
 {
-        if (atomic_sub_and_test(RW_LOCK_BIAS, &rw->counter))
+        unsigned long tmp, oldval;
-                return 1;
-        
+        __asm__ __volatile__ (
-        atomic_add(RW_LOCK_BIAS, &rw->counter);
+                "1:                                             \n\t"
+                "movli.l        @%2, %0 ! __raw_write_trylock   \n\t"
+                "mov            %0, %1                          \n\t"
+                "cmp/hs         %3, %0                          \n\t"
+                "bf             2f                              \n\t"
+                "sub            %3, %0                          \n\t"
+                "2:                                             \n\t"
+                "movco.l        %0, @%2                         \n\t"
+                "bf             1b                              \n\t"
+                "synco                                          \n\t"
+                : "=&z" (tmp), "=&r" (oldval)
+                : "r" (&rw->lock), "r" (RW_LOCK_BIAS)
+                : "t", "memory"
+        );
-        return 0;
+        return (oldval > (RW_LOCK_BIAS - 1));
 }
 #define _raw_spin_relax(lock)   cpu_relax()
diff --git a/include/asm-sh/spinlock_types.h b/include/asm-sh/spinlock_types.h
index 5c58134f2c4e..b4d244e7b60c 100644
--- a/include/asm-sh/spinlock_types.h
+++ b/include/asm-sh/spinlock_types.h
@@ -6,19 +6,16 @@
 #endif
 typedef struct {
-        volatile unsigned long lock;
+        volatile unsigned int lock;
 } raw_spinlock_t;
-#define __RAW_SPIN_LOCK_UNLOCKED        { 1 }
+#define __RAW_SPIN_LOCK_UNLOCKED                { 1 }
-#include <asm/atomic.h>
 typedef struct {
-        raw_spinlock_t lock;
+        volatile unsigned int lock;
-        atomic_t counter;
 } raw_rwlock_t;
 #define RW_LOCK_BIAS                    0x01000000
-#define __RAW_RW_LOCK_UNLOCKED          { { 0 }, { RW_LOCK_BIAS } }
+#define __RAW_RW_LOCK_UNLOCKED          { RW_LOCK_BIAS }
 #endif
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 245042537205..9d849e6df268 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -266,6 +266,7 @@ void disable_hlt(void);
 void enable_hlt(void);
 void default_idle(void);
+void per_cpu_trap_init(void);
 asmlinkage void break_point_trap(void);
 asmlinkage void debug_trap_handler(unsigned long r4, unsigned long r5,
diff --git a/include/asm-sh/voyagergx.h b/include/asm-sh/voyagergx.h
index 64c936b22715..d825596562df 100644
--- a/include/asm-sh/voyagergx.h
+++ b/include/asm-sh/voyagergx.h
@@ -27,13 +27,35 @@
 #define VOYAGER_UART_BASE               (0x30000 + VOYAGER_BASE)
 #define VOYAGER_AC97_BASE               (0xa0000 + VOYAGER_BASE)
-#define VOYAGER_IRQ_NUM                 32
+#define VOYAGER_IRQ_NUM                 26
-#define VOYAGER_IRQ_BASE                50
+#define VOYAGER_IRQ_BASE                200
-#define VOYAGER_USBH_IRQ                VOYAGER_IRQ_BASE + 6
-#define VOYAGER_8051_IRQ                VOYAGER_IRQ_BASE + 10
+#define IRQ_SM501_UP                    (VOYAGER_IRQ_BASE + 0)
-#define VOYAGER_UART0_IRQ               VOYAGER_IRQ_BASE + 12
+#define IRQ_SM501_G54                   (VOYAGER_IRQ_BASE + 1)
-#define VOYAGER_UART1_IRQ               VOYAGER_IRQ_BASE + 13
+#define IRQ_SM501_G53                   (VOYAGER_IRQ_BASE + 2)
-#define VOYAGER_AC97_IRQ                VOYAGER_IRQ_BASE + 17
+#define IRQ_SM501_G52                   (VOYAGER_IRQ_BASE + 3)
+#define IRQ_SM501_G51                   (VOYAGER_IRQ_BASE + 4)
+#define IRQ_SM501_G50                   (VOYAGER_IRQ_BASE + 5)
+#define IRQ_SM501_G49                   (VOYAGER_IRQ_BASE + 6)
+#define IRQ_SM501_G48                   (VOYAGER_IRQ_BASE + 7)
+#define IRQ_SM501_I2C                   (VOYAGER_IRQ_BASE + 8)
+#define IRQ_SM501_PW                    (VOYAGER_IRQ_BASE + 9)
+#define IRQ_SM501_DMA                   (VOYAGER_IRQ_BASE + 10)
+#define IRQ_SM501_PCI                   (VOYAGER_IRQ_BASE + 11)
+#define IRQ_SM501_I2S                   (VOYAGER_IRQ_BASE + 12)
+#define IRQ_SM501_AC                    (VOYAGER_IRQ_BASE + 13)
+#define IRQ_SM501_US                    (VOYAGER_IRQ_BASE + 14)
+#define IRQ_SM501_U1                    (VOYAGER_IRQ_BASE + 15)
+#define IRQ_SM501_U0                    (VOYAGER_IRQ_BASE + 16)
+#define IRQ_SM501_CV                    (VOYAGER_IRQ_BASE + 17)
+#define IRQ_SM501_MC                    (VOYAGER_IRQ_BASE + 18)
+#define IRQ_SM501_S1                    (VOYAGER_IRQ_BASE + 19)
+#define IRQ_SM501_S0                    (VOYAGER_IRQ_BASE + 20)
+#define IRQ_SM501_UH                    (VOYAGER_IRQ_BASE + 21)
+#define IRQ_SM501_2D                    (VOYAGER_IRQ_BASE + 22)
+#define IRQ_SM501_ZD                    (VOYAGER_IRQ_BASE + 23)
+#define IRQ_SM501_PV                    (VOYAGER_IRQ_BASE + 24)
+#define IRQ_SM501_CI                    (VOYAGER_IRQ_BASE + 25)
 /* ----- MISC controle  register ------------------------------ */
 #define MISC_CTRL                       (0x000004 + VOYAGER_BASE)
@@ -313,4 +335,7 @@
 void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
 int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
+/* arch/sh/cchips/voyagergx/irq.c */
+void setup_voyagergx_irq(void);
 #endif /* _VOYAGER_GX_REG_H */
diff --git a/include/asm-sh64/gpio.h b/include/asm-sh64/gpio.h
new file mode 100644
index 000000000000..6bc5a13d8415
--- /dev/null
+++ b/include/asm-sh64/gpio.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH64_GPIO_H
+#define __ASM_SH64_GPIO_H
+/*
+ * This is just a stub, so that every arch using sh-sci has a gpio.h
+ */
+#endif /* __ASM_SH64_GPIO_H */
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
index 1f37b6931922..3de3ad99f457 100644
--- a/include/asm-sh64/io.h
+++ b/include/asm-sh64/io.h
@@ -119,6 +119,13 @@ void insw(unsigned long port, void *addr, unsigned long count);
 void outsl(unsigned long port, const void *addr, unsigned long count);
 void insl(unsigned long port, void *addr, unsigned long count);
+#define inb_p(addr)    inb(addr)
+#define inw_p(addr)    inw(addr)
+#define inl_p(addr)    inl(addr)
+#define outb_p(x,addr) outb(x,addr)
+#define outw_p(x,addr) outw(x,addr)
+#define outl_p(x,addr) outl(x,addr)
 #define __raw_readb             readb
 #define __raw_readw             readw
 #define __raw_readl             readl
diff --git a/include/asm-sparc/irqflags.h b/include/asm-sparc/irqflags.h
new file mode 100644
index 000000000000..db398fb32826
--- /dev/null
+++ b/include/asm-sparc/irqflags.h
@@ -0,0 +1,39 @@
+/*
+ * include/asm-sparc/irqflags.h
+ *
+ * IRQ flags handling
+ *
+ * This file gets included from lowlevel asm headers too, to provide
+ * wrapped versions of the local_irq_*() APIs, based on the
+ * raw_local_irq_*() functions from the lowlevel headers.
+ */
+#ifndef _ASM_IRQFLAGS_H
+#define _ASM_IRQFLAGS_H
+#ifndef __ASSEMBLY__
+extern void raw_local_irq_restore(unsigned long);
+extern unsigned long __raw_local_irq_save(void);
+extern void raw_local_irq_enable(void);
+static inline unsigned long getipl(void)
+{
+        unsigned long retval;
+        __asm__ __volatile__("rd        %%psr, %0" : "=r" (retval));
+        return retval;
+}
+#define raw_local_save_flags(flags) ((flags) = getipl())
+#define raw_local_irq_save(flags)   ((flags) = __raw_local_irq_save())
+#define raw_local_irq_disable()     ((void) __raw_local_irq_save())
+#define raw_irqs_disabled()         ((getipl() & PSR_PIL) != 0)
+static inline int raw_irqs_disabled_flags(unsigned long flags)
+{
+        return ((flags & PSR_PIL) != 0);
+}
+#endif /* (__ASSEMBLY__) */
+#endif /* !(_ASM_IRQFLAGS_H) */
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index d1a2572e3f55..8c259de02614 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -15,6 +15,8 @@
 #ifndef __ASSEMBLY__
+#include <linux/irqflags.h>
 /*
 * Sparc (general) CPU types
 */
@@ -164,26 +166,6 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
          "o0", "o1", "o2", "o3",                   "o7");      \
        } while(0)
-/*
- * Changing the IRQ level on the Sparc.
- */
-extern void local_irq_restore(unsigned long);
-extern unsigned long __local_irq_save(void);
-extern void local_irq_enable(void);
-static inline unsigned long getipl(void)
-{
-        unsigned long retval;
-        __asm__ __volatile__("rd        %%psr, %0" : "=r" (retval));
-        return retval;
-}
-#define local_save_flags(flags) ((flags) = getipl())
-#define local_irq_save(flags)   ((flags) = __local_irq_save())
-#define local_irq_disable()     ((void) __local_irq_save())
-#define irqs_disabled()         ((getipl() & PSR_PIL) != 0)
 /* XXX Change this if we ever use a PSO mode kernel. */
 #define mb()    __asm__ __volatile__ ("" : : : "memory")
 #define rmb()   mb()
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index 98a6e609163e..542421460a12 100644
--- a/include/asm-sparc64/cpudata.h
+++ b/include/asm-sparc64/cpudata.h
@@ -75,12 +75,11 @@ struct trap_per_cpu {
        unsigned long           tsb_huge_temp;
 /* Dcache line 8: IRQ work list, and keep trap_block a power-of-2 in size.  */
-        unsigned int            irq_worklist;
+        unsigned long           irq_worklist_pa;
        unsigned int            cpu_mondo_qmask;
        unsigned int            dev_mondo_qmask;
        unsigned int            resum_qmask;
        unsigned int            nonresum_qmask;
-        unsigned int            __pad2[1];
        void                    *hdesc;
 } __attribute__((aligned(64)));
 extern struct trap_per_cpu trap_block[NR_CPUS];
@@ -128,11 +127,11 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
 #define TRAP_PER_CPU_CPU_LIST_PA        0xc8
 #define TRAP_PER_CPU_TSB_HUGE           0xd0
 #define TRAP_PER_CPU_TSB_HUGE_TEMP      0xd8
-#define TRAP_PER_CPU_IRQ_WORKLIST       0xe0
+#define TRAP_PER_CPU_IRQ_WORKLIST_PA    0xe0
-#define TRAP_PER_CPU_CPU_MONDO_QMASK    0xe4
+#define TRAP_PER_CPU_CPU_MONDO_QMASK    0xe8
-#define TRAP_PER_CPU_DEV_MONDO_QMASK    0xe8
+#define TRAP_PER_CPU_DEV_MONDO_QMASK    0xec
-#define TRAP_PER_CPU_RESUM_QMASK        0xec
+#define TRAP_PER_CPU_RESUM_QMASK        0xf0
-#define TRAP_PER_CPU_NONRESUM_QMASK     0xf0
+#define TRAP_PER_CPU_NONRESUM_QMASK     0xf4
 #define TRAP_BLOCK_SZ_SHIFT             8
@@ -184,9 +183,9 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
 /* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
-#define TRAP_LOAD_IRQ_WORK(DEST, TMP)           \
+#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST, DEST;
+        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
 /* Clobbers TMP, loads DEST with current thread info pointer.  */
 #define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
@@ -223,9 +222,9 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
        ldx     [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
 /* Clobbers TMP, loads local processor's IRQ work area into DEST.  */
-#define TRAP_LOAD_IRQ_WORK(DEST, TMP)           \
+#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)        \
        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
-        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST, DEST;
+        add     DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;
 #define TRAP_LOAD_THREAD_REG(DEST, TMP)         \
        TRAP_LOAD_TRAP_BLOCK(DEST, TMP)         \
diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index c00ad152771b..182dba05c702 100644
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -51,10 +51,19 @@ extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,
                                    unsigned int msi_devino_start,
                                    unsigned int msi_devino_end);
 extern void sun4v_destroy_msi(unsigned int virt_irq);
+extern unsigned int sun4u_build_msi(u32 portid, unsigned int *virt_irq_p,
+                                    unsigned int msi_devino_start,
+                                    unsigned int msi_devino_end,
+                                    unsigned long imap_base,
+                                    unsigned long iclr_base);
+extern void sun4u_destroy_msi(unsigned int virt_irq);
 extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
-extern void sparc64_set_msi(unsigned int virt_irq, u32 msi);
+extern unsigned char virt_irq_alloc(unsigned int dev_handle,
-extern u32 sparc64_get_msi(unsigned int virt_irq);
+                                    unsigned int dev_ino);
+#ifdef CONFIG_PCI_MSI
+extern void virt_irq_free(unsigned int virt_irq);
+#endif
 extern void fixup_irqs(void);
diff --git a/include/asm-x86/cpufeature_64.h b/include/asm-x86/cpufeature_64.h
index 2983501e8b3e..e18496b7b850 100644
--- a/include/asm-x86/cpufeature_64.h
+++ b/include/asm-x86/cpufeature_64.h
@@ -7,7 +7,7 @@
 #ifndef __ASM_X8664_CPUFEATURE_H
 #define __ASM_X8664_CPUFEATURE_H
-#include <asm/cpufeature_32.h>
+#include "cpufeature_32.h"
 #undef  cpu_has_vme
 #define cpu_has_vme            0
diff --git a/include/asm-x86/io_apic_32.h b/include/asm-x86/io_apic_32.h
index dbe734ddf2af..3f087883ea48 100644
--- a/include/asm-x86/io_apic_32.h
+++ b/include/asm-x86/io_apic_32.h
@@ -11,8 +11,6 @@
 * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
 */
-#ifdef CONFIG_X86_IO_APIC
 /*
 * The structure of the IO-APIC:
 */
@@ -55,12 +53,6 @@ union IO_APIC_reg_03 {
        } __attribute__ ((packed)) bits;
 };
-/*
- * # of IO-APICs and # of IRQ routing registers
- */
-extern int nr_ioapics;
-extern int nr_ioapic_registers[MAX_IO_APICS];
 enum ioapic_irq_destination_types {
        dest_Fixed = 0,
        dest_LowestPrio = 1,
@@ -100,6 +92,14 @@ struct IO_APIC_route_entry {
 } __attribute__ ((packed));
+#ifdef CONFIG_X86_IO_APIC
+/*
+ * # of IO-APICs and # of IRQ routing registers
+ */
+extern int nr_ioapics;
+extern int nr_ioapic_registers[MAX_IO_APICS];
 /*
 * MP-BIOS irq configuration table structures:
 */
diff --git a/include/asm-x86/irqflags_32.h b/include/asm-x86/irqflags_32.h
index eff8585cb741..d058b04e0083 100644
--- a/include/asm-x86/irqflags_32.h
+++ b/include/asm-x86/irqflags_32.h
@@ -160,4 +160,17 @@ static inline int raw_irqs_disabled(void)
 # define TRACE_IRQS_OFF
 #endif
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define LOCKDEP_SYS_EXIT                       \
+        pushl %eax;                             \
+        pushl %ecx;                             \
+        pushl %edx;                             \
+        call lockdep_sys_exit;                  \
+        popl %edx;                              \
+        popl %ecx;                              \
+        popl %eax;
+#else
+# define LOCKDEP_SYS_EXIT
+#endif
 #endif
diff --git a/include/asm-x86/irqflags_64.h b/include/asm-x86/irqflags_64.h
index 86e70fe23659..5341ea1f815a 100644
--- a/include/asm-x86/irqflags_64.h
+++ b/include/asm-x86/irqflags_64.h
@@ -137,6 +137,20 @@ static inline void halt(void)
 #  define TRACE_IRQS_ON
 #  define TRACE_IRQS_OFF
 # endif
+# ifdef CONFIG_DEBUG_LOCK_ALLOC
+#  define LOCKDEP_SYS_EXIT      call lockdep_sys_exit_thunk
+#  define LOCKDEP_SYS_EXIT_IRQ  \
+        TRACE_IRQS_ON; \
+        sti; \
+        SAVE_REST; \
+        LOCKDEP_SYS_EXIT; \
+        RESTORE_REST; \
+        cli; \
+        TRACE_IRQS_OFF;
+# else
+#  define LOCKDEP_SYS_EXIT
+#  define LOCKDEP_SYS_EXIT_IRQ
+# endif
 #endif
 #endif
diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h
index 5404e90edd57..199cab107d85 100644
--- a/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@ -63,7 +63,7 @@
 /*
 * x86-64 Task Priority Register, CR8
 */
-#define X86_CR8_TPR     0x00000007 /* task priority register */
+#define X86_CR8_TPR     0x0000000F /* task priority register */
 /*
 * AMD and Transmeta use MSRs for configuration; see <asm/msr-index.h>
diff --git a/include/asm-x86/system_32.h b/include/asm-x86/system_32.h
index d69ba937e092..e7e5d426fef5 100644
--- a/include/asm-x86/system_32.h
+++ b/include/asm-x86/system_32.h
@@ -216,6 +216,7 @@ static inline unsigned long get_limit(unsigned long segment)
 #define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
 #define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
+#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
 /**
 * read_barrier_depends - Flush all pending reads that subsequents reads
@@ -271,18 +272,18 @@ static inline unsigned long get_limit(unsigned long segment)
 #define read_barrier_depends()  do { } while(0)
+#ifdef CONFIG_SMP
+#define smp_mb()        mb()
+#ifdef CONFIG_X86_PPRO_FENCE
+# define smp_rmb()      rmb()
+#else
+# define smp_rmb()      barrier()
+#endif
 #ifdef CONFIG_X86_OOSTORE
-/* Actually there are no OOO store capable CPUs for now that do SSE, 
+# define smp_wmb()      wmb()
-   but make it already an possibility. */
-#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
 #else
-#define wmb()   __asm__ __volatile__ ("": : :"memory")
+# define smp_wmb()      barrier()
 #endif
-#ifdef CONFIG_SMP
-#define smp_mb()        mb()
-#define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
 #define smp_read_barrier_depends()      read_barrier_depends()
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #else
diff --git a/include/asm-x86/system_64.h b/include/asm-x86/system_64.h
index 02175aa1d16a..5022aecc333d 100644
--- a/include/asm-x86/system_64.h
+++ b/include/asm-x86/system_64.h
@@ -141,8 +141,8 @@ static inline void write_cr8(unsigned long val)
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
-#define smp_rmb()       rmb()
+#define smp_rmb()       barrier()
-#define smp_wmb()       wmb()
+#define smp_wmb()       barrier()
 #define smp_read_barrier_depends()      do {} while(0)
 #else
 #define smp_mb()        barrier()
@@ -159,12 +159,8 @@ static inline void write_cr8(unsigned long val)
 */
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
-#ifdef CONFIG_UNORDERED_IO
 #define wmb()   asm volatile("sfence" ::: "memory")
-#else
-#define wmb()   asm volatile("" ::: "memory")
-#endif
 #define read_barrier_depends()  do {} while(0)
 #define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index bfb8ec791b7b..09fbf7e5a6cb 100644
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -197,7 +197,7 @@ struct agp_file_private {
        struct agp_file_private *next;
        struct agp_file_private *prev;
        pid_t my_pid;
-        long access_flags;      /* long req'd for set_bit --RR */
+        unsigned long access_flags;     /* long req'd for set_bit --RR */
 };
 struct agp_front_data {
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index d2ddea926895..c33b0dc28e4d 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -31,6 +31,7 @@ enum clock_event_nofitiers {
        CLOCK_EVT_NOTIFY_ADD,
        CLOCK_EVT_NOTIFY_BROADCAST_ON,
        CLOCK_EVT_NOTIFY_BROADCAST_OFF,
+        CLOCK_EVT_NOTIFY_BROADCAST_FORCE,
        CLOCK_EVT_NOTIFY_BROADCAST_ENTER,
        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
        CLOCK_EVT_NOTIFY_SUSPEND,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 16421f662a7a..6d760f1ad875 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1302,8 +1302,14 @@ struct file_system_type {
        struct module *owner;
        struct file_system_type * next;
        struct list_head fs_supers;
        struct lock_class_key s_lock_key;
        struct lock_class_key s_umount_key;
+        struct lock_class_key i_lock_key;
+        struct lock_class_key i_mutex_key;
+        struct lock_class_key i_mutex_dir_key;
+        struct lock_class_key i_alloc_sem_key;
 };
 extern int get_sb_bdev(struct file_system_type *fs_type,
diff --git a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h
index 4f6ee3b267fa..bf6302f6b5f8 100644
--- a/include/linux/hdlcdrv.h
+++ b/include/linux/hdlcdrv.h
@@ -200,7 +200,7 @@ struct hdlcdrv_state {
        struct hdlcdrv_hdlcrx {
                struct hdlcdrv_hdlcbuffer hbuf;
-                long in_hdlc_rx;
+                unsigned long in_hdlc_rx;
                /* 0 = sync hunt, != 0 receiving */
                int rx_state;   
                unsigned int bitstream;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 898103b401f1..edb8024d744b 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -29,13 +29,6 @@
 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
 */
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/input.h>
 /*
 * USB HID (Human Interface Device) interface class code
 */
@@ -69,6 +62,17 @@
 #define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
 #define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
+#define HID_MAX_DESCRIPTOR_SIZE         4096
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
 /*
 * We parse each description item into this structure. Short items data
 * values are expanded to 32-bit signed int, long items contain a pointer
@@ -276,6 +280,7 @@ struct hid_item {
 #define HID_QUIRK_HIDINPUT                      0x00200000
 #define HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL 0x00400000
 #define HID_QUIRK_LOGITECH_EXPANDED_KEYMAP      0x00800000
+#define HID_QUIRK_IGNORE_HIDINPUT               0x01000000
 /*
 * Separate quirks for runtime report descriptor fixup
@@ -285,6 +290,7 @@ struct hid_item {
 #define HID_QUIRK_RDESC_LOGITECH                0x00000002
 #define HID_QUIRK_RDESC_SWAPPED_MIN_MAX         0x00000004
 #define HID_QUIRK_RDESC_PETALYNX                0x00000008
+#define HID_QUIRK_RDESC_MACBOOK_JIS             0x00000010
 /*
 * This is the global environment of the parser. This information is
@@ -309,7 +315,6 @@ struct hid_global {
 * This is the local environment. It is persistent up the next main-item.
 */
-#define HID_MAX_DESCRIPTOR_SIZE         4096
 #define HID_MAX_USAGES                  8192
 #define HID_DEFAULT_NUM_COLLECTIONS     16
@@ -403,6 +408,7 @@ struct hid_control_fifo {
 #define HID_CLAIMED_INPUT       1
 #define HID_CLAIMED_HIDDEV      2
+#define HID_CLAIMED_HIDRAW      4
 #define HID_CTRL_RUNNING        1
 #define HID_OUT_RUNNING         2
@@ -438,6 +444,7 @@ struct hid_device {							/* device report descriptor */
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */
+        void *hidraw;
        int minor;                                                      /* Hiddev minor number */
        wait_queue_head_t wait;                                         /* For sleeping */
@@ -458,6 +465,9 @@ struct hid_device {							/* device report descriptor */
        void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
                                  struct hid_usage *, __s32);
        void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
+        /* handler for raw output data, used by hidraw */
+        int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t);
 #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
        unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
        unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
@@ -553,4 +563,5 @@ static inline int hid_ff_init(struct hid_device *hid) { return -1; }
 #define err_hid(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
                __FILE__ , ## arg)
 #endif
+#endif
diff --git a/include/linux/hidraw.h b/include/linux/hidraw.h
new file mode 100644
index 000000000000..0536f299f7ff
--- /dev/null
+++ b/include/linux/hidraw.h
@@ -0,0 +1,86 @@
+#ifndef _HIDRAW_H
+#define _HIDRAW_H
+/*
+ *  Copyright (c) 2007 Jiri Kosina
+ */
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <linux/hid.h>
+struct hidraw_report_descriptor {
+        __u32 size;
+        __u8 value[HID_MAX_DESCRIPTOR_SIZE];
+};
+struct hidraw_devinfo {
+        __u32 bustype;
+        __s16 vendor;
+        __s16 product;
+};
+/* ioctl interface */
+#define HIDIOCGRDESCSIZE        _IOR('H', 0x01, int)
+#define HIDIOCGRDESC            _IOR('H', 0x02, struct hidraw_report_descriptor)
+#define HIDIOCGRAWINFO          _IOR('H', 0x03, struct hidraw_devinfo)
+#define HIDRAW_FIRST_MINOR 0
+#define HIDRAW_MAX_DEVICES 64
+/* number of reports to buffer */
+#define HIDRAW_BUFFER_SIZE 64
+/* kernel-only API declarations */
+#ifdef __KERNEL__
+struct hidraw {
+        unsigned int minor;
+        int exist;
+        int open;
+        wait_queue_head_t wait;
+        struct hid_device *hid;
+        struct device *dev;
+        struct list_head list;
+};
+struct hidraw_report {
+        __u8 *value;
+        int len;
+};
+struct hidraw_list {
+        struct hidraw_report buffer[HIDRAW_BUFFER_SIZE];
+        int head;
+        int tail;
+        struct fasync_struct *fasync;
+        struct hidraw *hidraw;
+        struct list_head node;
+        struct mutex read_mutex;
+};
+#ifdef CONFIG_HIDRAW
+int hidraw_init(void);
+void hidraw_exit(void);
+void hidraw_report_event(struct hid_device *, u8 *, int);
+int hidraw_connect(struct hid_device *);
+void hidraw_disconnect(struct hid_device *);
+#else
+static inline int hidraw_init(void) { return 0; }
+static inline void hidraw_exit(void) { }
+static inline void hidraw_report_event(struct hid_device *hid, u8 *data, int len) { }
+static inline int hidraw_connect(struct hid_device *hid) { return -1; }
+static inline void hidraw_disconnect(struct hid_device *hid) { }
+#endif
+#endif
+#endif
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 0efd994c37f1..6b6ee702b007 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -16,9 +16,9 @@
 #include <linux/device.h>
-struct class_device *hwmon_device_register(struct device *dev);
+struct device *hwmon_device_register(struct device *dev);
-void hwmon_device_unregister(struct class_device *cdev);
+void hwmon_device_unregister(struct device *dev);
 /* Scale user input to sensible values */
 static inline int SENSORS_LIMIT(long value, long low, long high)
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index 81c229a0fbca..311315b56b61 100644
--- a/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
@@ -25,8 +25,31 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
-/* Some IOCTL commands are defined in <linux/i2c.h> */
+/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
-/* Note: 10-bit addresses are NOT supported! */
+ * unsigned long, except for:
+ *      - I2C_FUNCS, takes pointer to an unsigned long
+ *      - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
+ *      - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
+ */
+#define I2C_RETRIES     0x0701  /* number of times a device address should
+                                   be polled when not acknowledging */
+#define I2C_TIMEOUT     0x0702  /* set timeout in jiffies - call with int */
+/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
+ * are NOT supported! (due to code brokenness)
+ */
+#define I2C_SLAVE       0x0703  /* Use this slave address */
+#define I2C_SLAVE_FORCE 0x0706  /* Use this slave address, even if it
+                                   is already in use by a driver! */
+#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit */
+#define I2C_FUNCS       0x0705  /* Get the adapter functionality mask */
+#define I2C_RDWR        0x0707  /* Combined R/W transfer (one STOP only) */
+#define I2C_PEC         0x0708  /* != 0 to use PEC with SMBus */
+#define I2C_SMBUS       0x0720  /* SMBus transfer */
 /* This is the structure as used in the I2C_SMBUS ioctl call */
 struct i2c_smbus_ioctl_data {
@@ -44,4 +67,8 @@ struct i2c_rdwr_ioctl_data {
 #define  I2C_RDRW_IOCTL_MAX_MSGS        42
+#ifdef __KERNEL__
+#define I2C_MAJOR       89              /* Device major number          */
+#endif
 #endif /* _LINUX_I2C_DEV_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 2a32f2fd940d..8033e6b33271 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -35,8 +35,6 @@
 #include <linux/sched.h>        /* for completion */
 #include <linux/mutex.h>
-extern struct bus_type i2c_bus_type;
 /* --- General options ------------------------------------------------ */
 struct i2c_msg;
@@ -292,9 +290,6 @@ struct i2c_algorithm {
                           unsigned short flags, char read_write,
                           u8 command, int size, union i2c_smbus_data * data);
-        /* --- ioctl like call to set div. parameters. */
-        int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
        /* To determine what the adapter supports */
        u32 (*functionality) (struct i2c_adapter *);
 };
@@ -342,9 +337,10 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data)
 }
 /*flags for the client struct: */
-#define I2C_CLIENT_PEC  0x04                    /* Use Packet Error Checking */
+#define I2C_CLIENT_PEC  0x04            /* Use Packet Error Checking */
-#define I2C_CLIENT_TEN  0x10                    /* we have a ten bit chip address       */
+#define I2C_CLIENT_TEN  0x10            /* we have a ten bit chip address */
-                                                /* Must equal I2C_M_TEN below */
+                                        /* Must equal I2C_M_TEN below */
+#define I2C_CLIENT_WAKE 0x80            /* for board_info; true iff can wake */
 /* i2c adapter classes (bitmask) */
 #define I2C_CLASS_HWMON         (1<<0)  /* lm_sensors, ... */
@@ -417,10 +413,6 @@ extern int i2c_probe(struct i2c_adapter *adapter,
                struct i2c_client_address_data *address_data,
                int (*found_proc) (struct i2c_adapter *, int, int));
-/* An ioctl like call to set div. parameters of the adapter.
- */
-extern int i2c_control(struct i2c_client *,unsigned int, unsigned long);
 extern struct i2c_adapter* i2c_get_adapter(int id);
 extern void i2c_put_adapter(struct i2c_adapter *adap);
@@ -444,19 +436,52 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
 }
 #endif /* __KERNEL__ */
-/*
+/**
- * I2C Message - used for pure i2c transaction, also from /dev interface
+ * struct i2c_msg - an I2C transaction segment beginning with START
+ * @addr: Slave address, either seven or ten bits.  When this is a ten
+ *      bit address, I2C_M_TEN must be set in @flags and the adapter
+ *      must support I2C_FUNC_10BIT_ADDR.
+ * @flags: I2C_M_RD is handled by all adapters.  No other flags may be
+ *      provided unless the adapter exported the relevant I2C_FUNC_*
+ *      flags through i2c_check_functionality().
+ * @len: Number of data bytes in @buf being read from or written to the
+ *      I2C slave address.  For read transactions where I2C_M_RECV_LEN
+ *      is set, the caller guarantees that this buffer can hold up to
+ *      32 bytes in addition to the initial length byte sent by the
+ *      slave (plus, if used, the SMBus PEC); and this value will be
+ *      incremented by the number of block data bytes received.
+ * @buf: The buffer into which data is read, or from which it's written.
+ *
+ * An i2c_msg is the low level representation of one segment of an I2C
+ * transaction.  It is visible to drivers in the @i2c_transfer() procedure,
+ * to userspace from i2c-dev, and to I2C adapter drivers through the
+ * @i2c_adapter.@master_xfer() method.
+ *
+ * Except when I2C "protocol mangling" is used, all I2C adapters implement
+ * the standard rules for I2C transactions.  Each transaction begins with a
+ * START.  That is followed by the slave address, and a bit encoding read
+ * versus write.  Then follow all the data bytes, possibly including a byte
+ * with SMBus PEC.  The transfer terminates with a NAK, or when all those
+ * bytes have been transferred and ACKed.  If this is the last message in a
+ * group, it is followed by a STOP.  Otherwise it is followed by the next
+ * @i2c_msg transaction segment, beginning with a (repeated) START.
+ *
+ * Alternatively, when the adapter supports I2C_FUNC_PROTOCOL_MANGLING then
+ * passing certain @flags may have changed those standard protocol behaviors.
+ * Those flags are only for use with broken/nonconforming slaves, and with
+ * adapters which are known to support the specific mangling options they
+ * need (one or more of IGNORE_NAK, NO_RD_ACK, NOSTART, and REV_DIR_ADDR).
 */
 struct i2c_msg {
        __u16 addr;     /* slave address                        */
        __u16 flags;
-#define I2C_M_TEN       0x10    /* we have a ten bit chip address       */
+#define I2C_M_TEN               0x0010  /* this is a ten bit chip address */
-#define I2C_M_RD        0x01
+#define I2C_M_RD                0x0001  /* read data, from slave to master */
-#define I2C_M_NOSTART   0x4000
+#define I2C_M_NOSTART           0x4000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_REV_DIR_ADDR      0x2000
+#define I2C_M_REV_DIR_ADDR      0x2000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_IGNORE_NAK        0x1000
+#define I2C_M_IGNORE_NAK        0x1000  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_NO_RD_ACK         0x0800
+#define I2C_M_NO_RD_ACK         0x0800  /* if I2C_FUNC_PROTOCOL_MANGLING */
-#define I2C_M_RECV_LEN          0x0400 /* length will be first received byte */
+#define I2C_M_RECV_LEN          0x0400  /* length will be first received byte */
        __u16 len;              /* msg length                           */
        __u8 *buf;              /* pointer to msg data                  */
 };
@@ -466,7 +491,7 @@ struct i2c_msg {
 #define I2C_FUNC_I2C                    0x00000001
 #define I2C_FUNC_10BIT_ADDR             0x00000002
 #define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
-#define I2C_FUNC_SMBUS_HWPEC_CALC       0x00000008 /* SMBus 2.0 */
+#define I2C_FUNC_SMBUS_PEC              0x00000008
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_QUICK            0x00010000
 #define I2C_FUNC_SMBUS_READ_BYTE        0x00020000
@@ -502,7 +527,8 @@ struct i2c_msg {
                             I2C_FUNC_SMBUS_WORD_DATA | \
                             I2C_FUNC_SMBUS_PROC_CALL | \
                             I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
-                             I2C_FUNC_SMBUS_I2C_BLOCK)
+                             I2C_FUNC_SMBUS_I2C_BLOCK | \
+                             I2C_FUNC_SMBUS_PEC)
 /*
 * Data for SMBus Messages
@@ -532,38 +558,8 @@ union i2c_smbus_data {
 #define I2C_SMBUS_I2C_BLOCK_DATA    8
-/* ----- commands for the ioctl like i2c_command call:
- * note that additional calls are defined in the algorithm and hw
- *      dependent layers - these can be listed here, or see the
- *      corresponding header files.
- */
-                                /* -> bit-adapter specific ioctls       */
-#define I2C_RETRIES     0x0701  /* number of times a device address      */
-                                /* should be polled when not            */
-                                /* acknowledging                        */
-#define I2C_TIMEOUT     0x0702  /* set timeout - call with int          */
-/* this is for i2c-dev.c        */
-#define I2C_SLAVE       0x0703  /* Change slave address                 */
-                                /* Attn.: Slave address is 7 or 10 bits */
-#define I2C_SLAVE_FORCE 0x0706  /* Change slave address                 */
-                                /* Attn.: Slave address is 7 or 10 bits */
-                                /* This changes the address, even if it */
-                                /* is already taken!                    */
-#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit   */
-#define I2C_FUNCS       0x0705  /* Get the adapter functionality */
-#define I2C_RDWR        0x0707  /* Combined R/W transfer (one stop only)*/
-#define I2C_PEC         0x0708  /* != 0 for SMBus PEC                   */
-#define I2C_SMBUS       0x0720  /* SMBus-level access */
-/* ----- I2C-DEV: char device interface stuff ------------------------- */
 #ifdef __KERNEL__
-#define I2C_MAJOR       89              /* Device major number          */
 /* These defines are used for probing i2c client addresses */
 /* The length of the option lists */
 #define I2C_CLIENT_MAX_OPTS 48
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 85d448b4abec..02a27e8cbad2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -681,7 +681,7 @@ typedef struct hwif_s {
        u8 straight8;   /* Alan's straight 8 check */
        u8 bus_state;   /* power state of the IDE bus */
-        u8 host_flags;
+        u16 host_flags;
        u8 pio_mask;
@@ -702,10 +702,10 @@ typedef struct hwif_s {
 #if 0
        ide_hwif_ops_t  *hwifops;
 #else
-        /* routine to set PIO mode for drives */
+        /* routine to program host for PIO mode */
        void    (*set_pio_mode)(ide_drive_t *, const u8);
-        /* routine to retune DMA modes for drives */
+        /* routine to program host for DMA mode */
-        int     (*speedproc)(ide_drive_t *, const u8);
+        void    (*set_dma_mode)(ide_drive_t *, const u8);
        /* tweaks hardware to select drive */
        void    (*selectproc)(ide_drive_t *);
        /* chipset polling based on hba specifics */
@@ -1079,16 +1079,7 @@ extern void ide_fix_driveid(struct hd_driveid *);
 */
 extern void ide_fixstring(u8 *, const int, const int);
-/*
+int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
- * This routine busy-waits for the drive status to be not "busy".
- * It then checks the status for all of the "good" bits and none
- * of the "bad" bits, and if all is okay it returns 0.  All other
- * cases return 1 after doing "*startstop = ide_error()", and the
- * caller should return the updated value of "startstop" in this case.
- * "startstop" is unchanged when the function returns 0;
- * (startstop, drive, good, bad, timeout)
- */
-extern int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
 /*
 * Start a reset operation for an IDE interface.
@@ -1162,7 +1153,6 @@ extern void SELECT_MASK(ide_drive_t *, int);
 extern void QUIRK_LIST(ide_drive_t *);
 extern int drive_is_ready(ide_drive_t *);
-extern int wait_for_ready(ide_drive_t *, int /* timeout */);
 /*
 * taskfile io for disks for now...and builds request from ide_ioctl
@@ -1262,6 +1252,15 @@ enum {
        IDE_HFLAG_ABUSE_FAST_DEVSEL     = (1 << 5),
        /* use 100-102 and 200-202 PIO values to set DMA modes */
        IDE_HFLAG_ABUSE_DMA_MODES       = (1 << 6),
+        /*
+         * keep DMA setting when programming PIO mode, may be used only
+         * for hosts which have separate PIO and DMA timings (ie. PMAC)
+         */
+        IDE_HFLAG_SET_PIO_MODE_KEEP_DMA = (1 << 7),
+        /* program host for the transfer mode after programming device */
+        IDE_HFLAG_POST_SET_MODE         = (1 << 8),
+        /* don't program host/device for the transfer mode ("smart" hosts) */
+        IDE_HFLAG_NO_SET_MODE           = (1 << 9),
 };
 typedef struct ide_pci_device_s {
@@ -1278,7 +1277,7 @@ typedef struct ide_pci_device_s {
        u8                      bootable;
        unsigned int            extra;
        struct ide_pci_device_s *next;
-        u8                      host_flags;
+        u16                     host_flags;
        u8                      pio_mask;
        u8                      udma_mask;
 } ide_pci_device_t;
@@ -1301,7 +1300,6 @@ int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *);
 #ifdef CONFIG_BLK_DEV_IDEDMA
 int __ide_dma_bad_drive(ide_drive_t *);
-int __ide_dma_good_drive(ide_drive_t *);
 u8 ide_find_dma_mode(ide_drive_t *, u8);
@@ -1420,6 +1418,9 @@ unsigned int ide_pio_cycle_time(ide_drive_t *, u8);
 u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
 extern const ide_pio_timings_t ide_pio_timings[6];
+int ide_set_pio_mode(ide_drive_t *, u8);
+int ide_set_dma_mode(ide_drive_t *, u8);
 void ide_set_pio(ide_drive_t *, u8);
 static inline void ide_set_max_pio(ide_drive_t *drive)
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h
index e1fc1d16d3cd..1246d46abbc0 100644
--- a/include/linux/inet_lro.h
+++ b/include/linux/inet_lro.h
@@ -52,14 +52,14 @@ struct net_lro_desc {
        struct tcphdr *tcph;
        struct vlan_group *vgrp;
        __wsum  data_csum;
-        u32 tcp_rcv_tsecr;
+        __be32 tcp_rcv_tsecr;
-        u32 tcp_rcv_tsval;
+        __be32 tcp_rcv_tsval;
-        u32 tcp_ack;
+        __be32 tcp_ack;
        u32 tcp_next_seq;
        u32 skb_tot_frags_len;
        u16 ip_tot_len;
        u16 tcp_saw_tstamp;             /* timestamps enabled */
-        u16 tcp_window;
+        __be16 tcp_window;
        u16 vlan_tag;
        int pkt_aggr_cnt;               /* counts aggregated packets */
        int vlan_packet;
diff --git a/include/linux/input.h b/include/linux/input.h
index 125e925320fd..f30da6fc08e3 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -523,6 +523,8 @@ struct input_absinfo {
 #define KEY_ADDRESSBOOK         0x1ad   /* AL Contacts/Address Book */
 #define KEY_MESSENGER           0x1ae   /* AL Instant Messaging */
 #define KEY_DISPLAYTOGGLE       0x1af   /* Turn display (LCD) on and off */
+#define KEY_SPELLCHECK          0x1b0   /* AL Spell Check */
+#define KEY_LOGOFF              0x1b1   /* AL Logoff */
 #define KEY_DEL_EOL             0x1c0
 #define KEY_DEL_EOS             0x1c1
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 452737551260..700a93b79189 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -30,6 +30,7 @@
 #include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
+#include <linux/lockdep.h>
 #include <asm/semaphore.h>
 #endif
@@ -396,6 +397,10 @@ struct handle_s
        unsigned int    h_sync:         1;      /* sync-on-close */
        unsigned int    h_jdata:        1;      /* force data journaling */
        unsigned int    h_aborted:      1;      /* fatal error on handle */
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map      h_lockdep_map;
+#endif
 };
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index 840631fa5ff1..6b563cae23df 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -46,6 +46,7 @@
 #define JFFS2_COMPR_COPY        0x04
 #define JFFS2_COMPR_DYNRUBIN    0x05
 #define JFFS2_COMPR_ZLIB        0x06
+#define JFFS2_COMPR_LZO         0x07
 /* Compatibility flags. */
 #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
 #define JFFS2_NODE_ACCURATE 0x2000
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index d7a5e034c3a2..e757a74b9d17 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -109,6 +109,10 @@ static inline u64 get_jiffies_64(void)
         ((long)(a) - (long)(b) >= 0))
 #define time_before_eq(a,b)     time_after_eq(b,a)
+#define time_in_range(a,b,c) \
+        (time_after_eq(a,b) && \
+         time_before_eq(a,c))
 /* Same as above, but does so with platform independent 64bit types.
 * These must be used when utilizing jiffies_64 (i.e. return value of
 * get_jiffies_64() */
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 43e895f1cabe..12bf44f083f5 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -23,6 +23,7 @@ struct cpu_usage_stat {
        cputime64_t idle;
        cputime64_t iowait;
        cputime64_t steal;
+        cputime64_t guest;
 };
 struct kernel_stat {
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index e6edca81ab84..057a7f34ee36 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -4,8 +4,7 @@
 /*
 * Userspace interface for /dev/kvm - kernel based virtual machine
 *
- * Note: this interface is considered experimental and may change without
+ * Note: you must update KVM_API_VERSION if you change this interface.
- *       notice.
 */
 #include <asm/types.h>
@@ -13,14 +12,8 @@
 #define KVM_API_VERSION 12
-/*
+/* Architectural interrupt line count. */
- * Architectural interrupt line count, and the size of the bitmap needed
- * to hold them.
- */
 #define KVM_NR_INTERRUPTS 256
-#define KVM_IRQ_BITMAP_SIZE_BYTES    ((KVM_NR_INTERRUPTS + 7) / 8)
-#define KVM_IRQ_BITMAP_SIZE(type)    (KVM_IRQ_BITMAP_SIZE_BYTES / sizeof(type))
 /* for KVM_CREATE_MEMORY_REGION */
 struct kvm_memory_region {
@@ -41,20 +34,89 @@ struct kvm_memory_alias {
        __u64 target_phys_addr;
 };
-enum kvm_exit_reason {
+/* for KVM_IRQ_LINE */
-        KVM_EXIT_UNKNOWN          = 0,
+struct kvm_irq_level {
-        KVM_EXIT_EXCEPTION        = 1,
+        /*
-        KVM_EXIT_IO               = 2,
+         * ACPI gsi notion of irq.
-        KVM_EXIT_HYPERCALL        = 3,
+         * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
-        KVM_EXIT_DEBUG            = 4,
+         * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
-        KVM_EXIT_HLT              = 5,
+         */
-        KVM_EXIT_MMIO             = 6,
+        __u32 irq;
-        KVM_EXIT_IRQ_WINDOW_OPEN  = 7,
+        __u32 level;
-        KVM_EXIT_SHUTDOWN         = 8,
+};
-        KVM_EXIT_FAIL_ENTRY       = 9,
-        KVM_EXIT_INTR             = 10,
+/* for KVM_GET_IRQCHIP and KVM_SET_IRQCHIP */
+struct kvm_pic_state {
+        __u8 last_irr;  /* edge detection */
+        __u8 irr;               /* interrupt request register */
+        __u8 imr;               /* interrupt mask register */
+        __u8 isr;               /* interrupt service register */
+        __u8 priority_add;      /* highest irq priority */
+        __u8 irq_base;
+        __u8 read_reg_select;
+        __u8 poll;
+        __u8 special_mask;
+        __u8 init_state;
+        __u8 auto_eoi;
+        __u8 rotate_on_auto_eoi;
+        __u8 special_fully_nested_mode;
+        __u8 init4;             /* true if 4 byte init */
+        __u8 elcr;              /* PIIX edge/trigger selection */
+        __u8 elcr_mask;
+};
+#define KVM_IOAPIC_NUM_PINS  24
+struct kvm_ioapic_state {
+        __u64 base_address;
+        __u32 ioregsel;
+        __u32 id;
+        __u32 irr;
+        __u32 pad;
+        union {
+                __u64 bits;
+                struct {
+                        __u8 vector;
+                        __u8 delivery_mode:3;
+                        __u8 dest_mode:1;
+                        __u8 delivery_status:1;
+                        __u8 polarity:1;
+                        __u8 remote_irr:1;
+                        __u8 trig_mode:1;
+                        __u8 mask:1;
+                        __u8 reserve:7;
+                        __u8 reserved[4];
+                        __u8 dest_id;
+                } fields;
+        } redirtbl[KVM_IOAPIC_NUM_PINS];
 };
+#define KVM_IRQCHIP_PIC_MASTER   0
+#define KVM_IRQCHIP_PIC_SLAVE    1
+#define KVM_IRQCHIP_IOAPIC       2
+struct kvm_irqchip {
+        __u32 chip_id;
+        __u32 pad;
+        union {
+                char dummy[512];  /* reserving space */
+                struct kvm_pic_state pic;
+                struct kvm_ioapic_state ioapic;
+        } chip;
+};
+#define KVM_EXIT_UNKNOWN          0
+#define KVM_EXIT_EXCEPTION        1
+#define KVM_EXIT_IO               2
+#define KVM_EXIT_HYPERCALL        3
+#define KVM_EXIT_DEBUG            4
+#define KVM_EXIT_HLT              5
+#define KVM_EXIT_MMIO             6
+#define KVM_EXIT_IRQ_WINDOW_OPEN  7
+#define KVM_EXIT_SHUTDOWN         8
+#define KVM_EXIT_FAIL_ENTRY       9
+#define KVM_EXIT_INTR             10
+#define KVM_EXIT_SET_TPR          11
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
        /* in */
@@ -106,11 +168,14 @@ struct kvm_run {
                } mmio;
                /* KVM_EXIT_HYPERCALL */
                struct {
+                        __u64 nr;
                        __u64 args[6];
                        __u64 ret;
                        __u32 longmode;
                        __u32 pad;
                } hypercall;
+                /* Fix the size of the union. */
+                char padding[256];
        };
 };
@@ -139,6 +204,12 @@ struct kvm_fpu {
        __u32 pad2;
 };
+/* for KVM_GET_LAPIC and KVM_SET_LAPIC */
+#define KVM_APIC_REG_SIZE 0x400
+struct kvm_lapic_state {
+        char regs[KVM_APIC_REG_SIZE];
+};
 struct kvm_segment {
        __u64 base;
        __u32 limit;
@@ -164,7 +235,7 @@ struct kvm_sregs {
        __u64 cr0, cr2, cr3, cr4, cr8;
        __u64 efer;
        __u64 apic_base;
-        __u64 interrupt_bitmap[KVM_IRQ_BITMAP_SIZE(__u64)];
+        __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];
 };
 struct kvm_msr_entry {
@@ -272,6 +343,12 @@ struct kvm_signal_mask {
 #define KVM_GET_VCPU_MMAP_SIZE    _IO(KVMIO,   0x04) /* in bytes */
 /*
+ * Extension capability list.
+ */
+#define KVM_CAP_IRQCHIP   0
+#define KVM_CAP_HLT       1
+/*
 * ioctls for VM fds
 */
 #define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 0x40, struct kvm_memory_region)
@@ -282,6 +359,11 @@ struct kvm_signal_mask {
 #define KVM_CREATE_VCPU           _IO(KVMIO,  0x41)
 #define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 0x42, struct kvm_dirty_log)
 #define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO, 0x43, struct kvm_memory_alias)
+/* Device model IOC */
+#define KVM_CREATE_IRQCHIP        _IO(KVMIO,  0x60)
+#define KVM_IRQ_LINE              _IOW(KVMIO, 0x61, struct kvm_irq_level)
+#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
+#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
 /*
 * ioctls for vcpu fds
@@ -300,5 +382,7 @@ struct kvm_signal_mask {
 #define KVM_SET_SIGNAL_MASK       _IOW(KVMIO,  0x8b, struct kvm_signal_mask)
 #define KVM_GET_FPU               _IOR(KVMIO,  0x8c, struct kvm_fpu)
 #define KVM_SET_FPU               _IOW(KVMIO,  0x8d, struct kvm_fpu)
+#define KVM_GET_LAPIC             _IOR(KVMIO,  0x8e, struct kvm_lapic_state)
+#define KVM_SET_LAPIC             _IOW(KVMIO,  0x8f, struct kvm_lapic_state)
 #endif
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 0e843bf65877..f6279f68a827 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -238,6 +238,7 @@ extern void lockdep_info(void);
 extern void lockdep_reset(void);
 extern void lockdep_reset_lock(struct lockdep_map *lock);
 extern void lockdep_free_key_range(void *start, unsigned long size);
+extern void lockdep_sys_exit(void);
 extern void lockdep_off(void);
 extern void lockdep_on(void);
@@ -252,6 +253,13 @@ extern void lockdep_init_map(struct lockdep_map *lock, const char *name,
                             struct lock_class_key *key, int subclass);
 /*
+ * To initialize a lockdep_map statically use this macro.
+ * Note that _name must not be NULL.
+ */
+#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \
+        { .name = (_name), .key = (void *)(_key), }
+/*
 * Reinitialize a lock key - for cases where there is special locking or
 * special initialization of locks so that the validator gets the scope
 * of dependencies wrong: they are either too broad (they need a class-split)
@@ -317,6 +325,7 @@ static inline void lockdep_on(void)
 # define INIT_LOCKDEP
 # define lockdep_reset()                do { debug_locks = 1; } while (0)
 # define lockdep_free_key_range(start, size)    do { } while (0)
+# define lockdep_sys_exit()                     do { } while (0)
 /*
 * The class key takes no space if lockdep is disabled:
 */
diff --git a/include/linux/maple.h b/include/linux/maple.h
new file mode 100644
index 000000000000..bad9a7b319de
--- /dev/null
+++ b/include/linux/maple.h
@@ -0,0 +1,80 @@
+#ifndef __LINUX_MAPLE_H
+#define __LINUX_MAPLE_H
+#include <linux/device.h>
+extern struct bus_type maple_bus_type;
+/* Maple Bus command and response codes */
+enum maple_code {
+       MAPLE_RESPONSE_FILEERR = -5,
+       MAPLE_RESPONSE_AGAIN = -4,      /* request should be retransmitted */
+       MAPLE_RESPONSE_BADCMD = -3,
+       MAPLE_RESPONSE_BADFUNC = -2,
+       MAPLE_RESPONSE_NONE = -1,       /* unit didn't respond at all */
+       MAPLE_COMMAND_DEVINFO = 1,
+       MAPLE_COMMAND_ALLINFO = 2,
+       MAPLE_COMMAND_RESET = 3,
+       MAPLE_COMMAND_KILL = 4,
+       MAPLE_RESPONSE_DEVINFO = 5,
+       MAPLE_RESPONSE_ALLINFO = 6,
+       MAPLE_RESPONSE_OK = 7,
+       MAPLE_RESPONSE_DATATRF = 8,
+       MAPLE_COMMAND_GETCOND = 9,
+       MAPLE_COMMAND_GETMINFO = 10,
+       MAPLE_COMMAND_BREAD = 11,
+       MAPLE_COMMAND_BWRITE = 12,
+       MAPLE_COMMAND_SETCOND = 14
+};
+struct mapleq {
+       struct list_head list;
+       struct maple_device *dev;
+       void *sendbuf, *recvbuf, *recvbufdcsp;
+       unsigned char length;
+       enum maple_code command;
+};
+struct maple_devinfo {
+       unsigned long function;
+       unsigned long function_data[3];
+       unsigned char area_code;
+       unsigned char connector_directon;
+       char product_name[31];
+       char product_licence[61];
+       unsigned short standby_power;
+       unsigned short max_power;
+};
+struct maple_device {
+       struct maple_driver *driver;
+       struct mapleq *mq;
+       void *private_data;
+       void (*callback) (struct mapleq * mq);
+       unsigned long when, interval, function;
+       struct maple_devinfo devinfo;
+       unsigned char port, unit;
+       char product_name[32];
+       char product_licence[64];
+       int registered;
+       struct device dev;
+};
+struct maple_driver {
+       unsigned long function;
+       int (*connect) (struct maple_device * dev);
+       void (*disconnect) (struct maple_device * dev);
+       struct device_driver drv;
+};
+void maple_getcond_callback(struct maple_device *dev,
+                           void (*callback) (struct mapleq * mq),
+                           unsigned long interval,
+                           unsigned long function);
+int maple_driver_register(struct device_driver *drv);
+void maple_add_packet(struct mapleq *mq);
+#define to_maple_dev(n) container_of(n, struct maple_device, dev)
+#define to_maple_driver(n) container_of(n, struct maple_driver, drv)
+#endif /* __LINUX_MAPLE_H */
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 74523d999f7a..522b0dd836cf 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -262,11 +262,6 @@ struct pcmcia_device_id {
 #define PCMCIA_DEV_ID_MATCH_FAKE_CIS    0x0200
 #define PCMCIA_DEV_ID_MATCH_ANONYMOUS   0x0400
-/* I2C */
-struct i2c_device_id {
-        __u16 id;
-};
 /* Input */
 #define INPUT_DEVICE_ID_EV_MAX          0x1f
 #define INPUT_DEVICE_ID_KEY_MIN_INTERESTING     0x71
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 123948b14547..e17c5343cf51 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -57,6 +57,15 @@
 #define cfi_interleave_is_8(cfi) (0)
 #endif
+#ifndef cfi_interleave
+#warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.
+static inline int cfi_interleave(void *cfi)
+{
+        BUG();
+        return 0;
+}
+#endif
 static inline int cfi_interleave_supported(int i)
 {
        switch (i) {
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index a293a3b78e05..39e7d2a1be9a 100644
--- a/include/linux/mtd/flashchip.h
+++ b/include/linux/mtd/flashchip.h
@@ -40,6 +40,7 @@ typedef enum {
        FL_POINT,
        FL_XIP_WHILE_ERASING,
        FL_XIP_WHILE_WRITING,
+        FL_SHUTDOWN,
        FL_UNKNOWN
 } flstate_t;
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 81f3a314dd76..a9fae032ba81 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -125,7 +125,15 @@
 #endif
 #ifndef map_bankwidth
-#error "No bus width supported. What's the point?"
+#warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"
+static inline int map_bankwidth(void *map)
+{
+        BUG();
+        return 0;
+}
+#define map_bankwidth_is_large(map) (0)
+#define map_words(map) (0)
+#define MAX_MAP_BANKWIDTH 1
 #endif
 static inline int map_bankwidth_supported(int w)
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index fd64ccfbce02..783fc983417c 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -133,6 +133,13 @@ struct mtd_info {
        int numeraseregions;
        struct mtd_erase_region_info *eraseregions;
+        /*
+         * Erase is an asynchronous operation.  Device drivers are supposed
+         * to call instr->callback() whenever the operation completes, even
+         * if it completes with a failure.
+         * Callers are supposed to pass a callback function and wait for it
+         * to be called before writing to the block.
+         */
        int (*erase) (struct mtd_info *mtd, struct erase_info *instr);
        /* This stuff for eXecute-In-Place */
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index d2365c8dcacc..c42bc7f533a5 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -432,6 +432,7 @@ struct nand_chip {
 #define NAND_MFR_STMICRO        0x20
 #define NAND_MFR_HYNIX          0xad
 #define NAND_MFR_MICRON         0x2c
+#define NAND_MFR_AMD            0x01
 /**
 * struct nand_flash_dev - NAND Flash Device ID Structure
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index a56d24ada505..fd0a260e070b 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -60,6 +60,7 @@ struct onenand_bufferram {
 * @erase_shift:        [INTERN] number of address bits in a block
 * @page_shift:         [INTERN] number of address bits in a page
 * @page_mask:          [INTERN] a page per block mask
+ * @writesize:          [INTERN] a real page size
 * @bufferram_index:    [INTERN] BufferRAM index
 * @bufferram:          [INTERN] BufferRAM info
 * @readw:              [REPLACEABLE] hardware specific function for read short
@@ -100,6 +101,7 @@ struct onenand_chip {
        unsigned int            erase_shift;
        unsigned int            page_shift;
        unsigned int            page_mask;
+        unsigned int            writesize;
        unsigned int            bufferram_index;
        struct onenand_bufferram        bufferram[MAX_BUFFERRAM];
@@ -140,6 +142,8 @@ struct onenand_chip {
 #define ONENAND_NEXT_BUFFERRAM(this)            (this->bufferram_index ^ 1)
 #define ONENAND_SET_NEXT_BUFFERRAM(this)        (this->bufferram_index ^= 1)
 #define ONENAND_SET_PREV_BUFFERRAM(this)        (this->bufferram_index ^= 1)
+#define ONENAND_SET_BUFFERRAM0(this)            (this->bufferram_index = 0)
+#define ONENAND_SET_BUFFERRAM1(this)            (this->bufferram_index = 1)
 #define ONENAND_GET_SYS_CFG1(this)                                      \
        (this->read_word(this->base + ONENAND_REG_SYS_CFG1))
@@ -149,6 +153,13 @@ struct onenand_chip {
 #define ONENAND_IS_DDP(this)                                            \
        (this->device_id & ONENAND_DEVICE_IS_DDP)
+#ifdef CONFIG_MTD_ONENAND_2X_PROGRAM
+#define ONENAND_IS_2PLANE(this)                                         \
+        (this->options & ONENAND_HAS_2PLANE)
+#else
+#define ONENAND_IS_2PLANE(this)                 (0)
+#endif
 /* Check byte access in OneNAND */
 #define ONENAND_CHECK_BYTE_ACCESS(addr)         (addr & 0x1)
@@ -157,6 +168,7 @@ struct onenand_chip {
 */
 #define ONENAND_HAS_CONT_LOCK           (0x0001)
 #define ONENAND_HAS_UNLOCK_ALL          (0x0002)
+#define ONENAND_HAS_2PLANE              (0x0004)
 #define ONENAND_PAGEBUF_ALLOC           (0x1000)
 #define ONENAND_OOBBUF_ALLOC            (0x2000)
diff --git a/include/linux/mtd/onenand_regs.h b/include/linux/mtd/onenand_regs.h
index af94719890e7..c46161f4eee3 100644
--- a/include/linux/mtd/onenand_regs.h
+++ b/include/linux/mtd/onenand_regs.h
@@ -74,6 +74,8 @@
 #define ONENAND_DEVICE_DENSITY_512Mb    (0x002)
 #define ONENAND_DEVICE_DENSITY_1Gb      (0x003)
+#define ONENAND_DEVICE_DENSITY_2Gb      (0x004)
+#define ONENAND_DEVICE_DENSITY_4Gb      (0x005)
 /*
 * Version ID Register F002h (R)
@@ -111,6 +113,8 @@
 #define ONENAND_CMD_READOOB             (0x13)
 #define ONENAND_CMD_PROG                (0x80)
 #define ONENAND_CMD_PROGOOB             (0x1A)
+#define ONENAND_CMD_2X_PROG             (0x7D)
+#define ONENAND_CMD_2X_CACHE_PROG       (0x7F)
 #define ONENAND_CMD_UNLOCK              (0x23)
 #define ONENAND_CMD_LOCK                (0x2A)
 #define ONENAND_CMD_LOCK_TIGHT          (0x2C)
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 0d50ea3df689..6a735c72f23f 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -120,14 +120,17 @@ static inline int fastcall mutex_is_locked(struct mutex *lock)
 * See kernel/mutex.c for detailed documentation of these APIs.
 * Also see Documentation/mutex-design.txt.
 */
-extern void fastcall mutex_lock(struct mutex *lock);
-extern int __must_check fastcall mutex_lock_interruptible(struct mutex *lock);
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
 extern int __must_check mutex_lock_interruptible_nested(struct mutex *lock,
                                        unsigned int subclass);
+#define mutex_lock(lock) mutex_lock_nested(lock, 0)
+#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
 #else
+extern void fastcall mutex_lock(struct mutex *lock);
+extern int __must_check fastcall mutex_lock_interruptible(struct mutex *lock);
 # define mutex_lock_nested(lock, subclass) mutex_lock(lock)
 # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
 #endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5a11f889e56a..39dd83b183a9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1294,6 +1294,7 @@ static inline void netif_rx_complete(struct net_device *dev,
 /**
 *      netif_tx_lock - grab network device transmit lock
 *      @dev: network device
+ *      @cpu: cpu number of lock owner
 *
 * Get network device transmit lock
 */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 7250eeadd7b5..c5164c257f71 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -47,10 +47,8 @@
 #include <linux/nfs3.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_xdr.h>
 #include <linux/nfs_fs_sb.h>
-#include <linux/rwsem.h>
 #include <linux/mempool.h>
 /*
@@ -77,6 +75,9 @@ struct nfs_open_context {
        struct nfs4_state *state;
        fl_owner_t lockowner;
        int mode;
+        unsigned long flags;
+#define NFS_CONTEXT_ERROR_WRITE         (0)
        int error;
        struct list_head list;
@@ -133,11 +134,6 @@ struct nfs_inode {
         * server.
         */
        unsigned long           cache_change_attribute;
-        /*
-         * Counter indicating the number of outstanding requests that
-         * will cause a file data update.
-         */
-        atomic_t                data_updates;
        struct rb_root          access_cache;
        struct list_head        access_cache_entry_lru;
@@ -205,27 +201,18 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 #define NFS_CLIENT(inode)               (NFS_SERVER(inode)->client)
 #define NFS_PROTO(inode)                (NFS_SERVER(inode)->nfs_client->rpc_ops)
 #define NFS_COOKIEVERF(inode)           (NFS_I(inode)->cookieverf)
-#define NFS_READTIME(inode)             (NFS_I(inode)->read_cache_jiffies)
-#define NFS_CHANGE_ATTR(inode)          (NFS_I(inode)->change_attr)
-#define NFS_ATTRTIMEO(inode)            (NFS_I(inode)->attrtimeo)
 #define NFS_MINATTRTIMEO(inode) \
        (S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmin \
                               : NFS_SERVER(inode)->acregmin)
 #define NFS_MAXATTRTIMEO(inode) \
        (S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmax \
                               : NFS_SERVER(inode)->acregmax)
-#define NFS_ATTRTIMEO_UPDATE(inode)     (NFS_I(inode)->attrtimeo_timestamp)
 #define NFS_FLAGS(inode)                (NFS_I(inode)->flags)
 #define NFS_STALE(inode)                (test_bit(NFS_INO_STALE, &NFS_FLAGS(inode)))
 #define NFS_FILEID(inode)               (NFS_I(inode)->fileid)
-static inline int nfs_caches_unstable(struct inode *inode)
-{
-        return atomic_read(&NFS_I(inode)->data_updates) != 0;
-}
 static inline void nfs_mark_for_revalidate(struct inode *inode)
 {
        struct nfs_inode *nfsi = NFS_I(inode);
@@ -237,12 +224,6 @@ static inline void nfs_mark_for_revalidate(struct inode *inode)
        spin_unlock(&inode->i_lock);
 }
-static inline void NFS_CACHEINV(struct inode *inode)
-{
-        if (!nfs_caches_unstable(inode))
-                nfs_mark_for_revalidate(inode);
-}
 static inline int nfs_server_capable(struct inode *inode, int cap)
 {
        return NFS_SERVER(inode)->caps & cap;
@@ -253,28 +234,33 @@ static inline int NFS_USE_READDIRPLUS(struct inode *inode)
        return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));
 }
+static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
+{
+        dentry->d_time = verf;
+}
 /**
 * nfs_save_change_attribute - Returns the inode attribute change cookie
- * @inode - pointer to inode
+ * @dir - pointer to parent directory inode
 * The "change attribute" is updated every time we finish an operation
 * that will result in a metadata change on the server.
 */
-static inline long nfs_save_change_attribute(struct inode *inode)
+static inline unsigned long nfs_save_change_attribute(struct inode *dir)
 {
-        return NFS_I(inode)->cache_change_attribute;
+        return NFS_I(dir)->cache_change_attribute;
 }
 /**
- * nfs_verify_change_attribute - Detects NFS inode cache updates
+ * nfs_verify_change_attribute - Detects NFS remote directory changes
- * @inode - pointer to inode
+ * @dir - pointer to parent directory inode
 * @chattr - previously saved change attribute
- * Return "false" if metadata has been updated (or is in the process of
+ * Return "false" if the verifiers doesn't match the change attribute.
- * being updated) since the change attribute was saved.
+ * This would usually indicate that the directory contents have changed on
+ * the server, and that any dentries need revalidating.
 */
-static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr)
+static inline int nfs_verify_change_attribute(struct inode *dir, unsigned long chattr)
 {
-        return !nfs_caches_unstable(inode)
+        return chattr == NFS_I(dir)->cache_change_attribute;
-                && time_after_eq(chattr, NFS_I(inode)->cache_change_attribute);
 }
 /*
@@ -283,15 +269,14 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long
 extern int nfs_sync_mapping(struct address_space *mapping);
 extern void nfs_zap_mapping(struct inode *inode, struct address_space *mapping);
 extern void nfs_zap_caches(struct inode *);
+extern void nfs_invalidate_atime(struct inode *);
 extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
                                struct nfs_fattr *);
 extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
 extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);
+extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int nfs_permission(struct inode *, int, struct nameidata *);
-extern int nfs_access_get_cached(struct inode *, struct rpc_cred *, struct nfs_access_entry *);
-extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
-extern void nfs_access_zap_cache(struct inode *inode);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
@@ -301,13 +286,10 @@ extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *map
 extern int nfs_revalidate_mapping_nolock(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
 extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
-extern void nfs_begin_attr_update(struct inode *);
-extern void nfs_end_attr_update(struct inode *);
-extern void nfs_begin_data_update(struct inode *);
-extern void nfs_end_data_update(struct inode *);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
+extern u64 nfs_compat_user_ino64(u64 fileid);
 /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
 extern __be32 root_nfs_parse_addr(char *name); /*__init*/
@@ -328,14 +310,15 @@ extern const struct inode_operations nfs3_file_inode_operations;
 extern const struct file_operations nfs_file_operations;
 extern const struct address_space_operations nfs_file_aops;
-static inline struct rpc_cred *nfs_file_cred(struct file *file)
+static inline struct nfs_open_context *nfs_file_open_context(struct file *filp)
 {
-        if (file != NULL) {
+        return filp->private_data;
-                struct nfs_open_context *ctx;
+}
-                ctx = (struct nfs_open_context*)file->private_data;
+static inline struct rpc_cred *nfs_file_cred(struct file *file)
-                return ctx->cred;
+{
-        }
+        if (file != NULL)
+                return nfs_file_open_context(file)->cred;
        return NULL;
 }
@@ -378,6 +361,8 @@ extern const struct file_operations nfs_dir_operations;
 extern struct dentry_operations nfs_dentry_operations;
 extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr);
+extern int nfs_may_open(struct inode *inode, struct rpc_cred *cred, int openflags);
+extern void nfs_access_zap_cache(struct inode *inode);
 /*
 * linux/fs/nfs/symlink.c
@@ -420,15 +405,14 @@ extern int  nfs_flush_incompatible(struct file *file, struct page *page);
 extern int  nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);
 extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
 extern void nfs_writedata_release(void *);
-extern int nfs_set_page_dirty(struct page *);
 /*
 * Try to write back everything synchronously (but check the
 * return value!)
 */
 extern long nfs_sync_mapping_wait(struct address_space *, struct writeback_control *, int);
-extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);
 extern int nfs_wb_all(struct inode *inode);
+extern int nfs_wb_nocommit(struct inode *inode);
 extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);
 extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 78e60798d10e..30dbcc185e69 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -30,7 +30,6 @@
 #define PG_BUSY                 0
 #define PG_NEED_COMMIT          1
 #define PG_NEED_RESCHED         2
-#define PG_NEED_FLUSH           3
 struct nfs_inode;
 struct nfs_page {
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index cf74a4db84a5..daab252f2e5c 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -62,7 +62,8 @@ struct nfs_fattr {
 #define NFS_ATTR_FATTR          0x0002          /* post-op attributes */
 #define NFS_ATTR_FATTR_V3       0x0004          /* NFSv3 attributes */
 #define NFS_ATTR_FATTR_V4       0x0008          /* NFSv4 change attribute */
-#define NFS_ATTR_FATTR_V4_REFERRAL      0x0010          /* NFSv4 referral */
+#define NFS_ATTR_WCC_V4         0x0010          /* pre-op change attribute */
+#define NFS_ATTR_FATTR_V4_REFERRAL      0x0020          /* NFSv4 referral */
 /*
 * Info on the file system
@@ -538,10 +539,13 @@ typedef u64 clientid4;
 struct nfs4_accessargs {
        const struct nfs_fh *           fh;
+        const u32 *                     bitmask;
        u32                             access;
 };
 struct nfs4_accessres {
+        const struct nfs_server *       server;
+        struct nfs_fattr *              fattr;
        u32                             supported;
        u32                             access;
 };
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index e452256d3f72..604a0d786bc6 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -153,19 +153,21 @@ extern int nfsd_max_blksize;
 */
 #ifdef CONFIG_NFSD_V4
 extern unsigned int max_delegations;
-void nfs4_state_init(void);
+int nfs4_state_init(void);
-int nfs4_state_start(void);
+void nfsd4_free_slabs(void);
+void nfs4_state_start(void);
 void nfs4_state_shutdown(void);
 time_t nfs4_lease_time(void);
 void nfs4_reset_lease(time_t leasetime);
 int nfs4_reset_recoverydir(char *recdir);
 #else
-static inline void nfs4_state_init(void){};
+static inline int nfs4_state_init(void) { return 0; }
-static inline int nfs4_state_start(void){return 0;}
+static inline void nfsd4_free_slabs(void) { }
-static inline void nfs4_state_shutdown(void){}
+static inline void nfs4_state_start(void) { }
-static inline time_t nfs4_lease_time(void){return 0;}
+static inline void nfs4_state_shutdown(void) { }
-static inline void nfs4_reset_lease(time_t leasetime){}
+static inline time_t nfs4_lease_time(void) { return 0; }
-static inline int nfs4_reset_recoverydir(char *recdir) {return 0;}
+static inline void nfs4_reset_lease(time_t leasetime) { }
+static inline int nfs4_reset_recoverydir(char *recdir) { return 0; }
 #endif
 /*
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 11e568ee0eeb..d1941cb965e9 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -150,17 +150,7 @@ typedef struct svc_fh {
        struct timespec         fh_pre_ctime;   /* ctime before oper */
        /* Post-op attributes saved in fh_unlock */
-        umode_t                 fh_post_mode;   /* i_mode */
+        struct kstat            fh_post_attr;   /* full attrs after operation */
-        nlink_t                 fh_post_nlink;  /* i_nlink */
-        uid_t                   fh_post_uid;    /* i_uid */
-        gid_t                   fh_post_gid;    /* i_gid */
-        __u64                   fh_post_size;   /* i_size */
-        unsigned long           fh_post_blocks; /* i_blocks */
-        unsigned long           fh_post_blksize;/* i_blksize */
-        __be32                  fh_post_rdev[2];/* i_rdev */
-        struct timespec         fh_post_atime;  /* i_atime */
-        struct timespec         fh_post_mtime;  /* i_mtime */
-        struct timespec         fh_post_ctime;  /* i_ctime */
 #endif /* CONFIG_NFSD_V3 */
 } svc_fh;
@@ -297,36 +287,12 @@ fill_pre_wcc(struct svc_fh *fhp)
        if (!fhp->fh_pre_saved) {
                fhp->fh_pre_mtime = inode->i_mtime;
                fhp->fh_pre_ctime = inode->i_ctime;
-                        fhp->fh_pre_size  = inode->i_size;
+                fhp->fh_pre_size  = inode->i_size;
-                        fhp->fh_pre_saved = 1;
+                fhp->fh_pre_saved = 1;
        }
 }
-/*
+extern void fill_post_wcc(struct svc_fh *);
- * Fill in the post_op attr for the wcc data
- */
-static inline void
-fill_post_wcc(struct svc_fh *fhp)
-{
-        struct inode    *inode = fhp->fh_dentry->d_inode;
-        if (fhp->fh_post_saved)
-                printk("nfsd: inode locked twice during operation.\n");
-        fhp->fh_post_mode       = inode->i_mode;
-        fhp->fh_post_nlink      = inode->i_nlink;
-        fhp->fh_post_uid        = inode->i_uid;
-        fhp->fh_post_gid        = inode->i_gid;
-        fhp->fh_post_size       = inode->i_size;
-        fhp->fh_post_blksize    = BLOCK_SIZE;
-        fhp->fh_post_blocks     = inode->i_blocks;
-        fhp->fh_post_rdev[0]    = htonl((u32)imajor(inode));
-        fhp->fh_post_rdev[1]    = htonl((u32)iminor(inode));
-        fhp->fh_post_atime      = inode->i_atime;
-        fhp->fh_post_mtime      = inode->i_mtime;
-        fhp->fh_post_ctime      = inode->i_ctime;
-        fhp->fh_post_saved      = 1;
-}
 #else
 #define fill_pre_wcc(ignored)
 #define fill_post_wcc(notused)
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 1b653267133a..b0ddfb41c790 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -428,8 +428,8 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
        cinfo->atomic = 1;
        cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec;
        cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
-        cinfo->after_ctime_sec = fhp->fh_post_ctime.tv_sec;
+        cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec;
-        cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec;
+        cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec;
 }
 int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 87439ad94685..2aaf1c16ce98 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1467,6 +1467,8 @@
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC     0x0108
 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
+#define PCI_VENDOR_ID_ATTO              0x117c
 #define PCI_VENDOR_ID_RICOH             0x1180
 #define PCI_DEVICE_ID_RICOH_RL5C465     0x0465
 #define PCI_DEVICE_ID_RICOH_RL5C466     0x0466
@@ -2075,6 +2077,9 @@
 #define PCI_DEVICE_ID_ARECA_1130        0x1130
 #define PCI_DEVICE_ID_ARECA_1160        0x1160
 #define PCI_DEVICE_ID_ARECA_1170        0x1170
+#define PCI_DEVICE_ID_ARECA_1200        0x1200
+#define PCI_DEVICE_ID_ARECA_1201        0x1201
+#define PCI_DEVICE_ID_ARECA_1202        0x1202
 #define PCI_DEVICE_ID_ARECA_1210        0x1210
 #define PCI_DEVICE_ID_ARECA_1220        0x1220
 #define PCI_DEVICE_ID_ARECA_1230        0x1230
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index fe17d7d750c2..76c1a530edc5 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -41,6 +41,7 @@
 #include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
+#include <linux/lockdep.h>
 /**
 * struct rcu_head - callback structure for use with RCU
@@ -133,6 +134,15 @@ static inline void rcu_bh_qsctr_inc(int cpu)
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+extern struct lockdep_map rcu_lock_map;
+# define rcu_read_acquire()     lock_acquire(&rcu_lock_map, 0, 0, 2, 1, _THIS_IP_)
+# define rcu_read_release()     lock_release(&rcu_lock_map, 1, _THIS_IP_)
+#else
+# define rcu_read_acquire()     do { } while (0)
+# define rcu_read_release()     do { } while (0)
+#endif
 /**
 * rcu_read_lock - mark the beginning of an RCU read-side critical section.
 *
@@ -166,6 +176,7 @@ extern int rcu_needs_cpu(int cpu);
        do { \
                preempt_disable(); \
                __acquire(RCU); \
+                rcu_read_acquire(); \
        } while(0)
 /**
@@ -175,6 +186,7 @@ extern int rcu_needs_cpu(int cpu);
 */
 #define rcu_read_unlock() \
        do { \
+                rcu_read_release(); \
                __release(RCU); \
                preempt_enable(); \
        } while(0)
@@ -204,6 +216,7 @@ extern int rcu_needs_cpu(int cpu);
        do { \
                local_bh_disable(); \
                __acquire(RCU_BH); \
+                rcu_read_acquire(); \
        } while(0)
 /*
@@ -213,6 +226,7 @@ extern int rcu_needs_cpu(int cpu);
 */
 #define rcu_read_unlock_bh() \
        do { \
+                rcu_read_release(); \
                __release(RCU_BH); \
                local_bh_enable(); \
        } while(0)
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 1e5488ede037..ff9e9234f8ba 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -120,7 +120,7 @@ struct reiserfs_journal_cnode {
        struct buffer_head *bh; /* real buffer head */
        struct super_block *sb; /* dev of real buffer head */
        __u32 blocknr;          /* block number of real buffer head, == 0 when buffer on disk */
-        long state;
+        unsigned long state;
        struct reiserfs_journal_list *jlist;    /* journal list this cnode lives in */
        struct reiserfs_journal_cnode *next;    /* next in transaction list */
        struct reiserfs_journal_cnode *prev;    /* prev in transaction list */
@@ -181,7 +181,7 @@ struct reiserfs_journal {
        struct block_device *j_dev_bd;
        int j_1st_reserved_block;       /* first block on s_dev of reserved area journal */
-        long j_state;
+        unsigned long j_state;
        unsigned long j_trans_id;
        unsigned long j_mount_id;
        unsigned long j_start;  /* start of current waiting commit (index into j_ap_blocks) */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 833f7dc2b8de..228e0a8ce248 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -87,6 +87,7 @@ struct sched_param {
 #include <linux/timer.h>
 #include <linux/hrtimer.h>
 #include <linux/task_io_accounting.h>
+#include <linux/kobject.h>
 #include <asm/processor.h>
@@ -136,6 +137,7 @@ extern unsigned long weighted_cpuload(const int cpu);
 struct seq_file;
 struct cfs_rq;
+struct task_group;
 #ifdef CONFIG_SCHED_DEBUG
 extern void proc_sched_show_task(struct task_struct *p, struct seq_file *m);
 extern void proc_sched_set_task(struct task_struct *p);
@@ -174,8 +176,7 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 #define EXIT_ZOMBIE             16
 #define EXIT_DEAD               32
 /* in tsk->state again */
-#define TASK_NONINTERACTIVE     64
+#define TASK_DEAD               64
-#define TASK_DEAD               128
 #define __set_task_state(tsk, state_value)              \
        do { (tsk)->state = (state_value); } while (0)
@@ -516,6 +517,8 @@ struct signal_struct {
         * in __exit_signal, except for the group leader.
         */
        cputime_t utime, stime, cutime, cstime;
+        cputime_t gtime;
+        cputime_t cgtime;
        unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
        unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
        unsigned long inblock, oublock, cinblock, coublock;
@@ -596,8 +599,21 @@ struct user_struct {
        /* Hash table maintenance information */
        struct hlist_node uidhash_node;
        uid_t uid;
+#ifdef CONFIG_FAIR_USER_SCHED
+        struct task_group *tg;
+        struct kset kset;
+        struct subsys_attribute user_attr;
+        struct work_struct work;
+#endif
 };
+#ifdef CONFIG_FAIR_USER_SCHED
+extern int uids_kobject_init(void);
+#else
+static inline int uids_kobject_init(void) { return 0; }
+#endif
 extern struct user_struct *find_user(uid_t);
 extern struct user_struct root_user;
@@ -609,13 +625,17 @@ struct reclaim_state;
 #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
 struct sched_info {
        /* cumulative counters */
-        unsigned long pcnt;           /* # of times run on this cpu */
+        unsigned long pcount;         /* # of times run on this cpu */
        unsigned long long cpu_time,  /* time spent on the cpu */
                           run_delay; /* time spent waiting on a runqueue */
        /* timestamps */
        unsigned long long last_arrival,/* when we last ran on a cpu */
                           last_queued; /* when we were last queued to run */
+#ifdef CONFIG_SCHEDSTATS
+        /* BKL stats */
+        unsigned long bkl_count;
+#endif
 };
 #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */
@@ -750,7 +770,7 @@ struct sched_domain {
 #ifdef CONFIG_SCHEDSTATS
        /* load_balance() stats */
-        unsigned long lb_cnt[CPU_MAX_IDLE_TYPES];
+        unsigned long lb_count[CPU_MAX_IDLE_TYPES];
        unsigned long lb_failed[CPU_MAX_IDLE_TYPES];
        unsigned long lb_balanced[CPU_MAX_IDLE_TYPES];
        unsigned long lb_imbalance[CPU_MAX_IDLE_TYPES];
@@ -760,17 +780,17 @@ struct sched_domain {
        unsigned long lb_nobusyq[CPU_MAX_IDLE_TYPES];
        /* Active load balancing */
-        unsigned long alb_cnt;
+        unsigned long alb_count;
        unsigned long alb_failed;
        unsigned long alb_pushed;
        /* SD_BALANCE_EXEC stats */
-        unsigned long sbe_cnt;
+        unsigned long sbe_count;
        unsigned long sbe_balanced;
        unsigned long sbe_pushed;
        /* SD_BALANCE_FORK stats */
-        unsigned long sbf_cnt;
+        unsigned long sbf_count;
        unsigned long sbf_balanced;
        unsigned long sbf_pushed;
@@ -854,11 +874,11 @@ struct rq;
 struct sched_domain;
 struct sched_class {
-        struct sched_class *next;
+        const struct sched_class *next;
        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup);
        void (*dequeue_task) (struct rq *rq, struct task_struct *p, int sleep);
-        void (*yield_task) (struct rq *rq, struct task_struct *p);
+        void (*yield_task) (struct rq *rq);
        void (*check_preempt_curr) (struct rq *rq, struct task_struct *p);
@@ -888,31 +908,22 @@ struct load_weight {
 *     4 se->block_start
 *     4 se->run_node
 *     4 se->sleep_start
- *     4 se->sleep_start_fair
 *     6 se->load.weight
- *     7 se->delta_fair
- *    15 se->wait_runtime
 */
 struct sched_entity {
-        long                    wait_runtime;
-        unsigned long           delta_fair_run;
-        unsigned long           delta_fair_sleep;
-        unsigned long           delta_exec;
-        s64                     fair_key;
        struct load_weight      load;           /* for load-balancing */
        struct rb_node          run_node;
        unsigned int            on_rq;
+        int                     peer_preempt;
        u64                     exec_start;
        u64                     sum_exec_runtime;
+        u64                     vruntime;
        u64                     prev_sum_exec_runtime;
-        u64                     wait_start_fair;
-        u64                     sleep_start_fair;
 #ifdef CONFIG_SCHEDSTATS
        u64                     wait_start;
        u64                     wait_max;
-        s64                     sum_wait_runtime;
        u64                     sleep_start;
        u64                     sleep_max;
@@ -921,9 +932,25 @@ struct sched_entity {
        u64                     block_start;
        u64                     block_max;
        u64                     exec_max;
+        u64                     slice_max;
-        unsigned long           wait_runtime_overruns;
-        unsigned long           wait_runtime_underruns;
+        u64                     nr_migrations;
+        u64                     nr_migrations_cold;
+        u64                     nr_failed_migrations_affine;
+        u64                     nr_failed_migrations_running;
+        u64                     nr_failed_migrations_hot;
+        u64                     nr_forced_migrations;
+        u64                     nr_forced2_migrations;
+        u64                     nr_wakeups;
+        u64                     nr_wakeups_sync;
+        u64                     nr_wakeups_migrate;
+        u64                     nr_wakeups_local;
+        u64                     nr_wakeups_remote;
+        u64                     nr_wakeups_affine;
+        u64                     nr_wakeups_affine_attempts;
+        u64                     nr_wakeups_passive;
+        u64                     nr_wakeups_idle;
 #endif
 #ifdef CONFIG_FAIR_GROUP_SCHED
@@ -952,7 +979,7 @@ struct task_struct {
        int prio, static_prio, normal_prio;
        struct list_head run_list;
-        struct sched_class *sched_class;
+        const struct sched_class *sched_class;
        struct sched_entity se;
 #ifdef CONFIG_PREEMPT_NOTIFIERS
@@ -1023,6 +1050,7 @@ struct task_struct {
        unsigned int rt_priority;
        cputime_t utime, stime;
+        cputime_t gtime;
        unsigned long nvcsw, nivcsw; /* context switch counts */
        struct timespec start_time;             /* monotonic time */
        struct timespec real_start_time;        /* boot based time */
@@ -1314,6 +1342,7 @@ static inline void put_task_struct(struct task_struct *t)
 #define PF_STARTING     0x00000002      /* being created */
 #define PF_EXITING      0x00000004      /* getting shut down */
 #define PF_EXITPIDONE   0x00000008      /* pi exit done on shut down */
+#define PF_VCPU         0x00000010      /* I'm a virtual CPU */
 #define PF_FORKNOEXEC   0x00000040      /* forked but didn't exec */
 #define PF_SUPERPRIV    0x00000100      /* used super-user privileges */
 #define PF_DUMPCORE     0x00000200      /* dumped core */
@@ -1401,15 +1430,17 @@ static inline void idle_task_exit(void) {}
 extern void sched_idle_next(void);
+#ifdef CONFIG_SCHED_DEBUG
 extern unsigned int sysctl_sched_latency;
-extern unsigned int sysctl_sched_min_granularity;
+extern unsigned int sysctl_sched_nr_latency;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_batch_wakeup_granularity;
-extern unsigned int sysctl_sched_stat_granularity;
-extern unsigned int sysctl_sched_runtime_limit;
-extern unsigned int sysctl_sched_compat_yield;
 extern unsigned int sysctl_sched_child_runs_first;
 extern unsigned int sysctl_sched_features;
+extern unsigned int sysctl_sched_migration_cost;
+#endif
+extern unsigned int sysctl_sched_compat_yield;
 #ifdef CONFIG_RT_MUTEXES
 extern int rt_mutex_getprio(struct task_struct *p);
@@ -1843,6 +1874,18 @@ extern int sched_mc_power_savings, sched_smt_power_savings;
 extern void normalize_rt_tasks(void);
+#ifdef CONFIG_FAIR_GROUP_SCHED
+extern struct task_group init_task_group;
+extern struct task_group *sched_create_group(void);
+extern void sched_destroy_group(struct task_group *tg);
+extern void sched_move_task(struct task_struct *tsk);
+extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
+extern unsigned long sched_group_shares(struct task_group *tg);
+#endif
 #ifdef CONFIG_TASK_XACCT
 static inline void add_rchar(struct task_struct *tsk, ssize_t amt)
 {
diff --git a/include/linux/scx200_gpio.h b/include/linux/scx200_gpio.h
index d2b058130eb1..ece4e553e9ac 100644
--- a/include/linux/scx200_gpio.h
+++ b/include/linux/scx200_gpio.h
@@ -1,7 +1,7 @@
 u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);
 extern unsigned scx200_gpio_base;
-extern long scx200_gpio_shadow[2];
+extern unsigned long scx200_gpio_shadow[2];
 extern struct nsc_gpio_ops scx200_gpio_ops;
 #define scx200_gpio_present() (scx200_gpio_base!=0)
@@ -9,7 +9,7 @@ extern struct nsc_gpio_ops scx200_gpio_ops;
 /* Definitions to make sure I do the same thing in all functions */
 #define __SCx200_GPIO_BANK unsigned bank = index>>5
 #define __SCx200_GPIO_IOADDR unsigned short ioaddr = scx200_gpio_base+0x10*bank
-#define __SCx200_GPIO_SHADOW long *shadow = scx200_gpio_shadow+bank
+#define __SCx200_GPIO_SHADOW unsigned long *shadow = scx200_gpio_shadow+bank
 #define __SCx200_GPIO_INDEX index &= 31
 #define __SCx200_GPIO_OUT __asm__ __volatile__("outsl":"=mS" (shadow):"d" (ioaddr), "0" (shadow))
@@ -42,7 +42,7 @@ static inline void scx200_gpio_set_high(unsigned index) {
        __SCx200_GPIO_IOADDR;
        __SCx200_GPIO_SHADOW;
        __SCx200_GPIO_INDEX;
-        set_bit(index, shadow);
+        set_bit(index, shadow); /* __set_bit()? */
        __SCx200_GPIO_OUT;
 }
@@ -53,7 +53,7 @@ static inline void scx200_gpio_set_low(unsigned index) {
        __SCx200_GPIO_IOADDR;
        __SCx200_GPIO_SHADOW;
        __SCx200_GPIO_INDEX;
-        clear_bit(index, shadow);
+        clear_bit(index, shadow); /* __clear_bit()? */
        __SCx200_GPIO_OUT;
 }
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a656cecd373c..8101e8b0d7ba 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1781,6 +1781,11 @@ static inline int skb_is_gso(const struct sk_buff *skb)
        return skb_shinfo(skb)->gso_size;
 }
+static inline int skb_is_gso_v6(const struct sk_buff *skb)
+{
+        return skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6;
+}
 static inline void skb_forward_csum(struct sk_buff *skb)
 {
        /* Unfortunately we don't support this one.  Any brave souls? */
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 4a0a329beafb..94b4a10b912f 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -75,7 +75,7 @@ struct stlport {
        int                     ioaddr;
        int                     uartaddr;
        unsigned int            pagenr;
-        long                    istate;
+        unsigned long           istate;
        int                     flags;
        int                     baud_base;
        int                     custom_divisor;
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 3699dff7db8f..bd7a6b0a87af 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -136,16 +136,6 @@ sunrpc_cache_update(struct cache_detail *detail,
                    struct cache_head *new, struct cache_head *old, int hash);
-#define cache_for_each(pos, detail, index, member)                                              \
-        for (({read_lock(&(detail)->hash_lock); index = (detail)->hash_size;}) ;                \
-             ({if (index==0)read_unlock(&(detail)->hash_lock); index--;});                      \
-                )                                                                               \
-                for (pos = container_of((detail)->hash_table[index], typeof(*pos), member);     \
-                     &pos->member;                                                              \
-                     pos = container_of(pos->member.next, typeof(*pos), member))
-             
 extern void cache_clean_deferred(void *owner);
 static inline struct cache_head  *cache_get(struct cache_head *h)
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index c0d9d14983b3..d9d5c5ad826c 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -117,7 +117,7 @@ struct rpc_create_args {
 struct rpc_clnt *rpc_create(struct rpc_create_args *args);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
-                                struct rpc_program *, int);
+                                struct rpc_program *, u32);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
 void            rpc_shutdown_client(struct rpc_clnt *);
 void            rpc_release_client(struct rpc_clnt *);
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 3912cf16361e..3347c72b848a 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -88,6 +88,11 @@ enum {
        CTL_SLOTTABLE_TCP,
        CTL_MIN_RESVPORT,
        CTL_MAX_RESVPORT,
+        CTL_SLOTTABLE_RDMA,
+        CTL_RDMA_MAXINLINEREAD,
+        CTL_RDMA_MAXINLINEWRITE,
+        CTL_RDMA_WRITEPADDING,
+        CTL_RDMA_MEMREG,
 };
 #endif /* _LINUX_SUNRPC_DEBUG_H_ */
diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
index 784d4c3ef651..c4beb5775111 100644
--- a/include/linux/sunrpc/msg_prot.h
+++ b/include/linux/sunrpc/msg_prot.h
@@ -138,6 +138,19 @@ typedef __be32	rpc_fraghdr;
 #define RPC_MAX_HEADER_WITH_AUTH \
        (RPC_CALLHDRSIZE + 2*(2+RPC_MAX_AUTH_SIZE/4))
+/*
+ * RFC1833/RFC3530 rpcbind (v3+) well-known netid's.
+ */
+#define RPCBIND_NETID_UDP       "udp"
+#define RPCBIND_NETID_TCP       "tcp"
+#define RPCBIND_NETID_UDP6      "udp6"
+#define RPCBIND_NETID_TCP6      "tcp6"
+/*
+ * Note that RFC 1833 does not put any size restrictions on the
+ * netid string, but all currently defined netid's fit in 4 bytes.
+ */
+#define RPCBIND_MAXNETIDLEN     (4u)
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_MSGPROT_H_ */
diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
new file mode 100644
index 000000000000..0013a0d8dc6b
--- /dev/null
+++ b/include/linux/sunrpc/rpc_rdma.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the BSD-type
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *      Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *      Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *
+ *      Neither the name of the Network Appliance, Inc. nor the names of
+ *      its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _LINUX_SUNRPC_RPC_RDMA_H
+#define _LINUX_SUNRPC_RPC_RDMA_H
+struct rpcrdma_segment {
+        uint32_t rs_handle;     /* Registered memory handle */
+        uint32_t rs_length;     /* Length of the chunk in bytes */
+        uint64_t rs_offset;     /* Chunk virtual address or offset */
+};
+/*
+ * read chunk(s), encoded as a linked list.
+ */
+struct rpcrdma_read_chunk {
+        uint32_t rc_discrim;    /* 1 indicates presence */
+        uint32_t rc_position;   /* Position in XDR stream */
+        struct rpcrdma_segment rc_target;
+};
+/*
+ * write chunk, and reply chunk.
+ */
+struct rpcrdma_write_chunk {
+        struct rpcrdma_segment wc_target;
+};
+/*
+ * write chunk(s), encoded as a counted array.
+ */
+struct rpcrdma_write_array {
+        uint32_t wc_discrim;    /* 1 indicates presence */
+        uint32_t wc_nchunks;    /* Array count */
+        struct rpcrdma_write_chunk wc_array[0];
+};
+struct rpcrdma_msg {
+        uint32_t rm_xid;        /* Mirrors the RPC header xid */
+        uint32_t rm_vers;       /* Version of this protocol */
+        uint32_t rm_credit;     /* Buffers requested/granted */
+        uint32_t rm_type;       /* Type of message (enum rpcrdma_proc) */
+        union {
+                struct {                        /* no chunks */
+                        uint32_t rm_empty[3];   /* 3 empty chunk lists */
+                } rm_nochunks;
+                struct {                        /* no chunks and padded */
+                        uint32_t rm_align;      /* Padding alignment */
+                        uint32_t rm_thresh;     /* Padding threshold */
+                        uint32_t rm_pempty[3];  /* 3 empty chunk lists */
+                } rm_padded;
+                uint32_t rm_chunks[0];  /* read, write and reply chunks */
+        } rm_body;
+};
+#define RPCRDMA_HDRLEN_MIN      28
+enum rpcrdma_errcode {
+        ERR_VERS = 1,
+        ERR_CHUNK = 2
+};
+struct rpcrdma_err_vers {
+        uint32_t rdma_vers_low; /* Version range supported by peer */
+        uint32_t rdma_vers_high;
+};
+enum rpcrdma_proc {
+        RDMA_MSG = 0,           /* An RPC call or reply msg */
+        RDMA_NOMSG = 1,         /* An RPC call or reply msg - separate body */
+        RDMA_MSGP = 2,          /* An RPC call or reply msg with padding */
+        RDMA_DONE = 3,          /* Client signals reply completion */
+        RDMA_ERROR = 4          /* An RPC RDMA encoding error */
+};
+#endif                          /* _LINUX_SUNRPC_RPC_RDMA_H */
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index c6b53d181bfa..0751c9464d0f 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -70,7 +70,10 @@ struct xdr_buf {
        struct page **  pages;          /* Array of contiguous pages */
        unsigned int    page_base,      /* Start of page data */
-                        page_len;       /* Length of page data */
+                        page_len,       /* Length of page data */
+                        flags;          /* Flags for data disposition */
+#define XDRBUF_READ             0x01            /* target of file read */
+#define XDRBUF_WRITE            0x02            /* source of file write */
        unsigned int    buflen,         /* Total length of storage buffer */
                        len;            /* Length of XDR encoded message */
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index d11cedd14f0f..30b17b3bc1a9 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -19,25 +19,11 @@
 #ifdef __KERNEL__
-extern unsigned int xprt_udp_slot_table_entries;
-extern unsigned int xprt_tcp_slot_table_entries;
 #define RPC_MIN_SLOT_TABLE      (2U)
 #define RPC_DEF_SLOT_TABLE      (16U)
 #define RPC_MAX_SLOT_TABLE      (128U)
 /*
- * Parameters for choosing a free port
- */
-extern unsigned int xprt_min_resvport;
-extern unsigned int xprt_max_resvport;
-#define RPC_MIN_RESVPORT        (1U)
-#define RPC_MAX_RESVPORT        (65535U)
-#define RPC_DEF_MIN_RESVPORT    (665U)
-#define RPC_DEF_MAX_RESVPORT    (1023U)
-/*
 * This describes a timeout strategy
 */
 struct rpc_timeout {
@@ -53,6 +39,10 @@ enum rpc_display_format_t {
        RPC_DISPLAY_PORT,
        RPC_DISPLAY_PROTO,
        RPC_DISPLAY_ALL,
+        RPC_DISPLAY_HEX_ADDR,
+        RPC_DISPLAY_HEX_PORT,
+        RPC_DISPLAY_UNIVERSAL_ADDR,
+        RPC_DISPLAY_NETID,
        RPC_DISPLAY_MAX,
 };
@@ -196,14 +186,22 @@ struct rpc_xprt {
        char *                  address_strings[RPC_DISPLAY_MAX];
 };
-struct rpc_xprtsock_create {
+struct xprt_create {
-        int                     proto;          /* IPPROTO_UDP or IPPROTO_TCP */
+        int                     ident;          /* XPRT_TRANSPORT identifier */
        struct sockaddr *       srcaddr;        /* optional local address */
        struct sockaddr *       dstaddr;        /* remote peer address */
        size_t                  addrlen;
        struct rpc_timeout *    timeout;        /* optional timeout parameters */
 };
+struct xprt_class {
+        struct list_head        list;
+        int                     ident;          /* XPRT_TRANSPORT identifier */
+        struct rpc_xprt *       (*setup)(struct xprt_create *);
+        struct module           *owner;
+        char                    name[32];
+};
 /*
 * Transport operations used by ULPs
 */
@@ -212,7 +210,7 @@ void			xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long
 /*
 * Generic internal transport functions
 */
-struct rpc_xprt *       xprt_create_transport(struct rpc_xprtsock_create *args);
+struct rpc_xprt         *xprt_create_transport(struct xprt_create *args);
 void                    xprt_connect(struct rpc_task *task);
 void                    xprt_reserve(struct rpc_task *task);
 int                     xprt_reserve_xprt(struct rpc_task *task);
@@ -235,6 +233,8 @@ static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *
 /*
 * Transport switch helper functions
 */
+int                     xprt_register_transport(struct xprt_class *type);
+int                     xprt_unregister_transport(struct xprt_class *type);
 void                    xprt_set_retrans_timeout_def(struct rpc_task *task);
 void                    xprt_set_retrans_timeout_rtt(struct rpc_task *task);
 void                    xprt_wake_pending_tasks(struct rpc_xprt *xprt, int status);
@@ -248,14 +248,6 @@ void			xprt_release_rqst_cong(struct rpc_task *task);
 void                    xprt_disconnect(struct rpc_xprt *xprt);
 /*
- * Socket transport setup operations
- */
-struct rpc_xprt *       xs_setup_udp(struct rpc_xprtsock_create *args);
-struct rpc_xprt *       xs_setup_tcp(struct rpc_xprtsock_create *args);
-int                     init_socket_xprt(void);
-void                    cleanup_socket_xprt(void);
-/*
 * Reserved bit positions in xprt->state
 */
 #define XPRT_LOCKED             (0)
diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
new file mode 100644
index 000000000000..4de56b1d372b
--- /dev/null
+++ b/include/linux/sunrpc/xprtrdma.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the BSD-type
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *      Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *      Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *
+ *      Neither the name of the Network Appliance, Inc. nor the names of
+ *      its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _LINUX_SUNRPC_XPRTRDMA_H
+#define _LINUX_SUNRPC_XPRTRDMA_H
+/*
+ * RPC transport identifier for RDMA
+ */
+#define XPRT_TRANSPORT_RDMA     256
+/*
+ * rpcbind (v3+) RDMA netid.
+ */
+#define RPCBIND_NETID_RDMA      "rdma"
+/*
+ * Constants. Max RPC/NFS header is big enough to account for
+ * additional marshaling buffers passed down by Linux client.
+ *
+ * RDMA header is currently fixed max size, and is big enough for a
+ * fully-chunked NFS message (read chunks are the largest). Note only
+ * a single chunk type per message is supported currently.
+ */
+#define RPCRDMA_MIN_SLOT_TABLE  (2U)
+#define RPCRDMA_DEF_SLOT_TABLE  (32U)
+#define RPCRDMA_MAX_SLOT_TABLE  (256U)
+#define RPCRDMA_DEF_INLINE  (1024)      /* default inline max */
+#define RPCRDMA_INLINE_PAD_THRESH  (512)/* payload threshold to pad (bytes) */
+#define RDMA_RESOLVE_TIMEOUT    (5*HZ)  /* TBD 5 seconds */
+#define RDMA_CONNECT_RETRY_MAX  (2)     /* retries if no listener backlog */
+/* memory registration strategies */
+#define RPCRDMA_PERSISTENT_REGISTRATION (1)
+enum rpcrdma_memreg {
+        RPCRDMA_BOUNCEBUFFERS = 0,
+        RPCRDMA_REGISTER,
+        RPCRDMA_MEMWINDOWS,
+        RPCRDMA_MEMWINDOWS_ASYNC,
+        RPCRDMA_MTHCAFMR,
+        RPCRDMA_ALLPHYSICAL,
+        RPCRDMA_LAST
+};
+#endif /* _LINUX_SUNRPC_XPRTRDMA_H */
diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
new file mode 100644
index 000000000000..2c6c2c2783d8
--- /dev/null
+++ b/include/linux/sunrpc/xprtsock.h
@@ -0,0 +1,51 @@
+/*
+ *  linux/include/linux/sunrpc/xprtsock.h
+ *
+ *  Declarations for the RPC transport socket provider.
+ */
+#ifndef _LINUX_SUNRPC_XPRTSOCK_H
+#define _LINUX_SUNRPC_XPRTSOCK_H
+#ifdef __KERNEL__
+/*
+ * Socket transport setup operations
+ */
+struct rpc_xprt *xs_setup_udp(struct xprt_create *args);
+struct rpc_xprt *xs_setup_tcp(struct xprt_create *args);
+int             init_socket_xprt(void);
+void            cleanup_socket_xprt(void);
+/*
+ * RPC transport identifiers for UDP, TCP
+ *
+ * To preserve compatibility with the historical use of raw IP protocol
+ * id's for transport selection, these are specified with the previous
+ * values. No such restriction exists for new transports, except that
+ * they may not collide with these values (17 and 6, respectively).
+ */
+#define XPRT_TRANSPORT_UDP      IPPROTO_UDP
+#define XPRT_TRANSPORT_TCP      IPPROTO_TCP
+/*
+ * RPC slot table sizes for UDP, TCP transports
+ */
+extern unsigned int xprt_udp_slot_table_entries;
+extern unsigned int xprt_tcp_slot_table_entries;
+/*
+ * Parameters for choosing a free port
+ */
+extern unsigned int xprt_min_resvport;
+extern unsigned int xprt_max_resvport;
+#define RPC_MIN_RESVPORT        (1U)
+#define RPC_MAX_RESVPORT        (65535U)
+#define RPC_DEF_MIN_RESVPORT    (665U)
+#define RPC_DEF_MAX_RESVPORT    (1023U)
+#endif /* __KERNEL__ */
+#endif /* _LINUX_SUNRPC_XPRTSOCK_H */
diff --git a/include/linux/topology.h b/include/linux/topology.h
index 525d437b1253..47729f18bfdf 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -159,15 +159,14 @@
        .imbalance_pct          = 125,                  \
        .cache_nice_tries       = 1,                    \
        .busy_idx               = 2,                    \
-        .idle_idx               = 0,                    \
+        .idle_idx               = 1,                    \
-        .newidle_idx            = 0,                    \
+        .newidle_idx            = 2,                    \
        .wake_idx               = 1,                    \
        .forkexec_idx           = 1,                    \
        .flags                  = SD_LOAD_BALANCE       \
                                | SD_BALANCE_NEWIDLE    \
                                | SD_BALANCE_EXEC       \
                                | SD_WAKE_AFFINE        \
-                                | SD_WAKE_IDLE          \
                                | BALANCE_FOR_PKG_POWER,\
        .last_balance           = jiffies,              \
        .balance_interval       = 1,                    \
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index c7c3337c3a88..d1321a81c9c4 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -62,8 +62,6 @@ struct writeback_control {
        unsigned for_reclaim:1;         /* Invoked from the page allocator */
        unsigned for_writepages:1;      /* This is a writepages() call */
        unsigned range_cyclic:1;        /* range_start is cyclic */
-        void *fs_private;               /* For use by ->writepages() */
 };
 /*
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 9fa09fb800a1..0fa5d5912555 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -133,7 +133,7 @@ struct videobuf_qtype_ops {
                                 enum v4l2_memory memory);
        int (*sync)             (struct videobuf_queue* q,
                                 struct videobuf_buffer *buf);
-        int (*copy_to_user)     (struct videobuf_queue *q,
+        int (*video_copy_to_user)(struct videobuf_queue *q,
                                 char __user *data,
                                 size_t count,
                                 int nonblocking);
diff --git a/include/scsi/libsrp.h b/include/scsi/libsrp.h
index d143171896ae..ba615e4c1d7c 100644
--- a/include/scsi/libsrp.h
+++ b/include/scsi/libsrp.h
@@ -59,7 +59,7 @@ extern void srp_target_free(struct srp_target *);
 extern struct iu_entry *srp_iu_get(struct srp_target *);
 extern void srp_iu_put(struct iu_entry *);
-extern int srp_cmd_queue(struct Scsi_Host *, struct srp_cmd *, void *, u64);
+extern int srp_cmd_queue(struct Scsi_Host *, struct srp_cmd *, void *, u64, u64);
 extern int srp_transfer_data(struct scsi_cmnd *, struct srp_cmd *,
                             srp_rdma_t, int, int);
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 53e170586c26..65ab5145a09b 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -33,20 +33,17 @@ struct scsi_cmnd {
        struct list_head list;  /* scsi_cmnd participates in queue lists */
        struct list_head eh_entry; /* entry for the host eh_cmd_q */
        int eh_eflags;          /* Used by error handlr */
-        void (*done) (struct scsi_cmnd *);      /* Mid-level done function */
        /*
         * A SCSI Command is assigned a nonzero serial_number before passed
         * to the driver's queue command function.  The serial_number is
         * cleared when scsi_done is entered indicating that the command
-         * has been completed.  It currently doesn't have much use other
+         * has been completed.  It is a bug for LLDDs to use this number
-         * than printk's.  Some lldd's use this number for other purposes.
+         * for purposes other than printk (and even that is only useful
-         * It's almost certain that such usages are either incorrect or
+         * for debugging).
-         * meaningless.  Please kill all usages other than printk's.  Also,
-         * as this number is always identical to ->pid, please convert
-         * printk's to use ->pid, so that we can kill this field.
         */
        unsigned long serial_number;
        /*
         * This is set to jiffies as it was when the command was first
         * allocated.  It is used to time how long the command has
@@ -116,7 +113,6 @@ struct scsi_cmnd {
        int result;             /* Status code from lower level driver */
        unsigned char tag;      /* SCSI-II queued command tag */
-        unsigned long pid;      /* Process ID, starts at 0. Unique per host. */
 };
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
@@ -124,7 +120,6 @@ extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *,
                               struct device *);
-extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
 extern void scsi_req_abort_cmd(struct scsi_cmnd *cmd);
diff --git a/include/scsi/scsi_dbg.h b/include/scsi/scsi_dbg.h
index 5a43a4cd96c6..e89844cc2cd3 100644
--- a/include/scsi/scsi_dbg.h
+++ b/include/scsi/scsi_dbg.h
@@ -9,6 +9,8 @@ extern void __scsi_print_command(unsigned char *);
 extern void scsi_show_extd_sense(unsigned char, unsigned char);
 extern void scsi_show_sense_hdr(struct scsi_sense_hdr *);
 extern void scsi_print_sense_hdr(const char *, struct scsi_sense_hdr *);
+extern void scsi_cmd_print_sense_hdr(struct scsi_cmnd *, const char *,
+                                     struct scsi_sense_hdr *);
 extern void scsi_print_sense(char *, struct scsi_cmnd *);
 extern void __scsi_print_sense(const char *name,
                               const unsigned char *sense_buffer,
diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index 3465f31a21c4..1f5ca7f62116 100644
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -5,14 +5,17 @@
 struct module;
 struct scsi_cmnd;
+struct scsi_device;
+struct request;
+struct request_queue;
 struct scsi_driver {
        struct module           *owner;
        struct device_driver    gendrv;
-        int (*init_command)(struct scsi_cmnd *);
        void (*rescan)(struct device *);
+        int (*done)(struct scsi_cmnd *);
 };
 #define to_scsi_driver(drv) \
        container_of((drv), struct scsi_driver, gendrv)
@@ -25,4 +28,9 @@ extern int scsi_register_interface(struct class_interface *);
 #define scsi_unregister_interface(intf) \
        class_interface_unregister(intf)
+int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req);
+int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req);
+int scsi_prep_state_check(struct scsi_device *sdev, struct request *req);
+int scsi_prep_return(struct request_queue *q, struct request *req, int ret);
 #endif /* _SCSI_SCSI_DRIVER_H */
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index c5c0f6762a01..44224ba4dd90 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -1,7 +1,7 @@
 #ifndef _SCSI_SCSI_EH_H
 #define _SCSI_SCSI_EH_H
-struct scsi_cmnd;
+#include <scsi/scsi_cmnd.h>
 struct scsi_device;
 struct Scsi_Host;
@@ -65,4 +65,25 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
 extern int scsi_reset_provider(struct scsi_device *, int);
+struct scsi_eh_save {
+        int result;
+        enum dma_data_direction data_direction;
+        unsigned char cmd_len;
+        unsigned char cmnd[MAX_COMMAND_SIZE];
+        void *buffer;
+        unsigned bufflen;
+        unsigned short use_sg;
+        int resid;
+        struct scatterlist sense_sgl;
+};
+extern void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
+                struct scsi_eh_save *ses, unsigned char *cmnd,
+                int cmnd_size, unsigned sense_bytes);
+extern void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
+                struct scsi_eh_save *ses);
 #endif /* _SCSI_SCSI_EH_H */
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 3b8a6a85c2f8..7d210cd6c38d 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -32,6 +32,9 @@ struct blk_queue_tags;
 #define SG_NONE 0
 #define SG_ALL 0xff
+#define MODE_UNKNOWN 0x00
+#define MODE_INITIATOR 0x01
+#define MODE_TARGET 0x02
 #define DISABLE_CLUSTERING 0
 #define ENABLE_CLUSTERING 1
@@ -145,9 +148,6 @@ struct scsi_host_template {
        int (* transfer_response)(struct scsi_cmnd *,
                                  void (*done)(struct scsi_cmnd *));
-        /* Used as callback for the completion of task management request. */
-        int (* tsk_mgmt_response)(u64 mid, int result);
        /*
         * This is an error handling strategy routine.  You don't need to
         * define one of these if you don't want to - there is a default
@@ -408,6 +408,11 @@ struct scsi_host_template {
        unsigned char present;
        /*
+         * This specifies the mode that a LLD supports.
+         */
+        unsigned supported_mode:2;
+        /*
         * true if this host adapter uses unchecked DMA onto an ISA bus.
         */
        unsigned unchecked_isa_dma:1;
@@ -575,8 +580,9 @@ struct Scsi_Host {
         * Used to assign serial numbers to the cmds.
         * Protected by the host lock.
         */
-        unsigned long cmd_serial_number, cmd_pid; 
+        unsigned long cmd_serial_number;
        
+        unsigned active_mode:2;
        unsigned unchecked_isa_dma:1;
        unsigned use_clustering:1;
        unsigned use_blk_tcq:1;
diff --git a/include/scsi/scsi_tgt.h b/include/scsi/scsi_tgt.h
index 4f4427937af2..d0fefb96158f 100644
--- a/include/scsi/scsi_tgt.h
+++ b/include/scsi/scsi_tgt.h
@@ -11,9 +11,11 @@ struct scsi_lun;
 extern struct Scsi_Host *scsi_tgt_cmd_to_host(struct scsi_cmnd *);
 extern int scsi_tgt_alloc_queue(struct Scsi_Host *);
 extern void scsi_tgt_free_queue(struct Scsi_Host *);
-extern int scsi_tgt_queue_command(struct scsi_cmnd *, struct scsi_lun *, u64);
+extern int scsi_tgt_queue_command(struct scsi_cmnd *, u64, struct scsi_lun *, u64);
-extern int scsi_tgt_tsk_mgmt_request(struct Scsi_Host *, int, u64, struct scsi_lun *,
+extern int scsi_tgt_tsk_mgmt_request(struct Scsi_Host *, u64, int, u64,
-                                     void *);
+                                     struct scsi_lun *, void *);
 extern struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *,
                                               enum dma_data_direction, gfp_t);
 extern void scsi_host_put_command(struct Scsi_Host *, struct scsi_cmnd *);
+extern int scsi_tgt_it_nexus_create(struct Scsi_Host *, u64, char *);
+extern int scsi_tgt_it_nexus_destroy(struct Scsi_Host *, u64);
diff --git a/include/scsi/scsi_tgt_if.h b/include/scsi/scsi_tgt_if.h
index 4cf9dff29a2f..f2ee7c238a45 100644
--- a/include/scsi/scsi_tgt_if.h
+++ b/include/scsi/scsi_tgt_if.h
@@ -23,13 +23,15 @@
 #define __SCSI_TARGET_IF_H
 /* user -> kernel */
-#define TGT_UEVENT_CMD_RSP      0x0001
+#define TGT_UEVENT_CMD_RSP              0x0001
-#define TGT_UEVENT_TSK_MGMT_RSP 0x0002
+#define TGT_UEVENT_IT_NEXUS_RSP         0x0002
+#define TGT_UEVENT_TSK_MGMT_RSP         0x0003
 /* kernel -> user */
-#define TGT_KEVENT_CMD_REQ      0x1001
+#define TGT_KEVENT_CMD_REQ              0x1001
-#define TGT_KEVENT_CMD_DONE     0x1002
+#define TGT_KEVENT_CMD_DONE             0x1002
-#define TGT_KEVENT_TSK_MGMT_REQ 0x1003
+#define TGT_KEVENT_IT_NEXUS_REQ         0x1003
+#define TGT_KEVENT_TSK_MGMT_REQ         0x1004
 struct tgt_event_hdr {
        uint16_t version;
@@ -46,6 +48,7 @@ struct tgt_event {
                struct {
                        int host_no;
                        int result;
+                        aligned_u64 itn_id;
                        aligned_u64 tag;
                        aligned_u64 uaddr;
                        aligned_u64 sense_uaddr;
@@ -55,15 +58,22 @@ struct tgt_event {
                } cmd_rsp;
                struct {
                        int host_no;
-                        aligned_u64 mid;
                        int result;
+                        aligned_u64 itn_id;
+                        aligned_u64 mid;
                } tsk_mgmt_rsp;
+                struct {
+                        __s32 host_no;
+                        __s32 result;
+                        aligned_u64 itn_id;
+                        __u32 function;
+                } it_nexus_rsp;
                /* kernel -> user */
                struct {
                        int host_no;
                        uint32_t data_len;
+                        aligned_u64 itn_id;
                        uint8_t scb[16];
                        uint8_t lun[8];
                        int attribute;
@@ -71,16 +81,25 @@ struct tgt_event {
                } cmd_req;
                struct {
                        int host_no;
-                        aligned_u64 tag;
                        int result;
+                        aligned_u64 itn_id;
+                        aligned_u64 tag;
                } cmd_done;
                struct {
                        int host_no;
                        int function;
+                        aligned_u64 itn_id;
                        aligned_u64 tag;
                        uint8_t lun[8];
                        aligned_u64 mid;
                } tsk_mgmt_req;
+                struct {
+                        __s32 host_no;
+                        __u32 function;
+                        aligned_u64 itn_id;
+                        __u32 max_cmds;
+                        __u8 initiator_id[16];
+                } it_nexus_req;
        } p;
 } __attribute__ ((aligned (sizeof(uint64_t))));
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index 3c18baa65a72..0dfef752f0e2 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -65,6 +65,18 @@ struct scsi_transport_template {
         * EH_NOT_HANDLED       Begin normal error recovery
         */
        enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
+        /*
+         * Used as callback for the completion of i_t_nexus request
+         * for target drivers.
+         */
+        int (* it_nexus_response)(struct Scsi_Host *, u64, int);
+        /*
+         * Used as callback for the completion of task management
+         * request for target drivers.
+         */
+        int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
 };
 #define transport_class_to_shost(tc) \
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index a0d80bcaa93d..e466d886e192 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -589,6 +589,10 @@ struct fc_function_template {
        int     (*vport_disable)(struct fc_vport *, bool);
        int     (*vport_delete)(struct fc_vport *);
+        /* target-mode drivers' functions */
+        int     (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
+        int     (* it_nexus_response)(struct Scsi_Host *, u64, int);
        /* allocation lengths for host-specific data */
        u32                             dd_fcrport_size;
        u32                             dd_fcvport_size;
@@ -632,6 +636,8 @@ struct fc_function_template {
        unsigned long   show_host_fabric_name:1;
        unsigned long   show_host_symbolic_name:1;
        unsigned long   show_host_system_hostname:1;
+        unsigned long   disable_target_scan:1;
 };
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 706c0cd36c14..7ff6199cbd55 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -24,6 +24,8 @@
 #define SCSI_TRANSPORT_ISCSI_H
 #include <linux/device.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
 #include <scsi/iscsi_if.h>
 struct scsi_transport_template;
diff --git a/include/scsi/scsi_transport_srp.h b/include/scsi/scsi_transport_srp.h
new file mode 100644
index 000000000000..9c60ca1c08c5
--- /dev/null
+++ b/include/scsi/scsi_transport_srp.h
@@ -0,0 +1,39 @@
+#ifndef SCSI_TRANSPORT_SRP_H
+#define SCSI_TRANSPORT_SRP_H
+#include <linux/transport_class.h>
+#include <linux/types.h>
+#include <linux/mutex.h>
+#define SRP_RPORT_ROLE_INITIATOR 0
+#define SRP_RPORT_ROLE_TARGET 1
+struct srp_rport_identifiers {
+        u8 port_id[16];
+        u8 roles;
+};
+struct srp_rport {
+        struct device dev;
+        u8 port_id[16];
+        u8 roles;
+};
+struct srp_function_template {
+        /* for target drivers */
+        int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
+        int (* it_nexus_response)(struct Scsi_Host *, u64, int);
+};
+extern struct scsi_transport_template *
+srp_attach_transport(struct srp_function_template *);
+extern void srp_release_transport(struct scsi_transport_template *);
+extern struct srp_rport *srp_rport_add(struct Scsi_Host *,
+                                       struct srp_rport_identifiers *);
+extern void srp_rport_del(struct srp_rport *);
+extern void srp_remove_host(struct Scsi_Host *);
+#endif
diff --git a/include/scsi/sd.h b/include/scsi/sd.h
index ce02ad1f5185..f7513313ef0d 100644
--- a/include/scsi/sd.h
+++ b/include/scsi/sd.h
@@ -47,20 +47,6 @@ struct scsi_disk {
 };
 #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
-static int  sd_revalidate_disk(struct gendisk *disk);
-static void sd_rw_intr(struct scsi_cmnd * SCpnt);
-static int  sd_probe(struct device *);
-static int  sd_remove(struct device *);
-static void sd_shutdown(struct device *dev);
-static int sd_suspend(struct device *dev, pm_message_t state);
-static int sd_resume(struct device *dev);
-static void sd_rescan(struct device *);
-static int  sd_init_command(struct scsi_cmnd *);
-static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
-static void scsi_disk_release(struct class_device *cdev);
-static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
-static void sd_print_result(struct scsi_disk *, int);
 #define sd_printk(prefix, sdsk, fmt, a...)                              \
        (sdsk)->disk ?                                                  \
        sdev_printk(prefix, (sdsk)->device, "[%s] " fmt,                \