31 files changed, 207 insertions, 101 deletions

diff --git a/include/asm-powerpc/asm-compat.h b/include/asm-powerpc/asm-compat.h
index 8ec2e1da68bf..8f0fe7971949 100644
--- a/include/asm-powerpc/asm-compat.h
+++ b/include/asm-powerpc/asm-compat.h
@@ -22,6 +22,7 @@
 #define PPC_STL         stringify_in_c(std)
 #define PPC_LCMPI       stringify_in_c(cmpdi)
 #define PPC_LONG        stringify_in_c(.llong)
+#define PPC_LONG_ALIGN  stringify_in_c(.balign 8)
 #define PPC_TLNEI       stringify_in_c(tdnei)
 #define PPC_LLARX       stringify_in_c(ldarx)
 #define PPC_STLCX       stringify_in_c(stdcx.)
@@ -43,6 +44,7 @@
 #define PPC_STL         stringify_in_c(stw)
 #define PPC_LCMPI       stringify_in_c(cmpwi)
 #define PPC_LONG        stringify_in_c(.long)
+#define PPC_LONG_ALIGN  stringify_in_c(.balign 4)
 #define PPC_TLNEI       stringify_in_c(twnei)
 #define PPC_LLARX       stringify_in_c(lwarx)
 #define PPC_STLCX       stringify_in_c(stwcx.)
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 989922621e35..1233d735fd28 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -80,7 +80,8 @@ struct machdep_calls {
                                      long index,
                                      long npages,
                                      unsigned long uaddr,
-                                     enum dma_data_direction direction);
+                                     enum dma_data_direction direction,
+                                     struct dma_attrs *attrs);
         void            (*tce_free)(struct iommu_table *tbl,
                                     long index,
                                     long npages);
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index 73015f0139de..3a96d001cb75 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -295,10 +295,10 @@ extern int icache_44x_need_flush;
 #define _PAGE_PRESENT   0x00001 /* S: PTE contains a translation */
 #define _PAGE_USER      0x00002 /* S: User page (maps to UR) */
 #define _PAGE_FILE      0x00002 /* S: when !present: nonlinear file mapping */
-#define _PAGE_ACCESSED  0x00004 /* S: Page referenced */
-#define _PAGE_HWWRITE   0x00008 /* H: Dirty & RW, set in exception */
-#define _PAGE_RW        0x00010 /* S: Write permission */
-#define _PAGE_HWEXEC    0x00020 /* H: UX permission */
+#define _PAGE_RW        0x00004 /* S: Write permission (SW) */
+#define _PAGE_DIRTY     0x00008 /* S: Page dirty */
+#define _PAGE_HWEXEC    0x00010 /* H: SX permission */
+#define _PAGE_ACCESSED  0x00020 /* S: Page referenced */
 
 #define _PAGE_ENDIAN    0x00040 /* H: E bit */
 #define _PAGE_GUARDED   0x00080 /* H: G bit */
@@ -307,21 +307,14 @@ extern int icache_44x_need_flush;
 #define _PAGE_WRITETHRU 0x00400 /* H: W bit */
 
 #ifdef CONFIG_PTE_64BIT
-#define _PAGE_DIRTY     0x08000 /* S: Page dirty */
-
 /* ERPN in a PTE never gets cleared, ignore it */
 #define _PTE_NONE_MASK  0xffffffffffff0000ULL
-#else
-#define _PAGE_DIRTY     0x00800 /* S: Page dirty */
 #endif
 
 #define _PMD_PRESENT    0
 #define _PMD_PRESENT_MASK (PAGE_MASK)
 #define _PMD_BAD        (~PAGE_MASK)
 
-/* Until my rework is finished, FSL BookE still needs atomic PTE updates */
-#define PTE_ATOMIC_UPDATES      1
-
 #elif defined(CONFIG_8xx)
 /* Definitions for 8xx embedded chips. */
 #define _PAGE_PRESENT   0x0001  /* Page is valid */
diff --git a/include/asm-powerpc/pmi.h b/include/asm-powerpc/pmi.h
index e1dc090748df..b4e91fbf5081 100644
--- a/include/asm-powerpc/pmi.h
+++ b/include/asm-powerpc/pmi.h
@@ -30,6 +30,7 @@
 #ifdef __KERNEL__
 
 #define PMI_TYPE_FREQ_CHANGE    0x01
