81 files changed, 2401 insertions, 323 deletions

diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h
index 5541101b58ae..ad854a4a3af6 100644
--- a/include/asm-alpha/termbits.h
+++ b/include/asm-alpha/termbits.h
@@ -25,6 +25,19 @@ struct termios {
         speed_t c_ospeed;               /* output speed */
 };
 
+/* Alpha has matching termios and ktermios */
+
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t c_line;                    /* line discipline (== c_cc[19]) */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VEOF 0
 #define VEOL 1
diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
index 90894214cace..93a58e7862b0 100644
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -31,6 +31,9 @@ struct s3c2410fb_hw {
 struct s3c2410fb_mach_info {
         unsigned char   fixed_syncs;    /* do not update sync/border */
 
+        /* LCD types */
+        int             type;
+
         /* Screen size */
         int             width;
         int             height;
diff --git a/include/asm-arm/termbits.h b/include/asm-arm/termbits.h
index bbc6e1d24d3f..a3f4fe1742d0 100644
--- a/include/asm-arm/termbits.h
+++ b/include/asm-arm/termbits.h
@@ -15,6 +15,18 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-arm26/termbits.h b/include/asm-arm26/termbits.h
index bbc6e1d24d3f..a3f4fe1742d0 100644
--- a/include/asm-arm26/termbits.h
+++ b/include/asm-arm26/termbits.h
@@ -15,6 +15,18 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-avr32/termbits.h b/include/asm-avr32/termbits.h
index 9dc6eacafa33..c215fafdae4d 100644
--- a/include/asm-avr32/termbits.h
+++ b/include/asm-avr32/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-cris/termbits.h b/include/asm-cris/termbits.h
index be0836d2f282..8d8cec225fe1 100644
--- a/include/asm-cris/termbits.h
+++ b/include/asm-cris/termbits.h
@@ -19,6 +19,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
index 1f70d47148bd..f8560edf59ff 100644
--- a/include/asm-frv/bitops.h
+++ b/include/asm-frv/bitops.h
@@ -256,6 +256,50 @@ int __ffs(unsigned long x)
         return 31 - bit;
 }
 
+/*
+ * special slimline version of fls() for calculating ilog2_u32()
+ * - note: no protection against n == 0
+ */
+#define ARCH_HAS_ILOG2_U32
+static inline __attribute__((const))
+int __ilog2_u32(u32 n)
+{
+        int bit;
+        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(n));
+        return 31 - bit;
+}
+
+/*
+ * special slimline version of fls64() for calculating ilog2_u64()
+ * - note: no protection against n == 0
+ */
+#define ARCH_HAS_ILOG2_U64
+static inline __attribute__((const))
+int __ilog2_u64(u64 n)
+{
+        union {
+                u64 ll;
+                struct { u32 h, l; };
+        } _;
+        int bit, x, y;
+
+        _.ll = n;
+
+        asm("   subcc           %3,gr0,gr0,icc0         \n"
+            "   ckeq            icc0,cc4                \n"
+            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
+            "   setlos          #63,%1                  \n"
+            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
+            "   setlos          #31,%2                  \n"
+            "   csub.p          %1,%0,%0        ,cc4,0  \n"
+            "   csub            %2,%0,%0        ,cc4,1  \n"
+            : "=&r"(bit), "=r"(x), "=r"(y)
+            : "0r"(_.h), "r"(_.l)
+            : "icc0", "cc4"
+            );
+        return bit;
+}
+
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
 
diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h
index 74f20d6e292f..2d6d389cff49 100644
--- a/include/asm-frv/termbits.h
+++ b/include/asm-frv/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index c92ae0f166ff..a06eecd48292 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -4,6 +4,22 @@
 #include <linux/compiler.h>
 
 #ifdef CONFIG_BUG
+
+#ifdef CONFIG_GENERIC_BUG
+#ifndef __ASSEMBLY__
+struct bug_entry {
+        unsigned long   bug_addr;
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+        const char      *file;
+        unsigned short  line;
+#endif
+        unsigned short  flags;
+};
+#endif          /* __ASSEMBLY__ */
+
+#define BUGFLAG_WARNING (1<<0)
+#endif  /* CONFIG_GENERIC_BUG */
+
 #ifndef HAVE_ARCH_BUG
 #define BUG() do { \
         printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
@@ -19,7 +35,7 @@
 #define WARN_ON(condition) ({                                           \
         typeof(condition) __ret_warn_on = (condition);                  \
         if (unlikely(__ret_warn_on)) {                                  \
-                printk("BUG: warning at %s:%d/%s()\n", __FILE__,        \
+                printk("WARNING at %s:%d %s()\n", __FILE__,     \
                         __LINE__, __FUNCTION__);                        \
                 dump_stack();                                           \
         }                                                               \
diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h
index a96b5d986b6e..b55052ce2330 100644
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
@@ -4,21 +4,51 @@
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-#include <linux/compiler.h>
+#include <linux/log2.h>
 
-/* Pure 2^n version of get_order */
-static __inline__ __attribute_const__ int get_order(unsigned long size)
+/*
+ * non-const pure 2^n version of get_order
+ * - the arch may override these in asm/bitops.h if they can be implemented
+ *   more efficiently than using the arch log2 routines
+ * - we use the non-const log2() instead if the arch has defined one suitable
+ */
+#ifndef ARCH_HAS_GET_ORDER
+static inline __attribute__((const))
+int __get_order(unsigned long size, int page_shift)
 {
+#if BITS_PER_LONG == 32 && defined(ARCH_HAS_ILOG2_U32)
+        int order = __ilog2_u32(size) - page_shift;
+        return order >= 0 ? order : 0;
+#elif BITS_PER_LONG == 64 && defined(ARCH_HAS_ILOG2_U64)
+        int order = __ilog2_u64(size) - page_shift;
+        return order >= 0 ? order : 0;
+#else
         int order;
 
-        size = (size - 1) >> (PAGE_SHIFT - 1);
+        size = (size - 1) >> (page_shift - 1);
         order = -1;
         do {
                 size >>= 1;
                 order++;
         } while (size);
         return order;
+#endif
 }
+#endif
+
+/**
+ * get_order - calculate log2(pages) to hold a block of the specified size
+ * @n - size
+ *
+ * calculate allocation order based on the current page size
+ * - this can be used to initialise global variables from constant data
+ */
+#define get_order(n)                                                    \
+(                                                                       \
+        __builtin_constant_p(n) ?                                       \
+        ((n < (1UL << PAGE_SHIFT)) ? 0 : ilog2(n) - PAGE_SHIFT) :       \
+        __get_order(n, PAGE_SHIFT)                                      \
+ )
 
 #endif  /* __ASSEMBLY__ */
 #endif  /* __KERNEL__ */
diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index 1e58ca39592c..3769e6bd63b1 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -11,7 +11,7 @@
 /*
  * Translate a "termio" structure into a "termios". Ugh.
  */
-static inline int user_termio_to_kernel_termios(struct termios *termios,
+static inline int user_termio_to_kernel_termios(struct ktermios *termios,
                                                 struct termio __user *termio)
 {
         unsigned short tmp;
@@ -48,7 +48,7 @@ static inline int user_termio_to_kernel_termios(struct termios *termios,
  * Translate a "termios" structure into a "termio". Ugh.
  */
 static inline int kernel_termios_to_user_termio(struct termio __user *termio,
-                                                struct termios *termios)
+                                                struct ktermios *termios)
 {
         if (put_user(termios->c_iflag, &termio->c_iflag) < 0 ||
             put_user(termios->c_oflag, &termio->c_oflag) < 0 ||
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4d4c62d11059..6e9fcebbf89f 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -218,6 +218,14 @@
                 .stab.indexstr 0 : { *(.stab.indexstr) }                \
                 .comment 0 : { *(.comment) }
 
+#define BUG_TABLE                                                       \
+        . = ALIGN(8);                                                   \
+        __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) {             \
+                __start___bug_table = .;                                \
+                *(__bug_table)                                          \
+                __stop___bug_table = .;                                 \
+        }
+
 #define NOTES                                                           \
                 .notes : { *(.note.*) } :note
 
diff --git a/include/asm-h8300/termbits.h b/include/asm-h8300/termbits.h
index fa69ae00eda3..6a1f4d3807b4 100644
--- a/include/asm-h8300/termbits.h
+++ b/include/asm-h8300/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-i386/bug.h b/include/asm-i386/bug.h
index 8062cdbf2587..b0fd78ca2619 100644
--- a/include/asm-i386/bug.h
+++ b/include/asm-i386/bug.h
@@ -4,20 +4,32 @@
 
 /*
  * Tell the user there is some problem.
- * The offending file and line are encoded after the "officially
- * undefined" opcode for parsing in the trap handler.
+ * The offending file and line are encoded encoded in the __bug_table section.
  */
 
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
+
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-#define BUG()                           \
- __asm__ __volatile__(  "ud2\n"         \
-                        "\t.word %c0\n" \
-                        "\t.long %c1\n" \
-                         : : "i" (__LINE__), "i" (__FILE__))
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile("1:\tud2\n"                                \
+                             ".pushsection __bug_table,\"a\"\n"         \
+                             "2:\t.long 1b, %c0\n"                      \
+                             "\t.word %c1, 0\n"                         \
+                             "\t.org 2b+%c2\n"                          \
+                             ".popsection"                              \
+                             : : "i" (__FILE__), "i" (__LINE__),        \
+                             "i" (sizeof(struct bug_entry)));           \
+                for(;;) ;                                               \
+        } while(0)
+
 #else
-#define BUG() __asm__ __volatile__("ud2\n")
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile("ud2");                                    \
+                for(;;) ;                                               \
+        } while(0)
 #endif
 #endif
 
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 73465d2892b9..0fc240c80f49 100644
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -40,13 +40,14 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
+        struct pci_dev *pdev;
         /*
          *      If PCI is present then it is not safe to poke around
          *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
          *      defined compatibility mode ports for PCI. A user can 
          *      override this using ide= but we must default safe.
          */
-        if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+        if ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL)) == NULL) {
                 switch(index) {
                         case 2: return 0x1e8;
                         case 3: return 0x168;
@@ -54,6 +55,7 @@ static __inline__ unsigned long ide_default_io_base(int index)
                         case 5: return 0x160;
                 }
         }