+#define PMI_TYPE_POWER_BUTTON   0x02
 #define PMI_READ_TYPE           0
 #define PMI_READ_DATA0          1
 #define PMI_READ_DATA1          2
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index 81ffe3b3c1ce..f9e34c493cbb 100644
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -337,12 +337,18 @@ enum ps3_system_bus_device_type {
         PS3_DEVICE_TYPE_LPM,
 };
 
+enum ps3_match_sub_id {
+        /* for PS3_MATCH_ID_GRAPHICS */
+        PS3_MATCH_SUB_ID_FB             = 1,
+};
+
 /**
  * struct ps3_system_bus_device - a device on the system bus
  */
 
 struct ps3_system_bus_device {
         enum ps3_match_id match_id;
+        enum ps3_match_sub_id match_sub_id;
         enum ps3_system_bus_device_type dev_type;
 
         u64 bus_id;                       /* SB */
@@ -371,6 +377,7 @@ int ps3_close_hv_device(struct ps3_system_bus_device *dev);
 
 struct ps3_system_bus_driver {
         enum ps3_match_id match_id;
+        enum ps3_match_sub_id match_sub_id;
         struct device_driver core;
         int (*probe)(struct ps3_system_bus_device *);
         int (*remove)(struct ps3_system_bus_device *);
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h
index bbccadfee0d6..c6d1ab650778 100644
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
@@ -155,10 +155,12 @@
 #define   CTRL_RUNLATCH 0x1
 #define SPRN_DABR       0x3F5   /* Data Address Breakpoint Register */
 #define   DABR_TRANSLATION      (1UL << 2)
+#define SPRN_DABR2      0x13D   /* e300 */
 #define SPRN_DABRX      0x3F7   /* Data Address Breakpoint Register Extension */
 #define   DABRX_USER    (1UL << 0)
 #define   DABRX_KERNEL  (1UL << 1)
 #define SPRN_DAR        0x013   /* Data Address Register */
+#define SPRN_DBCR       0x136   /* e300 Data Breakpoint Control Reg */
 #define SPRN_DSISR      0x012   /* Data Storage Interrupt Status Register */
 #define   DSISR_NOHPTE          0x40000000      /* no translation found */
 #define   DSISR_PROTFAULT       0x08000000      /* protection fault */
@@ -264,6 +266,8 @@
 #define HID1_PS         (1<<16)         /* 750FX PLL selection */
 #define SPRN_HID2       0x3F8           /* Hardware Implementation Register 2 */
 #define SPRN_IABR       0x3F2   /* Instruction Address Breakpoint Register */
+#define SPRN_IABR2      0x3FA           /* 83xx */
+#define SPRN_IBCR       0x135           /* 83xx Insn Breakpoint Control Reg */
 #define SPRN_HID4       0x3F4           /* 970 HID4 */
 #define SPRN_HID5       0x3F6           /* 970 HID5 */
 #define SPRN_HID6       0x3F9   /* BE HID 6 */
diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h
index 1a0736f8803f..bd0fb8495154 100644
--- a/include/asm-powerpc/uaccess.h
+++ b/include/asm-powerpc/uaccess.h
@@ -6,6 +6,7 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
+#include <asm/asm-compat.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 
@@ -141,12 +142,11 @@ extern long __put_user_bad(void);
                 "       b 2b\n"                                 \
                 ".previous\n"                                   \
                 ".section __ex_table,\"a\"\n"                   \
-                "       .balign %5\n"                           \
+                        PPC_LONG_ALIGN "\n"                     \
                         PPC_LONG "1b,3b\n"                      \
                 ".previous"                                     \
                 : "=r" (err)                                    \
-                : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
-                  "i"(sizeof(unsigned long)))
+                : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
 
 #ifdef __powerpc64__
 #define __put_user_asm2(x, ptr, retval)                         \
@@ -162,13 +162,12 @@ extern long __put_user_bad(void);
                 "       b 3b\n"                                 \
                 ".previous\n"                                   \
                 ".section __ex_table,\"a\"\n"                   \
-                "       .balign %5\n"                           \
+                        PPC_LONG_ALIGN "\n"                     \
                         PPC_LONG "1b,4b\n"                      \
                         PPC_LONG "2b,4b\n"                      \
                 ".previous"                                     \
                 : "=r" (err)                                    \
-                : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err),\
-                  "i"(sizeof(unsigned long)))
+                : "r" (x), "b" (addr), "i" (-EFAULT), "0" (err))
 #endif /* __powerpc64__ */
 
 #define __put_user_size(x, ptr, size, retval)                   \
@@ -226,12 +225,11 @@ extern long __get_user_bad(void);
                 "       b 2b\n"                         \
                 ".previous\n"                           \
                 ".section __ex_table,\"a\"\n"           \
-                "       .balign %5\n"                   \
+                        PPC_LONG_ALIGN "\n"             \
                         PPC_LONG "1b,3b\n"              \
                 ".previous"                             \
                 : "=r" (err), "=r" (x)                  \
-                : "b" (addr), "i" (-EFAULT), "0" (err), \
-                  "i"(sizeof(unsigned long)))
+                : "b" (addr), "i" (-EFAULT), "0" (err))
 
 #ifdef __powerpc64__
 #define __get_user_asm2(x, addr, err)                   \
@@ -249,13 +247,12 @@ extern long __get_user_bad(void);
                 "       b 3b\n"                         \
                 ".previous\n"                           \
                 ".section __ex_table,\"a\"\n"           \
-                "       .balign %5\n"                   \
+                        PPC_LONG_ALIGN "\n"             \
                         PPC_LONG "1b,4b\n"              \
                         PPC_LONG "2b,4b\n"              \
                 ".previous"                             \
                 : "=r" (err), "=&r" (x)                 \
-                : "b" (addr), "i" (-EFAULT), "0" (err), \
-                  "i"(sizeof(unsigned long)))
+                : "b" (addr), "i" (-EFAULT), "0" (err))
 #endif /* __powerpc64__ */
 
 #define __get_user_size(x, ptr, size, retval)                   \
diff --git a/include/asm-powerpc/ucc_fast.h b/include/asm-powerpc/ucc_fast.h
index f529f70b1d82..fce16abe7ee1 100644
--- a/include/asm-powerpc/ucc_fast.h
+++ b/include/asm-powerpc/ucc_fast.h
@@ -156,11 +156,11 @@ struct ucc_fast_info {
 
 struct ucc_fast_private {
         struct ucc_fast_info *uf_info;
-        struct ucc_fast *uf_regs;       /* a pointer to memory map of UCC regs. */
-        u32 *p_ucce;            /* a pointer to the event register in memory. */
-        u32 *p_uccm;            /* a pointer to the mask register in memory. */
+        struct ucc_fast __iomem *uf_regs; /* a pointer to the UCC regs. */
+        u32 __iomem *p_ucce;    /* a pointer to the event register in memory. */
+        u32 __iomem *p_uccm;    /* a pointer to the mask register in memory. */
 #ifdef CONFIG_UGETH_TX_ON_DEMAND
-        u16 *p_utodr;           /* pointer to the transmit on demand register */
+        u16 __iomem *p_utodr;   /* pointer to the transmit on demand register */
 #endif
         int enabled_tx;         /* Whether channel is enabled for Tx (ENT) */
         int enabled_rx;         /* Whether channel is enabled for Rx (ENR) */
diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h
index ad895455ab72..0da17d14fd13 100644
--- a/include/linux/auxvec.h
+++ b/include/linux/auxvec.h
@@ -26,8 +26,10 @@
 
 #define AT_SECURE 23   /* secure mode boolean */
 
+#define AT_EXECFN  31   /* filename of program */
 #ifdef __KERNEL__
-#define AT_VECTOR_SIZE_BASE (14 + 2) /* NEW_AUX_ENT entries in auxiliary table */
+#define AT_VECTOR_SIZE_BASE 17 /* NEW_AUX_ENT entries in auxiliary table */
+  /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */
 #endif
 
 #endif /* _LINUX_AUXVEC_H */
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 32755cdf68db..e1a6c046cea3 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -44,6 +44,7 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
                                       const char *dest);
 
 void debugfs_remove(struct dentry *dentry);
+void debugfs_remove_recursive(struct dentry *dentry);
 
 struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,
                 struct dentry *new_dir, const char *new_name);