+        pci_dev_put(pdev);
         switch (index) {
                 case 0: return 0x1f0;
                 case 1: return 0x170;
diff --git a/include/asm-i386/termbits.h b/include/asm-i386/termbits.h
index 72c10e3190f8..12baf1d6343f 100644
--- a/include/asm-i386/termbits.h
+++ b/include/asm-i386/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-ia64/termbits.h b/include/asm-ia64/termbits.h
index b9e843f7dc42..4531a511bde5 100644
--- a/include/asm-ia64/termbits.h
+++ b/include/asm-ia64/termbits.h
@@ -26,6 +26,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index 219a0f74eff3..c82ebe8f250d 100644
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -32,7 +32,8 @@
 static __inline__ int ide_default_irq(unsigned long base)
 {
         switch (base) {
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+        || defined(CONFIG_PLAT_OPSPUT)
                 case 0x1f0: return PLD_IRQ_CFIREQ;
                 default:
                         return 0;
diff --git a/include/asm-m32r/m32102.h b/include/asm-m32r/m32102.h
index a1f0d1fe9eb8..52807f8db166 100644
--- a/include/asm-m32r/m32102.h
+++ b/include/asm-m32r/m32102.h
@@ -104,7 +104,8 @@
 #define M32R_MFT5RLD_PORTL     (0x0C+M32R_MFT5_OFFSET)  /* MFT4 reload */
 #define M32R_MFT5CMPRLD_PORTL  (0x10+M32R_MFT5_OFFSET)  /* MFT4 compare reload */
 
-#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32104)
+#if (defined(CONFIG_CHIP_M32700) && !defined(CONFIG_PLAT_MAPPI2)) \
+        || defined(CONFIG_CHIP_M32104)
 #define M32R_MFTCR_MFT0MSK  (1UL<<31)  /* b0 */
 #define M32R_MFTCR_MFT1MSK  (1UL<<30)  /* b1 */
 #define M32R_MFTCR_MFT2MSK  (1UL<<29)  /* b2 */
@@ -117,7 +118,7 @@
 #define M32R_MFTCR_MFT3EN   (1UL<<20)  /* b11 */
 #define M32R_MFTCR_MFT4EN   (1UL<<19)  /* b12 */
 #define M32R_MFTCR_MFT5EN   (1UL<<18)  /* b13 */
-#else   /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
+#else
 #define M32R_MFTCR_MFT0MSK  (1UL<<15)  /* b16 */
 #define M32R_MFTCR_MFT1MSK  (1UL<<14)  /* b17 */
 #define M32R_MFTCR_MFT2MSK  (1UL<<13)  /* b18 */
@@ -130,7 +131,7 @@
 #define M32R_MFTCR_MFT3EN   (1UL<<4)   /* b27 */
 #define M32R_MFTCR_MFT4EN   (1UL<<3)   /* b28 */
 #define M32R_MFTCR_MFT5EN   (1UL<<2)   /* b29 */
-#endif  /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
+#endif
 
 #define M32R_MFTMOD_CC_MASK    (1UL<<15)  /* b16 */
 #define M32R_MFTMOD_TCCR       (1UL<<13)  /* b18 */
diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h
index 2d2a6c97331e..632b4ce4269a 100644
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
@@ -33,21 +33,10 @@
 #define PT_R15          PT_SP
 
 /* processor status and miscellaneous context registers.  */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
 #define PT_ACC0H        15
 #define PT_ACC0L        16
-#define PT_ACC1H        17
-#define PT_ACC1L        18
-#define PT_ACCH         PT_ACC0H
-#define PT_ACCL         PT_ACC0L
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-#define PT_ACCH         15
-#define PT_ACCL         16
-#define PT_DUMMY_ACC1H  17
-#define PT_DUMMY_ACC1L  18
-#else
-#error unknown isa conifiguration
-#endif
+#define PT_ACC1H        17      /* ISA_DSP_LEVEL2 only */
+#define PT_ACC1L        18      /* ISA_DSP_LEVEL2 only */
 #define PT_PSW          19
 #define PT_BPC          20
 #define PT_BBPSW        21
@@ -103,19 +92,10 @@ struct pt_regs {
         long syscall_nr;
 
         /* Saved main processor status and miscellaneous context registers. */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
         unsigned long acc0h;
         unsigned long acc0l;
-        unsigned long acc1h;
-        unsigned long acc1l;
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        unsigned long acch;
-        unsigned long accl;
-        unsigned long dummy_acc1h;
-        unsigned long dummy_acc1l;
-#else
-#error unknown isa configuration
-#endif
+        unsigned long acc1h;    /* ISA_DSP_LEVEL2 only */
+        unsigned long acc1l;    /* ISA_DSP_LEVEL2 only */
         unsigned long psw;
         unsigned long bpc;              /* saved PC for TRAP syscalls */
         unsigned long bbpsw;
diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h
index 73025c0c41a1..62537dc4dec9 100644
--- a/include/asm-m32r/sigcontext.h
+++ b/include/asm-m32r/sigcontext.h
@@ -23,19 +23,10 @@ struct sigcontext {
         unsigned long sc_r12;
 
         /* Saved main processor status and miscellaneous context registers. */
-#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)
         unsigned long sc_acc0h;
         unsigned long sc_acc0l;
-        unsigned long sc_acc1h;
-        unsigned long sc_acc1l;
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-        unsigned long sc_acch;
-        unsigned long sc_accl;
-        unsigned long sc_dummy_acc1h;
-        unsigned long sc_dummy_acc1l;
-#else
-#error unknown isa configuration
-#endif
+        unsigned long sc_acc1h; /* ISA_DSP_LEVEL2 only */
+        unsigned long sc_acc1l; /* ISA_DSP_LEVEL2 only */
         unsigned long sc_psw;
         unsigned long sc_bpc;           /* saved PC for TRAP syscalls */
         unsigned long sc_bbpsw;
diff --git a/include/asm-m32r/termbits.h b/include/asm-m32r/termbits.h
index 5ace3702df75..faf2bd0504c1 100644
--- a/include/asm-m32r/termbits.h
+++ b/include/asm-m32r/termbits.h
@@ -19,6 +19,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-m68k/termbits.h b/include/asm-m68k/termbits.h
index e9eec3eb0718..a194092240fb 100644
--- a/include/asm-m68k/termbits.h
+++ b/include/asm-m68k/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index b62ec7c521cc..0bbe07b42a07 100644
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -30,6 +30,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR            0              /* Interrupt character [ISIG].  */
 #define VQUIT            1              /* Quit character [ISIG].  */
diff --git a/include/asm-parisc/termbits.h b/include/asm-parisc/termbits.h
index 372b634892c9..a46e299a9391 100644
--- a/include/asm-parisc/termbits.h
+++ b/include/asm-parisc/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-powerpc/bitops.h b/include/asm-powerpc/bitops.h
index c341063d0804..0288144ea024 100644
--- a/include/asm-powerpc/bitops.h
+++ b/include/asm-powerpc/bitops.h
@@ -190,7 +190,8 @@ static __inline__ void set_bits(unsigned long mask, unsigned long *addr)
  * Return the zero-based bit position (LE, not IBM bit numbering) of
  * the most significant 1-bit in a double word.
  */
-static __inline__ int __ilog2(unsigned long x)
+static __inline__ __attribute__((const))
+int __ilog2(unsigned long x)
 {
         int lz;
 
@@ -198,6 +199,24 @@ static __inline__ int __ilog2(unsigned long x)
         return BITS_PER_LONG - 1 - lz;
 }
 
+static inline __attribute__((const))
+int __ilog2_u32(u32 n)
+{
+        int bit;
+        asm ("cntlzw %0,%1" : "=r" (bit) : "r" (n));
+        return 31 - bit;
+}
+
+#ifdef __powerpc64__
+static inline __attribute__((const))
+int __ilog2_u64(u32 n)
+{
+        int bit;
+        asm ("cntlzd %0,%1" : "=r" (bit) : "r" (n));
+        return 63 - bit;
+}
+#endif
+
 /*
  * Determines the bit position of the least significant 0 bit in the
  * specified double word. The returned bit position will be
diff --git a/include/asm-powerpc/page_32.h b/include/asm-powerpc/page_32.h
index 2677bad70f40..07f6d3cf5e5a 100644
--- a/include/asm-powerpc/page_32.h
+++ b/include/asm-powerpc/page_32.h
@@ -26,15 +26,7 @@ extern void clear_pages(void *page, int order);
 static inline void clear_page(void *page) { clear_pages(page, 0); }
 extern void copy_page(void *to, void *from);
 
-/* Pure 2^n version of get_order */
-extern __inline__ int get_order(unsigned long size)
-{
-        int lz;
-
-        size = (size-1) >> PAGE_SHIFT;
-        asm ("cntlzw %0,%1" : "=r" (lz) : "r" (size));
-        return 32 - lz;
-}
+#include <asm-generic/page.h>
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index 6d533b07aaf5..5e79198f7d18 100644
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -30,6 +30,19 @@ struct termios {
         speed_t c_ospeed;               /* output speed */
 };
 
+/* For PowerPC the termios and ktermios are the same */
+
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t c_line;                    /* line discipline (== c_cc[19]) */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR            0
 #define VQUIT            1
diff --git a/include/asm-s390/termbits.h b/include/asm-s390/termbits.h
index eb3f8bfabf61..585c78a6e407 100644
--- a/include/asm-s390/termbits.h
+++ b/include/asm-s390/termbits.h
@@ -25,6 +25,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-sh/termbits.h b/include/asm-sh/termbits.h
index 4f9822a8e7b4..f1b7b46f4e9a 100644
--- a/include/asm-sh/termbits.h
+++ b/include/asm-sh/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-sparc/termbits.h b/include/asm-sparc/termbits.h
index 1794d71134b7..5eb00a105d7c 100644
--- a/include/asm-sparc/termbits.h
+++ b/include/asm-sparc/termbits.h
@@ -31,6 +31,18 @@ struct termios {
 #endif
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR    0
 #define VQUIT    1
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h
index b07715273ed4..705cd44b4173 100644
--- a/include/asm-sparc64/termbits.h
+++ b/include/asm-sparc64/termbits.h
@@ -33,6 +33,18 @@ struct termios {
 #endif
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR    0
 #define VQUIT    1
diff --git a/include/asm-um/bug.h b/include/asm-um/bug.h
index 1e22fa26ff06..3357c5e2468e 100644
--- a/include/asm-um/bug.h
+++ b/include/asm-um/bug.h
@@ -1,4 +1,6 @@
 #ifndef __UM_BUG_H
 #define __UM_BUG_H
-#include <asm-generic/bug.h>
+
+#include <asm/arch/bug.h>
+
 #endif
diff --git a/include/asm-v850/termbits.h b/include/asm-v850/termbits.h
index 212d4e279263..f3b433032089 100644
--- a/include/asm-v850/termbits.h
+++ b/include/asm-v850/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-x86_64/bug.h b/include/asm-x86_64/bug.h
index 80ac1fe966ac..682606414913 100644
--- a/include/asm-x86_64/bug.h
+++ b/include/asm-x86_64/bug.h
@@ -1,30 +1,30 @@
 #ifndef __ASM_X8664_BUG_H
 #define __ASM_X8664_BUG_H 1
 
-#include <linux/stringify.h>
-
-/*
- * Tell the user there is some problem.  The exception handler decodes 
- * this frame.
- */
-struct bug_frame {
-        unsigned char ud2[2];
-        unsigned char push;
-        signed int filename;
-        unsigned char ret;
-        unsigned short line;
-} __attribute__((packed));
-
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
-/* We turn the bug frame into valid instructions to not confuse
-   the disassembler. Thanks to Jan Beulich & Suresh Siddha
-   for nice instruction selection.
-   The magic numbers generate mov $64bitimm,%eax ; ret $offset. */
-#define BUG()                                                           \
-        asm volatile(                                                   \
-        "ud2 ; pushq $%c1 ; ret $%c0" ::                                \
-                     "i"(__LINE__), "i" (__FILE__))
+
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile("1:\tud2\n"                                \
+                             ".pushsection __bug_table,\"a\"\n"         \
+                             "2:\t.quad 1b, %c0\n"                      \
+                             "\t.word %c1, 0\n"                         \
+                             "\t.org 2b+%c2\n"                          \
+                             ".popsection"                              \
+                             : : "i" (__FILE__), "i" (__LINE__),        \
+                                "i" (sizeof(struct bug_entry)));        \
+                for(;;) ;                                               \
+        } while(0)
+#else
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile("ud2");                                    \
+                for(;;) ;                                               \
+        } while(0)
+#endif
+
 void out_of_line_bug(void);
 #else
 static inline void out_of_line_bug(void) { }
diff --git a/include/asm-x86_64/ioctls.h b/include/asm-x86_64/ioctls.h
index 62caf8b6e4e1..3fc0b15a0d7e 100644
--- a/include/asm-x86_64/ioctls.h
+++ b/include/asm-x86_64/ioctls.h
@@ -46,6 +46,10 @@
 #define TIOCSBRK        0x5427  /* BSD compatibility */
 #define TIOCCBRK        0x5428  /* BSD compatibility */
 #define TIOCGSID        0x5429  /* Return the session ID of FD */
+#define TCGETS2         _IOR('T',0x2A, struct termios2)
+#define TCSETS2         _IOW('T',0x2B, struct termios2)
+#define TCSETSW2        _IOW('T',0x2C, struct termios2)
+#define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-x86_64/termbits.h b/include/asm-x86_64/termbits.h
index bd950946e52c..6cfc3bb10c1a 100644
--- a/include/asm-x86_64/termbits.h
+++ b/include/asm-x86_64/termbits.h
@@ -17,6 +17,28 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct termios2 {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
@@ -118,6 +140,7 @@ struct termios {
 #define HUPCL   0002000
 #define CLOCAL  0004000
 #define CBAUDEX 0010000
+#define    BOTHER 0010000               /* non standard rate */
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -133,10 +156,12 @@ struct termios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CIBAUD    002003600000  /* input baud rate */
 #define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
+#define IBSHIFT   8             /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG    0000001
 #define ICANON  0000002
diff --git a/include/asm-x86_64/termios.h b/include/asm-x86_64/termios.h
index 041a91f7ddfb..443b225537f0 100644
--- a/include/asm-x86_64/termios.h
+++ b/include/asm-x86_64/termios.h
@@ -98,8 +98,10 @@ struct termio {
         copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
 })
 
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
+#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
 
 #endif  /* __KERNEL__ */
 
diff --git a/include/linux/bitrev.h b/include/linux/bitrev.h
new file mode 100644
index 000000000000..05e540d6963a
--- /dev/null
+++ b/include/linux/bitrev.h
@@ -0,0 +1,15 @@
+#ifndef _LINUX_BITREV_H
+#define _LINUX_BITREV_H
+
+#include <linux/types.h>
+
+extern u8 const byte_rev_table[256];
+
+static inline u8 bitrev8(u8 byte)
+{
+        return byte_rev_table[byte];
+}
+
+extern u32 bitrev32(u32 in);
+
+#endif /* _LINUX_BITREV_H */
diff --git a/include/linux/bug.h b/include/linux/bug.h
new file mode 100644
index 000000000000..42aa0a54b6f4
--- /dev/null
+++ b/include/linux/bug.h
@@ -0,0 +1,47 @@
+#ifndef _LINUX_BUG_H
+#define _LINUX_BUG_H
+
+#include <linux/module.h>
+#include <asm/bug.h>
+
+enum bug_trap_type {
+        BUG_TRAP_TYPE_NONE = 0,
+        BUG_TRAP_TYPE_WARN = 1,
+        BUG_TRAP_TYPE_BUG = 2,
+};
+
+#ifdef CONFIG_GENERIC_BUG
+#include <asm-generic/bug.h>
+
+static inline int is_warning_bug(const struct bug_entry *bug)
+{
+        return bug->flags & BUGFLAG_WARNING;
+}
+
+const struct bug_entry *find_bug(unsigned long bugaddr);
+
+enum bug_trap_type report_bug(unsigned long bug_addr);
+
+int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
+                         struct module *);
+void module_bug_cleanup(struct module *);
+
+/* These are defined by the architecture */
+int is_valid_bugaddr(unsigned long addr);
+
+#else   /* !CONFIG_GENERIC_BUG */
+
+static inline enum bug_trap_type report_bug(unsigned long bug_addr)
+{
+        return BUG_TRAP_TYPE_BUG;
+}
+static inline int  module_bug_finalize(const Elf_Ehdr *hdr,
+                                        const Elf_Shdr *sechdrs,
+                                        struct module *mod)
+{
+        return 0;
+}
+static inline void module_bug_cleanup(struct module *mod) {}
+
+#endif  /* CONFIG_GENERIC_BUG */
+#endif  /* _LINUX_BUG_H */
diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index 56c0645789a9..e20dd1f9b40a 100644
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -6,10 +6,10 @@
 #define _LINUX_CRC32_H
 
 #include <linux/types.h>
+#include <linux/bitrev.h>
 
 extern u32  crc32_le(u32 crc, unsigned char const *p, size_t len);
 extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
-extern u32  bitreverse(u32 in);
 
 #define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)data, length)
 
@@ -21,7 +21,7 @@ extern u32  bitreverse(u32 in);
  * is in bit nr 0], thus it must be reversed before use. Except for
  * nics that bit swap the result internally...
  */
-#define ether_crc(length, data)    bitreverse(crc32_le(~0, data, length))
+#define ether_crc(length, data)    bitrev32(crc32_le(~0, data, length))
 #define ether_crc_le(length, data) crc32_le(~0, data, length)
 
 #endif /* _LINUX_CRC32_H */
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 03ef41c1eaac..499f5373e213 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -39,7 +39,8 @@ typedef void (*dm_dtr_fn) (struct dm_target *ti);
  * The map function must return:
  * < 0: error
  * = 0: The target will handle the io by resubmitting it later
- * > 0: simple remap complete
+ * = 1: simple remap complete
+ * = 2: The target wants to push back the io
  */
 typedef int (*dm_map_fn) (struct dm_target *ti, struct bio *bio,
                           union map_info *map_context);
@@ -50,6 +51,7 @@ typedef int (*dm_map_fn) (struct dm_target *ti, struct bio *bio,
  * 0   : ended successfully
  * 1   : for some reason the io has still not completed (eg,
  *       multipath target might want to requeue a failed io).
+ * 2   : The target wants to push back the io
  */
 typedef int (*dm_endio_fn) (struct dm_target *ti,
                             struct bio *bio, int error,
@@ -173,7 +175,7 @@ void *dm_get_mdptr(struct mapped_device *md);
 /*
  * A device can still be used while suspended, but I/O is deferred.
  */
-int dm_suspend(struct mapped_device *md, int with_lockfs);
+int dm_suspend(struct mapped_device *md, unsigned suspend_flags);
 int dm_resume(struct mapped_device *md);
 
 /*
@@ -188,6 +190,7 @@ int dm_wait_event(struct mapped_device *md, int event_nr);
 const char *dm_device_name(struct mapped_device *md);
 struct gendisk *dm_disk(struct mapped_device *md);
 int dm_suspended(struct mapped_device *md);
+int dm_noflush_suspending(struct dm_target *ti);
 
 /*
  * Geometry functions.
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 8853fc4d1c5e..b93486107821 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -285,9 +285,9 @@ typedef char ioctl_struct[308];
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        10
+#define DM_VERSION_MINOR        11
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2006-09-14)"
+#define DM_VERSION_EXTRA        "-ioctl (2006-10-12)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
@@ -323,4 +323,9 @@ typedef char ioctl_struct[308];
  */
 #define DM_SKIP_LOCKFS_FLAG     (1 << 10) /* In */
 
+/*
+ * Set this to suspend without flushing queued ios.
+ */
+#define DM_NOFLUSH_FLAG         (1 << 11) /* In */
+
 #endif                          /* _LINUX_DM_IOCTL_H */
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
new file mode 100644
index 000000000000..32368c4f0326
--- /dev/null
+++ b/include/linux/fault-inject.h
@@ -0,0 +1,84 @@
+#ifndef _LINUX_FAULT_INJECT_H
+#define _LINUX_FAULT_INJECT_H
+
+#ifdef CONFIG_FAULT_INJECTION
+
+#include <linux/types.h>
+#include <linux/debugfs.h>
+#include <asm/atomic.h>
+
+/*
+ * For explanation of the elements of this struct, see
+ * Documentation/fault-injection/fault-injection.txt
+ */
+struct fault_attr {
+        unsigned long probability;
+        unsigned long interval;
+        atomic_t times;
+        atomic_t space;
+        unsigned long verbose;
+        u32 task_filter;
+        unsigned long stacktrace_depth;
+        unsigned long require_start;
+        unsigned long require_end;
+        unsigned long reject_start;
+        unsigned long reject_end;
+
+        unsigned long count;
+
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+
+        struct {
+                struct dentry *dir;
+
+                struct dentry *probability_file;
+                struct dentry *interval_file;
+                struct dentry *times_file;
+                struct dentry *space_file;
+                struct dentry *verbose_file;
+                struct dentry *task_filter_file;
+                struct dentry *stacktrace_depth_file;
+                struct dentry *require_start_file;
+                struct dentry *require_end_file;
+                struct dentry *reject_start_file;
+                struct dentry *reject_end_file;
+        } dentries;
+
+#endif
+};
+
+#define FAULT_ATTR_INITIALIZER {                                \
+                .interval = 1,                                  \
+                .times = ATOMIC_INIT(1),                        \
+                .require_end = ULONG_MAX,                       \
+                .stacktrace_depth = 32,                         \
+                .verbose = 2,                                   \
+        }
+
+#define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER
+int setup_fault_attr(struct fault_attr *attr, char *str);
+void should_fail_srandom(unsigned long entropy);
+bool should_fail(struct fault_attr *attr, ssize_t size);
+
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+
+int init_fault_attr_dentries(struct fault_attr *attr, const char *name);
+void cleanup_fault_attr_dentries(struct fault_attr *attr);
+
+#else /* CONFIG_FAULT_INJECTION_DEBUG_FS */
+
+static inline int init_fault_attr_dentries(struct fault_attr *attr,
+                                          const char *name)
+{
+        return -ENODEV;
+}
+
+static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)
+{
+}
+
+#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */
+
+#endif /* CONFIG_FAULT_INJECTION */
+
+#endif /* _LINUX_FAULT_INJECT_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index fa23e0671bb3..6fe56aaa6685 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -970,11 +970,11 @@ extern struct fb_videomode *fb_find_best_display(struct fb_monspecs *specs,
 /* drivers/video/fbcmap.c */
 extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
 extern void fb_dealloc_cmap(struct fb_cmap *cmap);
-extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to);
-extern int fb_cmap_to_user(struct fb_cmap *from, struct fb_cmap_user *to);
+extern int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to);
+extern int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to);
 extern int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *fb_info);
 extern int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *fb_info);
-extern struct fb_cmap *fb_default_cmap(int len);
+extern const struct fb_cmap *fb_default_cmap(int len);
 extern void fb_invert_cmaps(void);
 
 struct fb_videomode {
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 70b99fbb560b..adce6e1d70c2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -269,6 +269,7 @@ extern int dir_notify_enable;
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 #include <linux/dcache.h>
+#include <linux/namei.h>
 #include <linux/stat.h>
 #include <linux/cache.h>
 #include <linux/kobject.h>
@@ -482,21 +483,6 @@ struct block_device {
 };
 
 /*
- * bdev->bd_mutex nesting subclasses for the lock validator:
- *
- * 0: normal
- * 1: 'whole'
- * 2: 'partition'
- */
-enum bdev_bd_mutex_lock_class
-{
-        BD_MUTEX_NORMAL,
-        BD_MUTEX_WHOLE,
-        BD_MUTEX_PARTITION
-};
-
-
-/*
  * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
  * radix trees
  */
@@ -726,8 +712,9 @@ struct file {
                 struct list_head        fu_list;
                 struct rcu_head         fu_rcuhead;
         } f_u;
-        struct dentry           *f_dentry;
-        struct vfsmount         *f_vfsmnt;
+        struct path             f_path;
+#define f_dentry        f_path.dentry
+#define f_vfsmnt        f_path.mnt
         const struct file_operations    *f_op;
         atomic_t                f_count;
         unsigned int            f_flags;
@@ -1239,7 +1226,7 @@ extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry);
 static inline void file_accessed(struct file *file)
 {
         if (!(file->f_flags & O_NOATIME))
-                touch_atime(file->f_vfsmnt, file->f_dentry);
+                touch_atime(file->f_path.mnt, file->f_path.dentry);
 }
 
 int sync_inode(struct inode *inode, struct writeback_control *wbc);
@@ -1499,7 +1486,6 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
-extern struct block_device *open_partition_by_devnum(dev_t, unsigned);
 extern const struct address_space_operations def_blk_aops;
 #else
 static inline void bd_forget(struct inode *inode) {}
@@ -1517,7 +1503,6 @@ extern int blkdev_driver_ioctl(struct inode *inode, struct file *file,
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
 extern int blkdev_get(struct block_device *, mode_t, unsigned);
 extern int blkdev_put(struct block_device *);
-extern int blkdev_put_partition(struct block_device *);
 extern int bd_claim(struct block_device *, void *);
 extern void bd_release(struct block_device *);
 #ifdef CONFIG_SYSFS
@@ -1632,7 +1617,7 @@ static inline void put_write_access(struct inode * inode)
 static inline void allow_write_access(struct file *file)
 {
         if (file)
-                atomic_inc(&file->f_dentry->d_inode->i_writecount);
+                atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
 }
 extern int do_pipe(int *);
 extern struct file *create_read_pipe(struct file *f);
diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h
new file mode 100644
index 000000000000..bb516ceeefc9
--- /dev/null
+++ b/include/linux/fs_stack.h
@@ -0,0 +1,31 @@
+#ifndef _LINUX_FS_STACK_H
+#define _LINUX_FS_STACK_H
+
+/* This file defines generic functions used primarily by stackable
+ * filesystems; none of these functions require i_mutex to be held.
+ */
+
+#include <linux/fs.h>
+
+/* externs for fs/stack.c */
+extern void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
+                                int (*get_nlinks)(struct inode *));
+
+extern void fsstack_copy_inode_size(struct inode *dst, const struct inode *src);
+
+/* inlines */
+static inline void fsstack_copy_attr_atime(struct inode *dest,
+                                           const struct inode *src)
+{
+        dest->i_atime = src->i_atime;
+}
+
+static inline void fsstack_copy_attr_times(struct inode *dest,
+                                           const struct inode *src)
+{
+        dest->i_atime = src->i_atime;
+        dest->i_mtime = src->i_mtime;
+        dest->i_ctime = src->i_ctime;
+}
+
+#endif /* _LINUX_FS_STACK_H */
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index d4f219ffaa5d..dfc4e4f68da4 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -164,7 +164,7 @@ static inline void fsnotify_open(struct dentry *dentry)
  */
 static inline void fsnotify_close(struct file *file)
 {
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
         struct inode *inode = dentry->d_inode;
         const char *name = dentry->d_name.name;
         mode_t mode = file->f_mode;
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index e25384561955..5412da28fa47 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -91,7 +91,7 @@ void gs_hangup(struct tty_struct *tty);
 int  gs_block_til_ready(void *port, struct file *filp);
 void gs_close(struct tty_struct *tty, struct file *filp);
 void gs_set_termios (struct tty_struct * tty, 
-                     struct termios * old_termios);
+                     struct ktermios * old_termios);
 int  gs_init_port(struct gs_port *port);
 int  gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
 int  gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 41f276fdd185..0a022b2f63fc 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -83,6 +83,9 @@ struct hd_struct {
         struct kobject *holder_dir;
         unsigned ios[2], sectors[2];    /* READs and WRITEs */
         int policy, partno;
+#ifdef CONFIG_FAIL_MAKE_REQUEST
+        int make_it_fail;
+#endif
 };
 
 #define GENHD_FL_REMOVABLE                      1
@@ -90,6 +93,7 @@ struct hd_struct {
 #define GENHD_FL_CD                             8
 #define GENHD_FL_UP                             16
 #define GENHD_FL_SUPPRESS_PARTITION_INFO        32
+#define GENHD_FL_FAIL                           64
 
 struct disk_stats {
         unsigned long sectors[2];       /* READs and WRITEs */
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h
new file mode 100644
index 000000000000..f04d6d75c098
--- /dev/null
+++ b/include/linux/hid-debug.h
@@ -0,0 +1,757 @@
+/*
+ * $Id: hid-debug.h,v 1.8 2001/09/25 09:37:57 vojtech Exp $
+ *
+ *  (c) 1999 Andreas Gal                <gal@cs.uni-magdeburg.de>
+ *  (c) 2000-2001 Vojtech Pavlik        <vojtech@ucw.cz>
+ *
+ *  Some debug stuff for the HID parser.
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/input.h>
+
+struct hid_usage_entry {
+        unsigned  page;
+        unsigned  usage;
+        char     *description;
+};
+
+static const struct hid_usage_entry hid_usage_table[] = {
+  {  0,      0, "Undefined" },
+  {  1,      0, "GenericDesktop" },
+    {0, 0x01, "Pointer"},
+    {0, 0x02, "Mouse"},
+    {0, 0x04, "Joystick"},
+    {0, 0x05, "GamePad"},
+    {0, 0x06, "Keyboard"},
+    {0, 0x07, "Keypad"},
+    {0, 0x08, "MultiAxis"},
+      {0, 0x30, "X"},
+      {0, 0x31, "Y"},
+      {0, 0x32, "Z"},
+      {0, 0x33, "Rx"},
+      {0, 0x34, "Ry"},
+      {0, 0x35, "Rz"},
+      {0, 0x36, "Slider"},
+      {0, 0x37, "Dial"},
+      {0, 0x38, "Wheel"},
+      {0, 0x39, "HatSwitch"},
+    {0, 0x3a, "CountedBuffer"},
+      {0, 0x3b, "ByteCount"},
+      {0, 0x3c, "MotionWakeup"},
+      {0, 0x3d, "Start"},
+      {0, 0x3e, "Select"},
+      {0, 0x40, "Vx"},
+      {0, 0x41, "Vy"},
+      {0, 0x42, "Vz"},
+      {0, 0x43, "Vbrx"},
+      {0, 0x44, "Vbry"},
+      {0, 0x45, "Vbrz"},
+      {0, 0x46, "Vno"},
+    {0, 0x80, "SystemControl"},
+      {0, 0x81, "SystemPowerDown"},
+      {0, 0x82, "SystemSleep"},
+      {0, 0x83, "SystemWakeUp"},
+      {0, 0x84, "SystemContextMenu"},
+      {0, 0x85, "SystemMainMenu"},
+      {0, 0x86, "SystemAppMenu"},
+      {0, 0x87, "SystemMenuHelp"},
+      {0, 0x88, "SystemMenuExit"},
+      {0, 0x89, "SystemMenuSelect"},
+      {0, 0x8a, "SystemMenuRight"},
+      {0, 0x8b, "SystemMenuLeft"},
+      {0, 0x8c, "SystemMenuUp"},
+      {0, 0x8d, "SystemMenuDown"},
+      {0, 0x90, "D-PadUp"},
+      {0, 0x91, "D-PadDown"},
+      {0, 0x92, "D-PadRight"},
+      {0, 0x93, "D-PadLeft"},
+  {  2, 0, "Simulation" },
+      {0, 0xb0, "Aileron"},
+      {0, 0xb1, "AileronTrim"},
+      {0, 0xb2, "Anti-Torque"},
+      {0, 0xb3, "Autopilot"},
+      {0, 0xb4, "Chaff"},
+      {0, 0xb5, "Collective"},
+      {0, 0xb6, "DiveBrake"},
+      {0, 0xb7, "ElectronicCountermeasures"},
+      {0, 0xb8, "Elevator"},
+      {0, 0xb9, "ElevatorTrim"},
+      {0, 0xba, "Rudder"},
+      {0, 0xbb, "Throttle"},
+      {0, 0xbc, "FlightCommunications"},
+      {0, 0xbd, "FlareRelease"},
+      {0, 0xbe, "LandingGear"},
+      {0, 0xbf, "ToeBrake"},
+  {  7, 0, "Keyboard" },
+  {  8, 0, "LED" },
+      {0, 0x01, "NumLock"},
+      {0, 0x02, "CapsLock"},
+      {0, 0x03, "ScrollLock"},
+      {0, 0x04, "Compose"},
+      {0, 0x05, "Kana"},
+      {0, 0x4b, "GenericIndicator"},
+  {  9, 0, "Button" },
+  { 10, 0, "Ordinal" },
+  { 12, 0, "Consumer" },
+      {0, 0x238, "HorizontalWheel"},
+  { 13, 0, "Digitizers" },
+    {0, 0x01, "Digitizer"},
+    {0, 0x02, "Pen"},
+    {0, 0x03, "LightPen"},
+    {0, 0x04, "TouchScreen"},
+    {0, 0x05, "TouchPad"},
+    {0, 0x20, "Stylus"},
+    {0, 0x21, "Puck"},
+    {0, 0x22, "Finger"},
+    {0, 0x30, "TipPressure"},
+    {0, 0x31, "BarrelPressure"},
+    {0, 0x32, "InRange"},
+    {0, 0x33, "Touch"},
+    {0, 0x34, "UnTouch"},
+    {0, 0x35, "Tap"},
+    {0, 0x39, "TabletFunctionKey"},
+    {0, 0x3a, "ProgramChangeKey"},
+    {0, 0x3c, "Invert"},
+    {0, 0x42, "TipSwitch"},
+    {0, 0x43, "SecondaryTipSwitch"},
+    {0, 0x44, "BarrelSwitch"},
+    {0, 0x45, "Eraser"},
+    {0, 0x46, "TabletPick"},
+  { 15, 0, "PhysicalInterfaceDevice" },
+    {0, 0x00, "Undefined"},
+    {0, 0x01, "Physical_Interface_Device"},
+      {0, 0x20, "Normal"},
+    {0, 0x21, "Set_Effect_Report"},
+      {0, 0x22, "Effect_Block_Index"},
+      {0, 0x23, "Parameter_Block_Offset"},
+      {0, 0x24, "ROM_Flag"},
+      {0, 0x25, "Effect_Type"},
+        {0, 0x26, "ET_Constant_Force"},
+        {0, 0x27, "ET_Ramp"},
+        {0, 0x28, "ET_Custom_Force_Data"},
+        {0, 0x30, "ET_Square"},
+        {0, 0x31, "ET_Sine"},
+        {0, 0x32, "ET_Triangle"},
+        {0, 0x33, "ET_Sawtooth_Up"},
+        {0, 0x34, "ET_Sawtooth_Down"},
+        {0, 0x40, "ET_Spring"},
+        {0, 0x41, "ET_Damper"},
+        {0, 0x42, "ET_Inertia"},
+        {0, 0x43, "ET_Friction"},
+      {0, 0x50, "Duration"},
+      {0, 0x51, "Sample_Period"},
+      {0, 0x52, "Gain"},
+      {0, 0x53, "Trigger_Button"},
+      {0, 0x54, "Trigger_Repeat_Interval"},
+      {0, 0x55, "Axes_Enable"},
+        {0, 0x56, "Direction_Enable"},
+      {0, 0x57, "Direction"},
+      {0, 0x58, "Type_Specific_Block_Offset"},
+        {0, 0x59, "Block_Type"},
+        {0, 0x5A, "Set_Envelope_Report"},
+          {0, 0x5B, "Attack_Level"},
+          {0, 0x5C, "Attack_Time"},
+          {0, 0x5D, "Fade_Level"},
+          {0, 0x5E, "Fade_Time"},
+        {0, 0x5F, "Set_Condition_Report"},
+        {0, 0x60, "CP_Offset"},
+        {0, 0x61, "Positive_Coefficient"},
+        {0, 0x62, "Negative_Coefficient"},
+        {0, 0x63, "Positive_Saturation"},
+        {0, 0x64, "Negative_Saturation"},
+        {0, 0x65, "Dead_Band"},
+      {0, 0x66, "Download_Force_Sample"},
+      {0, 0x67, "Isoch_Custom_Force_Enable"},
+      {0, 0x68, "Custom_Force_Data_Report"},
+        {0, 0x69, "Custom_Force_Data"},
+        {0, 0x6A, "Custom_Force_Vendor_Defined_Data"},
+      {0, 0x6B, "Set_Custom_Force_Report"},
+        {0, 0x6C, "Custom_Force_Data_Offset"},
+        {0, 0x6D, "Sample_Count"},
+      {0, 0x6E, "Set_Periodic_Report"},
+        {0, 0x6F, "Offset"},
+        {0, 0x70, "Magnitude"},
+        {0, 0x71, "Phase"},
+        {0, 0x72, "Period"},
+      {0, 0x73, "Set_Constant_Force_Report"},
+        {0, 0x74, "Set_Ramp_Force_Report"},
+        {0, 0x75, "Ramp_Start"},
+        {0, 0x76, "Ramp_End"},
+      {0, 0x77, "Effect_Operation_Report"},
+        {0, 0x78, "Effect_Operation"},
+          {0, 0x79, "Op_Effect_Start"},
+          {0, 0x7A, "Op_Effect_Start_Solo"},
+          {0, 0x7B, "Op_Effect_Stop"},
+          {0, 0x7C, "Loop_Count"},
+      {0, 0x7D, "Device_Gain_Report"},
+        {0, 0x7E, "Device_Gain"},
+    {0, 0x7F, "PID_Pool_Report"},
+      {0, 0x80, "RAM_Pool_Size"},
+      {0, 0x81, "ROM_Pool_Size"},
+      {0, 0x82, "ROM_Effect_Block_Count"},
+      {0, 0x83, "Simultaneous_Effects_Max"},
+      {0, 0x84, "Pool_Alignment"},
+    {0, 0x85, "PID_Pool_Move_Report"},
+      {0, 0x86, "Move_Source"},
+      {0, 0x87, "Move_Destination"},
+      {0, 0x88, "Move_Length"},
+    {0, 0x89, "PID_Block_Load_Report"},
+      {0, 0x8B, "Block_Load_Status"},
+      {0, 0x8C, "Block_Load_Success"},
+      {0, 0x8D, "Block_Load_Full"},
+      {0, 0x8E, "Block_Load_Error"},
+      {0, 0x8F, "Block_Handle"},
+      {0, 0x90, "PID_Block_Free_Report"},
+      {0, 0x91, "Type_Specific_Block_Handle"},
+    {0, 0x92, "PID_State_Report"},
+      {0, 0x94, "Effect_Playing"},
+      {0, 0x95, "PID_Device_Control_Report"},
+        {0, 0x96, "PID_Device_Control"},
+        {0, 0x97, "DC_Enable_Actuators"},
+        {0, 0x98, "DC_Disable_Actuators"},
+        {0, 0x99, "DC_Stop_All_Effects"},
+        {0, 0x9A, "DC_Device_Reset"},
+        {0, 0x9B, "DC_Device_Pause"},
+        {0, 0x9C, "DC_Device_Continue"},
+      {0, 0x9F, "Device_Paused"},
+      {0, 0xA0, "Actuators_Enabled"},
+      {0, 0xA4, "Safety_Switch"},
+      {0, 0xA5, "Actuator_Override_Switch"},
+      {0, 0xA6, "Actuator_Power"},
+    {0, 0xA7, "Start_Delay"},
+    {0, 0xA8, "Parameter_Block_Size"},
+    {0, 0xA9, "Device_Managed_Pool"},
+    {0, 0xAA, "Shared_Parameter_Blocks"},
+    {0, 0xAB, "Create_New_Effect_Report"},
+    {0, 0xAC, "RAM_Pool_Available"},
+  { 0x84, 0, "Power Device" },
+    { 0x84, 0x02, "PresentStatus" },
+    { 0x84, 0x03, "ChangeStatus" },
+    { 0x84, 0x04, "UPS" },
+    { 0x84, 0x05, "PowerSupply" },
+    { 0x84, 0x10, "BatterySystem" },
+    { 0x84, 0x11, "BatterySystemID" },
+    { 0x84, 0x12, "Battery" },
+    { 0x84, 0x13, "BatteryID" },
+    { 0x84, 0x14, "Charger" },
+    { 0x84, 0x15, "ChargerID" },
+    { 0x84, 0x16, "PowerConverter" },
+    { 0x84, 0x17, "PowerConverterID" },
+    { 0x84, 0x18, "OutletSystem" },
+    { 0x84, 0x19, "OutletSystemID" },
+    { 0x84, 0x1a, "Input" },
+    { 0x84, 0x1b, "InputID" },
+    { 0x84, 0x1c, "Output" },
+    { 0x84, 0x1d, "OutputID" },
+    { 0x84, 0x1e, "Flow" },
+    { 0x84, 0x1f, "FlowID" },
+    { 0x84, 0x20, "Outlet" },
+    { 0x84, 0x21, "OutletID" },
+    { 0x84, 0x22, "Gang" },
+    { 0x84, 0x24, "PowerSummary" },
+    { 0x84, 0x25, "PowerSummaryID" },
+    { 0x84, 0x30, "Voltage" },
+    { 0x84, 0x31, "Current" },
+    { 0x84, 0x32, "Frequency" },
+    { 0x84, 0x33, "ApparentPower" },
+    { 0x84, 0x35, "PercentLoad" },
+    { 0x84, 0x40, "ConfigVoltage" },
+    { 0x84, 0x41, "ConfigCurrent" },
+    { 0x84, 0x43, "ConfigApparentPower" },
+    { 0x84, 0x53, "LowVoltageTransfer" },
+    { 0x84, 0x54, "HighVoltageTransfer" },
+    { 0x84, 0x56, "DelayBeforeStartup" },
+    { 0x84, 0x57, "DelayBeforeShutdown" },
+    { 0x84, 0x58, "Test" },
+    { 0x84, 0x5a, "AudibleAlarmControl" },
+    { 0x84, 0x60, "Present" },
+    { 0x84, 0x61, "Good" },
+    { 0x84, 0x62, "InternalFailure" },
+    { 0x84, 0x65, "Overload" },
+    { 0x84, 0x66, "OverCharged" },
+    { 0x84, 0x67, "OverTemperature" },
+    { 0x84, 0x68, "ShutdownRequested" },
+    { 0x84, 0x69, "ShutdownImminent" },
+    { 0x84, 0x6b, "SwitchOn/Off" },
+    { 0x84, 0x6c, "Switchable" },
+    { 0x84, 0x6d, "Used" },
+    { 0x84, 0x6e, "Boost" },
+    { 0x84, 0x73, "CommunicationLost" },
+    { 0x84, 0xfd, "iManufacturer" },
+    { 0x84, 0xfe, "iProduct" },
+    { 0x84, 0xff, "iSerialNumber" },
+  { 0x85, 0, "Battery System" },
+    { 0x85, 0x01, "SMBBatteryMode" },
+    { 0x85, 0x02, "SMBBatteryStatus" },
+    { 0x85, 0x03, "SMBAlarmWarning" },
+    { 0x85, 0x04, "SMBChargerMode" },
+    { 0x85, 0x05, "SMBChargerStatus" },
+    { 0x85, 0x06, "SMBChargerSpecInfo" },
+    { 0x85, 0x07, "SMBSelectorState" },
+    { 0x85, 0x08, "SMBSelectorPresets" },
+    { 0x85, 0x09, "SMBSelectorInfo" },
+    { 0x85, 0x29, "RemainingCapacityLimit" },
+    { 0x85, 0x2c, "CapacityMode" },
+    { 0x85, 0x42, "BelowRemainingCapacityLimit" },
+    { 0x85, 0x44, "Charging" },
+    { 0x85, 0x45, "Discharging" },
+    { 0x85, 0x4b, "NeedReplacement" },
+    { 0x85, 0x66, "RemainingCapacity" },
+    { 0x85, 0x68, "RunTimeToEmpty" },
+    { 0x85, 0x6a, "AverageTimeToFull" },
+    { 0x85, 0x83, "DesignCapacity" },
+    { 0x85, 0x85, "ManufacturerDate" },
+    { 0x85, 0x89, "iDeviceChemistry" },
+    { 0x85, 0x8b, "Rechargable" },
+    { 0x85, 0x8f, "iOEMInformation" },
+    { 0x85, 0x8d, "CapacityGranularity1" },
+    { 0x85, 0xd0, "ACPresent" },
+  /* pages 0xff00 to 0xffff are vendor-specific */
+  { 0xffff, 0, "Vendor-specific-FF" },
+  { 0, 0, NULL }
+};
+
+static void resolv_usage_page(unsigned page) {
+        const struct hid_usage_entry *p;
+
+        for (p = hid_usage_table; p->description; p++)
+                if (p->page == page) {
+                        printk("%s", p->description);
+                        return;
+                }
+        printk("%04x", page);
+}
+
+static void resolv_usage(unsigned usage) {
+        const struct hid_usage_entry *p;
+
+        resolv_usage_page(usage >> 16);
+        printk(".");
+        for (p = hid_usage_table; p->description; p++)
+                if (p->page == (usage >> 16)) {
+                        for(++p; p->description && p->usage != 0; p++)
+                                if (p->usage == (usage & 0xffff)) {
+                                        printk("%s", p->description);
+                                        return;
+                                }
+                        break;
+                }
+        printk("%04x", usage & 0xffff);
+}
+
+__inline__ static void tab(int n) {
+        while (n--) printk(" ");
+}
+
+static void hid_dump_field(struct hid_field *field, int n) {
+        int j;
+
+        if (field->physical) {
+                tab(n);
+                printk("Physical(");
+                resolv_usage(field->physical); printk(")\n");
+        }
+        if (field->logical) {
+                tab(n);
+                printk("Logical(");
+                resolv_usage(field->logical); printk(")\n");
+        }
+        tab(n); printk("Usage(%d)\n", field->maxusage);
+        for (j = 0; j < field->maxusage; j++) {
+                tab(n+2);resolv_usage(field->usage[j].hid); printk("\n");
+        }
+        if (field->logical_minimum != field->logical_maximum) {
+                tab(n); printk("Logical Minimum(%d)\n", field->logical_minimum);
+                tab(n); printk("Logical Maximum(%d)\n", field->logical_maximum);
+        }
+        if (field->physical_minimum != field->physical_maximum) {
+                tab(n); printk("Physical Minimum(%d)\n", field->physical_minimum);
+                tab(n); printk("Physical Maximum(%d)\n", field->physical_maximum);
+        }
+        if (field->unit_exponent) {
+                tab(n); printk("Unit Exponent(%d)\n", field->unit_exponent);
+        }
+        if (field->unit) {
+                char *systems[5] = { "None", "SI Linear", "SI Rotation", "English Linear", "English Rotation" };
+                char *units[5][8] = {
+                        { "None", "None", "None", "None", "None", "None", "None", "None" },
+                        { "None", "Centimeter", "Gram", "Seconds", "Kelvin",     "Ampere", "Candela", "None" },
+                        { "None", "Radians",    "Gram", "Seconds", "Kelvin",     "Ampere", "Candela", "None" },
+                        { "None", "Inch",       "Slug", "Seconds", "Fahrenheit", "Ampere", "Candela", "None" },
+                        { "None", "Degrees",    "Slug", "Seconds", "Fahrenheit", "Ampere", "Candela", "None" }
+                };
+
+                int i;
+                int sys;
+                __u32 data = field->unit;
+
+                /* First nibble tells us which system we're in. */
+                sys = data & 0xf;
+                data >>= 4;
+
+                if(sys > 4) {
+                        tab(n); printk("Unit(Invalid)\n");
+                }
+                else {
+                        int earlier_unit = 0;
+
+                        tab(n); printk("Unit(%s : ", systems[sys]);
+
+                        for (i=1 ; i<sizeof(__u32)*2 ; i++) {
+                                char nibble = data & 0xf;
+                                data >>= 4;
+                                if (nibble != 0) {
+                                        if(earlier_unit++ > 0)
+                                                printk("*");
+                                        printk("%s", units[sys][i]);
+                                        if(nibble != 1) {
+                                                /* This is a _signed_ nibble(!) */
+
+                                                int val = nibble & 0x7;
+                                                if(nibble & 0x08)
+                                                        val = -((0x7 & ~val) +1);
+                                                printk("^%d", val);
+                                        }
+                                }
+                        }
+                        printk(")\n");
+                }
+        }
+        tab(n); printk("Report Size(%u)\n", field->report_size);
+        tab(n); printk("Report Count(%u)\n", field->report_count);
+        tab(n); printk("Report Offset(%u)\n", field->report_offset);
+
+        tab(n); printk("Flags( ");
+        j = field->flags;
+        printk("%s", HID_MAIN_ITEM_CONSTANT & j ? "Constant " : "");
+        printk("%s", HID_MAIN_ITEM_VARIABLE & j ? "Variable " : "Array ");
+        printk("%s", HID_MAIN_ITEM_RELATIVE & j ? "Relative " : "Absolute ");
+        printk("%s", HID_MAIN_ITEM_WRAP & j ? "Wrap " : "");
+        printk("%s", HID_MAIN_ITEM_NONLINEAR & j ? "NonLinear " : "");
+        printk("%s", HID_MAIN_ITEM_NO_PREFERRED & j ? "NoPrefferedState " : "");
+        printk("%s", HID_MAIN_ITEM_NULL_STATE & j ? "NullState " : "");
+        printk("%s", HID_MAIN_ITEM_VOLATILE & j ? "Volatile " : "");
+        printk("%s", HID_MAIN_ITEM_BUFFERED_BYTE & j ? "BufferedByte " : "");
+        printk(")\n");
+}
+
+static void __attribute__((unused)) hid_dump_device(struct hid_device *device) {
+        struct hid_report_enum *report_enum;
+        struct hid_report *report;
+        struct list_head *list;
+        unsigned i,k;
+        static char *table[] = {"INPUT", "OUTPUT", "FEATURE"};
+
+        for (i = 0; i < HID_REPORT_TYPES; i++) {
+                report_enum = device->report_enum + i;
+                list = report_enum->report_list.next;
+                while (list != &report_enum->report_list) {
+                        report = (struct hid_report *) list;
+                        tab(2);
+                        printk("%s", table[i]);
+                        if (report->id)
+                                printk("(%d)", report->id);
+                        printk("[%s]", table[report->type]);
+                        printk("\n");
+                        for (k = 0; k < report->maxfield; k++) {
+                                tab(4);
+                                printk("Field(%d)\n", k);
+                                hid_dump_field(report->field[k], 6);
+                        }
+                        list = list->next;
+                }
+        }
+}
+
+static void __attribute__((unused)) hid_dump_input(struct hid_usage *usage, __s32 value) {
+        printk("hid-debug: input ");
+        resolv_usage(usage->hid);
+        printk(" = %d\n", value);
+}
+
+
+static char *events[EV_MAX + 1] = {
+        [EV_SYN] = "Sync",                      [EV_KEY] = "Key",
+        [EV_REL] = "Relative",                  [EV_ABS] = "Absolute",
+        [EV_MSC] = "Misc",                      [EV_LED] = "LED",
+        [EV_SND] = "Sound",                     [EV_REP] = "Repeat",
+        [EV_FF] = "ForceFeedback",              [EV_PWR] = "Power",
+        [EV_FF_STATUS] = "ForceFeedbackStatus",
+};
+
+static char *syncs[2] = {
+        [SYN_REPORT] = "Report",                [SYN_CONFIG] = "Config",
+};
+static char *keys[KEY_MAX + 1] = {
+        [KEY_RESERVED] = "Reserved",            [KEY_ESC] = "Esc",
+        [KEY_1] = "1",                          [KEY_2] = "2",
+        [KEY_3] = "3",                          [KEY_4] = "4",
+        [KEY_5] = "5",                          [KEY_6] = "6",
+        [KEY_7] = "7",                          [KEY_8] = "8",
+        [KEY_9] = "9",                          [KEY_0] = "0",
+        [KEY_MINUS] = "Minus",                  [KEY_EQUAL] = "Equal",
+        [KEY_BACKSPACE] = "Backspace",          [KEY_TAB] = "Tab",
+        [KEY_Q] = "Q",                          [KEY_W] = "W",
+        [KEY_E] = "E",                          [KEY_R] = "R",
+        [KEY_T] = "T",                          [KEY_Y] = "Y",
+        [KEY_U] = "U",                          [KEY_I] = "I",
+        [KEY_O] = "O",                          [KEY_P] = "P",
+        [KEY_LEFTBRACE] = "LeftBrace",          [KEY_RIGHTBRACE] = "RightBrace",
+        [KEY_ENTER] = "Enter",                  [KEY_LEFTCTRL] = "LeftControl",
+        [KEY_A] = "A",                          [KEY_S] = "S",
+        [KEY_D] = "D",                          [KEY_F] = "F",
+        [KEY_G] = "G",                          [KEY_H] = "H",
+        [KEY_J] = "J",                          [KEY_K] = "K",
+        [KEY_L] = "L",                          [KEY_SEMICOLON] = "Semicolon",
+        [KEY_APOSTROPHE] = "Apostrophe",        [KEY_GRAVE] = "Grave",
+        [KEY_LEFTSHIFT] = "LeftShift",          [KEY_BACKSLASH] = "BackSlash",
+        [KEY_Z] = "Z",                          [KEY_X] = "X",
+        [KEY_C] = "C",                          [KEY_V] = "V",
+        [KEY_B] = "B",                          [KEY_N] = "N",
+        [KEY_M] = "M",                          [KEY_COMMA] = "Comma",
+        [KEY_DOT] = "Dot",                      [KEY_SLASH] = "Slash",
+        [KEY_RIGHTSHIFT] = "RightShift",        [KEY_KPASTERISK] = "KPAsterisk",
+        [KEY_LEFTALT] = "LeftAlt",              [KEY_SPACE] = "Space",
+        [KEY_CAPSLOCK] = "CapsLock",            [KEY_F1] = "F1",
+        [KEY_F2] = "F2",                        [KEY_F3] = "F3",
+        [KEY_F4] = "F4",                        [KEY_F5] = "F5",
+        [KEY_F6] = "F6",                        [KEY_F7] = "F7",
+        [KEY_F8] = "F8",                        [KEY_F9] = "F9",
+        [KEY_F10] = "F10",                      [KEY_NUMLOCK] = "NumLock",
+        [KEY_SCROLLLOCK] = "ScrollLock",        [KEY_KP7] = "KP7",
+        [KEY_KP8] = "KP8",                      [KEY_KP9] = "KP9",
+        [KEY_KPMINUS] = "KPMinus",              [KEY_KP4] = "KP4",
+        [KEY_KP5] = "KP5",                      [KEY_KP6] = "KP6",
+        [KEY_KPPLUS] = "KPPlus",                [KEY_KP1] = "KP1",
+        [KEY_KP2] = "KP2",                      [KEY_KP3] = "KP3",
+        [KEY_KP0] = "KP0",                      [KEY_KPDOT] = "KPDot",
+        [KEY_ZENKAKUHANKAKU] = "Zenkaku/Hankaku", [KEY_102ND] = "102nd",
+        [KEY_F11] = "F11",                      [KEY_F12] = "F12",
+        [KEY_RO] = "RO",                        [KEY_KATAKANA] = "Katakana",
+        [KEY_HIRAGANA] = "HIRAGANA",            [KEY_HENKAN] = "Henkan",
+        [KEY_KATAKANAHIRAGANA] = "Katakana/Hiragana", [KEY_MUHENKAN] = "Muhenkan",
+        [KEY_KPJPCOMMA] = "KPJpComma",          [KEY_KPENTER] = "KPEnter",
+        [KEY_RIGHTCTRL] = "RightCtrl",          [KEY_KPSLASH] = "KPSlash",
+        [KEY_SYSRQ] = "SysRq",                  [KEY_RIGHTALT] = "RightAlt",
+        [KEY_LINEFEED] = "LineFeed",            [KEY_HOME] = "Home",
+        [KEY_UP] = "Up",                        [KEY_PAGEUP] = "PageUp",
+        [KEY_LEFT] = "Left",                    [KEY_RIGHT] = "Right",
+        [KEY_END] = "End",                      [KEY_DOWN] = "Down",
+        [KEY_PAGEDOWN] = "PageDown",            [KEY_INSERT] = "Insert",
+        [KEY_DELETE] = "Delete",                [KEY_MACRO] = "Macro",
+        [KEY_MUTE] = "Mute",                    [KEY_VOLUMEDOWN] = "VolumeDown",
+        [KEY_VOLUMEUP] = "VolumeUp",            [KEY_POWER] = "Power",
+        [KEY_KPEQUAL] = "KPEqual",              [KEY_KPPLUSMINUS] = "KPPlusMinus",
+        [KEY_PAUSE] = "Pause",                  [KEY_KPCOMMA] = "KPComma",
+        [KEY_HANGUEL] = "Hangeul",              [KEY_HANJA] = "Hanja",
+        [KEY_YEN] = "Yen",                      [KEY_LEFTMETA] = "LeftMeta",
+        [KEY_RIGHTMETA] = "RightMeta",          [KEY_COMPOSE] = "Compose",
+        [KEY_STOP] = "Stop",                    [KEY_AGAIN] = "Again",
+        [KEY_PROPS] = "Props",                  [KEY_UNDO] = "Undo",
+        [KEY_FRONT] = "Front",                  [KEY_COPY] = "Copy",
+        [KEY_OPEN] = "Open",                    [KEY_PASTE] = "Paste",
+        [KEY_FIND] = "Find",                    [KEY_CUT] = "Cut",
+        [KEY_HELP] = "Help",                    [KEY_MENU] = "Menu",
+        [KEY_CALC] = "Calc",                    [KEY_SETUP] = "Setup",
+        [KEY_SLEEP] = "Sleep",                  [KEY_WAKEUP] = "WakeUp",
+        [KEY_FILE] = "File",                    [KEY_SENDFILE] = "SendFile",
+        [KEY_DELETEFILE] = "DeleteFile",        [KEY_XFER] = "X-fer",
+        [KEY_PROG1] = "Prog1",                  [KEY_PROG2] = "Prog2",
+        [KEY_WWW] = "WWW",                      [KEY_MSDOS] = "MSDOS",
+        [KEY_COFFEE] = "Coffee",                [KEY_DIRECTION] = "Direction",
+        [KEY_CYCLEWINDOWS] = "CycleWindows",    [KEY_MAIL] = "Mail",
+        [KEY_BOOKMARKS] = "Bookmarks",          [KEY_COMPUTER] = "Computer",
+        [KEY_BACK] = "Back",                    [KEY_FORWARD] = "Forward",
+        [KEY_CLOSECD] = "CloseCD",              [KEY_EJECTCD] = "EjectCD",
+        [KEY_EJECTCLOSECD] = "EjectCloseCD",    [KEY_NEXTSONG] = "NextSong",
+        [KEY_PLAYPAUSE] = "PlayPause",          [KEY_PREVIOUSSONG] = "PreviousSong",
+        [KEY_STOPCD] = "StopCD",                [KEY_RECORD] = "Record",
+        [KEY_REWIND] = "Rewind",                [KEY_PHONE] = "Phone",
+        [KEY_ISO] = "ISOKey",                   [KEY_CONFIG] = "Config",
+        [KEY_HOMEPAGE] = "HomePage",            [KEY_REFRESH] = "Refresh",
+        [KEY_EXIT] = "Exit",                    [KEY_MOVE] = "Move",
+        [KEY_EDIT] = "Edit",                    [KEY_SCROLLUP] = "ScrollUp",
+        [KEY_SCROLLDOWN] = "ScrollDown",        [KEY_KPLEFTPAREN] = "KPLeftParenthesis",
+        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_NEW] = "New",
+        [KEY_REDO] = "Redo",                    [KEY_F13] = "F13",
+        [KEY_F14] = "F14",                      [KEY_F15] = "F15",
+        [KEY_F16] = "F16",                      [KEY_F17] = "F17",
+        [KEY_F18] = "F18",                      [KEY_F19] = "F19",
+        [KEY_F20] = "F20",                      [KEY_F21] = "F21",
+        [KEY_F22] = "F22",                      [KEY_F23] = "F23",
+        [KEY_F24] = "F24",                      [KEY_PLAYCD] = "PlayCD",
+        [KEY_PAUSECD] = "PauseCD",              [KEY_PROG3] = "Prog3",
+        [KEY_PROG4] = "Prog4",                  [KEY_SUSPEND] = "Suspend",
+        [KEY_CLOSE] = "Close",                  [KEY_PLAY] = "Play",
+        [KEY_FASTFORWARD] = "FastForward",      [KEY_BASSBOOST] = "BassBoost",
+        [KEY_PRINT] = "Print",                  [KEY_HP] = "HP",
+        [KEY_CAMERA] = "Camera",                [KEY_SOUND] = "Sound",
+        [KEY_QUESTION] = "Question",            [KEY_EMAIL] = "Email",
+        [KEY_CHAT] = "Chat",                    [KEY_SEARCH] = "Search",
+        [KEY_CONNECT] = "Connect",              [KEY_FINANCE] = "Finance",
+        [KEY_SPORT] = "Sport",                  [KEY_SHOP] = "Shop",
+        [KEY_ALTERASE] = "AlternateErase",      [KEY_CANCEL] = "Cancel",
+        [KEY_BRIGHTNESSDOWN] = "BrightnessDown", [KEY_BRIGHTNESSUP] = "BrightnessUp",
+        [KEY_MEDIA] = "Media",                  [KEY_UNKNOWN] = "Unknown",
+        [BTN_0] = "Btn0",                       [BTN_1] = "Btn1",
+        [BTN_2] = "Btn2",                       [BTN_3] = "Btn3",
+        [BTN_4] = "Btn4",                       [BTN_5] = "Btn5",
+        [BTN_6] = "Btn6",                       [BTN_7] = "Btn7",
+        [BTN_8] = "Btn8",                       [BTN_9] = "Btn9",
+        [BTN_LEFT] = "LeftBtn",                 [BTN_RIGHT] = "RightBtn",
+        [BTN_MIDDLE] = "MiddleBtn",             [BTN_SIDE] = "SideBtn",
+        [BTN_EXTRA] = "ExtraBtn",               [BTN_FORWARD] = "ForwardBtn",
+        [BTN_BACK] = "BackBtn",                 [BTN_TASK] = "TaskBtn",
+        [BTN_TRIGGER] = "Trigger",              [BTN_THUMB] = "ThumbBtn",
+        [BTN_THUMB2] = "ThumbBtn2",             [BTN_TOP] = "TopBtn",
+        [BTN_TOP2] = "TopBtn2",                 [BTN_PINKIE] = "PinkieBtn",
+        [BTN_BASE] = "BaseBtn",                 [BTN_BASE2] = "BaseBtn2",
+        [BTN_BASE3] = "BaseBtn3",               [BTN_BASE4] = "BaseBtn4",
+        [BTN_BASE5] = "BaseBtn5",               [BTN_BASE6] = "BaseBtn6",
+        [BTN_DEAD] = "BtnDead",                 [BTN_A] = "BtnA",
+        [BTN_B] = "BtnB",                       [BTN_C] = "BtnC",
+        [BTN_X] = "BtnX",                       [BTN_Y] = "BtnY",
+        [BTN_Z] = "BtnZ",                       [BTN_TL] = "BtnTL",
+        [BTN_TR] = "BtnTR",                     [BTN_TL2] = "BtnTL2",
+        [BTN_TR2] = "BtnTR2",                   [BTN_SELECT] = "BtnSelect",
+        [BTN_START] = "BtnStart",               [BTN_MODE] = "BtnMode",
+        [BTN_THUMBL] = "BtnThumbL",             [BTN_THUMBR] = "BtnThumbR",
+        [BTN_TOOL_PEN] = "ToolPen",             [BTN_TOOL_RUBBER] = "ToolRubber",
+        [BTN_TOOL_BRUSH] = "ToolBrush",         [BTN_TOOL_PENCIL] = "ToolPencil",
+        [BTN_TOOL_AIRBRUSH] = "ToolAirbrush",   [BTN_TOOL_FINGER] = "ToolFinger",
+        [BTN_TOOL_MOUSE] = "ToolMouse",         [BTN_TOOL_LENS] = "ToolLens",
+        [BTN_TOUCH] = "Touch",                  [BTN_STYLUS] = "Stylus",
+        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
+        [BTN_TOOL_TRIPLETAP] = "ToolTripleTap", [BTN_GEAR_DOWN] = "WheelBtn",
+        [BTN_GEAR_UP] = "Gear up",              [KEY_OK] = "Ok",
+        [KEY_SELECT] = "Select",                [KEY_GOTO] = "Goto",
+        [KEY_CLEAR] = "Clear",                  [KEY_POWER2] = "Power2",
+        [KEY_OPTION] = "Option",                [KEY_INFO] = "Info",
+        [KEY_TIME] = "Time",                    [KEY_VENDOR] = "Vendor",
+        [KEY_ARCHIVE] = "Archive",              [KEY_PROGRAM] = "Program",
+        [KEY_CHANNEL] = "Channel",              [KEY_FAVORITES] = "Favorites",
+        [KEY_EPG] = "EPG",                      [KEY_PVR] = "PVR",
+        [KEY_MHP] = "MHP",                      [KEY_LANGUAGE] = "Language",
+        [KEY_TITLE] = "Title",                  [KEY_SUBTITLE] = "Subtitle",
+        [KEY_ANGLE] = "Angle",                  [KEY_ZOOM] = "Zoom",
+        [KEY_MODE] = "Mode",                    [KEY_KEYBOARD] = "Keyboard",
+        [KEY_SCREEN] = "Screen",                [KEY_PC] = "PC",
+        [KEY_TV] = "TV",                        [KEY_TV2] = "TV2",
+        [KEY_VCR] = "VCR",                      [KEY_VCR2] = "VCR2",
+        [KEY_SAT] = "Sat",                      [KEY_SAT2] = "Sat2",
+        [KEY_CD] = "CD",                        [KEY_TAPE] = "Tape",
+        [KEY_RADIO] = "Radio",                  [KEY_TUNER] = "Tuner",
+        [KEY_PLAYER] = "Player",                [KEY_TEXT] = "Text",
+        [KEY_DVD] = "DVD",                      [KEY_AUX] = "Aux",
+        [KEY_MP3] = "MP3",                      [KEY_AUDIO] = "Audio",
+        [KEY_VIDEO] = "Video",                  [KEY_DIRECTORY] = "Directory",
+        [KEY_LIST] = "List",                    [KEY_MEMO] = "Memo",
+        [KEY_CALENDAR] = "Calendar",            [KEY_RED] = "Red",
+        [KEY_GREEN] = "Green",                  [KEY_YELLOW] = "Yellow",
+        [KEY_BLUE] = "Blue",                    [KEY_CHANNELUP] = "ChannelUp",
+        [KEY_CHANNELDOWN] = "ChannelDown",      [KEY_FIRST] = "First",
+        [KEY_LAST] = "Last",                    [KEY_AB] = "AB",
+        [KEY_NEXT] = "Next",                    [KEY_RESTART] = "Restart",
+        [KEY_SLOW] = "Slow",                    [KEY_SHUFFLE] = "Shuffle",
+        [KEY_BREAK] = "Break",                  [KEY_PREVIOUS] = "Previous",
+        [KEY_DIGITS] = "Digits",                [KEY_TEEN] = "TEEN",
+        [KEY_TWEN] = "TWEN",                    [KEY_DEL_EOL] = "DeleteEOL",
+        [KEY_DEL_EOS] = "DeleteEOS",            [KEY_INS_LINE] = "InsertLine",
+        [KEY_DEL_LINE] = "DeleteLine",
+        [KEY_SEND] = "Send",                    [KEY_REPLY] = "Reply",
+        [KEY_FORWARDMAIL] = "ForwardMail",      [KEY_SAVE] = "Save",
+        [KEY_DOCUMENTS] = "Documents",
+        [KEY_FN] = "Fn",                        [KEY_FN_ESC] = "Fn+ESC",
+        [KEY_FN_1] = "Fn+1",                    [KEY_FN_2] = "Fn+2",
+        [KEY_FN_B] = "Fn+B",                    [KEY_FN_D] = "Fn+D",
+        [KEY_FN_E] = "Fn+E",                    [KEY_FN_F] = "Fn+F",
+        [KEY_FN_S] = "Fn+S",
+        [KEY_FN_F1] = "Fn+F1",                  [KEY_FN_F2] = "Fn+F2",
+        [KEY_FN_F3] = "Fn+F3",                  [KEY_FN_F4] = "Fn+F4",
+        [KEY_FN_F5] = "Fn+F5",                  [KEY_FN_F6] = "Fn+F6",
+        [KEY_FN_F7] = "Fn+F7",                  [KEY_FN_F8] = "Fn+F8",
+        [KEY_FN_F9] = "Fn+F9",                  [KEY_FN_F10] = "Fn+F10",
+        [KEY_FN_F11] = "Fn+F11",                [KEY_FN_F12] = "Fn+F12",
+        [KEY_KBDILLUMTOGGLE] = "KbdIlluminationToggle",
+        [KEY_KBDILLUMDOWN] = "KbdIlluminationDown",
+        [KEY_KBDILLUMUP] = "KbdIlluminationUp",
+        [KEY_SWITCHVIDEOMODE] = "SwitchVideoMode",
+};
+
+static char *relatives[REL_MAX + 1] = {
+        [REL_X] = "X",                  [REL_Y] = "Y",
+        [REL_Z] = "Z",                  [REL_HWHEEL] = "HWheel",
+        [REL_DIAL] = "Dial",            [REL_WHEEL] = "Wheel",
+        [REL_MISC] = "Misc",
+};
+
+static char *absolutes[ABS_MAX + 1] = {
+        [ABS_X] = "X",                  [ABS_Y] = "Y",
+        [ABS_Z] = "Z",                  [ABS_RX] = "Rx",
+        [ABS_RY] = "Ry",                [ABS_RZ] = "Rz",
+        [ABS_THROTTLE] = "Throttle",    [ABS_RUDDER] = "Rudder",
+        [ABS_WHEEL] = "Wheel",          [ABS_GAS] = "Gas",
+        [ABS_BRAKE] = "Brake",          [ABS_HAT0X] = "Hat0X",
+        [ABS_HAT0Y] = "Hat0Y",          [ABS_HAT1X] = "Hat1X",
+        [ABS_HAT1Y] = "Hat1Y",          [ABS_HAT2X] = "Hat2X",
+        [ABS_HAT2Y] = "Hat2Y",          [ABS_HAT3X] = "Hat3X",
+        [ABS_HAT3Y] = "Hat 3Y",         [ABS_PRESSURE] = "Pressure",
+        [ABS_DISTANCE] = "Distance",    [ABS_TILT_X] = "XTilt",
+        [ABS_TILT_Y] = "YTilt",         [ABS_TOOL_WIDTH] = "Tool Width",
+        [ABS_VOLUME] = "Volume",        [ABS_MISC] = "Misc",
+};
+
+static char *misc[MSC_MAX + 1] = {
+        [MSC_SERIAL] = "Serial",        [MSC_PULSELED] = "Pulseled",
+        [MSC_GESTURE] = "Gesture",      [MSC_RAW] = "RawData"
+};
+
+static char *leds[LED_MAX + 1] = {
+        [LED_NUML] = "NumLock",         [LED_CAPSL] = "CapsLock",
+        [LED_SCROLLL] = "ScrollLock",   [LED_COMPOSE] = "Compose",
+        [LED_KANA] = "Kana",            [LED_SLEEP] = "Sleep",
+        [LED_SUSPEND] = "Suspend",      [LED_MUTE] = "Mute",
+        [LED_MISC] = "Misc",
+};
+
+static char *repeats[REP_MAX + 1] = {
+        [REP_DELAY] = "Delay",          [REP_PERIOD] = "Period"
+};
+
+static char *sounds[SND_MAX + 1] = {
+        [SND_CLICK] = "Click",          [SND_BELL] = "Bell",
+        [SND_TONE] = "Tone"
+};
+
+static char **names[EV_MAX + 1] = {
+        [EV_SYN] = syncs,                       [EV_KEY] = keys,
+        [EV_REL] = relatives,                   [EV_ABS] = absolutes,
+        [EV_MSC] = misc,                        [EV_LED] = leds,
+        [EV_SND] = sounds,                      [EV_REP] = repeats,
+};
+
+static void __attribute__((unused)) resolv_event(__u8 type, __u16 code) {
+
+        printk("%s.%s", events[type] ? events[type] : "?",
+                names[type] ? (names[type][code] ? names[type][code] : "?") : "?");
+}
diff --git a/include/linux/hid.h b/include/linux/hid.h
new file mode 100644
index 000000000000..770120add15a
--- /dev/null
+++ b/include/linux/hid.h
@@ -0,0 +1,528 @@
+#ifndef __HID_H
+#define __HID_H
+
+/*
+ * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
+ *  Copyright (c) 2006 Jiri Kosina
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * 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
+ */
+
+#define USB_INTERFACE_CLASS_HID         3
+
+/*
+ * USB HID interface subclass and protocol codes
+ */
+
+#define USB_INTERFACE_SUBCLASS_BOOT     1
+#define USB_INTERFACE_PROTOCOL_KEYBOARD 1
+#define USB_INTERFACE_PROTOCOL_MOUSE    2
+
+/*
+ * HID class requests
+ */
+
+#define HID_REQ_GET_REPORT              0x01
+#define HID_REQ_GET_IDLE                0x02
+#define HID_REQ_GET_PROTOCOL            0x03
+#define HID_REQ_SET_REPORT              0x09
+#define HID_REQ_SET_IDLE                0x0A
+#define HID_REQ_SET_PROTOCOL            0x0B
+
+/*
+ * HID class descriptor types
+ */
+
+#define HID_DT_HID                      (USB_TYPE_CLASS | 0x01)
+#define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
+#define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
+
+/*
+ * We parse each description item into this structure. Short items data
+ * values are expanded to 32-bit signed int, long items contain a pointer
+ * into the data area.
+ */
+
+struct hid_item {
+        unsigned  format;
+        __u8      size;
+        __u8      type;
+        __u8      tag;
+        union {
+            __u8   u8;
+            __s8   s8;
+            __u16  u16;
+            __s16  s16;
+            __u32  u32;
+            __s32  s32;
+            __u8  *longdata;
+        } data;
+};
+
+/*
+ * HID report item format
+ */
+
+#define HID_ITEM_FORMAT_SHORT   0
+#define HID_ITEM_FORMAT_LONG    1
+
+/*
+ * Special tag indicating long items
+ */
+
+#define HID_ITEM_TAG_LONG       15
+
+/*
+ * HID report descriptor item type (prefix bit 2,3)
+ */
+
+#define HID_ITEM_TYPE_MAIN              0
+#define HID_ITEM_TYPE_GLOBAL            1
+#define HID_ITEM_TYPE_LOCAL             2
+#define HID_ITEM_TYPE_RESERVED          3
+
+/*
+ * HID report descriptor main item tags
+ */
+
+#define HID_MAIN_ITEM_TAG_INPUT                 8
+#define HID_MAIN_ITEM_TAG_OUTPUT                9
+#define HID_MAIN_ITEM_TAG_FEATURE               11
+#define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION      10
+#define HID_MAIN_ITEM_TAG_END_COLLECTION        12
+
+/*
+ * HID report descriptor main item contents
+ */
+
+#define HID_MAIN_ITEM_CONSTANT          0x001
+#define HID_MAIN_ITEM_VARIABLE          0x002
+#define HID_MAIN_ITEM_RELATIVE          0x004
+#define HID_MAIN_ITEM_WRAP              0x008
+#define HID_MAIN_ITEM_NONLINEAR         0x010
+#define HID_MAIN_ITEM_NO_PREFERRED      0x020
+#define HID_MAIN_ITEM_NULL_STATE        0x040
+#define HID_MAIN_ITEM_VOLATILE          0x080
+#define HID_MAIN_ITEM_BUFFERED_BYTE     0x100
+
+/*
+ * HID report descriptor collection item types
+ */
+
+#define HID_COLLECTION_PHYSICAL         0
+#define HID_COLLECTION_APPLICATION      1
+#define HID_COLLECTION_LOGICAL          2
+
+/*
+ * HID report descriptor global item tags
+ */
+
+#define HID_GLOBAL_ITEM_TAG_USAGE_PAGE          0
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM     1
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM     2
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM    3
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM    4
+#define HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT       5
+#define HID_GLOBAL_ITEM_TAG_UNIT                6
+#define HID_GLOBAL_ITEM_TAG_REPORT_SIZE         7
+#define HID_GLOBAL_ITEM_TAG_REPORT_ID           8
+#define HID_GLOBAL_ITEM_TAG_REPORT_COUNT        9
+#define HID_GLOBAL_ITEM_TAG_PUSH                10
+#define HID_GLOBAL_ITEM_TAG_POP                 11
+
+/*
+ * HID report descriptor local item tags
+ */
+
+#define HID_LOCAL_ITEM_TAG_USAGE                0
+#define HID_LOCAL_ITEM_TAG_USAGE_MINIMUM        1
+#define HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM        2
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX     3
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM   4
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM   5
+#define HID_LOCAL_ITEM_TAG_STRING_INDEX         7
+#define HID_LOCAL_ITEM_TAG_STRING_MINIMUM       8
+#define HID_LOCAL_ITEM_TAG_STRING_MAXIMUM       9
+#define HID_LOCAL_ITEM_TAG_DELIMITER            10
+
+/*
+ * HID usage tables
+ */
+
+#define HID_USAGE_PAGE          0xffff0000
+
+#define HID_UP_UNDEFINED        0x00000000
+#define HID_UP_GENDESK          0x00010000
+#define HID_UP_SIMULATION       0x00020000
+#define HID_UP_KEYBOARD         0x00070000
+#define HID_UP_LED              0x00080000
+#define HID_UP_BUTTON           0x00090000
+#define HID_UP_ORDINAL          0x000a0000
+#define HID_UP_CONSUMER         0x000c0000
+#define HID_UP_DIGITIZER        0x000d0000
+#define HID_UP_PID              0x000f0000
+#define HID_UP_HPVENDOR         0xff7f0000
+#define HID_UP_MSVENDOR         0xff000000
+#define HID_UP_CUSTOM           0x00ff0000
+#define HID_UP_LOGIVENDOR       0xffbc0000
+
+#define HID_USAGE               0x0000ffff
+
+#define HID_GD_POINTER          0x00010001
+#define HID_GD_MOUSE            0x00010002
+#define HID_GD_JOYSTICK         0x00010004
+#define HID_GD_GAMEPAD          0x00010005
+#define HID_GD_KEYBOARD         0x00010006
+#define HID_GD_KEYPAD           0x00010007
+#define HID_GD_MULTIAXIS        0x00010008
+#define HID_GD_X                0x00010030
+#define HID_GD_Y                0x00010031
+#define HID_GD_Z                0x00010032
+#define HID_GD_RX               0x00010033
+#define HID_GD_RY               0x00010034
+#define HID_GD_RZ               0x00010035
+#define HID_GD_SLIDER           0x00010036
+#define HID_GD_DIAL             0x00010037
+#define HID_GD_WHEEL            0x00010038
+#define HID_GD_HATSWITCH        0x00010039
+#define HID_GD_BUFFER           0x0001003a
+#define HID_GD_BYTECOUNT        0x0001003b
+#define HID_GD_MOTION           0x0001003c
+#define HID_GD_START            0x0001003d
+#define HID_GD_SELECT           0x0001003e
+#define HID_GD_VX               0x00010040
+#define HID_GD_VY               0x00010041
+#define HID_GD_VZ               0x00010042
+#define HID_GD_VBRX             0x00010043
+#define HID_GD_VBRY             0x00010044
+#define HID_GD_VBRZ             0x00010045
+#define HID_GD_VNO              0x00010046
+#define HID_GD_FEATURE          0x00010047
+#define HID_GD_UP               0x00010090
+#define HID_GD_DOWN             0x00010091
+#define HID_GD_RIGHT            0x00010092
+#define HID_GD_LEFT             0x00010093
+
+/*
+ * HID report types --- Ouch! HID spec says 1 2 3!
+ */
+
+#define HID_INPUT_REPORT        0
+#define HID_OUTPUT_REPORT       1
+#define HID_FEATURE_REPORT      2
+
+/*
+ * HID device quirks.
+ */
+
+#define HID_QUIRK_INVERT                        0x00000001
+#define HID_QUIRK_NOTOUCH                       0x00000002
+#define HID_QUIRK_IGNORE                        0x00000004
+#define HID_QUIRK_NOGET                         0x00000008
+#define HID_QUIRK_HIDDEV                        0x00000010
+#define HID_QUIRK_BADPAD                        0x00000020
+#define HID_QUIRK_MULTI_INPUT                   0x00000040
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_7           0x00000080
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_5           0x00000100
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_ON          0x00000200
+#define HID_QUIRK_MIGHTYMOUSE                   0x00000400
+#define HID_QUIRK_CYMOTION                      0x00000800
+#define HID_QUIRK_POWERBOOK_HAS_FN              0x00001000
+#define HID_QUIRK_POWERBOOK_FN_ON               0x00002000
+#define HID_QUIRK_INVERT_HWHEEL                 0x00004000
+#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD        0x00008000
+#define HID_QUIRK_BAD_RELATIVE_KEYS             0x00010000
+
+/*
+ * This is the global environment of the parser. This information is
+ * persistent for main-items. The global environment can be saved and
+ * restored with PUSH/POP statements.
+ */
+
+struct hid_global {
+        unsigned usage_page;
+        __s32    logical_minimum;
+        __s32    logical_maximum;
+        __s32    physical_minimum;
+        __s32    physical_maximum;
+        __s32    unit_exponent;
+        unsigned unit;
+        unsigned report_id;
+        unsigned report_size;
+        unsigned report_count;
+};
+
+/*
+ * This is the local environment. It is persistent up the next main-item.
+ */
+
+#define HID_MAX_DESCRIPTOR_SIZE         4096
+#define HID_MAX_USAGES                  1024
+#define HID_DEFAULT_NUM_COLLECTIONS     16
+
+struct hid_local {
+        unsigned usage[HID_MAX_USAGES]; /* usage array */
+        unsigned collection_index[HID_MAX_USAGES]; /* collection index array */
+        unsigned usage_index;
+        unsigned usage_minimum;
+        unsigned delimiter_depth;
+        unsigned delimiter_branch;
+};
+
+/*
+ * This is the collection stack. We climb up the stack to determine
+ * application and function of each field.
+ */
+
+struct hid_collection {
+        unsigned type;
+        unsigned usage;
+        unsigned level;
+};
+
+struct hid_usage {
+        unsigned  hid;                  /* hid usage code */
+        unsigned  collection_index;     /* index into collection array */
+        /* hidinput data */
+        __u16     code;                 /* input driver code */
+        __u8      type;                 /* input driver type */
+        __s8      hat_min;              /* hat switch fun */
+        __s8      hat_max;              /* ditto */
+        __s8      hat_dir;              /* ditto */
+};
+
+struct hid_input;
+
+struct hid_field {
+        unsigned  physical;             /* physical usage for this field */
+        unsigned  logical;              /* logical usage for this field */
+        unsigned  application;          /* application usage for this field */
+        struct hid_usage *usage;        /* usage table for this function */
+        unsigned  maxusage;             /* maximum usage index */
+        unsigned  flags;                /* main-item flags (i.e. volatile,array,constant) */
+        unsigned  report_offset;        /* bit offset in the report */
+        unsigned  report_size;          /* size of this field in the report */
+        unsigned  report_count;         /* number of this field in the report */
+        unsigned  report_type;          /* (input,output,feature) */
+        __s32    *value;                /* last known value(s) */
+        __s32     logical_minimum;
+        __s32     logical_maximum;
+        __s32     physical_minimum;
+        __s32     physical_maximum;
+        __s32     unit_exponent;
+        unsigned  unit;
+        struct hid_report *report;      /* associated report */
+        unsigned index;                 /* index into report->field[] */
+        /* hidinput data */
+        struct hid_input *hidinput;     /* associated input structure */
+        __u16 dpad;                     /* dpad input code */
+};
+
+#define HID_MAX_FIELDS 64
+
+struct hid_report {
+        struct list_head list;
+        unsigned id;                                    /* id of this report */
+        unsigned type;                                  /* report type */
+        struct hid_field *field[HID_MAX_FIELDS];        /* fields of the report */
+        unsigned maxfield;                              /* maximum valid field index */
+        unsigned size;                                  /* size of the report (bits) */
+        struct hid_device *device;                      /* associated device */
+};
+
+struct hid_report_enum {
+        unsigned numbered;
+        struct list_head report_list;
+        struct hid_report *report_id_hash[256];
+};
+
+#define HID_REPORT_TYPES 3
+
+#define HID_MIN_BUFFER_SIZE     64              /* make sure there is at least a packet size of space */
+#define HID_MAX_BUFFER_SIZE     4096            /* 4kb */
+#define HID_CONTROL_FIFO_SIZE   256             /* to init devices with >100 reports */
+#define HID_OUTPUT_FIFO_SIZE    64
+
+struct hid_control_fifo {
+        unsigned char dir;
+        struct hid_report *report;
+};
+
+#define HID_CLAIMED_INPUT       1
+#define HID_CLAIMED_HIDDEV      2
+
+#define HID_CTRL_RUNNING        1
+#define HID_OUT_RUNNING         2
+#define HID_IN_RUNNING          3
+#define HID_RESET_PENDING       4
+#define HID_SUSPENDED           5
+#define HID_CLEAR_HALT          6
+
+struct hid_input {
+        struct list_head list;
+        struct hid_report *report;
+        struct input_dev *input;
+};
+
+struct hid_device {                                                     /* device report descriptor */
+         __u8 *rdesc;
+        unsigned rsize;
+        struct hid_collection *collection;                              /* List of HID collections */
+        unsigned collection_size;                                       /* Number of allocated hid_collections */
+        unsigned maxcollection;                                         /* Number of parsed collections */
+        unsigned maxapplication;                                        /* Number of applications */
+        unsigned short bus;                                             /* BUS ID */
+        unsigned short vendor;                                          /* Vendor ID */
+        unsigned short product;                                         /* Product ID */
+        unsigned version;                                               /* HID version */
+        unsigned country;                                               /* HID country */
+        struct hid_report_enum report_enum[HID_REPORT_TYPES];
+
+        struct device *dev;                                             /* device */
+
+        unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
+        unsigned quirks;                                                /* Various quirks the device can pull on us */
+
+        struct list_head inputs;                                        /* The list of inputs */
+        void *hiddev;                                                   /* The hiddev structure */
+        int minor;                                                      /* Hiddev minor number */
+
+        wait_queue_head_t wait;                                         /* For sleeping */
+
+        int open;                                                       /* is the device open by anyone? */
+        char name[128];                                                 /* Device name */
+        char phys[64];                                                  /* Device physical location */
+        char uniq[64];                                                  /* Device unique identifier (serial #) */
+
+        void *driver_data;
+
+        /* device-specific function pointers */
+        int (*hidinput_input_event) (struct input_dev *, unsigned int, unsigned int, int);
+        int (*hidinput_open) (struct input_dev *);
+        void (*hidinput_close) (struct input_dev *);
+
+        /* hiddev event handler */
+        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 *);
+#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
+        unsigned int  pb_fnmode;
+        unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
+        unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
+#endif
+};
+
+#define HID_GLOBAL_STACK_SIZE 4
+#define HID_COLLECTION_STACK_SIZE 4
+
+struct hid_parser {
+        struct hid_global     global;
+        struct hid_global     global_stack[HID_GLOBAL_STACK_SIZE];
+        unsigned              global_stack_ptr;
+        struct hid_local      local;
+        unsigned              collection_stack[HID_COLLECTION_STACK_SIZE];
+        unsigned              collection_stack_ptr;
+        struct hid_device    *device;
+};
+
+struct hid_class_descriptor {
+        __u8  bDescriptorType;
+        __u16 wDescriptorLength;
+} __attribute__ ((packed));
+
+struct hid_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u16 bcdHID;
+        __u8  bCountryCode;
+        __u8  bNumDescriptors;
+
+        struct hid_class_descriptor desc[1];
+} __attribute__ ((packed));
+
+#ifdef DEBUG
+#include "hid-debug.h"
+#else
+#define hid_dump_input(a,b)     do { } while (0)
+#define hid_dump_device(c)      do { } while (0)
+#define hid_dump_field(a,b)     do { } while (0)
+#define resolv_usage(a)         do { } while (0)
+#define resolv_event(a,b)       do { } while (0)
+#endif
+
+/* Applications from HID Usage Tables 4/8/99 Version 1.1 */
+/* We ignore a few input applications that are not widely used */
+#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001))
+
+/* HID core API */
+extern void hidinput_hid_event(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
+extern void hidinput_report_event(struct hid_device *hid, struct hid_report *report);
+extern int hidinput_connect(struct hid_device *);
+extern void hidinput_disconnect(struct hid_device *);
+
+int hid_set_field(struct hid_field *, unsigned, __s32);
+int hid_input_report(struct hid_device *, int type, u8 *, int, int);
+int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
+void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);
+void hid_output_report(struct hid_report *report, __u8 *data);
+void hid_free_device(struct hid_device *device);
+struct hid_device *hid_parse_report(__u8 *start, unsigned size);
+
+#ifdef CONFIG_HID_FF
+int hid_ff_init(struct hid_device *hid);
+
+int hid_lgff_init(struct hid_device *hid);
+int hid_tmff_init(struct hid_device *hid);
+int hid_zpff_init(struct hid_device *hid);
+#ifdef CONFIG_HID_PID
+int hid_pidff_init(struct hid_device *hid);
+#else
+static inline int hid_pidff_init(struct hid_device *hid) { return -ENODEV; }
+#endif
+
+#else
+static inline int hid_ff_init(struct hid_device *hid) { return -1; }
+#endif
+#ifdef DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
+                __FILE__ , ## arg)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif
+
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
+                __FILE__ , ## arg)
+#endif
+
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 733790d4f7db..7272ff9ee77c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -7,6 +7,7 @@
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
 #include <linux/ipc.h>