@@ -101,6 +102,9 @@ static inline struct dentry *debugfs_create_symlink(const char *name,
 static inline void debugfs_remove(struct dentry *dentry)
 { }
 
+static inline void debugfs_remove_recursive(struct dentry *dentry)
+{ }
+
 static inline struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,
                 struct dentry *new_dir, char *new_name)
 {
diff --git a/include/linux/device.h b/include/linux/device.h
index f71a78d123ae..d24a47f80f9c 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -16,6 +16,7 @@
 #include <linux/kobject.h>
 #include <linux/klist.h>
 #include <linux/list.h>
+#include <linux/lockdep.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/module.h>
@@ -24,17 +25,13 @@
 #include <asm/atomic.h>
 #include <asm/device.h>
 
-#define DEVICE_NAME_SIZE        50
-/* DEVICE_NAME_HALF is really less than half to accommodate slop */
-#define DEVICE_NAME_HALF        __stringify(20)
-#define DEVICE_ID_SIZE          32
-#define BUS_ID_SIZE             KOBJ_NAME_LEN
-
+#define BUS_ID_SIZE             20
 
 struct device;
 struct device_driver;
 struct driver_private;
 struct class;
+struct class_private;
 struct bus_type;
 struct bus_type_private;
 
@@ -186,13 +183,9 @@ struct class {
         const char              *name;
         struct module           *owner;
 
-        struct kset             subsys;
-        struct list_head        devices;
-        struct list_head        interfaces;
-        struct kset             class_dirs;
-        struct semaphore        sem; /* locks children, devices, interfaces */
         struct class_attribute          *class_attrs;
         struct device_attribute         *dev_attrs;
+        struct kobject                  *dev_kobj;
 
         int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
 
@@ -203,13 +196,28 @@ struct class {
         int (*resume)(struct device *dev);
 
         struct pm_ops *pm;
+        struct class_private *p;
 };
 
-extern int __must_check class_register(struct class *class);
+extern struct kobject *sysfs_dev_block_kobj;
+extern struct kobject *sysfs_dev_char_kobj;
+extern int __must_check __class_register(struct class *class,
+                                         struct lock_class_key *key);
 extern void class_unregister(struct class *class);
-extern int class_for_each_device(struct class *class, void *data,
+
+/* This is a #define to keep the compiler from merging different
+ * instances of the __key variable */
+#define class_register(class)                   \
+({                                              \
+        static struct lock_class_key __key;     \
+        __class_register(class, &__key);        \
+})
+
+extern int class_for_each_device(struct class *class, struct device *start,
+                                 void *data,
                                  int (*fn)(struct device *dev, void *data));
-extern struct device *class_find_device(struct class *class, void *data,
+extern struct device *class_find_device(struct class *class,
+                                        struct device *start, void *data,
                                         int (*match)(struct device *, void *));
 
 struct class_attribute {
@@ -237,9 +245,19 @@ struct class_interface {
 extern int __must_check class_interface_register(struct class_interface *);
 extern void class_interface_unregister(struct class_interface *);
 
-extern struct class *class_create(struct module *owner, const char *name);
+extern struct class * __must_check __class_create(struct module *owner,
+                                                  const char *name,
+                                                  struct lock_class_key *key);
 extern void class_destroy(struct class *cls);
 
+/* This is a #define to keep the compiler from merging different
+ * instances of the __key variable */
+#define class_create(owner, name)               \
+({                                              \
+        static struct lock_class_key __key;     \
+        __class_create(owner, name, &__key);    \
+})
+
 /*
  * The type of device, "struct device" is embedded in. A class
  * or bus can contain devices of different types
@@ -468,14 +486,10 @@ extern struct device *device_create_vargs(struct class *cls,
                                           const char *fmt,
                                           va_list vargs);
 extern struct device *device_create(struct class *cls, struct device *parent,
-                                    dev_t devt, const char *fmt, ...)
-                                    __attribute__((format(printf, 4, 5)));
-extern struct device *device_create_drvdata(struct class *cls,
-                                            struct device *parent,
-                                            dev_t devt,
-                                            void *drvdata,
-                                            const char *fmt, ...)
+                                    dev_t devt, void *drvdata,
+                                    const char *fmt, ...)
                                     __attribute__((format(printf, 5, 6)));
+#define device_create_drvdata   device_create
 extern void device_destroy(struct class *cls, dev_t devt);
 
 /*
diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h
index 1677e2bfa00c..71ad34eca6e3 100644
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
@@ -12,6 +12,7 @@
  */
 enum dma_attr {
         DMA_ATTR_WRITE_BARRIER,
+        DMA_ATTR_WEAK_ORDERING,
         DMA_ATTR_MAX,
 };
 
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index fe806b6f030d..e61c0be2a459 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -40,7 +40,7 @@ struct eisa_device {
         u64                   dma_mask;
         struct device         dev; /* generic device */
 #ifdef CONFIG_EISA_NAMES
-        char                  pretty_name[DEVICE_NAME_SIZE];
+        char                  pretty_name[50];
 #endif
 };
 
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 9bc045b8c478..0ba21ee0f58c 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -135,11 +135,7 @@ struct fs_platform_info {
         u32 device_flags;
 
         int phy_addr;           /* the phy address (-1 no phy) */
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
         char bus_id[16];
-#else
-        const char*     bus_id;
-#endif
         int phy_irq;            /* the phy irq (if it exists)  */
 
         const struct fs_mii_bus_info *bus_info;
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index c415a496de3a..4e625e0094c8 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -69,6 +69,7 @@ struct gianfar_mdio_data {
 #define FSL_GIANFAR_DEV_HAS_VLAN                0x00000020
 #define FSL_GIANFAR_DEV_HAS_EXTENDED_HASH       0x00000040
 #define FSL_GIANFAR_DEV_HAS_PADDING             0x00000080
+#define FSL_GIANFAR_DEV_HAS_MAGIC_PACKET        0x00000100
 
 /* Flags in gianfar_platform_data */
 #define FSL_GIANFAR_BRD_HAS_PHY_INTR    0x00000001 /* set or use a timer */
@@ -125,4 +126,10 @@ struct mpc8xx_pcmcia_ops {
         int(*voltage_set)(int slot, int vcc, int vpp);
 };
 
+/* Returns non-zero if the current suspend operation would
+ * lead to a deep sleep (i.e. power removed from the core,
+ * instead of just the clock).
+ */
+int fsl_deep_sleep(void);
+
 #endif /* _FSL_DEVICE_H_ */
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 39e709f88aa0..60f0d418ae32 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -26,7 +26,6 @@
 #include <linux/wait.h>
 #include <asm/atomic.h>
 
-#define KOBJ_NAME_LEN                   20
 #define UEVENT_HELPER_PATH_LEN          256
 #define UEVENT_NUM_ENVP                 32      /* number of env pointers */
 #define UEVENT_BUFFER_SIZE              2048    /* buffer for the variables */
@@ -59,12 +58,12 @@ enum kobject_action {
 
 struct kobject {
         const char              *name;
-        struct kref             kref;
         struct list_head        entry;
         struct kobject          *parent;
         struct kset             *kset;
         struct kobj_type        *ktype;
         struct sysfs_dirent     *sd;
+        struct kref             kref;
         unsigned int state_initialized:1;
         unsigned int state_in_sysfs:1;
         unsigned int state_add_uevent_sent:1;
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index a9fae032ba81..9c1d95491f8b 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -189,7 +189,7 @@ typedef union {
 */
 
 struct map_info {
-        char *name;
+        const char *name;
         unsigned long size;
         resource_size_t phys;
 #define NO_XIP (-1UL)
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 245f9098e171..8b5d49133ec6 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -121,7 +121,7 @@ struct mtd_info {
         u_int32_t oobavail;  // Available OOB bytes per block
 
         // Kernel-only stuff starts here.
-        char *name;
+        const char *name;
         int index;
 
         /* ecc layout structure pointer - read only ! */
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index 2ee97e9877a7..67db101d0eb8 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -15,7 +15,7 @@
 #define __LINUX_OF_GPIO_H
 
 #include <linux/errno.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 #ifdef CONFIG_OF_GPIO
 
diff --git a/include/linux/spi/max7301.h b/include/linux/spi/max7301.h
new file mode 100644
index 000000000000..6dfd83f19b4b
--- /dev/null
+++ b/include/linux/spi/max7301.h
@@ -0,0 +1,9 @@
+#ifndef LINUX_SPI_MAX7301_H
+#define LINUX_SPI_MAX7301_H
+
+struct max7301_platform_data {
+        /* number assigned to the first GPIO */
+        unsigned        base;
+};
+
+#endif
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 387e428f1cdf..b9a76c972084 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -733,7 +733,7 @@ struct spi_board_info {
          * controller_data goes to spi_device.controller_data,
          * irq is copied too
          */
-        char            modalias[KOBJ_NAME_LEN];
+        char            modalias[32];
         const void      *platform_data;
         void            *controller_data;
         int             irq;
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index 45f6bc82d317..c844a229acc9 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -136,6 +136,7 @@
 #define MGSL_INTERFACE_RTS_EN   0x10
 #define MGSL_INTERFACE_LL       0x20
 #define MGSL_INTERFACE_RL       0x40
+#define MGSL_INTERFACE_MSB_FIRST 0x80
 
 typedef struct _MGSL_PARAMS
 {
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index f2767bc6b735..f395bb3fa2f2 100644
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -99,8 +99,9 @@ extern void sysdev_unregister(struct sys_device *);
 
 struct sysdev_attribute { 
         struct attribute        attr;
-        ssize_t (*show)(struct sys_device *, char *);
-        ssize_t (*store)(struct sys_device *, const char *, size_t);
+        ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *);
+        ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
+                         const char *, size_t);
 };
 
 
@@ -118,4 +119,38 @@ struct sysdev_attribute {
 extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);
 extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);
 
+struct sysdev_ext_attribute {
+        struct sysdev_attribute attr;
+        void *var;
+};
+
+/*
+ * Support for simple variable sysdev attributes.
+ * The pointer to the variable is stored in a sysdev_ext_attribute
+ */
+
+/* Add more types as needed */
+
+extern ssize_t sysdev_show_ulong(struct sys_device *, struct sysdev_attribute *,
+                                char *);
+extern ssize_t sysdev_store_ulong(struct sys_device *,
+                        struct sysdev_attribute *, const char *, size_t);
+extern ssize_t sysdev_show_int(struct sys_device *, struct sysdev_attribute *,
+                                char *);
+extern ssize_t sysdev_store_int(struct sys_device *,
+                        struct sysdev_attribute *, const char *, size_t);
+
+#define _SYSDEV_ULONG_ATTR(_name, _mode, _var)                          \
+        { _SYSDEV_ATTR(_name, _mode, sysdev_show_ulong, sysdev_store_ulong), \
+          &(_var) }
+#define SYSDEV_ULONG_ATTR(_name, _mode, _var)                   \
+        struct sysdev_ext_attribute attr_##_name =              \
+                _SYSDEV_ULONG_ATTR(_name, _mode, _var);
+#define _SYSDEV_INT_ATTR(_name, _mode, _var)                            \
+        { _SYSDEV_ATTR(_name, _mode, sysdev_show_int, sysdev_store_int), \
+          &(_var) }
+#define SYSDEV_INT_ATTR(_name, _mode, _var)                     \
+        struct sysdev_ext_attribute attr_##_name =              \
+                _SYSDEV_INT_ATTR(_name, _mode, _var);
+
 #endif /* _SYSDEV_H_ */
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 7858eac40aa7..37fa24152bd8 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -101,6 +101,9 @@ void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr);
 
 int __must_check sysfs_create_link(struct kobject *kobj, struct kobject *target,
                                    const char *name);
+int __must_check sysfs_create_link_nowarn(struct kobject *kobj,
+                                          struct kobject *target,
+                                          const char *name);
 void sysfs_remove_link(struct kobject *kobj, const char *name);
 
 int __must_check sysfs_create_group(struct kobject *kobj,
@@ -180,6 +183,13 @@ static inline int sysfs_create_link(struct kobject *kobj,
         return 0;
 }
 
+static inline int sysfs_create_link_nowarn(struct kobject *kobj,
+                                           struct kobject *target,
+                                           const char *name)
+{
+        return 0;
+}
+
 static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
 }
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 4e5833073aa6..e3579cb086e0 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -317,8 +317,6 @@ extern void tty_wait_until_sent(struct tty_struct *tty, long timeout);
 extern int tty_check_change(struct tty_struct *tty);
 extern void stop_tty(struct tty_struct *tty);
 extern void start_tty(struct tty_struct *tty);
-extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
-extern int tty_unregister_ldisc(int disc);
 extern int tty_register_driver(struct tty_driver *driver);
 extern int tty_unregister_driver(struct tty_driver *driver);
 extern struct device *tty_register_device(struct tty_driver *driver,
@@ -383,6 +381,15 @@ extern void tty_port_init(struct tty_port *port);
 extern int tty_port_alloc_xmit_buf(struct tty_port *port);
 extern void tty_port_free_xmit_buf(struct tty_port *port);
 
+extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
+extern int tty_unregister_ldisc(int disc);
+extern int tty_set_ldisc(struct tty_struct *tty, int ldisc);
+extern int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty);
+extern void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty);
+extern void tty_ldisc_init(struct tty_struct *tty);
+extern void tty_ldisc_begin(void);
+/* This last one is just for the tty layer internals and shouldn't be used elsewhere */
+extern void tty_ldisc_enable(struct tty_struct *tty);
 
 
 /* n_tty.c */
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index d2a003586761..e1065ac0d922 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -135,7 +135,7 @@
  *
  *      Optional:
  *
- * void (*break_ctl)(struct tty_stuct *tty, int state);
+ * int (*break_ctl)(struct tty_stuct *tty, int state);
  *
  *      This optional routine requests the tty driver to turn on or
  *      off BREAK status on the RS-232 port.  If state is -1,
@@ -146,6 +146,10 @@
  *      handle the following ioctls: TCSBRK, TCSBRKP, TIOCSBRK,
  *      TIOCCBRK.
  *
+ *      If the driver sets TTY_DRIVER_HARDWARE_BREAK then the interface
+ *      will also be called with actual times and the hardware is expected
+ *      to do the delay work itself. 0 and -1 are still used for on/off.
+ *
  *      Optional: Required for TCSBRK/BRKP/etc handling.
  *
  * void (*wait_until_sent)(struct tty_struct *tty, int timeout);
@@ -192,7 +196,7 @@ struct tty_operations {
         void (*stop)(struct tty_struct *tty);
         void (*start)(struct tty_struct *tty);
         void (*hangup)(struct tty_struct *tty);
-        void (*break_ctl)(struct tty_struct *tty, int state);
+        int (*break_ctl)(struct tty_struct *tty, int state);
         void (*flush_buffer)(struct tty_struct *tty);
         void (*set_ldisc)(struct tty_struct *tty);
         void (*wait_until_sent)(struct tty_struct *tty, int timeout);
@@ -285,12 +289,18 @@ extern struct tty_driver *tty_find_polling_driver(char *name, int *line);
  * TTY_DRIVER_DEVPTS_MEM -- don't use the standard arrays, instead
  *      use dynamic memory keyed through the devpts filesystem.  This
  *      is only applicable to the pty driver.
+ *
+ * TTY_DRIVER_HARDWARE_BREAK -- hardware handles break signals. Pass
+ *      the requested timeout to the caller instead of using a simple
+ *      on/off interface.
+ *
  */
 #define TTY_DRIVER_INSTALLED            0x0001
 #define TTY_DRIVER_RESET_TERMIOS        0x0002
 #define TTY_DRIVER_REAL_RAW             0x0004
 #define TTY_DRIVER_DYNAMIC_DEV          0x0008
 #define TTY_DRIVER_DEVPTS_MEM           0x0010
+#define TTY_DRIVER_HARDWARE_BREAK       0x0020
 
 /* tty driver types */
 #define TTY_DRIVER_TYPE_SYSTEM          0x0001
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 973386d439da..cdf338d94b7f 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -36,7 +36,7 @@ struct uio_mem {
         struct uio_map          *map;
 };
 
-#define MAX_UIO_MAPS    5
+#define MAX_UIO_MAPS    5
 
 struct uio_device;
 
@@ -53,6 +53,7 @@ struct uio_device;
  * @mmap:               mmap operation for this uio device
  * @open:               open operation for this uio device
  * @release:            release operation for this uio device
+ * @irqcontrol:         disable/enable irqs when 0/1 is written to /dev/uioX
  */
 struct uio_info {
         struct uio_device       *uio_dev;
@@ -66,6 +67,7 @@ struct uio_info {
         int (*mmap)(struct uio_info *info, struct vm_area_struct *vma);
         int (*open)(struct uio_info *info, struct inode *inode);
         int (*release)(struct uio_info *info, struct inode *inode);
+        int (*irqcontrol)(struct uio_info *info, s32 irq_on);
 };
 
 extern int __must_check
@@ -80,11 +82,11 @@ static inline int __must_check
 extern void uio_unregister_device(struct uio_info *info);
 extern void uio_event_notify(struct uio_info *info);
 
-/* defines for uio_device->irq */
+/* defines for uio_info->irq */
 #define UIO_IRQ_CUSTOM  -1
 #define UIO_IRQ_NONE    -2
 
-/* defines for uio_device->memtype */
+/* defines for uio_mem->memtype */
 #define UIO_MEM_NONE    0
 #define UIO_MEM_PHYS    1
 #define UIO_MEM_LOGICAL 2
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 8f891cbaf9ab..09a3e6a7518f 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -62,7 +62,7 @@
  */
 struct usb_serial_port {
         struct usb_serial       *serial;
-        struct tty_struct       *tty;
+        struct tty_port         port;
         spinlock_t              lock;
         struct mutex            mutex;
         unsigned char           number;
@@ -89,7 +89,6 @@ struct usb_serial_port {
 
         wait_queue_head_t       write_wait;
         struct work_struct      work;
-        int                     open_count;
         char                    throttled;
         char                    throttle_req;
         char                    console;
@@ -217,22 +216,27 @@ struct usb_serial_driver {
         int (*resume)(struct usb_serial *serial);
 
         /* serial function calls */
-        int  (*open)(struct usb_serial_port *port, struct file *filp);
-        void (*close)(struct usb_serial_port *port, struct file *filp);
-        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,
+        /* Called by console with tty = NULL and by tty */
+        int  (*open)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
+        void (*close)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
+        int  (*write)(struct tty_struct *tty, struct usb_serial_port *port,
+                        const unsigned char *buf, int count);
+        /* Called only by the tty layer */
+        int  (*write_room)(struct tty_struct *tty);
+        int  (*ioctl)(struct tty_struct *tty, struct file *file,
                       unsigned int cmd, unsigned long arg);
-        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);
-        void (*unthrottle)(struct usb_serial_port *port);
-        int  (*tiocmget)(struct usb_serial_port *port, struct file *file);
-        int  (*tiocmset)(struct usb_serial_port *port, struct file *file,
+        void (*set_termios)(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct ktermios *old);
+        void (*break_ctl)(struct tty_struct *tty, int break_state);
+        int  (*chars_in_buffer)(struct tty_struct *tty);
+        void (*throttle)(struct tty_struct *tty);
+        void (*unthrottle)(struct tty_struct *tty);
+        int  (*tiocmget)(struct tty_struct *tty, struct file *file);
+        int  (*tiocmset)(struct tty_struct *tty, struct file *file,
                          unsigned int set, unsigned int clear);
-
+        /* USB events */
         void (*read_int_callback)(struct urb *urb);
         void (*write_int_callback)(struct urb *urb);
         void (*read_bulk_callback)(struct urb *urb);
@@ -270,19 +274,19 @@ static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 /* Functions needed by other parts of the usbserial core */
 extern struct usb_serial *usb_serial_get_by_index(unsigned int minor);
 extern void usb_serial_put(struct usb_serial *serial);
-extern int usb_serial_generic_open(struct usb_serial_port *port,
-                                   struct file *filp);
-extern int usb_serial_generic_write(struct usb_serial_port *port,
-                                    const unsigned char *buf, int count);
-extern void usb_serial_generic_close(struct usb_serial_port *port,
-                                     struct file *filp);
+extern int usb_serial_generic_open(struct tty_struct *tty,
+                struct usb_serial_port *port, struct file *filp);
+extern int usb_serial_generic_write(struct tty_struct *tty,
+        struct usb_serial_port *port, const unsigned char *buf, int count);
+extern void usb_serial_generic_close(struct tty_struct *tty,
+                        struct usb_serial_port *port, struct file *filp);
 extern int usb_serial_generic_resume(struct usb_serial *serial);
-extern int usb_serial_generic_write_room(struct usb_serial_port *port);
-extern int usb_serial_generic_chars_in_buffer(struct usb_serial_port *port);
+extern int usb_serial_generic_write_room(struct tty_struct *tty);
+extern int usb_serial_generic_chars_in_buffer(struct tty_struct *tty);
 extern void usb_serial_generic_read_bulk_callback(struct urb *urb);
 extern void usb_serial_generic_write_bulk_callback(struct urb *urb);
-extern void usb_serial_generic_throttle(struct usb_serial_port *port);
-extern void usb_serial_generic_unthrottle(struct usb_serial_port *port);
+extern void usb_serial_generic_throttle(struct tty_struct *tty);
+extern void usb_serial_generic_unthrottle(struct tty_struct *tty);
 extern void usb_serial_generic_shutdown(struct usb_serial *serial);
 extern int usb_serial_generic_register(int debug);
 extern void usb_serial_generic_deregister(void);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 1834fdfe82a7..a594bac4a77d 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -623,7 +623,7 @@ struct Scsi_Host {
         /*
          * Optional work queue to be utilized by the transport
          */
-        char work_q_name[KOBJ_NAME_LEN];
+        char work_q_name[20];
         struct workqueue_struct *work_q;
 
         /*
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 06f72bab9df0..878373c32ef7 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -489,9 +489,9 @@ struct fc_host_attrs {
         u16 npiv_vports_inuse;
 
         /* work queues for rport state manipulation */
-        char work_q_name[KOBJ_NAME_LEN];
+        char work_q_name[20];
         struct workqueue_struct *work_q;
-        char devloss_work_q_name[KOBJ_NAME_LEN];
+        char devloss_work_q_name[20];
         struct workqueue_struct *devloss_work_q;
 };
 
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index f5444e033cc9..8b6c91df4c7a 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -198,7 +198,7 @@ struct iscsi_cls_host {
         atomic_t nr_scans;
         struct mutex mutex;
         struct workqueue_struct *scan_workq;
-        char scan_workq_name[KOBJ_NAME_LEN];
+        char scan_workq_name[20];
 };
 
 extern void iscsi_host_for_each_session(struct Scsi_Host *shost,