+#include <linux/pid_namespace.h>
 
 #define INIT_FDTABLE \
 {                                                       \
@@ -57,25 +58,28 @@
         .cpu_vm_mask    = CPU_MASK_ALL,                         \
 }
 
-#define INIT_SIGNALS(sig) {     \
-        .count          = ATOMIC_INIT(1),               \
+#define INIT_SIGNALS(sig) {                                             \
+        .count          = ATOMIC_INIT(1),                               \
         .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
-        .shared_pending = {                             \
+        .shared_pending = {                                             \
                 .list = LIST_HEAD_INIT(sig.shared_pending.list),        \
-                .signal =  {{0}}}, \
+                .signal =  {{0}}},                                      \
         .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
         .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
         .rlim           = INIT_RLIMITS,                                 \
         .pgrp           = 1,                                            \
-        .session        = 1,                                            \
+        .tty_old_pgrp   = 0,                                            \
+        { .__session      = 1},                                         \
 }
 
 extern struct nsproxy init_nsproxy;
 #define INIT_NSPROXY(nsproxy) {                                         \
+        .pid_ns         = &init_pid_ns,                                 \
         .count          = ATOMIC_INIT(1),                               \
         .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
+        .id             = 0,                                            \
         .uts_ns         = &init_uts_ns,                                 \
-        .namespace      = NULL,                                         \
+        .mnt_ns         = NULL,                                         \
         INIT_IPC_NS(ipc_ns)                                             \
 }
 
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 62991148d5a5..3c7875b7ab5b 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -511,8 +511,8 @@ typedef struct modem_info {
 #endif
   struct tty_struct     *tty;            /* Pointer to corresponding tty   */
   atemu                 emu;             /* AT-emulator data               */
-  struct termios        normal_termios;  /* For saving termios structs     */
-  struct termios        callout_termios;
+  struct ktermios       normal_termios;  /* For saving termios structs     */
+  struct ktermios       callout_termios;
   wait_queue_head_t     open_wait, close_wait;
   struct semaphore      write_sem;
   spinlock_t            readlock;
@@ -525,8 +525,8 @@ typedef struct _isdn_modem {
   int                refcount;                          /* Number of opens        */
   struct tty_driver  *tty_modem;                        /* tty-device             */
   struct tty_struct  *modem_table[ISDN_MAX_CHANNELS];   /* ?? copied from Orig    */
-  struct termios     *modem_termios[ISDN_MAX_CHANNELS];
-  struct termios     *modem_termios_locked[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios_locked[ISDN_MAX_CHANNELS];
   modem_info         info[ISDN_MAX_CHANNELS];      /* Private data           */
 } isdn_modem_t;
 
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index b55e2a035605..106a5e85e5c4 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -49,13 +49,13 @@
  *      communication with the slave board will always be on a per port
  *      basis.
  */
-typedef struct {
+struct stliport {
         unsigned long           magic;
-        int                     portnr;
-        int                     panelnr;
-        int                     brdnr;
+        unsigned int            portnr;
+        unsigned int            panelnr;
+        unsigned int            brdnr;
         unsigned long           state;
-        int                     devnr;
+        unsigned int            devnr;
         int                     flags;
         int                     baud_base;
         int                     custom_divisor;
@@ -72,7 +72,7 @@ typedef struct {
         wait_queue_head_t       close_wait;
         wait_queue_head_t       raw_wait;
         struct work_struct      tqhangup;
-        asysigs_t               asig;
+        struct asysigs          asig;
         unsigned long           addr;
         unsigned long           rxoffset;
         unsigned long           txoffset;
@@ -83,31 +83,31 @@ typedef struct {
         unsigned char           reqbit;
         unsigned char           portidx;
         unsigned char           portbit;
-} stliport_t;
+};
 
 /*
  *      Use a structure of function pointers to do board level operations.
  *      These include, enable/disable, paging shared memory, interrupting, etc.
  */
-typedef struct stlibrd {
+struct stlibrd {
         unsigned long   magic;
-        int             brdnr;
-        int             brdtype;
-        int             state;
-        int             nrpanels;
-        int             nrports;
-        int             nrdevs;
+        unsigned int    brdnr;
+        unsigned int    brdtype;
+        unsigned int    state;
+        unsigned int    nrpanels;
+        unsigned int    nrports;
+        unsigned int    nrdevs;
         unsigned int    iobase;
         int             iosize;
         unsigned long   memaddr;
         void            __iomem *membase;
-        int             memsize;
+        unsigned long   memsize;
         int             pagesize;
         int             hostoffset;
         int             slaveoffset;
         int             bitsize;
         int             enabval;
-        int             panels[STL_MAXPANELS];
+        unsigned int    panels[STL_MAXPANELS];
         int             panelids[STL_MAXPANELS];
         void            (*init)(struct stlibrd *brdp);
         void            (*enable)(struct stlibrd *brdp);
@@ -116,8 +116,8 @@ typedef struct stlibrd {
         void            __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
         void            (*intr)(struct stlibrd *brdp);
         void            (*reset)(struct stlibrd *brdp);
-        stliport_t      *ports[STL_MAXPORTS];
-} stlibrd_t;
+        struct stliport *ports[STL_MAXPORTS];
+};
 
 
 /*
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 6738283ac385..e8bfac34d2ba 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -13,6 +13,7 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/bitops.h>
+#include <linux/log2.h>
 #include <asm/byteorder.h>
 #include <asm/bug.h>
 
@@ -157,20 +158,6 @@ static inline int printk(const char *s, ...) { return 0; }
 
 unsigned long int_sqrt(unsigned long);
 
-static inline int __attribute_pure__ long_log2(unsigned long x)
-{
-        int r = 0;
-        for (x >>= 1; x > 0; x >>= 1)
-                r++;
-        return r;
-}
-
-static inline unsigned long
-__attribute_const__ roundup_pow_of_two(unsigned long x)
-{
-        return 1UL << fls_long(x - 1);
-}
-
 extern int printk_ratelimit(void);
 extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 8c39654549d8..0c962b82a9de 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -206,7 +206,7 @@ void		  nlmsvc_invalidate_all(void);
 static __inline__ struct inode *
 nlmsvc_file_inode(struct nlm_file *file)
 {
-        return file->f_file->f_dentry->d_inode;
+        return file->f_file->f_path.dentry->d_inode;
 }
 
 /*
diff --git a/include/linux/log2.h b/include/linux/log2.h
new file mode 100644
index 000000000000..d02e1a547a7e
--- /dev/null
+++ b/include/linux/log2.h
@@ -0,0 +1,157 @@
+/* Integer base 2 logarithm calculation
+ *
+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _LINUX_LOG2_H
+#define _LINUX_LOG2_H
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+
+/*
+ * deal with unrepresentable constant logarithms
+ */
+extern __attribute__((const, noreturn))
+int ____ilog2_NaN(void);
+
+/*
+ * non-constant log of base 2 calculators
+ * - the arch may override these in asm/bitops.h if they can be implemented
+ *   more efficiently than using fls() and fls64()
+ * - the arch is not required to handle n==0 if implementing the fallback
+ */
+#ifndef CONFIG_ARCH_HAS_ILOG2_U32
+static inline __attribute__((const))
+int __ilog2_u32(u32 n)
+{
+        return fls(n) - 1;
+}
+#endif
+
+#ifndef CONFIG_ARCH_HAS_ILOG2_U64
+static inline __attribute__((const))
+int __ilog2_u64(u64 n)
+{
+        return fls64(n) - 1;
+}
+#endif
+
+/*
+ * round up to nearest power of two
+ */
+static inline __attribute__((const))
+unsigned long __roundup_pow_of_two(unsigned long n)
+{
+        return 1UL << fls_long(n - 1);
+}
+
+/**
+ * ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value
+ * @n - parameter
+ *
+ * constant-capable log of base 2 calculation
+ * - this can be used to initialise global variables from constant data, hence
+ *   the massive ternary operator construction
+ *
+ * selects the appropriately-sized optimised version depending on sizeof(n)
+ */
+#define ilog2(n)                                \
+(                                               \
+        __builtin_constant_p(n) ? (             \
+                (n) < 1 ? ____ilog2_NaN() :     \
+                (n) & (1ULL << 63) ? 63 :       \
+                (n) & (1ULL << 62) ? 62 :       \
+                (n) & (1ULL << 61) ? 61 :       \
+                (n) & (1ULL << 60) ? 60 :       \
+                (n) & (1ULL << 59) ? 59 :       \
+                (n) & (1ULL << 58) ? 58 :       \
+                (n) & (1ULL << 57) ? 57 :       \
+                (n) & (1ULL << 56) ? 56 :       \
+                (n) & (1ULL << 55) ? 55 :       \
+                (n) & (1ULL << 54) ? 54 :       \
+                (n) & (1ULL << 53) ? 53 :       \
+                (n) & (1ULL << 52) ? 52 :       \
+                (n) & (1ULL << 51) ? 51 :       \
+                (n) & (1ULL << 50) ? 50 :       \
+                (n) & (1ULL << 49) ? 49 :       \
+                (n) & (1ULL << 48) ? 48 :       \
+                (n) & (1ULL << 47) ? 47 :       \
+                (n) & (1ULL << 46) ? 46 :       \
+                (n) & (1ULL << 45) ? 45 :       \
+                (n) & (1ULL << 44) ? 44 :       \
+                (n) & (1ULL << 43) ? 43 :       \
+                (n) & (1ULL << 42) ? 42 :       \
+                (n) & (1ULL << 41) ? 41 :       \
+                (n) & (1ULL << 40) ? 40 :       \
+                (n) & (1ULL << 39) ? 39 :       \
+                (n) & (1ULL << 38) ? 38 :       \
+                (n) & (1ULL << 37) ? 37 :       \
+                (n) & (1ULL << 36) ? 36 :       \
+                (n) & (1ULL << 35) ? 35 :       \
+                (n) & (1ULL << 34) ? 34 :       \
+                (n) & (1ULL << 33) ? 33 :       \
+                (n) & (1ULL << 32) ? 32 :       \
+                (n) & (1ULL << 31) ? 31 :       \
+                (n) & (1ULL << 30) ? 30 :       \
+                (n) & (1ULL << 29) ? 29 :       \
+                (n) & (1ULL << 28) ? 28 :       \
+                (n) & (1ULL << 27) ? 27 :       \
+                (n) & (1ULL << 26) ? 26 :       \
+                (n) & (1ULL << 25) ? 25 :       \
+                (n) & (1ULL << 24) ? 24 :       \
+                (n) & (1ULL << 23) ? 23 :       \
+                (n) & (1ULL << 22) ? 22 :       \
+                (n) & (1ULL << 21) ? 21 :       \
+                (n) & (1ULL << 20) ? 20 :       \
+                (n) & (1ULL << 19) ? 19 :       \
+                (n) & (1ULL << 18) ? 18 :       \
+                (n) & (1ULL << 17) ? 17 :       \
+                (n) & (1ULL << 16) ? 16 :       \
+                (n) & (1ULL << 15) ? 15 :       \
+                (n) & (1ULL << 14) ? 14 :       \
+                (n) & (1ULL << 13) ? 13 :       \
+                (n) & (1ULL << 12) ? 12 :       \
+                (n) & (1ULL << 11) ? 11 :       \
+                (n) & (1ULL << 10) ? 10 :       \
+                (n) & (1ULL <<  9) ?  9 :       \
+                (n) & (1ULL <<  8) ?  8 :       \
+                (n) & (1ULL <<  7) ?  7 :       \
+                (n) & (1ULL <<  6) ?  6 :       \
+                (n) & (1ULL <<  5) ?  5 :       \
+                (n) & (1ULL <<  4) ?  4 :       \
+                (n) & (1ULL <<  3) ?  3 :       \
+                (n) & (1ULL <<  2) ?  2 :       \
+                (n) & (1ULL <<  1) ?  1 :       \
+                (n) & (1ULL <<  0) ?  0 :       \
+                ____ilog2_NaN()                 \
+                                   ) :          \
+        (sizeof(n) <= 4) ?                      \
+        __ilog2_u32(n) :                        \
+        __ilog2_u64(n)                          \
+ )
+
+/**
+ * roundup_pow_of_two - round the given value up to nearest power of two
+ * @n - parameter
+ *
+ * round the given balue up to the nearest power of two
+ * - the result is undefined when n == 0
+ * - this can be used to initialise global variables from constant data
+ */
+#define roundup_pow_of_two(n)                   \
+(                                               \
+        __builtin_constant_p(n) ? (             \
+                (n == 1) ? 0 :                  \
+                (1UL << (ilog2((n) - 1) + 1))   \
+                                   ) :          \
+        __roundup_pow_of_two(n)                 \
+ )
+
+#endif /* _LINUX_LOG2_H */
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
new file mode 100644
index 000000000000..4af0b1fc282a
--- /dev/null
+++ b/include/linux/mnt_namespace.h
@@ -0,0 +1,42 @@
+#ifndef _NAMESPACE_H_
+#define _NAMESPACE_H_
+#ifdef __KERNEL__
+
+#include <linux/mount.h>
+#include <linux/sched.h>
+#include <linux/nsproxy.h>
+
+struct mnt_namespace {
+        atomic_t                count;
+        struct vfsmount *       root;
+        struct list_head        list;
+        wait_queue_head_t poll;
+        int event;
+};
+
+extern int copy_mnt_ns(int, struct task_struct *);
+extern void __put_mnt_ns(struct mnt_namespace *ns);
+extern struct mnt_namespace *dup_mnt_ns(struct task_struct *,
+                struct fs_struct *);
+
+static inline void put_mnt_ns(struct mnt_namespace *ns)
+{
+        if (atomic_dec_and_lock(&ns->count, &vfsmount_lock))
+                /* releases vfsmount_lock */
+                __put_mnt_ns(ns);
+}
+
+static inline void exit_mnt_ns(struct task_struct *p)
+{
+        struct mnt_namespace *ns = p->nsproxy->mnt_ns;
+        if (ns)
+                put_mnt_ns(ns);
+}
+
+static inline void get_mnt_ns(struct mnt_namespace *ns)
+{
+        atomic_inc(&ns->count);
+}
+
+#endif
+#endif
diff --git a/include/linux/module.h b/include/linux/module.h
index d33df2408e05..10f771a49997 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -319,6 +319,13 @@ struct module
 
         unsigned int taints;    /* same bits as kernel:tainted */
 
+#ifdef CONFIG_GENERIC_BUG
+        /* Support for BUG */
+        struct list_head bug_list;
+        struct bug_entry *bug_table;
+        unsigned num_bugs;
+#endif
+
 #ifdef CONFIG_MODULE_UNLOAD
         /* Reference counts */
         struct module_ref ref[NR_CPUS];
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 403d1a97c512..e357dc86a4de 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,7 +20,7 @@
 struct super_block;
 struct vfsmount;
 struct dentry;
-struct namespace;
+struct mnt_namespace;
 
 #define MNT_NOSUID      0x01
 #define MNT_NODEV       0x02
@@ -52,7 +52,7 @@ struct vfsmount {
         struct list_head mnt_slave_list;/* list of slave mounts */
         struct list_head mnt_slave;     /* slave list entry */
         struct vfsmount *mnt_master;    /* slave is on master->mnt_slave_list */
-        struct namespace *mnt_namespace; /* containing namespace */
+        struct mnt_namespace *mnt_ns;   /* containing namespace */
         int mnt_pinned;
 };
 
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index b2b91c477563..a7544afd7582 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -125,8 +125,10 @@ extern int 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 mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass);
 #else
 # 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/namei.h b/include/linux/namei.h
index f5f19606effb..d39a5a67e979 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -29,6 +29,11 @@ struct nameidata {
         } intent;
 };
 
+struct path {
+        struct vfsmount *mnt;
+        struct dentry *dentry;
+};
+
 /*
  * Type of the last component on LOOKUP_PARENT
  */
diff --git a/include/linux/namespace.h b/include/linux/namespace.h
deleted file mode 100644
index d137009f0b2b..000000000000
--- a/include/linux/namespace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-#ifdef __KERNEL__
-
-#include <linux/mount.h>
-#include <linux/sched.h>
-#include <linux/nsproxy.h>
-
-struct namespace {
-        atomic_t                count;
-        struct vfsmount *       root;
-        struct list_head        list;
-        wait_queue_head_t poll;
-        int event;
-};
-
-extern int copy_namespace(int, struct task_struct *);
-extern void __put_namespace(struct namespace *namespace);
-extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *);
-
-static inline void put_namespace(struct namespace *namespace)
-{
-        if (atomic_dec_and_lock(&namespace->count, &vfsmount_lock))
-                /* releases vfsmount_lock */
-                __put_namespace(namespace);
-}
-
-static inline void exit_namespace(struct task_struct *p)
-{
-        struct namespace *namespace = p->nsproxy->namespace;
-        if (namespace) {
-                put_namespace(namespace);
-        }
-}
-
-static inline void get_namespace(struct namespace *namespace)
-{
-        atomic_inc(&namespace->count);
-}
-
-#endif
-#endif
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 971d1c6dfc4b..fdfb0e44912f 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -4,9 +4,10 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 
-struct namespace;
+struct mnt_namespace;
 struct uts_namespace;
 struct ipc_namespace;
+struct pid_namespace;
 
 /*
  * A structure to contain pointers to all per-process
@@ -23,9 +24,11 @@ struct ipc_namespace;
 struct nsproxy {
         atomic_t count;
         spinlock_t nslock;
+        unsigned long id;
         struct uts_namespace *uts_ns;
         struct ipc_namespace *ipc_ns;
-        struct namespace *namespace;
+        struct mnt_namespace *mnt_ns;
+        struct pid_namespace *pid_ns;
 };
 extern struct nsproxy init_nsproxy;
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4d972bbef316..51180dba9a98 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1785,14 +1785,17 @@
 #define PCI_DEVICE_ID_MOXA_C104         0x1040
 #define PCI_DEVICE_ID_MOXA_CP104U       0x1041
 #define PCI_DEVICE_ID_MOXA_CP104JU      0x1042
+#define PCI_DEVICE_ID_MOXA_CP104EL      0x1043
 #define PCI_DEVICE_ID_MOXA_CT114        0x1140
 #define PCI_DEVICE_ID_MOXA_CP114        0x1141
 #define PCI_DEVICE_ID_MOXA_CP118U       0x1180
+#define PCI_DEVICE_ID_MOXA_CP118EL      0x1181
 #define PCI_DEVICE_ID_MOXA_CP132        0x1320
 #define PCI_DEVICE_ID_MOXA_CP132U       0x1321
 #define PCI_DEVICE_ID_MOXA_CP134U       0x1340
 #define PCI_DEVICE_ID_MOXA_C168         0x1680
 #define PCI_DEVICE_ID_MOXA_CP168U       0x1681
+#define PCI_DEVICE_ID_MOXA_CP168EL      0x1682
 
 #define PCI_VENDOR_ID_CCD               0x1397
 #define PCI_DEVICE_ID_CCD_2BD0          0x2bd0
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 2c0007d17218..4dec047b1837 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -35,8 +35,9 @@ enum pid_type
  *
  * Holding a reference to struct pid solves both of these problems.
  * It is small so holding a reference does not consume a lot of
- * resources, and since a new struct pid is allocated when the numeric
- * pid value is reused we don't mistakenly refer to new processes.
+ * resources, and since a new struct pid is allocated when the numeric pid
+ * value is reused (when pids wrap around) we don't mistakenly refer to new
+ * processes.
  */
 
 struct pid
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
new file mode 100644
index 000000000000..d2a9d419f01f
--- /dev/null
+++ b/include/linux/pid_namespace.h
@@ -0,0 +1,45 @@
+#ifndef _LINUX_PID_NS_H
+#define _LINUX_PID_NS_H
+
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/threads.h>
+#include <linux/pid.h>
+#include <linux/nsproxy.h>
+#include <linux/kref.h>
+
+struct pidmap {
+       atomic_t nr_free;
+       void *page;
+};
+
+#define PIDMAP_ENTRIES         ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
+
+struct pid_namespace {
+        struct kref kref;
+        struct pidmap pidmap[PIDMAP_ENTRIES];
+        int last_pid;
+        struct task_struct *child_reaper;
+};
+
+extern struct pid_namespace init_pid_ns;
+
+static inline void get_pid_ns(struct pid_namespace *ns)
+{
+        kref_get(&ns->kref);
+}
+
+extern int copy_pid_ns(int flags, struct task_struct *tsk);
+extern void free_pid_ns(struct kref *kref);
+
+static inline void put_pid_ns(struct pid_namespace *ns)
+{
+        kref_put(&ns->kref, free_pid_ns);
+}
+
+static inline struct task_struct *child_reaper(struct task_struct *tsk)
+{
+        return tsk->nsproxy->pid_ns->child_reaper;
+}
+
+#endif /* _LINUX_PID_NS_H */
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index 8a94c717c266..5ea4f05683f6 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -111,6 +111,13 @@ struct pkt_ctrl_command {
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
+
+/* default bio write queue congestion marks */
+#define PKT_WRITE_CONGESTION_ON    10000
+#define PKT_WRITE_CONGESTION_OFF   9000
+
 
 struct packet_settings
 {
@@ -241,6 +248,14 @@ struct packet_stacked_data
 };
 #define PSD_POOL_SIZE           64
 
+struct pktcdvd_kobj
+{
+        struct kobject          kobj;
+        struct pktcdvd_device   *pd;
+};
+#define to_pktcdvdkobj(_k) \
+  ((struct pktcdvd_kobj*)container_of(_k,struct pktcdvd_kobj,kobj))
+
 struct pktcdvd_device
 {
         struct block_device     *bdev;          /* dev attached */
@@ -271,6 +286,16 @@ struct pktcdvd_device
 
         struct packet_iosched   iosched;
         struct gendisk          *disk;
+
+        int                     write_congestion_off;
+        int                     write_congestion_on;
+
+        struct class_device     *clsdev;        /* sysfs pktcdvd[0-7] class dev */
+        struct pktcdvd_kobj     *kobj_stat;     /* sysfs pktcdvd[0-7]/stat/     */
+        struct pktcdvd_kobj     *kobj_wqueue;   /* sysfs pktcdvd[0-7]/write_queue/ */
+
+        struct dentry           *dfs_d_root;    /* debugfs: devname directory */
+        struct dentry           *dfs_f_info;    /* debugfs: info file */
 };
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/pspace.h b/include/linux/pspace.h
deleted file mode 100644
index 91d48b8b2d99..000000000000
--- a/include/linux/pspace.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _LINUX_PSPACE_H
-#define _LINUX_PSPACE_H
-
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/threads.h>
-#include <linux/pid.h>
-
-struct pidmap {
-       atomic_t nr_free;
-       void *page;
-};
-
-#define PIDMAP_ENTRIES         ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
-
-struct pspace {
-       struct pidmap pidmap[PIDMAP_ENTRIES];
-       int last_pid;
-};
-
-extern struct pspace init_pspace;
-
-#endif /* _LINUX_PSPACE_H */
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index d0e4dce33ad5..c3fc6caaad3f 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1159,7 +1159,7 @@ znodes are the way! */
 #define PATH_READA      0x1     /* do read ahead */
 #define PATH_READA_BACK 0x2     /* read backwards */
 
-struct path {
+struct treepath {
         int path_length;        /* Length of the array above.   */
         int reada;
         struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements.  */
@@ -1169,7 +1169,7 @@ struct path {
 #define pos_in_item(path) ((path)->pos_in_item)
 
 #define INITIALIZE_PATH(var) \
-struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
+struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 
 /* Get path element by path and path position. */
 #define PATH_OFFSET_PELEMENT(p_s_path,n_offset)  ((p_s_path)->path_elements +(n_offset))
@@ -1327,7 +1327,7 @@ struct tree_balance {
         int need_balance_dirty;
         struct super_block *tb_sb;
         struct reiserfs_transaction_handle *transaction_handle;
-        struct path *tb_path;
+        struct treepath *tb_path;
         struct buffer_head *L[MAX_HEIGHT];      /* array of left neighbors of nodes in the path */
         struct buffer_head *R[MAX_HEIGHT];      /* array of right neighbors of nodes in the path */
         struct buffer_head *FL[MAX_HEIGHT];     /* array of fathers of the left  neighbors      */
@@ -1793,41 +1793,41 @@ static inline void copy_key(struct reiserfs_key *to,
         memcpy(to, from, KEY_SIZE);
 }
 
-int comp_items(const struct item_head *stored_ih, const struct path *p_s_path);
-const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path,
+int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path);
+const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path,
                                     const struct super_block *p_s_sb);
 int search_by_key(struct super_block *, const struct cpu_key *,
-                  struct path *, int);
+                  struct treepath *, int);
 #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)
 int search_for_position_by_key(struct super_block *p_s_sb,
                                const struct cpu_key *p_s_cpu_key,
-                               struct path *p_s_search_path);
+                               struct treepath *p_s_search_path);
 extern void decrement_bcount(struct buffer_head *p_s_bh);
-void decrement_counters_in_path(struct path *p_s_search_path);
-void pathrelse(struct path *p_s_search_path);
-int reiserfs_check_path(struct path *p);
-void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path);
+void decrement_counters_in_path(struct treepath *p_s_search_path);
+void pathrelse(struct treepath *p_s_search_path);
+int reiserfs_check_path(struct treepath *p);
+void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path);
 
 int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
-                         struct path *path,
+                         struct treepath *path,
                          const struct cpu_key *key,
                          struct item_head *ih,
                          struct inode *inode, const char *body);
 
 int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,
-                             struct path *path,
+                             struct treepath *path,
                              const struct cpu_key *key,
                              struct inode *inode,
                              const char *body, int paste_size);
 
 int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
-                           struct path *path,
+                           struct treepath *path,
                            struct cpu_key *key,
                            struct inode *inode,
                            struct page *page, loff_t new_file_size);
 
 int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
-                         struct path *path,
+                         struct treepath *path,
                          const struct cpu_key *key,
                          struct inode *inode, struct buffer_head *p_s_un_bh);
 
@@ -1858,7 +1858,7 @@ void padd_item(char *item, int total_length, int length);
 #define GET_BLOCK_NO_DANGLE   16        /* don't leave any transactions running */
 
 int restart_transaction(struct reiserfs_transaction_handle *th,
-                        struct inode *inode, struct path *path);
+                        struct inode *inode, struct treepath *path);
 void reiserfs_read_locked_inode(struct inode *inode,
                                 struct reiserfs_iget_args *args);
 int reiserfs_find_actor(struct inode *inode, void *p);
@@ -1905,7 +1905,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
 /* namei.c */
 void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
 int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
-                        struct path *path, struct reiserfs_dir_entry *de);
+                        struct treepath *path, struct reiserfs_dir_entry *de);
 struct dentry *reiserfs_get_parent(struct dentry *);
 /* procfs.c */
 
@@ -1956,9 +1956,9 @@ extern const struct file_operations reiserfs_dir_operations;
 
 /* tail_conversion.c */
 int direct2indirect(struct reiserfs_transaction_handle *, struct inode *,
-                    struct path *, struct buffer_head *, loff_t);
+                    struct treepath *, struct buffer_head *, loff_t);
 int indirect2direct(struct reiserfs_transaction_handle *, struct inode *,
-                    struct page *, struct path *, const struct cpu_key *,
+                    struct page *, struct treepath *, const struct cpu_key *,
                     loff_t, char *);
 void reiserfs_unmap_buffer(struct buffer_head *);
 
@@ -2045,7 +2045,7 @@ struct __reiserfs_blocknr_hint {
         struct inode *inode;    /* inode passed to allocator, if we allocate unf. nodes */
         long block;             /* file offset, in blocks */
         struct in_core_key key;
-        struct path *path;      /* search path, used by allocator to deternine search_start by
+        struct treepath *path;  /* search path, used by allocator to deternine search_start by
                                  * various ways */
         struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and
                                                  * bitmap blocks changes  */
@@ -2101,7 +2101,7 @@ static inline int reiserfs_new_form_blocknrs(struct tree_balance *tb,
 static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle
                                             *th, struct inode *inode,
                                             b_blocknr_t * new_blocknrs,
-                                            struct path *path, long block)
+                                            struct treepath *path, long block)
 {
         reiserfs_blocknr_hint_t hint = {
                 .th = th,
@@ -2118,7 +2118,7 @@ static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle
 static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle
                                              *th, struct inode *inode,
                                              b_blocknr_t * new_blocknrs,
-                                             struct path *path, long block)
+                                             struct treepath *path, long block)
 {
         reiserfs_blocknr_hint_t hint = {
                 .th = th,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index dede82c63445..ad9c46071ff8 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -436,7 +436,12 @@ struct signal_struct {
         /* job control IDs */
         pid_t pgrp;
         pid_t tty_old_pgrp;
-        pid_t session;
+
+        union {
+                pid_t session __deprecated;
+                pid_t __session;
+        };
+
         /* boolean value for session group leader */
         int leader;
 
@@ -1040,6 +1045,9 @@ struct task_struct {
 #ifdef  CONFIG_TASK_DELAY_ACCT
         struct task_delay_info *delays;
 #endif
+#ifdef CONFIG_FAULT_INJECTION
+        int make_it_fail;
+#endif
 };
 
 static inline pid_t process_group(struct task_struct *tsk)
@@ -1047,6 +1055,21 @@ static inline pid_t process_group(struct task_struct *tsk)
         return tsk->signal->pgrp;
 }
 
+static inline pid_t signal_session(struct signal_struct *sig)
+{
+        return sig->__session;
+}
+
+static inline pid_t process_session(struct task_struct *tsk)
+{
+        return signal_session(tsk->signal);
+}
+
+static inline void set_signal_session(struct signal_struct *sig, pid_t session)
+{
+        sig->__session = session;
+}
+
 static inline struct pid *task_pid(struct task_struct *task)
 {
         return task->pids[PIDTYPE_PID].pid;
@@ -1240,7 +1263,6 @@ extern struct   mm_struct init_mm;
 
 #define find_task_by_pid(nr)    find_task_by_pid_type(PIDTYPE_PID, nr)
 extern struct task_struct *find_task_by_pid_type(int type, int pid);
-extern void set_special_pids(pid_t session, pid_t pgrp);
 extern void __set_special_pids(pid_t session, pid_t pgrp);
 
 /* per-UID process charging. */
@@ -1381,7 +1403,6 @@ extern NORET_TYPE void do_group_exit(int);
 extern void daemonize(const char *, ...);
 extern int allow_signal(int);
 extern int disallow_signal(int);
-extern struct task_struct *child_reaper;
 
 extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);
 extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 827672136646..cf23813cbec2 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -166,8 +166,8 @@ struct uart_ops {
         void            (*break_ctl)(struct uart_port *, int ctl);
         int             (*startup)(struct uart_port *);
         void            (*shutdown)(struct uart_port *);
-        void            (*set_termios)(struct uart_port *, struct termios *new,
-                                       struct termios *old);
+        void            (*set_termios)(struct uart_port *, struct ktermios *new,
+                                       struct ktermios *old);
         void            (*pm)(struct uart_port *, unsigned int state,
                               unsigned int oldstate);
         int             (*set_wake)(struct uart_port *, unsigned int state);
@@ -361,8 +361,8 @@ void uart_write_wakeup(struct uart_port *port);
  */
 void uart_update_timeout(struct uart_port *port, unsigned int cflag,
                          unsigned int baud);
-unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios,
-                                struct termios *old, unsigned int min,
+unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
+                                struct ktermios *old, unsigned int min,
                                 unsigned int max);
 unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud);
 
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 13a37f137ea2..4a0a329beafb 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -52,11 +52,11 @@
  *      protection - since "write" code only needs to change the head, and
  *      interrupt code only needs to change the tail.
  */
-typedef struct {
+struct stlrq {
         char    *buf;
         char    *head;
         char    *tail;
-} stlrq_t;
+};
 
 /*
  *      Port, panel and board structures to hold status info about each.
@@ -67,14 +67,14 @@ typedef struct {
  *      is associated with, this makes it (fairly) easy to get back to the
  *      board/panel info for a port.
  */
-typedef struct stlport {
+struct stlport {
         unsigned long           magic;
-        int                     portnr;
-        int                     panelnr;
-        int                     brdnr;
+        unsigned int            portnr;
+        unsigned int            panelnr;
+        unsigned int            brdnr;
         int                     ioaddr;
         int                     uartaddr;
-        int                     pagenr;
+        unsigned int            pagenr;
         long                    istate;
         int                     flags;
         int                     baud_base;
@@ -97,31 +97,31 @@ typedef struct stlport {
         wait_queue_head_t       close_wait;
         struct work_struct      tqueue;
         comstats_t              stats;
-        stlrq_t                 tx;
-} stlport_t;
+        struct stlrq            tx;
+};
 
-typedef struct stlpanel {
+struct stlpanel {
         unsigned long   magic;
-        int             panelnr;
-        int             brdnr;
-        int             pagenr;
-        int             nrports;
+        unsigned int    panelnr;
+        unsigned int    brdnr;
+        unsigned int    pagenr;
+        unsigned int    nrports;
         int             iobase;
         void            *uartp;
         void            (*isr)(struct stlpanel *panelp, unsigned int iobase);
         unsigned int    hwid;
         unsigned int    ackmask;
-        stlport_t       *ports[STL_PORTSPERPANEL];
-} stlpanel_t;
+        struct stlport  *ports[STL_PORTSPERPANEL];
+};
 
-typedef struct stlbrd {
+struct stlbrd {
         unsigned long   magic;
-        int             brdnr;
-        int             brdtype;
-        int             state;
-        int             nrpanels;
-        int             nrports;
-        int             nrbnks;
+        unsigned int    brdnr;
+        unsigned int    brdtype;
+        unsigned int    state;
+        unsigned int    nrpanels;
+        unsigned int    nrports;
+        unsigned int    nrbnks;
         int             irq;
         int             irqtype;
         int             (*isr)(struct stlbrd *brdp);
@@ -136,9 +136,9 @@ typedef struct stlbrd {
         unsigned long   clk;
         unsigned int    bnkpageaddr[STL_MAXBANKS];
         unsigned int    bnkstataddr[STL_MAXBANKS];
-        stlpanel_t      *bnk2panel[STL_MAXBANKS];
-        stlpanel_t      *panels[STL_MAXPANELS];
-} stlbrd_t;
+        struct stlpanel *bnk2panel[STL_MAXBANKS];
+        struct stlpanel *panels[STL_MAXPANELS];
+};
 
 
 /*
diff --git a/include/linux/tty.h b/include/linux/tty.h
index f717f0898238..65cbcf22c31e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -175,7 +175,7 @@ struct tty_struct {
         int index;
         struct tty_ldisc ldisc;
         struct mutex termios_mutex;
-        struct termios *termios, *termios_locked;
+        struct ktermios *termios, *termios_locked;
         char name[64];
         int pgrp;
         int session;
@@ -258,7 +258,7 @@ struct tty_struct {
 
 extern void tty_write_flush(struct tty_struct *);
 
-extern struct termios tty_std_termios;
+extern struct ktermios tty_std_termios;
 
 extern int kmsg_redirect;
 
@@ -293,8 +293,9 @@ extern int tty_hung_up_p(struct file * filp);
 extern void do_SAK(struct tty_struct *tty);
 extern void disassociate_ctty(int priv);
 extern void tty_flip_buffer_push(struct tty_struct *tty);
-extern int tty_get_baud_rate(struct tty_struct *tty);
-extern int tty_termios_baud_rate(struct termios *termios);
+extern speed_t tty_get_baud_rate(struct tty_struct *tty);
+extern speed_t tty_termios_baud_rate(struct ktermios *termios);
+extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
 
 extern struct tty_ldisc *tty_ldisc_ref(struct tty_struct *);
 extern void tty_ldisc_deref(struct tty_ldisc *);
@@ -309,6 +310,12 @@ extern void tty_ldisc_flush(struct tty_struct *tty);
 extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                      unsigned long arg);
 
+extern dev_t tty_devnum(struct tty_struct *tty);
+extern void proc_clear_tty(struct task_struct *p);
+extern void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+extern struct tty_struct *get_current_tty(void);
+
 extern struct mutex tty_mutex;
 
 /* n_tty.c */
@@ -335,10 +342,5 @@ extern void console_print(const char *);
 extern int vt_ioctl(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
 
-static inline dev_t tty_devnum(struct tty_struct *tty)
-{
-        return MKDEV(tty->driver->major, tty->driver->minor_start) + tty->index;
-}
-
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 5c8473bb6882..659487e3ebeb 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -53,7 +53,7 @@
  *      device-specific ioctl's.  If the ioctl number passed in cmd
  *      is not recognized by the driver, it should return ENOIOCTLCMD.
  * 
- * void (*set_termios)(struct tty_struct *tty, struct termios * old);
+ * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *      This routine allows the tty driver to be notified when
  *      device's termios settings have changed.  Note that a
@@ -132,7 +132,7 @@ struct tty_operations {
         int  (*chars_in_buffer)(struct tty_struct *tty);
         int  (*ioctl)(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
-        void (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         void (*throttle)(struct tty_struct * tty);
         void (*unthrottle)(struct tty_struct * tty);
         void (*stop)(struct tty_struct *tty);
@@ -165,7 +165,7 @@ struct tty_driver {
         int     num;            /* number of devices allocated */
         short   type;           /* type of tty driver */
         short   subtype;        /* subtype of tty driver */
-        struct termios init_termios; /* Initial termios */
+        struct ktermios init_termios; /* Initial termios */
         int     flags;          /* tty driver flags */
         int     refcount;       /* for loadable tty drivers */
         struct proc_dir_entry *proc_entry; /* /proc fs entry */
@@ -175,8 +175,8 @@ struct tty_driver {
          * Pointer to the tty data structures
          */
         struct tty_struct **ttys;
-        struct termios **termios;
-        struct termios **termios_locked;
+        struct ktermios **termios;
+        struct ktermios **termios_locked;
         void *driver_state;     /* only used for the PTY driver */
         
         /*
@@ -193,7 +193,7 @@ struct tty_driver {
         int  (*chars_in_buffer)(struct tty_struct *tty);
         int  (*ioctl)(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
-        void (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         void (*throttle)(struct tty_struct * tty);
         void (*unthrottle)(struct tty_struct * tty);
         void (*stop)(struct tty_struct *tty);
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 83c6e6c10ebb..d75932e27710 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -59,7 +59,7 @@
  *      low-level driver can "grab" an ioctl request before the line
  *      discpline has a chance to see it.
  * 
- * void (*set_termios)(struct tty_struct *tty, struct termios * old);
+ * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *      This function notifies the line discpline that a change has
  *      been made to the termios structure.
@@ -118,7 +118,7 @@ struct tty_ldisc {
                          const unsigned char * buf, size_t nr); 
         int     (*ioctl)(struct tty_struct * tty, struct file * file,
                          unsigned int cmd, unsigned long arg);
-        void    (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         unsigned int (*poll)(struct tty_struct *, struct file *,
                              struct poll_table_struct *);
         int     (*hangup)(struct tty_struct *tty);
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 91b3ea2bbb14..10f99e5f1a97 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -218,7 +218,7 @@ struct usb_serial_driver {
         int  (*write)           (struct usb_serial_port *port, const unsigned char *buf, int count);
         int  (*write_room)      (struct usb_serial_port *port);
         int  (*ioctl)           (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
-        void (*set_termios)     (struct usb_serial_port *port, struct termios * old);
+        void (*set_termios)     (struct usb_serial_port *port, struct ktermios * old);
         void (*break_ctl)       (struct usb_serial_port *port, int break_state);
         int  (*chars_in_buffer) (struct usb_serial_port *port);
         void (*throttle)        (struct usb_serial_port *port);
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index 87699cb4ef8c..8dabdd603fe1 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -126,7 +126,7 @@ extern int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
 extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, 
                             unsigned int cmd, unsigned long arg);
 extern void ircomm_tty_set_termios(struct tty_struct *tty, 
-                                   struct termios *old_termios);
+                                   struct ktermios *old_termios);
 extern hashbin_t *ircomm_tty;
 
 #endif
diff --git a/include/video/mbxfb.h b/include/video/mbxfb.h
index 3bde0f5cd55c..20b9002712ef 100644
--- a/include/video/mbxfb.h
+++ b/include/video/mbxfb.h
@@ -1,6 +1,9 @@
 #ifndef __MBX_FB_H
 #define __MBX_FB_H
 
+#include <asm/ioctl.h>
+#include <asm/types.h>
+
 struct mbxfb_val {
         unsigned int    defval;
         unsigned int    min;
@@ -25,4 +28,32 @@ struct mbxfb_platform_data {
                 int (*remove)(struct fb_info *fb);
 };
 
+/* planar */
+#define MBXFB_FMT_YUV12         0
+
+/* packed */
+#define MBXFB_FMT_UY0VY1        1
+#define MBXFB_FMT_VY0UY1        2
+#define MBXFB_FMT_Y0UY1V        3
+#define MBXFB_FMT_Y0VY1U        4
+struct mbxfb_overlaySetup {
+        __u32 enable;
+        __u32 x, y;
+        __u32 width, height;
+        __u32 alpha;
+        __u32 fmt;
+        __u32 mem_offset;
+        __u32 scaled_width;
+        __u32 scaled_height;
+
+        /* Filled by the driver */
+        __u32 U_offset;
+        __u32 V_offset;
+
+        __u16 Y_stride;
+        __u16 UV_stride;
+};
+
+#define MBXFB_IOCX_OVERLAY      _IOWR(0xF4, 0x00,struct mbxfb_overlaySetup)
+
 #endif /* __MBX_FB_H */
diff --git a/include/video/pm3fb.h b/include/video/pm3fb.h
index ac021379ac40..94c7d2da90ea 100644
--- a/include/video/pm3fb.h
+++ b/include/video/pm3fb.h
@@ -607,16 +607,16 @@
 #define PM3FBDestReadModeOr                                     0xac98
         #define PM3FBDestReadMode_ReadDisable                   0<<0
         #define PM3FBDestReadMode_ReadEnable                    1<<0
-        #define PM3FBDestReadMode_StripePitch(sp)       (((sp)&0x7)<<2
-        #define PM3FBDestReadMode_StripeHeight(sh)      (((sh)&0x7)<<7
+        #define PM3FBDestReadMode_StripePitch(sp)       (((sp)&0x7)<<2)
+        #define PM3FBDestReadMode_StripeHeight(sh)      (((sh)&0x7)<<7)
         #define PM3FBDestReadMode_Enable0                       1<<8
         #define PM3FBDestReadMode_Enable1                       1<<9
         #define PM3FBDestReadMode_Enable2                       1<<10
         #define PM3FBDestReadMode_Enable3                       1<<11
-        #define PM3FBDestReadMode_Layout0(l)            (((l)&0x3)<<12
-        #define PM3FBDestReadMode_Layout1(l)            (((l)&0x3)<<14
-        #define PM3FBDestReadMode_Layout2(l)            (((l)&0x3)<<16
-        #define PM3FBDestReadMode_Layout3(l)            (((l)&0x3)<<18
+        #define PM3FBDestReadMode_Layout0(l)            (((l)&0x3)<<12)
+        #define PM3FBDestReadMode_Layout1(l)            (((l)&0x3)<<14)
+        #define PM3FBDestReadMode_Layout2(l)            (((l)&0x3)<<16)
+        #define PM3FBDestReadMode_Layout3(l)            (((l)&0x3)<<18)
         #define PM3FBDestReadMode_Origin0                       1<<20
         #define PM3FBDestReadMode_Origin1                       1<<21
         #define PM3FBDestReadMode_Origin2                       1<<22
@@ -640,16 +640,16 @@
 #define PM3FBSourceReadModeOr                                   0xaca8
         #define PM3FBSourceReadMode_ReadDisable                 (0<<0)
         #define PM3FBSourceReadMode_ReadEnable                  (1<<0)
-        #define PM3FBSourceReadMode_StripePitch(sp)     (((sp)&0x7)<<2
-        #define PM3FBSourceReadMode_StripeHeight(sh)    (((sh)&0x7)<<7
-        #define PM3FBSourceReadMode_Layout(l)           (((l)&0x3)<<8
+        #define PM3FBSourceReadMode_StripePitch(sp)     (((sp)&0x7)<<2)
+        #define PM3FBSourceReadMode_StripeHeight(sh)    (((sh)&0x7)<<7)
+        #define PM3FBSourceReadMode_Layout(l)           (((l)&0x3)<<8)
         #define PM3FBSourceReadMode_Origin                      1<<10
         #define PM3FBSourceReadMode_Blocking                    1<<11
         #define PM3FBSourceReadMode_UserTexelCoord              1<<13
         #define PM3FBSourceReadMode_WrapXEnable                 1<<14
         #define PM3FBSourceReadMode_WrapYEnable                 1<<15
-        #define PM3FBSourceReadMode_WrapX(w)            (((w)&0xf)<<16
-        #define PM3FBSourceReadMode_WrapY(w)            (((w)&0xf)<<20
+        #define PM3FBSourceReadMode_WrapX(w)            (((w)&0xf)<<16)
+        #define PM3FBSourceReadMode_WrapY(w)            (((w)&0xf)<<20)
         #define PM3FBSourceReadMode_ExternalSourceData          1<<24
 #define PM3FBWriteBufferAddr0                                   0xb000
 #define PM3FBWriteBufferAddr1                                   0xb008
@@ -942,7 +942,7 @@
 #define PM3Window                                               0x8980
         #define PM3Window_ForceLBUpdate                         1<<3
         #define PM3Window_LBUpdateSource                        1<<4
-        #define PM3Window_FrameCount(c)                         (((c)&0xff)<<9
+        #define PM3Window_FrameCount(c)                         (((c)&0xff)<<9)
         #define PM3Window_StencilFCP                            1<<17
         #define PM3Window_DepthFCP                              1<<18
         #define PM3Window_OverrideWriteFiltering                1<<19