Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c

216 files changed, 6732 insertions, 1933 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index bcf875e844fe..818cc3a50e6b 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -7,6 +7,7 @@ header-y += raid/
 header-y += spi/
 header-y += sunrpc/
 header-y += tc_act/
+header-y += tc_ematch/
 header-y += netfilter/
 header-y += netfilter_arp/
 header-y += netfilter_bridge/
@@ -137,6 +138,7 @@ header-y += radeonfb.h
 header-y += raw.h
 header-y += resource.h
 header-y += rose.h
+header-y += serial_reg.h
 header-y += smbno.h
 header-y += snmp.h
 header-y += sockios.h
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fccd8b548d93..bf5e0009de75 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -33,6 +33,7 @@
 #endif
 
 #include <linux/list.h>
+#include <linux/mod_devicetable.h>
 
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
@@ -88,10 +89,8 @@ int acpi_table_parse (char *id, acpi_table_handler handler);
 int __init acpi_table_parse_entries(char *id, unsigned long table_size,
         int entry_id, acpi_table_entry_handler handler, unsigned int max_entries);
 int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
-int acpi_table_parse_srat (enum acpi_srat_type id, acpi_table_entry_handler handler, unsigned int max_entries);
 int acpi_parse_mcfg (struct acpi_table_header *header);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
-void acpi_table_print_srat_entry (struct acpi_subtable_header *srat);
 
 /* the following four functions are architecture-dependent */
 #ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
@@ -122,7 +121,7 @@ extern struct acpi_mcfg_allocation *pci_mmcfg_config;
 extern int pci_mmcfg_config_num;
 
 extern int sbf_port;
-extern unsigned long acpi_video_flags;
+extern unsigned long acpi_realmode_flags;
 
 #else   /* !CONFIG_ACPI */
 
@@ -233,6 +232,9 @@ extern int acpi_paddr_to_node(u64 start_addr, u64 size);
 
 extern int pnpacpi_disabled;
 
+#define PXM_INVAL       (-1)
+#define NID_INVAL       (-1)
+
 #else   /* CONFIG_ACPI */
 
 static inline int acpi_boot_init(void)
diff --git a/include/linux/aer.h b/include/linux/aer.h
index 509656286e53..bcf236d825e8 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -15,11 +15,26 @@ extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
 extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
 extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);
 #else
-#define pci_enable_pcie_error_reporting(dev)            (-EINVAL)
-#define pci_find_aer_capability(dev)                    (0)
-#define pci_disable_pcie_error_reporting(dev)           (-EINVAL)
-#define pci_cleanup_aer_uncorrect_error_status(dev)     (-EINVAL)
-#define pci_cleanup_aer_correct_error_status(dev)       (-EINVAL)
+static inline int pci_enable_pcie_error_reporting(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_find_aer_capability(struct pci_dev *dev)
+{
+        return 0;
+}
+static inline int pci_disable_pcie_error_reporting(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
+static inline int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
+{
+        return -EINVAL;
+}
 #endif
 
 #endif //_AER_H_
diff --git a/include/linux/aio.h b/include/linux/aio.h
index b903fc02bdb7..d10e608f232d 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -86,7 +86,7 @@ struct kioctx;
  */
 struct kiocb {
         struct list_head        ki_run_list;
-        long                    ki_flags;
+        unsigned long           ki_flags;
         int                     ki_users;
         unsigned                ki_key;         /* id of this request */
 
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index 290aef326812..5f921c84827a 100644
--- a/include/linux/apm_bios.h
+++ b/include/linux/apm_bios.h
@@ -21,20 +21,22 @@ typedef unsigned short	apm_eventinfo_t;
 
 #ifdef __KERNEL__
 
+#include <linux/types.h>
+
 #define APM_CS          (GDT_ENTRY_APMBIOS_BASE * 8)
 #define APM_CS_16       (APM_CS + 8)
 #define APM_DS          (APM_CS_16 + 8)
 
 struct apm_bios_info {
-        unsigned short  version;
-        unsigned short  cseg;
-        unsigned long   offset;
-        unsigned short  cseg_16;
-        unsigned short  dseg;
-        unsigned short  flags;
-        unsigned short  cseg_len;
-        unsigned short  cseg_16_len;
-        unsigned short  dseg_len;
+        u16     version;
+        u16     cseg;
+        u32     offset;
+        u16     cseg_16;
+        u16     dseg;
+        u16     flags;
+        u16     cseg_len;
+        u16     cseg_16_len;
+        u16     dseg_len;
 };
 
 /* Results of APM Installation Check */
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index 2f85049cfb3d..fde675872c56 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -214,7 +214,7 @@ extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
  */
 struct Incoming {
         struct sk_buff *skb;    /* packet data buffer             */
-        uint16_t sequence;      /* sequence number of assembly    */
+        __be16 sequence;        /* sequence number of assembly    */
         uint8_t lastpacket,     /* number of last packet (from 1) */
                 numpackets;     /* number of packets in split     */
 };
@@ -292,7 +292,7 @@ struct arcnet_local {
 
         struct {
                 uint16_t sequence;      /* sequence number (incs with each packet) */
-                uint16_t aborted_seq;
+                __be16 aborted_seq;
 
                 struct Incoming incoming[256];  /* one from each address */
         } rfc1201;
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index ff1255079fa1..bdca3f1b3213 100644
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -51,10 +51,6 @@ struct dma_chan_ref {
  * @ASYNC_TX_ACK: immediately ack the descriptor, precludes setting up a
  * dependency chain
  * @ASYNC_TX_DEP_ACK: ack the dependency descriptor.  Useful for chaining.
- * @ASYNC_TX_KMAP_SRC: if the transaction is to be performed synchronously
- * take an atomic mapping (KM_USER0) on the source page(s)
- * @ASYNC_TX_KMAP_DST: if the transaction is to be performed synchronously
- * take an atomic mapping (KM_USER0) on the dest page(s)
  */
 enum async_tx_flags {
         ASYNC_TX_XOR_ZERO_DST    = (1 << 0),
@@ -62,8 +58,6 @@ enum async_tx_flags {
         ASYNC_TX_ASSUME_COHERENT = (1 << 2),
         ASYNC_TX_ACK             = (1 << 3),
         ASYNC_TX_DEP_ACK         = (1 << 4),
-        ASYNC_TX_KMAP_SRC        = (1 << 5),
-        ASYNC_TX_KMAP_DST        = (1 << 6),
 };
 
 #ifdef CONFIG_DMA_ENGINE
diff --git a/include/linux/ata.h b/include/linux/ata.h
index b5a20162af32..a4f373f8b798 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -64,6 +64,28 @@ enum {
         ATA_ID_PROD_LEN         = 40,
 
         ATA_PCI_CTL_OFS         = 2,
+
+        ATA_PIO0                = (1 << 0),
+        ATA_PIO1                = ATA_PIO0 | (1 << 1),
+        ATA_PIO2                = ATA_PIO1 | (1 << 2),
+        ATA_PIO3                = ATA_PIO2 | (1 << 3),
+        ATA_PIO4                = ATA_PIO3 | (1 << 4),
+        ATA_PIO5                = ATA_PIO4 | (1 << 5),
+        ATA_PIO6                = ATA_PIO5 | (1 << 6),
+
+        ATA_SWDMA0              = (1 << 0),
+        ATA_SWDMA1              = ATA_SWDMA0 | (1 << 1),
+        ATA_SWDMA2              = ATA_SWDMA1 | (1 << 2),
+
+        ATA_SWDMA2_ONLY         = (1 << 2),
+
+        ATA_MWDMA0              = (1 << 0),
+        ATA_MWDMA1              = ATA_MWDMA0 | (1 << 1),
+        ATA_MWDMA2              = ATA_MWDMA1 | (1 << 2),
+
+        ATA_MWDMA12_ONLY        = (1 << 1) | (1 << 2),
+        ATA_MWDMA2_ONLY         = (1 << 2),
+
         ATA_UDMA0               = (1 << 0),
         ATA_UDMA1               = ATA_UDMA0 | (1 << 1),
         ATA_UDMA2               = ATA_UDMA1 | (1 << 2),
@@ -208,6 +230,12 @@ enum {
 
         SETFEATURES_SPINUP      = 0x07, /* Spin-up drive */
 
+        SETFEATURES_SATA_ENABLE = 0x10, /* Enable use of SATA feature */
+        SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */
+
+        /* SETFEATURE Sector counts for SATA features */
+        SATA_AN                 = 0x05,  /* Asynchronous Notification */
+
         /* ATAPI stuff */
         ATAPI_PKT_DMA           = (1 << 0),
         ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir:
@@ -259,6 +287,15 @@ enum {
         SERR_PROTOCOL           = (1 << 10), /* protocol violation */
         SERR_INTERNAL           = (1 << 11), /* host internal error */
         SERR_PHYRDY_CHG         = (1 << 16), /* PHY RDY changed */
+        SERR_PHY_INT_ERR        = (1 << 17), /* PHY internal error */
+        SERR_COMM_WAKE          = (1 << 18), /* Comm wake */
+        SERR_10B_8B_ERR         = (1 << 19), /* 10b to 8b decode error */
+        SERR_DISPARITY          = (1 << 20), /* Disparity */
+        SERR_CRC                = (1 << 21), /* CRC error */
+        SERR_HANDSHAKE          = (1 << 22), /* Handshake error */
+        SERR_LINK_SEQ_ERR       = (1 << 23), /* Link sequence error */
+        SERR_TRANS_ST_ERROR     = (1 << 24), /* Transport state trans. error */
+        SERR_UNRECOG_FIS        = (1 << 25), /* Unrecognized FIS */
         SERR_DEV_XCHG           = (1 << 26), /* device exchanged */
 
         /* struct ata_taskfile flags */
@@ -319,24 +356,17 @@ struct ata_taskfile {
 };
 
 #define ata_id_is_ata(id)       (((id)[0] & (1 << 15)) == 0)
-#define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
-#define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
-#define ata_id_hpa_enabled(id)  ((id)[85] & (1 << 10))
-#define ata_id_has_fua(id)      ((id)[84] & (1 << 6))
-#define ata_id_has_flush(id)    ((id)[83] & (1 << 12))
-#define ata_id_has_flush_ext(id) ((id)[83] & (1 << 13))
-#define ata_id_has_lba48(id)    ((id)[83] & (1 << 10))
-#define ata_id_has_hpa(id)      ((id)[82] & (1 << 10))
-#define ata_id_has_wcache(id)   ((id)[82] & (1 << 5))
-#define ata_id_has_pm(id)       ((id)[82] & (1 << 3))
 #define ata_id_has_lba(id)      ((id)[49] & (1 << 9))
 #define ata_id_has_dma(id)      ((id)[49] & (1 << 8))
 #define ata_id_has_ncq(id)      ((id)[76] & (1 << 8))
 #define ata_id_queue_depth(id)  (((id)[75] & 0x1f) + 1)
 #define ata_id_removeable(id)   ((id)[0] & (1 << 7))
-#define ata_id_has_dword_io(id) ((id)[50] & (1 << 0))
+#define ata_id_has_dword_io(id) ((id)[48] & (1 << 0))
+#define ata_id_has_atapi_AN(id) \
+        ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \
+          ((id)[78] & (1 << 5)) )
 #define ata_id_iordy_disable(id) ((id)[49] & (1 << 10))
-#define ata_id_has_iordy(id) ((id)[49] & (1 << 9))
+#define ata_id_has_iordy(id) ((id)[49] & (1 << 11))
 #define ata_id_u32(id,n)        \
         (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)]))
 #define ata_id_u64(id,n)        \
@@ -347,6 +377,90 @@ struct ata_taskfile {
 
 #define ata_id_cdb_intr(id)     (((id)[0] & 0x60) == 0x20)
 
+static inline int ata_id_has_fua(const u16 *id)
+{
+        if ((id[84] & 0xC000) != 0x4000)
+                return 0;
+        return id[84] & (1 << 6);
+}
+
+static inline int ata_id_has_flush(const u16 *id)
+{
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        return id[83] & (1 << 12);
+}
+
+static inline int ata_id_has_flush_ext(const u16 *id)
+{
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        return id[83] & (1 << 13);
+}
+
+static inline int ata_id_has_lba48(const u16 *id)
+{
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        return id[83] & (1 << 10);
+}
+
+static inline int ata_id_hpa_enabled(const u16 *id)
+{
+        /* Yes children, word 83 valid bits cover word 82 data */
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        /* And 87 covers 85-87 */
+        if ((id[87] & 0xC000) != 0x4000)
+                return 0;
+        /* Check command sets enabled as well as supported */
+        if ((id[85] & ( 1 << 10)) == 0)
+                return 0;
+        return id[82] & (1 << 10);
+}
+
+static inline int ata_id_has_wcache(const u16 *id)
+{
+        /* Yes children, word 83 valid bits cover word 82 data */
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        return id[82] & (1 << 5);
+}
+
+static inline int ata_id_has_pm(const u16 *id)
+{
+        if ((id[83] & 0xC000) != 0x4000)
+                return 0;
+        return id[82] & (1 << 3);
+}
+
+static inline int ata_id_rahead_enabled(const u16 *id)
+{
+        if ((id[87] & 0xC000) != 0x4000)
+                return 0;
+        return id[85] & (1 << 6);
+}
+
+static inline int ata_id_wcache_enabled(const u16 *id)
+{
+        if ((id[87] & 0xC000) != 0x4000)
+                return 0;
+        return id[85] & (1 << 5);
+}
+
+/**
+ *      ata_id_major_version    -       get ATA level of drive
+ *      @id: Identify data
+ *
+ *      Caveats:
+ *              ATA-1 considers identify optional
+ *              ATA-2 introduces mandatory identify
+ *              ATA-3 introduces word 80 and accurate reporting
+ *
+ *      The practical impact of this is that ata_id_major_version cannot
+ *      reliably report on drives below ATA3. 
+ */
+
 static inline unsigned int ata_id_major_version(const u16 *id)
 {
         unsigned int mver;
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 8ca7ca0b47f0..9ae740936a65 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -63,8 +63,8 @@
 #define AUDIT_ADD_RULE          1011    /* Add syscall filtering rule */
 #define AUDIT_DEL_RULE          1012    /* Delete syscall filtering rule */
 #define AUDIT_LIST_RULES        1013    /* List syscall filtering rules */
-#define AUDIT_TTY_GET           1014    /* Get TTY auditing status */
-#define AUDIT_TTY_SET           1015    /* Set TTY auditing status */
+#define AUDIT_TTY_GET           1016    /* Get TTY auditing status */
+#define AUDIT_TTY_SET           1017    /* Set TTY auditing status */
 
 #define AUDIT_FIRST_USER_MSG    1100    /* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC          1107    /* We filter this differently */
@@ -108,10 +108,11 @@
 #define AUDIT_MAC_CIPSOV4_DEL   1408    /* NetLabel: del CIPSOv4 DOI entry */
 #define AUDIT_MAC_MAP_ADD       1409    /* NetLabel: add LSM domain mapping */
 #define AUDIT_MAC_MAP_DEL       1410    /* NetLabel: del LSM domain mapping */
-#define AUDIT_MAC_IPSEC_ADDSA   1411    /* Add a XFRM state */
-#define AUDIT_MAC_IPSEC_DELSA   1412    /* Delete a XFRM state */
-#define AUDIT_MAC_IPSEC_ADDSPD  1413    /* Add a XFRM policy */
-#define AUDIT_MAC_IPSEC_DELSPD  1414    /* Delete a XFRM policy */
+#define AUDIT_MAC_IPSEC_ADDSA   1411    /* Not used */
+#define AUDIT_MAC_IPSEC_DELSA   1412    /* Not used  */
+#define AUDIT_MAC_IPSEC_ADDSPD  1413    /* Not used */
+#define AUDIT_MAC_IPSEC_DELSPD  1414    /* Not used */
+#define AUDIT_MAC_IPSEC_EVENT   1415    /* Audit an IPSec event */
 
 #define AUDIT_FIRST_KERN_ANOM_MSG   1700
 #define AUDIT_LAST_KERN_ANOM_MSG    1799
@@ -161,7 +162,7 @@
  * are currently used in an audit field constant understood by the kernel.
  * If you are adding a new #define AUDIT_<whatever>, please ensure that
  * AUDIT_UNUSED_BITS is updated if need be. */
-#define AUDIT_UNUSED_BITS       0x0FFFFC00
+#define AUDIT_UNUSED_BITS       0x07FFFC00
 
 
 /* Rule fields */
@@ -213,25 +214,29 @@
 #define AUDIT_NEGATE                    0x80000000
 
 /* These are the supported operators.
- *      4  2  1
- *      =  >  <
- *      -------
- *      0  0  0         0       nonsense
- *      0  0  1         1       <
- *      0  1  0         2       >
- *      0  1  1         3       !=
- *      1  0  0         4       =
- *      1  0  1         5       <=
- *      1  1  0         6       >=
- *      1  1  1         7       all operators
+ *      4  2  1  8
+ *      =  >  <  ?
+ *      ----------
+ *      0  0  0  0      00      nonsense
+ *      0  0  0  1      08      &  bit mask
+ *      0  0  1  0      10      <
+ *      0  1  0  0      20      >
+ *      0  1  1  0      30      !=
+ *      1  0  0  0      40      =
+ *      1  0  0  1      48      &=  bit test
+ *      1  0  1  0      50      <=
+ *      1  1  0  0      60      >=
+ *      1  1  1  1      78      all operators
  */
+#define AUDIT_BIT_MASK                  0x08000000
 #define AUDIT_LESS_THAN                 0x10000000
 #define AUDIT_GREATER_THAN              0x20000000
 #define AUDIT_NOT_EQUAL                 0x30000000
 #define AUDIT_EQUAL                     0x40000000
+#define AUDIT_BIT_TEST                  (AUDIT_BIT_MASK|AUDIT_EQUAL)
 #define AUDIT_LESS_THAN_OR_EQUAL        (AUDIT_LESS_THAN|AUDIT_EQUAL)
 #define AUDIT_GREATER_THAN_OR_EQUAL     (AUDIT_GREATER_THAN|AUDIT_EQUAL)
-#define AUDIT_OPERATORS                 (AUDIT_EQUAL|AUDIT_NOT_EQUAL)
+#define AUDIT_OPERATORS                 (AUDIT_EQUAL|AUDIT_NOT_EQUAL|AUDIT_BIT_MASK)
 
 /* Status symbols */
                                 /* Mask values */
@@ -407,7 +412,6 @@ extern int audit_bprm(struct linux_binprm *bprm);
 extern int audit_socketcall(int nargs, unsigned long *args);
 extern int audit_sockaddr(int len, void *addr);
 extern int __audit_fd_pair(int fd1, int fd2);
-extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
 extern int audit_set_macxattr(const char *name);
 extern int __audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr);
 extern int __audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout);
@@ -487,7 +491,6 @@ extern int audit_signals;
 #define audit_socketcall(n,a) ({ 0; })
 #define audit_fd_pair(n,a) ({ 0; })
 #define audit_sockaddr(len, addr) ({ 0; })
-#define audit_avc_path(dentry, mnt) ({ 0; })
 #define audit_set_macxattr(n) do { ; } while (0)
 #define audit_mq_open(o,m,a) ({ 0; })
 #define audit_mq_timedsend(d,l,p,t) ({ 0; })
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 1023ba0d6e55..1ee9488ca2e4 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -69,8 +69,8 @@ struct backlight_device {
 
         /* The framebuffer notifier block */
         struct notifier_block fb_notif;
-        /* The class device structure */
-        struct class_device class_dev;
+
+        struct device dev;
 };
 
 static inline void backlight_update_status(struct backlight_device *bd)
@@ -85,6 +85,20 @@ extern struct backlight_device *backlight_device_register(const char *name,
         struct device *dev, void *devdata, struct backlight_ops *ops);
 extern void backlight_device_unregister(struct backlight_device *bd);
 
-#define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev)
+#define to_backlight_device(obj) container_of(obj, struct backlight_device, dev)
+
+static inline void * bl_get_data(struct backlight_device *bl_dev)
+{
+        return dev_get_drvdata(&bl_dev->dev);
+}
+
+struct generic_bl_info {
+        const char *name;
+        int max_intensity;
+        int default_intensity;
+        int limit_mask;
+        void (*set_bl_intensity)(int intensity);
+        void (*kick_battery)(void);
+};
 
 #endif
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index e1a708337be3..91c8c07fe8b7 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -6,11 +6,13 @@
 struct pt_regs;
 
 /*
- * MAX_ARG_PAGES defines the number of pages allocated for arguments
- * and envelope for the new program. 32 should suffice, this gives
- * a maximum env+arg of 128kB w/4KB pages!
+ * These are the maximum length and maximum number of strings passed to the
+ * execve() system call.  MAX_ARG_STRLEN is essentially random but serves to
+ * prevent the kernel from being unduly impacted by misaddressed pointers.
+ * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
  */
-#define MAX_ARG_PAGES 32
+#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
+#define MAX_ARG_STRINGS 0x7FFFFFFF
 
 /* sizeof(linux_binprm->buf) */
 #define BINPRM_BUF_SIZE 128
@@ -24,7 +26,12 @@ struct pt_regs;
  */
 struct linux_binprm{
         char buf[BINPRM_BUF_SIZE];
+#ifdef CONFIG_MMU
+        struct vm_area_struct *vma;
+#else
+# define MAX_ARG_PAGES  32
         struct page *page[MAX_ARG_PAGES];
+#endif
         struct mm_struct *mm;
         unsigned long p; /* current top of mem */
         int sh_bang;
@@ -40,6 +47,7 @@ struct linux_binprm{
         unsigned interp_flags;
         unsigned interp_data;
         unsigned long loader, exec;
+        unsigned long argv_len;
 };
 
 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
@@ -68,7 +76,7 @@ extern int register_binfmt(struct linux_binfmt *);
 extern int unregister_binfmt(struct linux_binfmt *);
 
 extern int prepare_binprm(struct linux_binprm *);
-extern void remove_arg_zero(struct linux_binprm *);
+extern int __must_check remove_arg_zero(struct linux_binprm *);
 extern int search_binary_handler(struct linux_binprm *,struct pt_regs *);
 extern int flush_old_exec(struct linux_binprm * bprm);
 
@@ -85,6 +93,7 @@ extern int suid_dumpable;
 extern int setup_arg_pages(struct linux_binprm * bprm,
                            unsigned long stack_top,
                            int executable_stack);
+extern int bprm_mm_init(struct linux_binprm *bprm);
 extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm);
 extern void compute_creds(struct linux_binprm *binprm);
 extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 4d85262b4fa4..089a8bc55dd4 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -24,6 +24,8 @@
 #include <linux/mempool.h>
 #include <linux/ioprio.h>
 
+#ifdef CONFIG_BLOCK
+
 /* Platforms may set this to teach the BIO layer about IOMMU hardware. */
 #include <asm/io.h>
 
@@ -62,7 +64,7 @@ struct bio_vec {
 
 struct bio_set;
 struct bio;
-typedef int (bio_end_io_t) (struct bio *, unsigned int, int);
+typedef void (bio_end_io_t) (struct bio *, int);
 typedef void (bio_destructor_t) (struct bio *);
 
 /*
@@ -224,7 +226,7 @@ struct bio {
 #define BIO_SEG_BOUNDARY(q, b1, b2) \
         BIOVEC_SEG_BOUNDARY((q), __BVEC_END((b1)), __BVEC_START((b2)))
 
-#define bio_io_error(bio, bytes) bio_endio((bio), (bytes), -EIO)
+#define bio_io_error(bio) bio_endio((bio), -EIO)
 
 /*
  * drivers should not use the __ version unless they _really_ want to
@@ -284,7 +286,7 @@ extern struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);
 extern void bio_put(struct bio *);
 extern void bio_free(struct bio *, struct bio_set *);
 
-extern void bio_endio(struct bio *, unsigned int, int);
+extern void bio_endio(struct bio *, int);
 struct request_queue;
 extern int bio_phys_segments(struct request_queue *, struct bio *);
 extern int bio_hw_segments(struct request_queue *, struct bio *);
@@ -361,4 +363,5 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
         __bio_kmap_irq((bio), (bio)->bi_idx, (flags))
 #define bio_kunmap_irq(buf,flags)       __bio_kunmap_irq(buf, flags)
 
+#endif /* CONFIG_BLOCK */
 #endif /* __LINUX_BIO_H */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f78965fc6426..5ed888b04b29 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
+#ifdef CONFIG_BLOCK
+
 #include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
@@ -18,26 +20,10 @@
 
 #include <asm/scatterlist.h>
 
-#ifdef CONFIG_LBD
-# include <asm/div64.h>
-# define sector_div(a, b) do_div(a, b)
-#else
-# define sector_div(n, b)( \
-{ \
-        int _res; \
-        _res = (n) % (b); \
-        (n) /= (b); \
-        _res; \
-} \
-)
-#endif
-
-#ifdef CONFIG_BLOCK
-
 struct scsi_ioctl_command;
 
 struct request_queue;
-typedef struct request_queue request_queue_t;
+typedef struct request_queue request_queue_t __deprecated;
 struct elevator_queue;
 typedef struct elevator_queue elevator_t;
 struct request_pm_state;
@@ -233,7 +219,7 @@ struct request {
         struct list_head queuelist;
         struct list_head donelist;
 
-        request_queue_t *q;
+        struct request_queue *q;
 
         unsigned int cmd_flags;
         enum rq_cmd_type_bits cmd_type;
@@ -337,15 +323,15 @@ struct request_pm_state
 
 #include <linux/elevator.h>
 
-typedef void (request_fn_proc) (request_queue_t *q);
-typedef int (make_request_fn) (request_queue_t *q, struct bio *bio);
-typedef int (prep_rq_fn) (request_queue_t *, struct request *);
-typedef void (unplug_fn) (request_queue_t *);
+typedef void (request_fn_proc) (struct request_queue *q);
+typedef int (make_request_fn) (struct request_queue *q, struct bio *bio);
+typedef int (prep_rq_fn) (struct request_queue *, struct request *);
+typedef void (unplug_fn) (struct request_queue *);
 
 struct bio_vec;
-typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *);
-typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *);
-typedef void (prepare_flush_fn) (request_queue_t *, struct request *);
+typedef int (merge_bvec_fn) (struct request_queue *, struct bio *, struct bio_vec *);
+typedef int (issue_flush_fn) (struct request_queue *, struct gendisk *, sector_t *);
+typedef void (prepare_flush_fn) (struct request_queue *, struct request *);
 typedef void (softirq_done_fn)(struct request *);
 
 enum blk_queue_state {
@@ -471,7 +457,6 @@ struct request_queue
         int                     orderr, ordcolor;
         struct request          pre_flush_rq, bar_rq, post_flush_rq;
         struct request          *orig_bar_rq;
-        unsigned int            bi_size;
 
         struct mutex            sysfs_lock;
 
@@ -483,8 +468,8 @@ struct request_queue
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */
-#define QUEUE_FLAG_READFULL     3       /* write queue has been filled */
-#define QUEUE_FLAG_WRITEFULL    4       /* read queue has been filled */
+#define QUEUE_FLAG_READFULL     3       /* read queue has been filled */
+#define QUEUE_FLAG_WRITEFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
 #define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
@@ -626,34 +611,47 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
 
 #ifdef CONFIG_BOUNCE
 extern int init_emergency_isa_pool(void);
-extern void blk_queue_bounce(request_queue_t *q, struct bio **bio);
+extern void blk_queue_bounce(struct request_queue *q, struct bio **bio);
 #else
 static inline int init_emergency_isa_pool(void)
 {
         return 0;
 }
-static inline void blk_queue_bounce(request_queue_t *q, struct bio **bio)
+static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio)
 {
 }
 #endif /* CONFIG_MMU */
 
-#define rq_for_each_bio(_bio, rq)       \
+struct req_iterator {
+        int i;
+        struct bio *bio;
+};
+
+/* This should not be used directly - use rq_for_each_segment */
+#define __rq_for_each_bio(_bio, rq)     \
         if ((rq->bio))                  \
                 for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next)
 
+#define rq_for_each_segment(bvl, _rq, _iter)                    \
+        __rq_for_each_bio(_iter.bio, _rq)                       \
+                bio_for_each_segment(bvl, _iter.bio, _iter.i)
+
+#define rq_iter_last(rq, _iter)                                 \
+                (_iter.bio->bi_next == NULL && _iter.i == _iter.bio->bi_vcnt-1)
+
 extern int blk_register_queue(struct gendisk *disk);
 extern void blk_unregister_queue(struct gendisk *disk);
 extern void register_disk(struct gendisk *dev);
 extern void generic_make_request(struct bio *bio);
 extern void blk_put_request(struct request *);
-extern void __blk_put_request(request_queue_t *, struct request *);
+extern void __blk_put_request(struct request_queue *, struct request *);
 extern void blk_end_sync_rq(struct request *rq, int error);
-extern struct request *blk_get_request(request_queue_t *, int, gfp_t);
-extern void blk_insert_request(request_queue_t *, struct request *, int, void *);
-extern void blk_requeue_request(request_queue_t *, struct request *);
-extern void blk_plug_device(request_queue_t *);
-extern int blk_remove_plug(request_queue_t *);
-extern void blk_recount_segments(request_queue_t *, struct bio *);
+extern struct request *blk_get_request(struct request_queue *, int, gfp_t);
+extern void blk_insert_request(struct request_queue *, struct request *, int, void *);
+extern void blk_requeue_request(struct request_queue *, struct request *);
+extern void blk_plug_device(struct request_queue *);
+extern int blk_remove_plug(struct request_queue *);
+extern void blk_recount_segments(struct request_queue *, struct bio *);
 extern int scsi_cmd_ioctl(struct file *, struct request_queue *,
                           struct gendisk *, unsigned int, void __user *);
 extern int sg_scsi_ioctl(struct file *, struct request_queue *,
@@ -662,14 +660,15 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *,
 /*
  * Temporary export, until SCSI gets fixed up.
  */
-extern int ll_back_merge_fn(request_queue_t *, struct request *, struct bio *);
+extern int blk_rq_append_bio(struct request_queue *q, struct request *rq,
+                             struct bio *bio);
 
 /*
  * A queue has just exitted congestion.  Note this in the global counter of
  * congested queues, and wake up anyone who was waiting for requests to be
  * put back.
  */
-static inline void blk_clear_queue_congested(request_queue_t *q, int rw)
+static inline void blk_clear_queue_congested(struct request_queue *q, int rw)
 {
         clear_bdi_congested(&q->backing_dev_info, rw);
 }
@@ -678,34 +677,29 @@ static inline void blk_clear_queue_congested(request_queue_t *q, int rw)
  * A queue has just entered congestion.  Flag that in the queue's VM-visible
  * state flags and increment the global gounter of congested queues.
  */
-static inline void blk_set_queue_congested(request_queue_t *q, int rw)
+static inline void blk_set_queue_congested(struct request_queue *q, int rw)
 {
         set_bdi_congested(&q->backing_dev_info, rw);
 }
 
-extern void blk_start_queue(request_queue_t *q);
-extern void blk_stop_queue(request_queue_t *q);
+extern void blk_start_queue(struct request_queue *q);
+extern void blk_stop_queue(struct request_queue *q);
 extern void blk_sync_queue(struct request_queue *q);
-extern void __blk_stop_queue(request_queue_t *q);
-extern void blk_run_queue(request_queue_t *);
-extern void blk_start_queueing(request_queue_t *);
-extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long);
+extern void __blk_stop_queue(struct request_queue *q);
+extern void blk_run_queue(struct request_queue *);
+extern void blk_start_queueing(struct request_queue *);
+extern int blk_rq_map_user(struct request_queue *, struct request *, void __user *, unsigned long);
 extern int blk_rq_unmap_user(struct bio *);
-extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t);
-extern int blk_rq_map_user_iov(request_queue_t *, struct request *,
+extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t);
+extern int blk_rq_map_user_iov(struct request_queue *, struct request *,
                                struct sg_iovec *, int, unsigned int);
-extern int blk_execute_rq(request_queue_t *, struct gendisk *,
+extern int blk_execute_rq(struct request_queue *, struct gendisk *,
                           struct request *, int);
-extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,
+extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,
                                   struct request *, int, rq_end_io_fn *);
-extern int blk_fill_sghdr_rq(request_queue_t *, struct request *,
-                      struct sg_io_hdr *, int);
-extern int blk_unmap_sghdr_rq(struct request *, struct sg_io_hdr *);
-extern int blk_complete_sghdr_rq(struct request *, struct sg_io_hdr *,
-                          struct bio *);
 extern int blk_verify_command(unsigned char *, int);
 
-static inline request_queue_t *bdev_get_queue(struct block_device *bdev)
+static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
 {
         return bdev->bd_disk->queue;
 }
@@ -754,41 +748,41 @@ static inline void blkdev_dequeue_request(struct request *req)
 /*
  * Access functions for manipulating queue properties
  */
-extern request_queue_t *blk_init_queue_node(request_fn_proc *rfn,
+extern struct request_queue *blk_init_queue_node(request_fn_proc *rfn,
                                         spinlock_t *lock, int node_id);
-extern request_queue_t *blk_init_queue(request_fn_proc *, spinlock_t *);
-extern void blk_cleanup_queue(request_queue_t *);
-extern void blk_queue_make_request(request_queue_t *, make_request_fn *);
-extern void blk_queue_bounce_limit(request_queue_t *, u64);
-extern void blk_queue_max_sectors(request_queue_t *, unsigned int);
-extern void blk_queue_max_phys_segments(request_queue_t *, unsigned short);
-extern void blk_queue_max_hw_segments(request_queue_t *, unsigned short);
-extern void blk_queue_max_segment_size(request_queue_t *, unsigned int);
-extern void blk_queue_hardsect_size(request_queue_t *, unsigned short);
-extern void blk_queue_stack_limits(request_queue_t *t, request_queue_t *b);
-extern void blk_queue_segment_boundary(request_queue_t *, unsigned long);
-extern void blk_queue_prep_rq(request_queue_t *, prep_rq_fn *pfn);
-extern void blk_queue_merge_bvec(request_queue_t *, merge_bvec_fn *);
-extern void blk_queue_dma_alignment(request_queue_t *, int);
-extern void blk_queue_softirq_done(request_queue_t *, softirq_done_fn *);
+extern struct request_queue *blk_init_queue(request_fn_proc *, spinlock_t *);
+extern void blk_cleanup_queue(struct request_queue *);
+extern void blk_queue_make_request(struct request_queue *, make_request_fn *);
+extern void blk_queue_bounce_limit(struct request_queue *, u64);
+extern void blk_queue_max_sectors(struct request_queue *, unsigned int);
+extern void blk_queue_max_phys_segments(struct request_queue *, unsigned short);
+extern void blk_queue_max_hw_segments(struct request_queue *, unsigned short);
+extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);
+extern void blk_queue_hardsect_size(struct request_queue *, unsigned short);
+extern void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b);
+extern void blk_queue_segment_boundary(struct request_queue *, unsigned long);
+extern void blk_queue_prep_rq(struct request_queue *, prep_rq_fn *pfn);
+extern void blk_queue_merge_bvec(struct request_queue *, merge_bvec_fn *);
+extern void blk_queue_dma_alignment(struct request_queue *, int);
+extern void blk_queue_softirq_done(struct request_queue *, softirq_done_fn *);
 extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev);
-extern int blk_queue_ordered(request_queue_t *, unsigned, prepare_flush_fn *);
-extern void blk_queue_issue_flush_fn(request_queue_t *, issue_flush_fn *);
-extern int blk_do_ordered(request_queue_t *, struct request **);
-extern unsigned blk_ordered_cur_seq(request_queue_t *);
+extern int blk_queue_ordered(struct request_queue *, unsigned, prepare_flush_fn *);
+extern void blk_queue_issue_flush_fn(struct request_queue *, issue_flush_fn *);
+extern int blk_do_ordered(struct request_queue *, struct request **);
+extern unsigned blk_ordered_cur_seq(struct request_queue *);
 extern unsigned blk_ordered_req_seq(struct request *);
-extern void blk_ordered_complete_seq(request_queue_t *, unsigned, int);
+extern void blk_ordered_complete_seq(struct request_queue *, unsigned, int);
 
-extern int blk_rq_map_sg(request_queue_t *, struct request *, struct scatterlist *);
+extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
 extern void blk_dump_rq_flags(struct request *, char *);
-extern void generic_unplug_device(request_queue_t *);
-extern void __generic_unplug_device(request_queue_t *);
+extern void generic_unplug_device(struct request_queue *);
+extern void __generic_unplug_device(struct request_queue *);
 extern long nr_blockdev_pages(void);
 
-int blk_get_queue(request_queue_t *);
-request_queue_t *blk_alloc_queue(gfp_t);
-request_queue_t *blk_alloc_queue_node(gfp_t, int);
-extern void blk_put_queue(request_queue_t *);
+int blk_get_queue(struct request_queue *);
+struct request_queue *blk_alloc_queue(gfp_t);
+struct request_queue *blk_alloc_queue_node(gfp_t, int);
+extern void blk_put_queue(struct request_queue *);
 
 /*
  * tag stuff
@@ -796,13 +790,13 @@ extern void blk_put_queue(request_queue_t *);
 #define blk_queue_tag_depth(q)          ((q)->queue_tags->busy)
 #define blk_queue_tag_queue(q)          ((q)->queue_tags->busy < (q)->queue_tags->max_depth)
 #define blk_rq_tagged(rq)               ((rq)->cmd_flags & REQ_QUEUED)
-extern int blk_queue_start_tag(request_queue_t *, struct request *);
-extern struct request *blk_queue_find_tag(request_queue_t *, int);
-extern void blk_queue_end_tag(request_queue_t *, struct request *);
-extern int blk_queue_init_tags(request_queue_t *, int, struct blk_queue_tag *);
-extern void blk_queue_free_tags(request_queue_t *);
-extern int blk_queue_resize_tags(request_queue_t *, int);
-extern void blk_queue_invalidate_tags(request_queue_t *);
+extern int blk_queue_start_tag(struct request_queue *, struct request *);
+extern struct request *blk_queue_find_tag(struct request_queue *, int);
+extern void blk_queue_end_tag(struct request_queue *, struct request *);
+extern int blk_queue_init_tags(struct request_queue *, int, struct blk_queue_tag *);
+extern void blk_queue_free_tags(struct request_queue *);
+extern int blk_queue_resize_tags(struct request_queue *, int);
+extern void blk_queue_invalidate_tags(struct request_queue *);
 extern struct blk_queue_tag *blk_init_tags(int);
 extern void blk_free_tags(struct blk_queue_tag *);
 
@@ -814,7 +808,6 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,
         return bqt->tag_index[tag];
 }
 
-extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
 extern int blkdev_issue_flush(struct block_device *, sector_t *);
 
 #define MAX_PHYS_SEGMENTS 128
@@ -826,7 +819,7 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *);
 
 #define blkdev_entry_to_request(entry) list_entry((entry), struct request, queuelist)
 
-static inline int queue_hardsect_size(request_queue_t *q)
+static inline int queue_hardsect_size(struct request_queue *q)
 {
         int retval = 512;
 
@@ -841,7 +834,7 @@ static inline int bdev_hardsect_size(struct block_device *bdev)
         return queue_hardsect_size(bdev_get_queue(bdev));
 }
 
-static inline int queue_dma_alignment(request_queue_t *q)
+static inline int queue_dma_alignment(struct request_queue *q)
 {
         int retval = 511;
 
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 3680ff9a30ed..7e11d23ac36a 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -105,7 +105,7 @@ struct blk_io_trace {
  */
 struct blk_io_trace_remap {
         __be32 device;
-        u32 __pad;
+        __be32 device_from;
         __be64 sector;
 };
 
@@ -142,10 +142,14 @@ struct blk_user_trace_setup {
         u32 pid;
 };
 
+#ifdef __KERNEL__
 #if defined(CONFIG_BLK_DEV_IO_TRACE)
 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-extern void blk_trace_shutdown(request_queue_t *);
+extern void blk_trace_shutdown(struct request_queue *);
 extern void __blk_add_trace(struct blk_trace *, sector_t, int, int, u32, int, int, void *);
+extern int do_blk_trace_setup(struct request_queue *q,
+        struct block_device *bdev, struct blk_user_trace_setup *buts);
+
 
 /**
  * blk_add_trace_rq - Add a trace for a request oriented action
@@ -272,6 +276,7 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
                 return;
 
         r.device = cpu_to_be32(dev);
+        r.device_from = cpu_to_be32(bio->bi_bdev->bd_dev);
         r.sector = cpu_to_be64(to);
 
         __blk_add_trace(bt, from, bio->bi_size, bio->bi_rw, BLK_TA_REMAP, !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r);
@@ -285,6 +290,7 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
 #define blk_add_trace_generic(q, rq, rw, what)  do { } while (0)
 #define blk_add_trace_pdu_int(q, what, bio, pdu)        do { } while (0)
 #define blk_add_trace_remap(q, bio, dev, f, t)  do {} while (0)
+#define do_blk_trace_setup(q, bdev, buts)       (-ENOTTY)
 #endif /* CONFIG_BLK_DEV_IO_TRACE */
-
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index 8547b10c388b..60e377b520f8 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -15,14 +15,18 @@ struct sg_io_v4 {
 
         __u32 request_len;      /* [i] in bytes */
         __u64 request;          /* [i], [*i] {SCSI: cdb} */
+        __u64 request_tag;      /* [i] {SCSI: task tag (only if flagged)} */
         __u32 request_attr;     /* [i] {SCSI: task attribute} */
-        __u32 request_tag;      /* [i] {SCSI: task tag (only if flagged)} */
         __u32 request_priority; /* [i] {SCSI: task priority} */
+        __u32 request_extra;    /* [i] {spare, for padding} */
         __u32 max_response_len; /* [i] in bytes */
         __u64 response;         /* [i], [*o] {SCSI: (auto)sense data} */
 
-        /* "din_" for data in (from device); "dout_" for data out (to device) */
+        /* "dout_": data out (to device); "din_": data in (from device) */
+        __u32 dout_iovec_count; /* [i] 0 -> "flat" dout transfer else
+                                   dout_xfer points to array of iovec */
         __u32 dout_xfer_len;    /* [i] bytes to be transferred to device */
+        __u32 din_iovec_count;  /* [i] 0 -> "flat" din transfer */
         __u32 din_xfer_len;     /* [i] bytes to be transferred from device */
         __u64 dout_xferp;       /* [i], [*i] */
         __u64 din_xferp;        /* [i], [*o] */
@@ -39,8 +43,9 @@ struct sg_io_v4 {
         __u32 info;             /* [o] additional information */
         __u32 duration;         /* [o] time to complete, in milliseconds */
         __u32 response_len;     /* [o] bytes of response actually written */
-        __s32 din_resid;        /* [o] actual_din_xfer_len - din_xfer_len */
-        __u32 generated_tag;    /* [o] {SCSI: task tag that transport chose} */
+        __s32 din_resid;        /* [o] din_xfer_len - actual_din_xfer_len */
+        __s32 dout_resid;       /* [o] dout_xfer_len - actual_dout_xfer_len */
+        __u64 generated_tag;    /* [o] {SCSI: transport generated task tag} */
         __u32 spare_out;        /* [o] */
 
         __u32 padding;
@@ -53,15 +58,19 @@ struct bsg_class_device {
         struct class_device *class_dev;
         struct device *dev;
         int minor;
-        struct list_head list;
         struct request_queue *queue;
 };
 
-extern int bsg_register_queue(struct request_queue *, const char *);
+extern int bsg_register_queue(struct request_queue *, struct device *, const char *);
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-#define bsg_register_queue(disk, name)          (0)
-#define bsg_unregister_queue(disk)      do { } while (0)
+static inline int bsg_register_queue(struct request_queue * rq, struct device *dev, const char *name)
+{
+        return 0;
+}
+static inline void bsg_unregister_queue(struct request_queue *rq)
+{
+}
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 5c6e12853a9b..35cadad84b14 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -209,6 +209,8 @@ int cont_prepare_write(struct page*, unsigned, unsigned, get_block_t*,
 int generic_cont_expand(struct inode *inode, loff_t size);
 int generic_cont_expand_simple(struct inode *inode, loff_t size);
 int block_commit_write(struct page *page, unsigned from, unsigned to);
+int block_page_mkwrite(struct vm_area_struct *vma, struct page *page,
+                                get_block_t get_block);
 void block_sync_page(struct page *);
 sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
 int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 8486e78f7335..d2ddea926895 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -8,7 +8,7 @@
 #ifndef _LINUX_CLOCKCHIPS_H
 #define _LINUX_CLOCKCHIPS_H
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
 
 #include <linux/clocksource.h>
 #include <linux/cpumask.h>
@@ -23,6 +23,7 @@ enum clock_event_mode {
         CLOCK_EVT_MODE_SHUTDOWN,
         CLOCK_EVT_MODE_PERIODIC,
         CLOCK_EVT_MODE_ONESHOT,
+        CLOCK_EVT_MODE_RESUME,
 };
 
 /* Clock event notification values */
@@ -119,22 +120,20 @@ extern void clockevents_register_device(struct clock_event_device *dev);
 
 extern void clockevents_exchange_device(struct clock_event_device *old,
                                         struct clock_event_device *new);
-extern
-struct clock_event_device *clockevents_request_device(unsigned int features,
-                                                      cpumask_t cpumask);
-extern void clockevents_release_device(struct clock_event_device *dev);
 extern void clockevents_set_mode(struct clock_event_device *dev,
                                  enum clock_event_mode mode);
 extern int clockevents_register_notifier(struct notifier_block *nb);
-extern void clockevents_unregister_notifier(struct notifier_block *nb);
 extern int clockevents_program_event(struct clock_event_device *dev,
                                      ktime_t expires, ktime_t now);
 
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
-
 #else
+# define clockevents_notify(reason, arg) do { } while (0)
+#endif
+
+#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
 
-static inline void clockevents_resume_events(void) { }
 #define clockevents_notify(reason, arg) do { } while (0)
 
 #endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index bf297b03a4e4..16ea3374dddf 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -67,6 +67,12 @@ struct clocksource {
         unsigned long flags;
         cycle_t (*vread)(void);
         void (*resume)(void);
+#ifdef CONFIG_IA64
+        void *fsys_mmio;        /* used by fsyscall asm code */
+#define CLKSRC_FSYS_MMIO_SET(mmio, addr)      ((mmio) = (addr))
+#else
+#define CLKSRC_FSYS_MMIO_SET(mmio, addr)      do { } while (0)
+#endif
 
         /* timekeeping specific data, ignore */
         cycle_t cycle_interval;
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
index e4ac016ad272..1c47a34aa794 100644
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
@@ -36,16 +36,12 @@ extern const struct file_operations coda_ioctl_operations;
 
 /* operations shared over more than one file */
 int coda_open(struct inode *i, struct file *f);
-int coda_flush(struct file *f, fl_owner_t id);
 int coda_release(struct inode *i, struct file *f);
 int coda_permission(struct inode *inode, int mask, struct nameidata *nd);
 int coda_revalidate_inode(struct dentry *);
 int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 int coda_setattr(struct dentry *, struct iattr *);
 
-/* global variables */
-extern int coda_fake_statfs;
-
 /* this file:  heloers */
 static __inline__ struct CodaFid *coda_i2f(struct inode *);
 static __inline__ char *coda_i2s(struct inode *);
diff --git a/include/linux/coda_proc.h b/include/linux/coda_proc.h
deleted file mode 100644
index 0dc1b0458e75..000000000000
--- a/include/linux/coda_proc.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * coda_statis.h
- * 
- * CODA operation statistics
- *
- * (c) March, 1998
- * by Michihiro Kuramochi, Zhenyu Xia and Zhanyong Wan
- * zhanyong.wan@yale.edu
- *
- */
-
-#ifndef _CODA_PROC_H
-#define _CODA_PROC_H
-
-void coda_sysctl_init(void);
-void coda_sysctl_clean(void);
-
-#include <linux/sysctl.h>
-#include <linux/coda_fs_i.h>
-#include <linux/coda.h>
-
-/* these four files are presented to show the result of the statistics:
- *
- *      /proc/fs/coda/vfs_stats
- *                    cache_inv_stats
- *
- * these four files are presented to reset the statistics to 0:
- *
- *      /proc/sys/coda/vfs_stats
- *                     cache_inv_stats
- */
-
-/* VFS operation statistics */
-struct coda_vfs_stats 
-{
-        /* file operations */
-        int open;
-        int flush;
-        int release;
-        int fsync;
-
-        /* dir operations */
-        int readdir;
-  
-        /* inode operations */
-        int create;
-        int lookup;
-        int link;
-        int unlink;
-        int symlink;
-        int mkdir;
-        int rmdir;
-        int rename;
-        int permission;
-
-        /* symlink operatoins*/
-        int follow_link;
-        int readlink;
-};
-
-/* cache invalidation statistics */
-struct coda_cache_inv_stats
-{
-        int flush;
-        int purge_user;
-        int zap_dir;
-        int zap_file;
-        int zap_vnode;
-        int purge_fid;
-        int replace;
-};
-
-/* these global variables hold the actual statistics data */
-extern struct coda_vfs_stats            coda_vfs_stat;
-
-#endif /* _CODA_PROC_H */
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index b541bb3d1f4b..07ae8f846055 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -8,11 +8,6 @@
 
 struct kstatfs;
 
-struct coda_sb_info
-{
-        struct venus_comm *sbi_vcomm;
-};
-
 /* communication pending/processing queues */
 struct venus_comm {
         u_long              vc_seq;
@@ -24,9 +19,9 @@ struct venus_comm {
 };
 
 
-static inline struct coda_sb_info *coda_sbp(struct super_block *sb)
+static inline struct venus_comm *coda_vcp(struct super_block *sb)
 {
-    return ((struct coda_sb_info *)((sb)->s_fs_info));
+        return (struct venus_comm *)((sb)->s_fs_info);
 }
 
 
@@ -38,9 +33,6 @@ int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *);
 int venus_lookup(struct super_block *sb, struct CodaFid *fid, 
                  const char *name, int length, int *type, 
                  struct CodaFid *resfid);
-int venus_store(struct super_block *sb, struct CodaFid *fid, int flags,
-                vuid_t uid);
-int venus_release(struct super_block *sb, struct CodaFid *fid, int flags);
 int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
                 vuid_t uid);
 int venus_open(struct super_block *sb, struct CodaFid *fid, int flags,
@@ -74,8 +66,6 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
 
 
 /* messages between coda filesystem in kernel and Venus */
-extern int coda_hard;
-extern unsigned long coda_timeout;
 struct upc_req {
         struct list_head    uc_chain;
         caddr_t             uc_data;
@@ -85,7 +75,6 @@ struct upc_req {
         u_short             uc_opcode;  /* copied from data to save lookup */
         int                 uc_unique;
         wait_queue_head_t   uc_sleep;   /* process' wait queue */
-        unsigned long       uc_posttime;
 };
 
 #define REQ_ASYNC  0x1
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index a03e9398a6c2..14f7494280f0 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -23,3 +23,21 @@
  * code
  */
 #define uninitialized_var(x) x = x
+
+#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+/* Mark functions as cold. gcc will assume any path leading to a call
+   to them will be unlikely.  This means a lot of manual unlikely()s
+   are unnecessary now for any paths leading to the usual suspects
+   like BUG(), printk(), panic() etc. [but let's keep them for now for
+   older compilers]
+
+   Early snapshots of gcc 4.3 don't support this and we can't detect this
+   in the preprocessor, but we can live with this because they're unreleased.
+   Maketime probing would be overkill here.
+
+   gcc also has a __attribute__((__hot__)) to move hot functions into
+   a special section, but I don't see any sense in this right now in
+   the kernel context */
+#define __cold                  __attribute__((__cold__))
+
+#endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 8287a72bb6a9..86f9a3a6137d 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -15,8 +15,8 @@
 # define __acquire(x)   __context__(x,1)
 # define __release(x)   __context__(x,-1)
 # define __cond_lock(x,c)       ((c) ? ({ __acquire(x); 1; }) : 0)
-extern void __chk_user_ptr(const void __user *);
-extern void __chk_io_ptr(const void __iomem *);
+extern void __chk_user_ptr(const volatile void __user *);
+extern void __chk_io_ptr(const volatile void __iomem *);
 #else
 # define __user
 # define __kernel
@@ -174,4 +174,13 @@ extern void __chk_io_ptr(const void __iomem *);
 # define __attribute_const__    /* unimplemented */
 #endif
 
+/*
+ * Tell gcc if a function is cold. The compiler will assume any path
+ * directly leading to the call is unlikely.
+ */
+
+#ifndef __cold
+#define __cold
+#endif
+
 #endif /* __LINUX_COMPILER_H */
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 10eb56b2940a..b62f823e90cf 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -153,7 +153,7 @@ struct cn_dev {
 
         u32 seq, groups;
         struct sock *nls;
-        void (*input) (struct sock * sk, int len);
+        void (*input) (struct sk_buff *skb);
 
         struct cn_queue_dev *cbdev;
 };
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index c2236bbff412..0ad72c4cf312 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -41,8 +41,6 @@ extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr);
 extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs);
 extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs);
 
-extern struct sysdev_attribute attr_sched_mc_power_savings;
-extern struct sysdev_attribute attr_sched_smt_power_savings;
 extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -128,16 +126,16 @@ static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
 static inline int cpu_is_offline(int cpu) { return 0; }
 #endif          /* CONFIG_HOTPLUG_CPU */
 
-#ifdef CONFIG_SUSPEND_SMP
+#ifdef CONFIG_PM_SLEEP_SMP
 extern int suspend_cpu_hotplug;
 
 extern int disable_nonboot_cpus(void);
 extern void enable_nonboot_cpus(void);
-#else
+#else /* !CONFIG_PM_SLEEP_SMP */
 #define suspend_cpu_hotplug     0
 
 static inline int disable_nonboot_cpus(void) { return 0; }
 static inline void enable_nonboot_cpus(void) {}
-#endif
+#endif /* !CONFIG_PM_SLEEP_SMP */
 
 #endif /* _LINUX_CPU_H_ */
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 963051a967d6..23932d7741a9 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -32,20 +32,24 @@
  *                     CPUFREQ NOTIFIER INTERFACE                    *
  *********************************************************************/
 
+#define CPUFREQ_TRANSITION_NOTIFIER     (0)
+#define CPUFREQ_POLICY_NOTIFIER         (1)
+
 #ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);
-#else
+int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
+#else           /* CONFIG_CPU_FREQ */
 static inline int cpufreq_register_notifier(struct notifier_block *nb,
                                                 unsigned int list)
 {
         return 0;
 }
-#endif
-int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list);
-
-#define CPUFREQ_TRANSITION_NOTIFIER     (0)
-#define CPUFREQ_POLICY_NOTIFIER         (1)
-
+static inline int cpufreq_unregister_notifier(struct notifier_block *nb,
+                                                unsigned int list)
+{
+        return 0;
+}
+#endif          /* CONFIG_CPU_FREQ */
 
 /* if (cpufreq_driver->target) exists, the ->governor decides what frequency
  * within the limits is used. If (cpufreq_driver->setpolicy> exists, these
@@ -163,6 +167,9 @@ struct cpufreq_governor {
         char    name[CPUFREQ_NAME_LEN];
         int     (*governor)     (struct cpufreq_policy *policy,
                                  unsigned int event);
+        unsigned int max_transition_latency; /* HW must be able to switch to
+                        next freq faster than this value in nano secs or we
+                        will fallback to performance governor */
         struct list_head        governor_list;
         struct module           *owner;
 };
@@ -268,22 +275,17 @@ struct freq_attr {
 int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
 int cpufreq_update_policy(unsigned int cpu);
 
+/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */
+unsigned int cpufreq_get(unsigned int cpu);
 
-/*
- * query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it
- */
+/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */
 #ifdef CONFIG_CPU_FREQ
 unsigned int cpufreq_quick_get(unsigned int cpu);
-unsigned int cpufreq_get(unsigned int cpu);
 #else
 static inline unsigned int cpufreq_quick_get(unsigned int cpu)
 {
         return 0;
 }
-static inline unsigned int cpufreq_get(unsigned int cpu)
-{
-        return 0;
-}
 #endif
 
 
@@ -292,12 +294,24 @@ static inline unsigned int cpufreq_get(unsigned int cpu)
  *********************************************************************/
 
 
-#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
+/*
+  Performance governor is fallback governor if any other gov failed to
+  auto load due latency restrictions
+*/
+#ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE
 extern struct cpufreq_governor cpufreq_gov_performance;
-#define CPUFREQ_DEFAULT_GOVERNOR        &cpufreq_gov_performance
+#endif
+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
+#define CPUFREQ_DEFAULT_GOVERNOR        (&cpufreq_gov_performance)
 #elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE)
 extern struct cpufreq_governor cpufreq_gov_userspace;
-#define CPUFREQ_DEFAULT_GOVERNOR        &cpufreq_gov_userspace
+#define CPUFREQ_DEFAULT_GOVERNOR        (&cpufreq_gov_userspace)
+#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND)
+extern struct cpufreq_governor cpufreq_gov_ondemand;
+#define CPUFREQ_DEFAULT_GOVERNOR        (&cpufreq_gov_ondemand)
+#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE)
+extern struct cpufreq_governor cpufreq_gov_conservative;
+#define CPUFREQ_DEFAULT_GOVERNOR        (&cpufreq_gov_conservative)
 #endif
 
 
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 357e8cfedc37..fc32694287e2 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -34,6 +34,7 @@
 #define CRYPTO_ALG_TYPE_HASH            0x00000003
 #define CRYPTO_ALG_TYPE_BLKCIPHER       0x00000004
 #define CRYPTO_ALG_TYPE_COMPRESS        0x00000005
+#define CRYPTO_ALG_TYPE_AEAD            0x00000006
 
 #define CRYPTO_ALG_TYPE_HASH_MASK       0x0000000e
 
@@ -91,9 +92,9 @@
 struct scatterlist;
 struct crypto_ablkcipher;
 struct crypto_async_request;
+struct crypto_aead;
 struct crypto_blkcipher;
 struct crypto_hash;
-struct crypto_queue;
 struct crypto_tfm;
 struct crypto_type;
 
@@ -121,6 +122,32 @@ struct ablkcipher_request {
         void *__ctx[] CRYPTO_MINALIGN_ATTR;
 };
 
+/**
+ *      struct aead_request - AEAD request
+ *      @base: Common attributes for async crypto requests
+ *      @assoclen: Length in bytes of associated data for authentication
+ *      @cryptlen: Length of data to be encrypted or decrypted
+ *      @iv: Initialisation vector
+ *      @assoc: Associated data
+ *      @src: Source data
+ *      @dst: Destination data
+ *      @__ctx: Start of private context data
+ */
+struct aead_request {
+        struct crypto_async_request base;
+
+        unsigned int assoclen;
+        unsigned int cryptlen;
+
+        u8 *iv;
+
+        struct scatterlist *assoc;
+        struct scatterlist *src;
+        struct scatterlist *dst;
+
+        void *__ctx[] CRYPTO_MINALIGN_ATTR;
+};
+
 struct blkcipher_desc {
         struct crypto_blkcipher *tfm;
         void *info;
@@ -150,13 +177,21 @@ struct ablkcipher_alg {
         int (*encrypt)(struct ablkcipher_request *req);
         int (*decrypt)(struct ablkcipher_request *req);
 
-        struct crypto_queue *queue;
-
         unsigned int min_keysize;
         unsigned int max_keysize;
         unsigned int ivsize;
 };
 
+struct aead_alg {
+        int (*setkey)(struct crypto_aead *tfm, const u8 *key,
+                      unsigned int keylen);
+        int (*encrypt)(struct aead_request *req);
+        int (*decrypt)(struct aead_request *req);
+
+        unsigned int ivsize;
+        unsigned int authsize;
+};
+
 struct blkcipher_alg {
         int (*setkey)(struct crypto_tfm *tfm, const u8 *key,
                       unsigned int keylen);
@@ -212,6 +247,7 @@ struct compress_alg {
 };
 
 #define cra_ablkcipher  cra_u.ablkcipher
+#define cra_aead        cra_u.aead
 #define cra_blkcipher   cra_u.blkcipher
 #define cra_cipher      cra_u.cipher
 #define cra_digest      cra_u.digest
@@ -237,6 +273,7 @@ struct crypto_alg {
 
         union {
                 struct ablkcipher_alg ablkcipher;
+                struct aead_alg aead;
                 struct blkcipher_alg blkcipher;
                 struct cipher_alg cipher;
                 struct digest_alg digest;
@@ -284,6 +321,16 @@ struct ablkcipher_tfm {
         unsigned int reqsize;
 };
 
+struct aead_tfm {
+        int (*setkey)(struct crypto_aead *tfm, const u8 *key,
+                      unsigned int keylen);
+        int (*encrypt)(struct aead_request *req);
+        int (*decrypt)(struct aead_request *req);
+        unsigned int ivsize;
+        unsigned int authsize;
+        unsigned int reqsize;
+};
+
 struct blkcipher_tfm {
         void *iv;
         int (*setkey)(struct crypto_tfm *tfm, const u8 *key,
@@ -323,6 +370,7 @@ struct compress_tfm {
 };
 
 #define crt_ablkcipher  crt_u.ablkcipher
+#define crt_aead        crt_u.aead
 #define crt_blkcipher   crt_u.blkcipher
 #define crt_cipher      crt_u.cipher
 #define crt_hash        crt_u.hash
@@ -334,6 +382,7 @@ struct crypto_tfm {
         
         union {
                 struct ablkcipher_tfm ablkcipher;
+                struct aead_tfm aead;
                 struct blkcipher_tfm blkcipher;
                 struct cipher_tfm cipher;
                 struct hash_tfm hash;
@@ -349,6 +398,10 @@ struct crypto_ablkcipher {
         struct crypto_tfm base;
 };
 
+struct crypto_aead {
+        struct crypto_tfm base;
+};
+
 struct crypto_blkcipher {
         struct crypto_tfm base;
 };
@@ -369,11 +422,15 @@ enum {
         CRYPTOA_UNSPEC,
         CRYPTOA_ALG,
         CRYPTOA_TYPE,
+        CRYPTOA_U32,
         __CRYPTOA_MAX,
 };
 
 #define CRYPTOA_MAX (__CRYPTOA_MAX - 1)
 
+/* Maximum number of (rtattr) parameters for each template. */
+#define CRYPTO_MAX_ATTRS 32
+
 struct crypto_attr_alg {
         char name[CRYPTO_MAX_ALG_NAME];
 };
@@ -383,6 +440,10 @@ struct crypto_attr_type {
         u32 mask;
 };
 
+struct crypto_attr_u32 {
+        u32 num;
+};
+
 /* 
  * Transform user interface.
  */
@@ -563,7 +624,8 @@ static inline int crypto_ablkcipher_decrypt(struct ablkcipher_request *req)
         return crt->decrypt(req);
 }
 
-static inline int crypto_ablkcipher_reqsize(struct crypto_ablkcipher *tfm)
+static inline unsigned int crypto_ablkcipher_reqsize(
+        struct crypto_ablkcipher *tfm)
 {
         return crypto_ablkcipher_crt(tfm)->reqsize;
 }
@@ -619,6 +681,150 @@ static inline void ablkcipher_request_set_crypt(
         req->info = iv;
 }
 
+static inline struct crypto_aead *__crypto_aead_cast(struct crypto_tfm *tfm)
+{
+        return (struct crypto_aead *)tfm;
+}
+
+static inline struct crypto_aead *crypto_alloc_aead(const char *alg_name,
+                                                    u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_AEAD;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+
+        return __crypto_aead_cast(crypto_alloc_base(alg_name, type, mask));
+}
+
+static inline struct crypto_tfm *crypto_aead_tfm(struct crypto_aead *tfm)
+{
+        return &tfm->base;
+}
+
+static inline void crypto_free_aead(struct crypto_aead *tfm)
+{
+        crypto_free_tfm(crypto_aead_tfm(tfm));
+}
+
+static inline struct aead_tfm *crypto_aead_crt(struct crypto_aead *tfm)
+{
+        return &crypto_aead_tfm(tfm)->crt_aead;
+}
+
+static inline unsigned int crypto_aead_ivsize(struct crypto_aead *tfm)
+{
+        return crypto_aead_crt(tfm)->ivsize;
+}
+
+static inline unsigned int crypto_aead_authsize(struct crypto_aead *tfm)
+{
+        return crypto_aead_crt(tfm)->authsize;
+}
+
+static inline unsigned int crypto_aead_blocksize(struct crypto_aead *tfm)
+{
+        return crypto_tfm_alg_blocksize(crypto_aead_tfm(tfm));
+}
+
+static inline unsigned int crypto_aead_alignmask(struct crypto_aead *tfm)
+{
+        return crypto_tfm_alg_alignmask(crypto_aead_tfm(tfm));
+}
+
+static inline u32 crypto_aead_get_flags(struct crypto_aead *tfm)
+{
+        return crypto_tfm_get_flags(crypto_aead_tfm(tfm));
+}
+
+static inline void crypto_aead_set_flags(struct crypto_aead *tfm, u32 flags)
+{
+        crypto_tfm_set_flags(crypto_aead_tfm(tfm), flags);
+}
+
+static inline void crypto_aead_clear_flags(struct crypto_aead *tfm, u32 flags)
+{
+        crypto_tfm_clear_flags(crypto_aead_tfm(tfm), flags);
+}
+
+static inline int crypto_aead_setkey(struct crypto_aead *tfm, const u8 *key,
+                                     unsigned int keylen)
+{
+        return crypto_aead_crt(tfm)->setkey(tfm, key, keylen);
+}
+
+static inline struct crypto_aead *crypto_aead_reqtfm(struct aead_request *req)
+{
+        return __crypto_aead_cast(req->base.tfm);
+}
+
+static inline int crypto_aead_encrypt(struct aead_request *req)
+{
+        return crypto_aead_crt(crypto_aead_reqtfm(req))->encrypt(req);
+}
+
+static inline int crypto_aead_decrypt(struct aead_request *req)
+{
+        return crypto_aead_crt(crypto_aead_reqtfm(req))->decrypt(req);
+}
+
+static inline unsigned int crypto_aead_reqsize(struct crypto_aead *tfm)
+{
+        return crypto_aead_crt(tfm)->reqsize;
+}
+
+static inline void aead_request_set_tfm(struct aead_request *req,
+                                        struct crypto_aead *tfm)
+{
+        req->base.tfm = crypto_aead_tfm(tfm);
+}
+
+static inline struct aead_request *aead_request_alloc(struct crypto_aead *tfm,
+                                                      gfp_t gfp)
+{
+        struct aead_request *req;
+
+        req = kmalloc(sizeof(*req) + crypto_aead_reqsize(tfm), gfp);
+
+        if (likely(req))
+                aead_request_set_tfm(req, tfm);
+
+        return req;
+}
+
+static inline void aead_request_free(struct aead_request *req)
+{
+        kfree(req);
+}
+
+static inline void aead_request_set_callback(struct aead_request *req,
+                                             u32 flags,
+                                             crypto_completion_t complete,
+                                             void *data)
+{
+        req->base.complete = complete;
+        req->base.data = data;
+        req->base.flags = flags;
+}
+
+static inline void aead_request_set_crypt(struct aead_request *req,
+                                          struct scatterlist *src,
+                                          struct scatterlist *dst,
+                                          unsigned int cryptlen, u8 *iv)
+{
+        req->src = src;
+        req->dst = dst;
+        req->cryptlen = cryptlen;
+        req->iv = iv;
+}
+
+static inline void aead_request_set_assoc(struct aead_request *req,
+                                          struct scatterlist *assoc,
+                                          unsigned int assoclen)
+{
+        req->assoc = assoc;
+        req->assoclen = assoclen;
+}
+
 static inline struct crypto_blkcipher *__crypto_blkcipher_cast(
         struct crypto_tfm *tfm)
 {
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index fda2148d8c85..f3fc4392e93d 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -56,10 +56,9 @@ struct dccp_hdr_ext {
 };
 
 /**
- * struct dccp_hdr_request - Conection initiation request header
+ * struct dccp_hdr_request - Connection initiation request header
  *
  * @dccph_req_service - Service to which the client app wants to connect
- * @dccph_req_options - list of options (must be a multiple of 32 bits
  */
 struct dccp_hdr_request {
         __be32  dccph_req_service;
@@ -76,12 +75,10 @@ struct dccp_hdr_ack_bits {
         __be32  dccph_ack_nr_low;
 };
 /**
- * struct dccp_hdr_response - Conection initiation response header
+ * struct dccp_hdr_response - Connection initiation response header
  *
- * @dccph_resp_ack_nr_high - 48 bit ack number high order bits, contains GSR
- * @dccph_resp_ack_nr_low - 48 bit ack number low order bits, contains GSR
+ * @dccph_resp_ack - 48 bit Acknowledgment Number Subheader (5.3)
  * @dccph_resp_service - Echoes the Service Code on a received DCCP-Request
- * @dccph_resp_options - list of options (must be a multiple of 32 bits
  */
 struct dccp_hdr_response {
         struct dccp_hdr_ack_bits        dccph_resp_ack;
@@ -91,8 +88,9 @@ struct dccp_hdr_response {
 /**
  * struct dccp_hdr_reset - Unconditionally shut down a connection
  *
- * @dccph_reset_service - Echoes the Service Code on a received DCCP-Request
- * @dccph_reset_options - list of options (must be a multiple of 32 bits
+ * @dccph_reset_ack - 48 bit Acknowledgment Number Subheader (5.6)
+ * @dccph_reset_code - one of %dccp_reset_codes
+ * @dccph_reset_data - the Data 1 ... Data 3 fields from 5.6
  */
 struct dccp_hdr_reset {
         struct dccp_hdr_ack_bits        dccph_reset_ack;
@@ -204,6 +202,7 @@ struct dccp_so_feat {
 #define DCCP_SOCKOPT_SERVICE            2
 #define DCCP_SOCKOPT_CHANGE_L           3
 #define DCCP_SOCKOPT_CHANGE_R           4
+#define DCCP_SOCKOPT_GET_CUR_MPS        5
 #define DCCP_SOCKOPT_SEND_CSCOV         10
 #define DCCP_SOCKOPT_RECV_CSCOV         11
 #define DCCP_SOCKOPT_CCID_RX_INFO       128
@@ -215,6 +214,7 @@ struct dccp_so_feat {
 #ifdef __KERNEL__
 
 #include <linux/in.h>
+#include <linux/ktime.h>
 #include <linux/list.h>
 #include <linux/uio.h>
 #include <linux/workqueue.h>
@@ -391,7 +391,6 @@ struct dccp_opt_pend {
         struct dccp_opt_conf    *dccpop_sc;
 };
 
-extern void __dccp_minisock_init(struct dccp_minisock *dmsk);
 extern void dccp_minisock_init(struct dccp_minisock *dmsk);
 
 extern int dccp_parse_options(struct sock *sk, struct sk_buff *skb);
@@ -471,6 +470,7 @@ struct dccp_ackvec;
  * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)
  * @dccps_ndp_count - number of Non Data Packets since last data packet
  * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)
+ * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)
  * @dccps_minisock - associated minisock (accessed via dccp_msk)
  * @dccps_hc_rx_ackvec - rx half connection ack vector
  * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)
@@ -498,7 +498,7 @@ struct dccp_sock {
         __u64                           dccps_gar;
         __be32                          dccps_service;
         struct dccp_service_list        *dccps_service_list;
-        struct timeval                  dccps_timestamp_time;
+        ktime_t                         dccps_timestamp_time;
         __u32                           dccps_timestamp_echo;
         __u16                           dccps_l_ack_ratio;
         __u16                           dccps_r_ack_ratio;
@@ -506,12 +506,12 @@ struct dccp_sock {
         __u16                           dccps_pcrlen;
         unsigned long                   dccps_ndp_count;
         __u32                           dccps_mss_cache;
+        unsigned long                   dccps_rate_last;
         struct dccp_minisock            dccps_minisock;
         struct dccp_ackvec              *dccps_hc_rx_ackvec;
         struct ccid                     *dccps_hc_rx_ccid;
         struct ccid                     *dccps_hc_tx_ccid;
         struct dccp_options_received    dccps_options_received;
-        struct timeval                  dccps_epoch;
         enum dccp_role                  dccps_role:2;
         __u8                            dccps_hc_rx_insert_options:1;
         __u8                            dccps_hc_tx_insert_options:1;
diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h
index 0fe7cdf326f7..98c69ab80c84 100644
--- a/include/linux/dcookies.h
+++ b/include/linux/dcookies.h
@@ -12,6 +12,7 @@
 
 #ifdef CONFIG_PROFILING
  
+#include <linux/dcache.h>
 #include <linux/types.h>
  
 struct dcookie_user;
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 104e51e20e14..f592d6de3b97 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -49,6 +49,12 @@ struct dentry *debugfs_create_u32(const char *name, mode_t mode,
                                   struct dentry *parent, u32 *value);
 struct dentry *debugfs_create_u64(const char *name, mode_t mode,
                                   struct dentry *parent, u64 *value);
+struct dentry *debugfs_create_x8(const char *name, mode_t mode,
+                                 struct dentry *parent, u8 *value);
+struct dentry *debugfs_create_x16(const char *name, mode_t mode,
+                                  struct dentry *parent, u16 *value);
+struct dentry *debugfs_create_x32(const char *name, mode_t mode,
+                                  struct dentry *parent, u32 *value);
 struct dentry *debugfs_create_bool(const char *name, mode_t mode,
                                   struct dentry *parent, u32 *value);
 
@@ -122,6 +128,27 @@ static inline struct dentry *debugfs_create_u64(const char *name, mode_t mode,
         return ERR_PTR(-ENODEV);
 }
 
+static inline struct dentry *debugfs_create_x8(const char *name, mode_t mode,
+                                               struct dentry *parent,
+                                               u8 *value)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline struct dentry *debugfs_create_x16(const char *name, mode_t mode,
+                                                struct dentry *parent,
+                                                u16 *value)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode,
+                                                struct dentry *parent,
+                                                u32 *value)
+{
+        return ERR_PTR(-ENODEV);
+}
+
 static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode,
                                                  struct dentry *parent,
                                                  u32 *value)
diff --git a/include/linux/device.h b/include/linux/device.h
index be2debed70d2..2e15822fe409 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -64,12 +64,9 @@ struct bus_type {
         struct bus_attribute    * bus_attrs;
         struct device_attribute * dev_attrs;
         struct driver_attribute * drv_attrs;
-        struct bus_attribute drivers_autoprobe_attr;
-        struct bus_attribute drivers_probe_attr;
 
         int             (*match)(struct device * dev, struct device_driver * drv);
-        int             (*uevent)(struct device *dev, char **envp,
-                                  int num_envp, char *buffer, int buffer_size);
+        int             (*uevent)(struct device *dev, struct kobj_uevent_env *env);
         int             (*probe)(struct device * dev);
         int             (*remove)(struct device * dev);
         void            (*shutdown)(struct device * dev);
@@ -189,10 +186,8 @@ struct class {
         struct class_device_attribute   * class_dev_attrs;
         struct device_attribute         * dev_attrs;
 
-        int     (*uevent)(struct class_device *dev, char **envp,
-                           int num_envp, char *buffer, int buffer_size);
-        int     (*dev_uevent)(struct device *dev, char **envp, int num_envp,
-                                char *buffer, int buffer_size);
+        int     (*uevent)(struct class_device *dev, struct kobj_uevent_env *env);
+        int     (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
 
         void    (*release)(struct class_device *dev);
         void    (*class_release)(struct class *class);
@@ -268,8 +263,7 @@ struct class_device {
         struct attribute_group  ** groups;      /* optional groups */
 
         void    (*release)(struct class_device *dev);
-        int     (*uevent)(struct class_device *dev, char **envp,
-                           int num_envp, char *buffer, int buffer_size);
+        int     (*uevent)(struct class_device *dev, struct kobj_uevent_env *env);
         char    class_id[BUS_ID_SIZE];  /* unique to this class */
 };
 
@@ -337,8 +331,7 @@ extern void class_device_destroy(struct class *cls, dev_t devt);
 struct device_type {
         const char *name;
         struct attribute_group **groups;
-        int (*uevent)(struct device *dev, char **envp, int num_envp,
-                      char *buffer, int buffer_size);
+        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
         void (*release)(struct device *dev);
         int (*suspend)(struct device * dev, pm_message_t state);
         int (*resume)(struct device * dev);
@@ -551,6 +544,9 @@ extern void put_device(struct device * dev);
 /* drivers/base/power/shutdown.c */
 extern void device_shutdown(void);
 
+/* drivers/base/sys.c */
+extern void sysdev_shutdown(void);
+
 
 /* drivers/base/firmware.c */
 extern int __must_check firmware_register(struct kset *);
@@ -572,6 +568,16 @@ dev_dbg(struct device * dev, const char * fmt, ...)
 }
 #endif
 
+#ifdef VERBOSE_DEBUG
+#define dev_vdbg        dev_dbg
+#else
+static inline int __attribute__ ((format (printf, 2, 3)))
+dev_vdbg(struct device * dev, const char * fmt, ...)
+{
+        return 0;
+}
+#endif
+
 #define dev_err(dev, format, arg...)            \
         dev_printk(KERN_ERR , dev , format , ## arg)
 #define dev_info(dev, format, arg...)           \
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index b8ac7b01c45e..00fc7a9c35ec 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -54,7 +54,7 @@ struct dmi_strmatch {
 };
 
 struct dmi_system_id {
-        int (*callback)(struct dmi_system_id *);
+        int (*callback)(const struct dmi_system_id *);
         const char *ident;
         struct dmi_strmatch matches[4];
         void *driver_data;
@@ -71,22 +71,22 @@ struct dmi_device {
 
 #ifdef CONFIG_DMI
 
-extern int dmi_check_system(struct dmi_system_id *list);
-extern char * dmi_get_system_info(int field);
-extern struct dmi_device * dmi_find_device(int type, const char *name,
-        struct dmi_device *from);
+extern int dmi_check_system(const struct dmi_system_id *list);
+extern const char * dmi_get_system_info(int field);
+extern const struct dmi_device * dmi_find_device(int type, const char *name,
+        const struct dmi_device *from);
 extern void dmi_scan_machine(void);
 extern int dmi_get_year(int field);
-extern int dmi_name_in_vendors(char *str);
+extern int dmi_name_in_vendors(const char *str);
 
 #else
 
-static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
-static inline char * dmi_get_system_info(int field) { return NULL; }
-static inline struct dmi_device * dmi_find_device(int type, const char *name,
-        struct dmi_device *from) { return NULL; }
+static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; }
+static inline const char * dmi_get_system_info(int field) { return NULL; }
+static inline const struct dmi_device * dmi_find_device(int type, const char *name,
+        const struct dmi_device *from) { return NULL; }
 static inline int dmi_get_year(int year) { return 0; }
-static inline int dmi_name_in_vendors(char *s) { return 0; }
+static inline int dmi_name_in_vendors(const char *s) { return 0; }
 
 #endif
 
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 93e4c3a6d190..50839fe9e39e 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -29,6 +29,7 @@
 #ifdef __KERNEL__
 #include <linux/types.h>
 #else
+#include <asm/types.h>
 #include <stdint.h>
 #include <time.h>
 #endif
diff --git a/include/linux/edac.h b/include/linux/edac.h
new file mode 100644
index 000000000000..eab451e69a91
--- /dev/null
+++ b/include/linux/edac.h
@@ -0,0 +1,29 @@
+/*
+ * Generic EDAC defs
+ *
+ * Author: Dave Jiang <djiang@mvista.com>
+ *
+ * 2006-2007 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ */
+#ifndef _LINUX_EDAC_H_
+#define _LINUX_EDAC_H_
+
+#include <asm/atomic.h>
+
+#define EDAC_OPSTATE_INVAL      -1
+#define EDAC_OPSTATE_POLL       0
+#define EDAC_OPSTATE_NMI        1
+#define EDAC_OPSTATE_INT        2
+
+extern int edac_op_state;
+extern int edac_err_assert;
+extern atomic_t edac_handlers;
+
+extern int edac_handler_set(void);
+extern void edac_atomic_assert_error(void);
+
+#endif
diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h
index d774b7778c91..a55c873e8b66 100644
--- a/include/linux/eeprom_93cx6.h
+++ b/include/linux/eeprom_93cx6.h
@@ -21,13 +21,14 @@
 /*
         Module: eeprom_93cx6
         Abstract: EEPROM reader datastructures for 93cx6 chipsets.
-        Supported chipsets: 93c46 & 93c66.
+        Supported chipsets: 93c46, 93c56 and 93c66.
  */
 
 /*
  * EEPROM operation defines.
  */
 #define PCI_EEPROM_WIDTH_93C46  6
+#define PCI_EEPROM_WIDTH_93C56  8
 #define PCI_EEPROM_WIDTH_93C66  8
 #define PCI_EEPROM_WIDTH_OPCODE 3
 #define PCI_EEPROM_WRITE_OPCODE 0x05
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index e88fcbc77f8f..e8f42133a616 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -5,29 +5,29 @@
 
 #ifdef CONFIG_BLOCK
 
-typedef int (elevator_merge_fn) (request_queue_t *, struct request **,
+typedef int (elevator_merge_fn) (struct request_queue *, struct request **,
                                  struct bio *);
 
-typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struct request *);
+typedef void (elevator_merge_req_fn) (struct request_queue *, struct request *, struct request *);
 
-typedef void (elevator_merged_fn) (request_queue_t *, struct request *, int);
+typedef void (elevator_merged_fn) (struct request_queue *, struct request *, int);
 
-typedef int (elevator_allow_merge_fn) (request_queue_t *, struct request *, struct bio *);
+typedef int (elevator_allow_merge_fn) (struct request_queue *, struct request *, struct bio *);
 
-typedef int (elevator_dispatch_fn) (request_queue_t *, int);
+typedef int (elevator_dispatch_fn) (struct request_queue *, int);
 
-typedef void (elevator_add_req_fn) (request_queue_t *, struct request *);
-typedef int (elevator_queue_empty_fn) (request_queue_t *);
-typedef struct request *(elevator_request_list_fn) (request_queue_t *, struct request *);
-typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *);
-typedef int (elevator_may_queue_fn) (request_queue_t *, int);
+typedef void (elevator_add_req_fn) (struct request_queue *, struct request *);
+typedef int (elevator_queue_empty_fn) (struct request_queue *);
+typedef struct request *(elevator_request_list_fn) (struct request_queue *, struct request *);
+typedef void (elevator_completed_req_fn) (struct request_queue *, struct request *);
+typedef int (elevator_may_queue_fn) (struct request_queue *, int);
 
-typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, gfp_t);
+typedef int (elevator_set_req_fn) (struct request_queue *, struct request *, gfp_t);
 typedef void (elevator_put_req_fn) (struct request *);
-typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
-typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
+typedef void (elevator_activate_req_fn) (struct request_queue *, struct request *);
+typedef void (elevator_deactivate_req_fn) (struct request_queue *, struct request *);
 
-typedef void *(elevator_init_fn) (request_queue_t *);
+typedef void *(elevator_init_fn) (struct request_queue *);
 typedef void (elevator_exit_fn) (elevator_t *);
 
 struct elevator_ops
@@ -94,27 +94,27 @@ struct elevator_queue
 /*
  * block elevator interface
  */
-extern void elv_dispatch_sort(request_queue_t *, struct request *);
-extern void elv_dispatch_add_tail(request_queue_t *, struct request *);
-extern void elv_add_request(request_queue_t *, struct request *, int, int);
-extern void __elv_add_request(request_queue_t *, struct request *, int, int);
-extern void elv_insert(request_queue_t *, struct request *, int);
-extern int elv_merge(request_queue_t *, struct request **, struct bio *);
-extern void elv_merge_requests(request_queue_t *, struct request *,
+extern void elv_dispatch_sort(struct request_queue *, struct request *);
+extern void elv_dispatch_add_tail(struct request_queue *, struct request *);
+extern void elv_add_request(struct request_queue *, struct request *, int, int);
+extern void __elv_add_request(struct request_queue *, struct request *, int, int);
+extern void elv_insert(struct request_queue *, struct request *, int);
+extern int elv_merge(struct request_queue *, struct request **, struct bio *);
+extern void elv_merge_requests(struct request_queue *, struct request *,
                                struct request *);
-extern void elv_merged_request(request_queue_t *, struct request *, int);
-extern void elv_dequeue_request(request_queue_t *, struct request *);
-extern void elv_requeue_request(request_queue_t *, struct request *);
-extern int elv_queue_empty(request_queue_t *);
+extern void elv_merged_request(struct request_queue *, struct request *, int);
+extern void elv_dequeue_request(struct request_queue *, struct request *);
+extern void elv_requeue_request(struct request_queue *, struct request *);
+extern int elv_queue_empty(struct request_queue *);
 extern struct request *elv_next_request(struct request_queue *q);
-extern struct request *elv_former_request(request_queue_t *, struct request *);
-extern struct request *elv_latter_request(request_queue_t *, struct request *);
-extern int elv_register_queue(request_queue_t *q);
-extern void elv_unregister_queue(request_queue_t *q);
-extern int elv_may_queue(request_queue_t *, int);
-extern void elv_completed_request(request_queue_t *, struct request *);
-extern int elv_set_request(request_queue_t *, struct request *, gfp_t);
-extern void elv_put_request(request_queue_t *, struct request *);
+extern struct request *elv_former_request(struct request_queue *, struct request *);
+extern struct request *elv_latter_request(struct request_queue *, struct request *);
+extern int elv_register_queue(struct request_queue *q);
+extern void elv_unregister_queue(struct request_queue *q);
+extern int elv_may_queue(struct request_queue *, int);
+extern void elv_completed_request(struct request_queue *, struct request *);
+extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
+extern void elv_put_request(struct request_queue *, struct request *);
 
 /*
  * io scheduler registration
@@ -125,18 +125,18 @@ extern void elv_unregister(struct elevator_type *);
 /*
  * io scheduler sysfs switching
  */
-extern ssize_t elv_iosched_show(request_queue_t *, char *);
-extern ssize_t elv_iosched_store(request_queue_t *, const char *, size_t);
+extern ssize_t elv_iosched_show(struct request_queue *, char *);
+extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t);
 
-extern int elevator_init(request_queue_t *, char *);
+extern int elevator_init(struct request_queue *, char *);
 extern void elevator_exit(elevator_t *);
 extern int elv_rq_merge_ok(struct request *, struct bio *);
 
 /*
  * Helper functions.
  */
-extern struct request *elv_rb_former_request(request_queue_t *, struct request *);
-extern struct request *elv_rb_latter_request(request_queue_t *, struct request *);
+extern struct request *elv_rb_former_request(struct request_queue *, struct request *);
+extern struct request *elv_rb_latter_request(struct request_queue *, struct request *);
 
 /*
  * rb support functions.
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
index 0311bad838b1..5834e843a946 100644
--- a/include/linux/elf-em.h
+++ b/include/linux/elf-em.h
@@ -20,7 +20,8 @@
 #define EM_PARISC       15      /* HPPA */
 #define EM_SPARC32PLUS  18      /* Sun's "v8plus" */
 #define EM_PPC          20      /* PowerPC */
-#define EM_PPC64        21       /* PowerPC64 */
+#define EM_PPC64        21       /* PowerPC64 */
+#define EM_SPU          23      /* Cell BE SPU */
 #define EM_SH           42      /* SuperH */
 #define EM_SPARCV9      43      /* SPARC v9 64-bit */
 #define EM_IA_64        50      /* HP/Intel IA-64 */
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 8b17ffe222c4..d2da84acf45d 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -389,12 +389,14 @@ extern Elf64_Dyn _DYNAMIC [];
 
 #endif
 
+/* Optional callbacks to write extra ELF notes. */
 #ifndef ARCH_HAVE_EXTRA_ELF_NOTES
-static inline int arch_notes_size(void) { return 0; }
-static inline void arch_write_notes(struct file *file) { }
-
-#define ELF_CORE_EXTRA_NOTES_SIZE arch_notes_size()
-#define ELF_CORE_WRITE_EXTRA_NOTES arch_write_notes(file)
-#endif /* ARCH_HAVE_EXTRA_ELF_NOTES */
+static inline int elf_coredump_extra_notes_size(void) { return 0; }
+static inline int elf_coredump_extra_notes_write(struct file *file,
+                        loff_t *foffset) { return 0; }
+#else
+extern int elf_coredump_extra_notes_size(void);
+extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
+#endif
 
 #endif /* _LINUX_ELF_H */
diff --git a/include/linux/elfnote.h b/include/linux/elfnote.h
index 9a1e0674e56c..e831759b2fb5 100644
--- a/include/linux/elfnote.h
+++ b/include/linux/elfnote.h
@@ -38,17 +38,25 @@
  * e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
  *      ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
  */
-#define ELFNOTE(name, type, desctype, descdata) \
-.pushsection .note.name, "",@note       ;       \
-  .align 4                              ;       \
+#define ELFNOTE_START(name, type, flags)        \
+.pushsection .note.name, flags,@note    ;       \
+  .balign 4                             ;       \
   .long 2f - 1f         /* namesz */    ;       \
-  .long 4f - 3f         /* descsz */    ;       \
+  .long 4484f - 3f      /* descsz */    ;       \
   .long type                            ;       \
 1:.asciz #name                          ;       \
-2:.align 4                              ;       \
-3:desctype descdata                     ;       \
-4:.align 4                              ;       \
+2:.balign 4                             ;       \
+3:
+
+#define ELFNOTE_END                             \
+4484:.balign 4                          ;       \
 .popsection                             ;
+
+#define ELFNOTE(name, type, desc)               \
+        ELFNOTE_START(name, type, "")           \
+                desc                    ;       \
+        ELFNOTE_END
+
 #else   /* !__ASSEMBLER__ */
 #include <linux/elf.h>
 /*
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 6cdb97365e47..b7558ec81ed5 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -29,15 +29,19 @@
 #include <linux/random.h>
 
 #ifdef __KERNEL__
-extern int              eth_header(struct sk_buff *skb, struct net_device *dev,
-                                   unsigned short type, void *daddr,
-                                   void *saddr, unsigned len);
-extern int              eth_rebuild_header(struct sk_buff *skb);
 extern __be16           eth_type_trans(struct sk_buff *skb, struct net_device *dev);
-extern void             eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
-                                                unsigned char * haddr);
-extern int              eth_header_cache(struct neighbour *neigh,
-                                         struct hh_cache *hh);
+extern const struct header_ops eth_header_ops;
+
+extern int eth_header(struct sk_buff *skb, struct net_device *dev,
+                      unsigned short type,
+                      const void *daddr, const void *saddr, unsigned len);
+extern int eth_rebuild_header(struct sk_buff *skb);
+extern int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
+extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh);
+extern void eth_header_cache_update(struct hh_cache *hh,
+                                    const struct net_device *dev,
+                                    const unsigned char *haddr);
+
 
 extern struct net_device *alloc_etherdev_mq(int sizeof_priv, unsigned int queue_count);
 #define alloc_etherdev(sizeof_priv) alloc_etherdev_mq(sizeof_priv, 1)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 3a632244f31b..71d4ada6f315 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -39,7 +39,8 @@ struct ethtool_drvinfo {
         char    bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
                                 /* For PCI devices, use pci_name(pci_dev). */
         char    reserved1[32];
-        char    reserved2[16];
+        char    reserved2[12];
+        __u32   n_priv_flags;   /* number of flags valid in ETHTOOL_GPFLAGS */
         __u32   n_stats;        /* number of u64's from ETHTOOL_GSTATS */
         __u32   testinfo_len;
         __u32   eedump_len;     /* Size of data from ETHTOOL_GEEPROM (bytes) */
@@ -219,6 +220,7 @@ struct ethtool_pauseparam {
 enum ethtool_stringset {
         ETH_SS_TEST             = 0,
         ETH_SS_STATS,
+        ETH_SS_PRIV_FLAGS,
 };
 
 /* for passing string sets for data tagging */
@@ -256,6 +258,19 @@ struct ethtool_perm_addr {
         __u8    data[0];
 };
 
+/* boolean flags controlling per-interface behavior characteristics.
+ * When reading, the flag indicates whether or not a certain behavior
+ * is enabled/present.  When writing, the flag indicates whether
+ * or not the driver should turn on (set) or off (clear) a behavior.
+ *
+ * Some behaviors may read-only (unconditionally absent or present).
+ * If such is the case, return EINVAL in the set-flags operation if the
+ * flag differs from the read-only value.
+ */
+enum ethtool_flags {
+        ETH_FLAG_LRO            = (1 << 15),    /* LRO is enabled */
+};
+
 #ifdef __KERNEL__
 
 struct net_device;
@@ -270,10 +285,10 @@ u32 ethtool_op_get_sg(struct net_device *dev);
 int ethtool_op_set_sg(struct net_device *dev, u32 data);
 u32 ethtool_op_get_tso(struct net_device *dev);
 int ethtool_op_set_tso(struct net_device *dev, u32 data);
-int ethtool_op_get_perm_addr(struct net_device *dev, 
-                             struct ethtool_perm_addr *addr, u8 *data);
 u32 ethtool_op_get_ufo(struct net_device *dev);
 int ethtool_op_set_ufo(struct net_device *dev, u32 data);
+u32 ethtool_op_get_flags(struct net_device *dev);
+int ethtool_op_set_flags(struct net_device *dev, u32 data);
 
 /**
  * &ethtool_ops - Alter and report network device settings
@@ -309,7 +324,8 @@ int ethtool_op_set_ufo(struct net_device *dev, u32 data);
  * get_strings: Return a set of strings that describe the requested objects 
  * phys_id: Identify the device
  * get_stats: Return statistics about the device
- * get_perm_addr: Gets the permanent hardware address
+ * get_flags: get 32-bit flags bitmap
+ * set_flags: set 32-bit flags bitmap
  * 
  * Description:
  *
@@ -362,17 +378,23 @@ struct ethtool_ops {
         int     (*set_sg)(struct net_device *, u32);
         u32     (*get_tso)(struct net_device *);
         int     (*set_tso)(struct net_device *, u32);
-        int     (*self_test_count)(struct net_device *);
         void    (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
         void    (*get_strings)(struct net_device *, u32 stringset, u8 *);
         int     (*phys_id)(struct net_device *, u32);
-        int     (*get_stats_count)(struct net_device *);
         void    (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *, u64 *);
-        int     (*get_perm_addr)(struct net_device *, struct ethtool_perm_addr *, u8 *);
         int     (*begin)(struct net_device *);
         void    (*complete)(struct net_device *);
         u32     (*get_ufo)(struct net_device *);
         int     (*set_ufo)(struct net_device *, u32);
+        u32     (*get_flags)(struct net_device *);
+        int     (*set_flags)(struct net_device *, u32);
+        u32     (*get_priv_flags)(struct net_device *);
+        int     (*set_priv_flags)(struct net_device *, u32);
+        int     (*get_sset_count)(struct net_device *, int);
+
+        /* the following hooks are obsolete */
+        int     (*self_test_count)(struct net_device *);/* use get_sset_count */
+        int     (*get_stats_count)(struct net_device *);/* use get_sset_count */
 };
 #endif /* __KERNEL__ */
 
@@ -414,6 +436,10 @@ struct ethtool_ops {
 #define ETHTOOL_SUFO            0x00000022 /* Set UFO enable (ethtool_value) */
 #define ETHTOOL_GGSO            0x00000023 /* Get GSO enable (ethtool_value) */
 #define ETHTOOL_SGSO            0x00000024 /* Set GSO enable (ethtool_value) */
+#define ETHTOOL_GFLAGS          0x00000025 /* Get flags bitmap(ethtool_value) */
+#define ETHTOOL_SFLAGS          0x00000026 /* Set flags bitmap(ethtool_value) */
+#define ETHTOOL_GPFLAGS         0x00000027 /* Get driver-private flags bitmap */
+#define ETHTOOL_SPFLAGS         0x00000028 /* Set driver-private flags bitmap */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
index de1f9f78625a..cdee7aaa57aa 100644
--- a/include/linux/ext4_fs.h
+++ b/include/linux/ext4_fs.h
@@ -71,7 +71,7 @@
 /*
  * Maximal count of links to a file
  */
-#define EXT4_LINK_MAX           32000
+#define EXT4_LINK_MAX           65000
 
 /*
  * Macro-instructions used to manage several block sizes
@@ -102,6 +102,7 @@
                                  EXT4_GOOD_OLD_FIRST_INO : \
                                  (s)->s_first_ino)
 #endif
+#define EXT4_BLOCK_ALIGN(size, blkbits)         ALIGN((size), (1 << (blkbits)))
 
 /*
  * Macro-instructions used to manage fragments
@@ -201,6 +202,7 @@ struct ext4_group_desc
 #define EXT4_STATE_JDATA                0x00000001 /* journaled data exists */
 #define EXT4_STATE_NEW                  0x00000002 /* inode is newly created */
 #define EXT4_STATE_XATTR                0x00000004 /* has in-inode xattrs */
+#define EXT4_STATE_NO_EXPAND            0x00000008 /* No space for expansion */
 
 /* Used to pass group descriptor data when online resize is done */
 struct ext4_new_group_input {
@@ -225,6 +227,11 @@ struct ext4_new_group_data {
         __u32 free_blocks_count;
 };
 
+/*
+ * Following is used by preallocation code to tell get_blocks() that we
+ * want uninitialzed extents.
+ */
+#define EXT4_CREATE_UNINITIALIZED_EXT           2
 
 /*
  * ioctl commands
@@ -237,7 +244,7 @@ struct ext4_new_group_data {
 #define EXT4_IOC_GROUP_ADD              _IOW('f', 8,struct ext4_new_group_input)
 #define EXT4_IOC_GETVERSION_OLD         FS_IOC_GETVERSION
 #define EXT4_IOC_SETVERSION_OLD         FS_IOC_SETVERSION
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
 #define EXT4_IOC_WAIT_FOR_READONLY      _IOR('f', 99, long)
 #endif
 #define EXT4_IOC_GETRSVSZ               _IOR('f', 5, long)
@@ -253,7 +260,7 @@ struct ext4_new_group_data {
 #define EXT4_IOC32_GETRSVSZ             _IOR('f', 5, int)
 #define EXT4_IOC32_SETRSVSZ             _IOW('f', 6, int)
 #define EXT4_IOC32_GROUP_EXTEND         _IOW('f', 7, unsigned int)
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
 #define EXT4_IOC32_WAIT_FOR_READONLY    _IOR('f', 99, int)
 #endif
 #define EXT4_IOC32_GETVERSION_OLD       FS_IOC32_GETVERSION
@@ -282,7 +289,7 @@ struct ext4_inode {
         __le16  i_uid;          /* Low 16 bits of Owner Uid */
         __le32  i_size;         /* Size in bytes */
         __le32  i_atime;        /* Access time */
-        __le32  i_ctime;        /* Creation time */
+        __le32  i_ctime;        /* Inode Change time */
         __le32  i_mtime;        /* Modification time */
         __le32  i_dtime;        /* Deletion Time */
         __le16  i_gid;          /* Low 16 bits of Group Id */
@@ -331,10 +338,85 @@ struct ext4_inode {
         } osd2;                         /* OS dependent 2 */
         __le16  i_extra_isize;
         __le16  i_pad1;
+        __le32  i_ctime_extra;  /* extra Change time      (nsec << 2 | epoch) */
+        __le32  i_mtime_extra;  /* extra Modification time(nsec << 2 | epoch) */
+        __le32  i_atime_extra;  /* extra Access time      (nsec << 2 | epoch) */
+        __le32  i_crtime;       /* File Creation time */
+        __le32  i_crtime_extra; /* extra FileCreationtime (nsec << 2 | epoch) */
 };
 
 #define i_size_high     i_dir_acl
 
+#define EXT4_EPOCH_BITS 2
+#define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)
+#define EXT4_NSEC_MASK  (~0UL << EXT4_EPOCH_BITS)
+
+/*
+ * Extended fields will fit into an inode if the filesystem was formatted
+ * with large inodes (-I 256 or larger) and there are not currently any EAs
+ * consuming all of the available space. For new inodes we always reserve
+ * enough space for the kernel's known extended fields, but for inodes
+ * created with an old kernel this might not have been the case. None of
+ * the extended inode fields is critical for correct filesystem operation.
+ * This macro checks if a certain field fits in the inode. Note that
+ * inode-size = GOOD_OLD_INODE_SIZE + i_extra_isize
+ */
+#define EXT4_FITS_IN_INODE(ext4_inode, einode, field)   \
+        ((offsetof(typeof(*ext4_inode), field) +        \
+          sizeof((ext4_inode)->field))                  \
+        <= (EXT4_GOOD_OLD_INODE_SIZE +                  \
+            (einode)->i_extra_isize))                   \
+
+static inline __le32 ext4_encode_extra_time(struct timespec *time)
+{
+       return cpu_to_le32((sizeof(time->tv_sec) > 4 ?
+                           time->tv_sec >> 32 : 0) |
+                           ((time->tv_nsec << 2) & EXT4_NSEC_MASK));
+}
+
+static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
+{
+       if (sizeof(time->tv_sec) > 4)
+               time->tv_sec |= (__u64)(le32_to_cpu(extra) & EXT4_EPOCH_MASK)
+                               << 32;
+       time->tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> 2;
+}
+
+#define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode)                          \
+do {                                                                           \
+        (raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec);               \
+        if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra))     \
+                (raw_inode)->xtime ## _extra =                                 \
+                                ext4_encode_extra_time(&(inode)->xtime);       \
+} while (0)
+
+#define EXT4_EINODE_SET_XTIME(xtime, einode, raw_inode)                        \
+do {                                                                           \
+        if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))                      \
+                (raw_inode)->xtime = cpu_to_le32((einode)->xtime.tv_sec);      \
+        if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))            \
+                (raw_inode)->xtime ## _extra =                                 \
+                                ext4_encode_extra_time(&(einode)->xtime);      \
+} while (0)
+
+#define EXT4_INODE_GET_XTIME(xtime, inode, raw_inode)                          \
+do {                                                                           \
+        (inode)->xtime.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime);       \
+        if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra))     \
+                ext4_decode_extra_time(&(inode)->xtime,                        \
+                                       raw_inode->xtime ## _extra);            \
+} while (0)
+
+#define EXT4_EINODE_GET_XTIME(xtime, einode, raw_inode)                        \
+do {                                                                           \
+        if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))                      \
+                (einode)->xtime.tv_sec =                                       \
+                        (signed)le32_to_cpu((raw_inode)->xtime);               \
+        if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))            \
+                ext4_decode_extra_time(&(einode)->xtime,                       \
+                                       raw_inode->xtime ## _extra);            \
+} while (0)
+
 #if defined(__KERNEL__) || defined(__linux__)
 #define i_reserved1     osd1.linux1.l_i_reserved1
 #define i_frag          osd2.linux2.l_i_frag
@@ -533,6 +615,13 @@ static inline struct ext4_inode_info *EXT4_I(struct inode *inode)
         return container_of(inode, struct ext4_inode_info, vfs_inode);
 }
 
+static inline struct timespec ext4_current_time(struct inode *inode)
+{
+        return (inode->i_sb->s_time_gran < NSEC_PER_SEC) ?
+                current_fs_time(inode->i_sb) : CURRENT_TIME_SEC;
+}
+
+
 static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 {
         return ino == EXT4_ROOT_INO ||
@@ -603,6 +692,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 #define EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
 #define EXT4_FEATURE_RO_COMPAT_LARGE_FILE       0x0002
 #define EXT4_FEATURE_RO_COMPAT_BTREE_DIR        0x0004
+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK        0x0020
+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE      0x0040
 
 #define EXT4_FEATURE_INCOMPAT_COMPRESSION       0x0001
 #define EXT4_FEATURE_INCOMPAT_FILETYPE          0x0002
@@ -620,6 +711,8 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
                                          EXT4_FEATURE_INCOMPAT_64BIT)
 #define EXT4_FEATURE_RO_COMPAT_SUPP     (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                         EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \
+                                         EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE | \
                                          EXT4_FEATURE_RO_COMPAT_BTREE_DIR)
 
 /*
@@ -862,6 +955,7 @@ extern int ext4_change_inode_journal_flag(struct inode *, int);
 extern int ext4_get_inode_loc(struct inode *, struct ext4_iloc *);
 extern void ext4_truncate (struct inode *);
 extern void ext4_set_inode_flags(struct inode *);
+extern void ext4_get_inode_flags(struct ext4_inode_info *);
 extern void ext4_set_aops(struct inode *inode);
 extern int ext4_writepage_trans_blocks(struct inode *);
 extern int ext4_block_truncate_page(handle_t *handle, struct page *page,
@@ -983,6 +1077,8 @@ extern int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,
 extern void ext4_ext_truncate(struct inode *, struct page *);
 extern void ext4_ext_init(struct super_block *);
 extern void ext4_ext_release(struct super_block *);
+extern long ext4_fallocate(struct inode *inode, int mode, loff_t offset,
+                          loff_t len);
 static inline int
 ext4_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block,
                         unsigned long max_blocks, struct buffer_head *bh,
diff --git a/include/linux/ext4_fs_extents.h b/include/linux/ext4_fs_extents.h
index acfe59740b03..81406f3655d4 100644
--- a/include/linux/ext4_fs_extents.h
+++ b/include/linux/ext4_fs_extents.h
@@ -141,7 +141,25 @@ typedef int (*ext_prepare_callback)(struct inode *, struct ext4_ext_path *,
 
 #define EXT_MAX_BLOCK   0xffffffff
 
-#define EXT_MAX_LEN     ((1UL << 15) - 1)
+/*
+ * EXT_INIT_MAX_LEN is the maximum number of blocks we can have in an
+ * initialized extent. This is 2^15 and not (2^16 - 1), since we use the
+ * MSB of ee_len field in the extent datastructure to signify if this
+ * particular extent is an initialized extent or an uninitialized (i.e.
+ * preallocated).
+ * EXT_UNINIT_MAX_LEN is the maximum number of blocks we can have in an
+ * uninitialized extent.
+ * If ee_len is <= 0x8000, it is an initialized extent. Otherwise, it is an
+ * uninitialized one. In other words, if MSB of ee_len is set, it is an
+ * uninitialized extent with only one special scenario when ee_len = 0x8000.
+ * In this case we can not have an uninitialized extent of zero length and
+ * thus we make it as a special case of initialized extent with 0x8000 length.
+ * This way we get better extent-to-group alignment for initialized extents.
+ * Hence, the maximum number of blocks we can have in an *initialized*
+ * extent is 2^15 (32768) and in an *uninitialized* extent is 2^15-1 (32767).
+ */
+#define EXT_INIT_MAX_LEN        (1UL << 15)
+#define EXT_UNINIT_MAX_LEN      (EXT_INIT_MAX_LEN - 1)
 
 
 #define EXT_FIRST_EXTENT(__hdr__) \
@@ -188,8 +206,31 @@ ext4_ext_invalidate_cache(struct inode *inode)
         EXT4_I(inode)->i_cached_extent.ec_type = EXT4_EXT_CACHE_NO;
 }
 
+static inline void ext4_ext_mark_uninitialized(struct ext4_extent *ext)
+{
+        /* We can not have an uninitialized extent of zero length! */
+        BUG_ON((le16_to_cpu(ext->ee_len) & ~EXT_INIT_MAX_LEN) == 0);
+        ext->ee_len |= cpu_to_le16(EXT_INIT_MAX_LEN);
+}
+
+static inline int ext4_ext_is_uninitialized(struct ext4_extent *ext)
+{
+        /* Extent with ee_len of 0x8000 is treated as an initialized extent */
+        return (le16_to_cpu(ext->ee_len) > EXT_INIT_MAX_LEN);
+}
+
+static inline int ext4_ext_get_actual_len(struct ext4_extent *ext)
+{
+        return (le16_to_cpu(ext->ee_len) <= EXT_INIT_MAX_LEN ?
+                le16_to_cpu(ext->ee_len) :
+                (le16_to_cpu(ext->ee_len) - EXT_INIT_MAX_LEN));
+}
+
 extern int ext4_extent_tree_init(handle_t *, struct inode *);
 extern int ext4_ext_calc_credits_for_insert(struct inode *, struct ext4_ext_path *);
+extern int ext4_ext_try_to_merge(struct inode *inode,
+                                 struct ext4_ext_path *path,
+                                 struct ext4_extent *);
 extern unsigned int ext4_ext_check_overlap(struct inode *, struct ext4_extent *, struct ext4_ext_path *);
 extern int ext4_ext_insert_extent(handle_t *, struct inode *, struct ext4_ext_path *, struct ext4_extent *);
 extern int ext4_ext_walk_space(struct inode *, unsigned long, unsigned long, ext_prepare_callback, void *);
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index 9de494406995..1a511e9905aa 100644
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -153,6 +153,11 @@ struct ext4_inode_info {
 
         unsigned long i_ext_generation;
         struct ext4_ext_cache i_cached_extent;
+        /*
+         * File creation time. Its function is same as that of
+         * struct timespec i_{a,c,m}time in the generic inode.
+         */
+        struct timespec i_crtime;
 };
 
 #endif  /* _LINUX_EXT4_FS_I */
diff --git a/include/linux/ext4_fs_sb.h b/include/linux/ext4_fs_sb.h
index 2347557a327a..1b2ffee12be9 100644
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
@@ -73,7 +73,7 @@ struct ext4_sb_info {
         struct list_head s_orphan;
         unsigned long s_commit_interval;
         struct block_device *journal_bdev;
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
         struct timer_list turn_ro_timer;        /* For turning read-only (crash simulation) */
         wait_queue_head_t ro_wait_queue;        /* For people waiting for the fs to go read-only */
 #endif
@@ -81,6 +81,7 @@ struct ext4_sb_info {
         char *s_qf_names[MAXQUOTAS];            /* Names of quota files with journalled quota */
         int s_jquota_fmt;                       /* Format of quota to use */
 #endif
+        unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */
 
 #ifdef EXTENTS_STATS
         /* ext4 extents stats */
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
new file mode 100644
index 000000000000..8e912ab6a072
--- /dev/null
+++ b/include/linux/falloc.h
@@ -0,0 +1,6 @@
+#ifndef _FALLOC_H_
+#define _FALLOC_H_
+
+#define FALLOC_FL_KEEP_SIZE     0x01 /* default is extend size */
+
+#endif /* _FALLOC_H_ */
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 2d38b1a74662..efded00ad08c 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -5,7 +5,7 @@
 
 #include <linux/sched.h>
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /*
  * Check if a process has been frozen
  */
@@ -25,7 +25,7 @@ static inline int freezing(struct task_struct *p)
 /*
  * Request that a process be frozen
  */
-static inline void freeze(struct task_struct *p)
+static inline void set_freeze_flag(struct task_struct *p)
 {
         set_tsk_thread_flag(p, TIF_FREEZE);
 }
@@ -33,7 +33,7 @@ static inline void freeze(struct task_struct *p)
 /*
  * Sometimes we may need to cancel the previous 'freeze' request
  */
-static inline void do_not_freeze(struct task_struct *p)
+static inline void clear_freeze_flag(struct task_struct *p)
 {
         clear_tsk_thread_flag(p, TIF_FREEZE);
 }
@@ -56,7 +56,7 @@ static inline int thaw_process(struct task_struct *p)
                 wake_up_process(p);
                 return 1;
         }
-        clear_tsk_thread_flag(p, TIF_FREEZE);
+        clear_freeze_flag(p);
         task_unlock(p);
         return 0;
 }
@@ -126,10 +126,11 @@ static inline void set_freezable(void)
         current->flags &= ~PF_NOFREEZE;
 }
 
-#else
+#else /* !CONFIG_PM_SLEEP */
 static inline int frozen(struct task_struct *p) { return 0; }
 static inline int freezing(struct task_struct *p) { return 0; }
-static inline void freeze(struct task_struct *p) { BUG(); }
+static inline void set_freeze_flag(struct task_struct *p) {}
+static inline void clear_freeze_flag(struct task_struct *p) {}
 static inline int thaw_process(struct task_struct *p) { return 1; }
 
 static inline void refrigerator(void) {}
@@ -142,6 +143,6 @@ static inline void freezer_do_not_count(void) {}
 static inline void freezer_count(void) {}
 static inline int freezer_should_skip(struct task_struct *p) { return 0; }
 static inline void set_freezable(void) {}
-#endif
+#endif /* !CONFIG_PM_SLEEP */
 
 #endif  /* FREEZER_H_INCLUDED */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 98205f680476..16421f662a7a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -697,20 +697,26 @@ struct fown_struct {
  * Track a single file's readahead state
  */
 struct file_ra_state {
-        unsigned long start;            /* Current window */
-        unsigned long size;
-        unsigned long flags;            /* ra flags RA_FLAG_xxx*/
-        unsigned long cache_hit;        /* cache hit count*/
-        unsigned long prev_index;       /* Cache last read() position */
-        unsigned long ahead_start;      /* Ahead window */
-        unsigned long ahead_size;
+        pgoff_t start;                  /* where readahead started */
+        unsigned long size;             /* # of readahead pages */
+        unsigned long async_size;       /* do asynchronous readahead when
+                                           there are only # of pages ahead */
+
         unsigned long ra_pages;         /* Maximum readahead window */
         unsigned long mmap_hit;         /* Cache hit stat for mmap accesses */
         unsigned long mmap_miss;        /* Cache miss stat for mmap accesses */
+        unsigned long prev_index;       /* Cache last read() position */
         unsigned int prev_offset;       /* Offset where last read() ended in a page */
 };
-#define RA_FLAG_MISS 0x01       /* a cache miss occured against this file */
-#define RA_FLAG_INCACHE 0x02    /* file is already in cache */
+
+/*
+ * Check if @index falls in the readahead windows.
+ */
+static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index)
+{
+        return (index >= ra->start &&
+                index <  ra->start + ra->size);
+}
 
 struct file {
         /*
@@ -862,7 +868,7 @@ extern void locks_init_lock(struct file_lock *);
 extern void locks_copy_lock(struct file_lock *, struct file_lock *);
 extern void locks_remove_posix(struct file *, fl_owner_t);
 extern void locks_remove_flock(struct file *);
-extern int posix_test_lock(struct file *, struct file_lock *);
+extern void posix_test_lock(struct file *, struct file_lock *);
 extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
 extern int posix_lock_file_wait(struct file *, struct file_lock *);
 extern int posix_unblock_lock(struct file *, struct file_lock *);
@@ -872,7 +878,8 @@ extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
 extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
 extern int __break_lease(struct inode *inode, unsigned int flags);
 extern void lease_get_mtime(struct inode *, struct timespec *time);
-extern int setlease(struct file *, long, struct file_lock **);
+extern int generic_setlease(struct file *, long, struct file_lock **);
+extern int vfs_setlease(struct file *, long, struct file_lock **);
 extern int lease_modify(struct file_lock **, int);
 extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
 extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
@@ -1122,6 +1129,7 @@ struct file_operations {
         int (*flock) (struct file *, int, struct file_lock *);
         ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
         ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
+        int (*setlease)(struct file *, long, struct file_lock **);
 };
 
 struct inode_operations {
@@ -1147,6 +1155,8 @@ struct inode_operations {
         ssize_t (*listxattr) (struct dentry *, char *, size_t);
         int (*removexattr) (struct dentry *, const char *);
         void (*truncate_range)(struct inode *, loff_t, loff_t);
+        long (*fallocate)(struct inode *inode, int mode, loff_t offset,
+                          loff_t len);
 };
 
 struct seq_file;
@@ -1459,7 +1469,7 @@ extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, const char *);
 extern int register_chrdev_region(dev_t, unsigned, const char *);
 extern int register_chrdev(unsigned int, const char *,
                            const struct file_operations *);
-extern int unregister_chrdev(unsigned int, const char *);
+extern void unregister_chrdev(unsigned int, const char *);
 extern void unregister_chrdev_region(dev_t, unsigned);
 extern int chrdev_open(struct inode *, struct file *);
 extern void chrdev_show(struct seq_file *,off_t);
@@ -1649,7 +1659,6 @@ extern int sb_min_blocksize(struct super_block *, int);
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
 extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
-extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
 int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
 extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
 extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 543cd3cd9e77..9bc045b8c478 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -16,6 +16,7 @@
 #ifndef FS_ENET_PD_H
 #define FS_ENET_PD_H
 
+#include <linux/string.h>
 #include <asm/types.h>
 
 #define FS_ENET_NAME    "fs_enet"
@@ -119,6 +120,7 @@ struct fs_platform_info {
 
         u32 cp_page;            /* CPM page */
         u32 cp_block;           /* CPM sblock */
+        u32 cp_command;         /* CPM page/sblock/mcn */
 
         u32 clk_trx;            /* some stuff for pins & mux configuration*/
         u32 clk_rx;
@@ -133,7 +135,11 @@ 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 695741b0e420..1831b196c70a 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -53,6 +53,7 @@ struct gianfar_platform_data {
         u32     bus_id;
         u32     phy_id;
         u8      mac_addr[6];
+        phy_interface_t interface;
 };
 
 struct gianfar_mdio_data {
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index f7a93770e1be..7da02c93002b 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -39,6 +39,9 @@ enum {
         CTRL_CMD_NEWOPS,
         CTRL_CMD_DELOPS,
         CTRL_CMD_GETOPS,
+        CTRL_CMD_NEWMCAST_GRP,
+        CTRL_CMD_DELMCAST_GRP,
+        CTRL_CMD_GETMCAST_GRP, /* unused */
         __CTRL_CMD_MAX,
 };
 
@@ -52,6 +55,7 @@ enum {
         CTRL_ATTR_HDRSIZE,
         CTRL_ATTR_MAXATTR,
         CTRL_ATTR_OPS,
+        CTRL_ATTR_MCAST_GROUPS,
         __CTRL_ATTR_MAX,
 };
 
@@ -66,4 +70,13 @@ enum {
 
 #define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
 
+enum {
+        CTRL_ATTR_MCAST_GRP_UNSPEC,
+        CTRL_ATTR_MCAST_GRP_NAME,
+        CTRL_ATTR_MCAST_GRP_ID,
+        __CTRL_ATTR_MCAST_GRP_MAX,
+};
+
+#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
+
 #endif  /* __LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 9756fc102a83..a47b8025d399 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -264,7 +264,7 @@ static inline void set_capacity(struct gendisk *disk, sector_t size)
 
 #ifdef CONFIG_SOLARIS_X86_PARTITION
 
-#define SOLARIS_X86_NUMSLICE    8
+#define SOLARIS_X86_NUMSLICE    16
 #define SOLARIS_X86_VTOC_SANE   (0x600DDEEEUL)
 
 struct solaris_x86_slice {
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index a44a6a078f0a..c3c19f926e6f 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -170,6 +170,33 @@ struct gfs2_rgrp {
 };
 
 /*
+ * quota linked list: user quotas and group quotas form two separate 
+ * singly linked lists. ll_next stores uids or gids of next quotas in the 
+ * linked list.
+
+Given the uid/gid, how to calculate the quota file offsets for the corresponding
+gfs2_quota structures on disk:
+
+for user quotas, given uid,
+offset = uid * sizeof(struct gfs2_quota);
+
+for group quotas, given gid,
+offset = (gid * sizeof(struct gfs2_quota)) + sizeof(struct gfs2_quota);
+
+
+  uid:0   gid:0       uid:12   gid:12      uid:17   gid:17     uid:5142 gid:5142
++-------+-------+    +-------+-------+    +-------+- - - -+    +- - - -+-------+
+| valid | valid | :: | valid | valid | :: | valid | inval | :: | inval | valid |
++-------+-------+    +-------+-------+    +-------+- - - -+    +- - - -+-------+
+next:12   next:12    next:17 next:5142    next:NULL                    next:NULL
+    |       |            |       |            |<-- user quota list         |
+     \______|___________/ \______|___________/         group quota list -->|
+            |                    |                                         |
+             \__________________/ \_______________________________________/
+
+*/
+
+/*
  * quota structure
  */
 
@@ -177,7 +204,8 @@ struct gfs2_quota {
         __be64 qu_limit;
         __be64 qu_warn;
         __be64 qu_value;
-        __u8 qu_reserved[64];
+        __be32 qu_ll_next; /* location of next quota in list */
+        __u8 qu_reserved[60];
 };
 
 /*
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 12c5e4e3135a..1fcb0033179e 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -103,21 +103,6 @@ __alloc_zeroed_user_highpage(gfp_t movableflags,
 #endif
 
 /**
- * alloc_zeroed_user_highpage - Allocate a zeroed HIGHMEM page for a VMA
- * @vma: The VMA the page is to be allocated for
- * @vaddr: The virtual address the page will be inserted into
- *
- * This function will allocate a page for a VMA that the caller knows will
- * not be able to move in the future using move_pages() or reclaim. If it
- * is known that the page can move, use alloc_zeroed_user_highpage_movable
- */
-static inline struct page *
-alloc_zeroed_user_highpage(struct vm_area_struct *vma, unsigned long vaddr)
-{
-        return __alloc_zeroed_user_highpage(0, vma, vaddr);
-}
-
-/**
  * alloc_zeroed_user_highpage_movable - Allocate a zeroed HIGHMEM page for a VMA that the caller knows can move
  * @vma: The VMA the page is to be allocated for
  * @vaddr: The virtual address the page will be inserted into
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 49b7053043ad..3a19b032c0eb 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_HUGETLB_H
 #define _LINUX_HUGETLB_H
 
+#include <linux/fs.h>
+
 #ifdef CONFIG_HUGETLB_PAGE
 
 #include <linux/mempolicy.h>
@@ -64,11 +66,8 @@ void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
  * If the arch doesn't supply something else, assume that hugepage
  * size aligned regions are ok without further preparation.
  */
-static inline int prepare_hugepage_range(unsigned long addr, unsigned long len,
-                                                pgoff_t pgoff)
+static inline int prepare_hugepage_range(unsigned long addr, unsigned long len)
 {
-        if (pgoff & (~HPAGE_MASK >> PAGE_SHIFT))
-                return -EINVAL;
         if (len & ~HPAGE_MASK)
                 return -EINVAL;
         if (addr & ~HPAGE_MASK)
@@ -76,8 +75,7 @@ static inline int prepare_hugepage_range(unsigned long addr, unsigned long len,
         return 0;
 }
 #else
-int prepare_hugepage_range(unsigned long addr, unsigned long len,
-                                                pgoff_t pgoff);
+int prepare_hugepage_range(unsigned long addr, unsigned long len);
 #endif
 
 #ifndef ARCH_HAS_SETCLEAR_HUGE_PTE
@@ -115,7 +113,7 @@ static inline unsigned long hugetlb_total_pages(void)
 #define hugetlb_report_meminfo(buf)             0
 #define hugetlb_report_node_meminfo(n, buf)     0
 #define follow_huge_pmd(mm, addr, pmd, write)   NULL
-#define prepare_hugepage_range(addr,len,pgoff)  (-EINVAL)
+#define prepare_hugepage_range(addr,len)        (-EINVAL)
 #define pmd_huge(x)     0
 #define is_hugepage_only_range(mm, addr, len)   0
 #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index aa83d4163096..a271b67a8e2d 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -115,9 +115,11 @@
 #define I2C_DRIVERID_KS0127     86      /* Samsung ks0127 video decoder */
 #define I2C_DRIVERID_TLV320AIC23B 87    /* TI TLV320AIC23B audio codec  */
 #define I2C_DRIVERID_ISL1208    88      /* Intersil ISL1208 RTC         */
-#define I2C_DRIVERID_WM8731             89      /* Wolfson WM8731 audio codec */
-#define I2C_DRIVERID_WM8750             90      /* Wolfson WM8750 audio codec */
-#define I2C_DRIVERID_WM8753             91      /* Wolfson WM8753 audio codec */
+#define I2C_DRIVERID_WM8731     89      /* Wolfson WM8731 audio codec */
+#define I2C_DRIVERID_WM8750     90      /* Wolfson WM8750 audio codec */
+#define I2C_DRIVERID_WM8753     91      /* Wolfson WM8753 audio codec */
+#define I2C_DRIVERID_LM4857     92      /* LM4857 Audio Amplifier */
+#define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
 
 #define I2C_DRIVERID_I2CDEV     900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
@@ -195,6 +197,7 @@
 #define I2C_HW_B_EM28XX         0x01001f /* em28xx video capture cards */
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_INTELFB        0x010021 /* intel framebuffer driver */
+#define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 
 /* --- PCF 8584 based algorithms                                        */
 #define I2C_HW_P_LP             0x020000 /* Parallel port interface */
diff --git a/include/linux/i2c-isa.h b/include/linux/i2c-isa.h
deleted file mode 100644
index 67e3598c4cec..000000000000
--- a/include/linux/i2c-isa.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * i2c-isa.h - definitions for the i2c-isa pseudo-i2c-adapter interface
- *
- * Copyright (C) 2005 Jean Delvare <khali@linux-fr.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _LINUX_I2C_ISA_H
-#define _LINUX_I2C_ISA_H
-
-#include <linux/i2c.h>
-
-extern int i2c_isa_add_driver(struct i2c_driver *driver);
-extern int i2c_isa_del_driver(struct i2c_driver *driver);
-
-/* Detect whether we are on the isa bus. This is only useful to hybrid
-   (i2c+isa) drivers. */
-#define i2c_is_isa_adapter(adapptr) \
-        ((adapptr)->id == I2C_HW_ISA)
-#define i2c_is_isa_client(clientptr) \
-        i2c_is_isa_adapter((clientptr)->adapter)
-
-#endif /* _LINUX_I2C_ISA_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 2eaba21b9b1a..2a32f2fd940d 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -156,10 +156,14 @@ struct i2c_driver {
  * @name: Indicates the type of the device, usually a chip name that's
  *      generic enough to hide second-sourcing and compatible revisions.
  * @adapter: manages the bus segment hosting this I2C device
+ * @driver: device's driver, hence pointer to access routines
+ * @usage_count: counts current number of users of this client
  * @dev: Driver model device node for the slave.
  * @irq: indicates the IRQ generated by this device (if any)
  * @driver_name: Identifies new-style driver used with this device; also
  *      used as the module name for hotplug/coldplug modprobe support.
+ * @list: list of active/busy clients
+ * @released: used to synchronize client releases & detaches and references
  *
  * An i2c_client identifies a single device (i.e. chip) connected to an
  * i2c bus. The behaviour exposed to Linux is defined by the driver
@@ -368,7 +372,6 @@ struct i2c_client_address_data {
 
 /* The numbers to use to set I2C bus address */
 #define ANY_I2C_BUS             0xffff
-#define ANY_I2C_ISA_BUS         9191
 
 
 /* ----- functions exported by i2c.o */
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 333a370a3bdc..9752307d16ba 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -946,8 +946,7 @@ static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
         strcpy(pool->name, name);
 
         pool->slab =
-            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL,
-                              NULL);
+            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL);
         if (!pool->slab)
                 goto free_name;
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 19ab25804056..85d448b4abec 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -555,7 +555,7 @@ typedef struct ide_drive_s {
         char            name[4];        /* drive name, such as "hda" */
         char            driver_req[10]; /* requests specific driver */
 
-        request_queue_t         *queue; /* request queue */
+        struct request_queue    *queue; /* request queue */
 
         struct request          *rq;    /* current request */
         struct ide_drive_s      *next;  /* circular list of hwgroup drives */
@@ -634,7 +634,7 @@ typedef struct ide_drive_s {
 
         unsigned int    bios_cyl;       /* BIOS/fdisk/LILO number of cyls */
         unsigned int    cyl;            /* "real" number of cyls */
-        unsigned int    drive_data;     /* use by tuneproc/selectproc */
+        unsigned int    drive_data;     /* used by set_pio_mode/selectproc */
         unsigned int    failures;       /* current failure count */
         unsigned int    max_failures;   /* maximum allowed failure count */
         u64             probed_capacity;/* initial reported media capacity (ide-cd only currently) */
@@ -681,6 +681,10 @@ typedef struct hwif_s {
         u8 straight8;   /* Alan's straight 8 check */
         u8 bus_state;   /* power state of the IDE bus */
 
+        u8 host_flags;
+
+        u8 pio_mask;
+
         u8 atapi_dma;   /* host supports atapi_dma */
         u8 ultra_mask;
         u8 mwdma_mask;
@@ -698,10 +702,10 @@ typedef struct hwif_s {
 #if 0
         ide_hwif_ops_t  *hwifops;
 #else
-        /* routine to tune PIO mode for drives */
-        void    (*tuneproc)(ide_drive_t *, u8);
+        /* routine to set PIO mode for drives */
+        void    (*set_pio_mode)(ide_drive_t *, const u8);
         /* routine to retune DMA modes for drives */
-        int     (*speedproc)(ide_drive_t *, u8);
+        int     (*speedproc)(ide_drive_t *, const u8);
         /* tweaks hardware to select drive */
         void    (*selectproc)(ide_drive_t *);
         /* chipset polling based on hba specifics */
@@ -719,6 +723,7 @@ typedef struct hwif_s {
         /* driver soft-power interface */
         int     (*busproc)(ide_drive_t *, int);
 #endif
+        u8 (*mdma_filter)(ide_drive_t *);
         u8 (*udma_filter)(ide_drive_t *);
 
         void (*ata_input_data)(ide_drive_t *, void *, u32);
@@ -1202,7 +1207,7 @@ extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);
 extern int ide_spin_wait_hwgroup(ide_drive_t *);
 extern void ide_timer_expiry(unsigned long);
 extern irqreturn_t ide_intr(int irq, void *dev_id);
-extern void do_ide_request(request_queue_t *);
+extern void do_ide_request(struct request_queue *);
 
 void ide_init_disk(struct gendisk *, ide_drive_t *);
 
@@ -1244,7 +1249,19 @@ typedef struct ide_pci_enablebit_s {
 
 enum {
         /* Uses ISA control ports not PCI ones. */
-        IDEPCI_FLAG_ISA_PORTS           = (1 << 0),
+        IDE_HFLAG_ISA_PORTS             = (1 << 0),
+        /* single port device */
+        IDE_HFLAG_SINGLE                = (1 << 1),
+        /* don't use legacy PIO blacklist */
+        IDE_HFLAG_PIO_NO_BLACKLIST      = (1 << 2),
+        /* don't use conservative PIO "downgrade" */
+        IDE_HFLAG_PIO_NO_DOWNGRADE      = (1 << 3),
+        /* use PIO8/9 for prefetch off/on */
+        IDE_HFLAG_ABUSE_PREFETCH        = (1 << 4),
+        /* use PIO6/7 for fast-devsel off/on */
+        IDE_HFLAG_ABUSE_FAST_DEVSEL     = (1 << 5),
+        /* use 100-102 and 200-202 PIO values to set DMA modes */
+        IDE_HFLAG_ABUSE_DMA_MODES       = (1 << 6),
 };
 
 typedef struct ide_pci_device_s {
@@ -1256,13 +1273,13 @@ typedef struct ide_pci_device_s {
         void                    (*init_hwif)(ide_hwif_t *);
         void                    (*init_dma)(ide_hwif_t *, unsigned long);
         void                    (*fixup)(ide_hwif_t *);
-        u8                      channels;
         u8                      autodma;
         ide_pci_enablebit_t     enablebits[2];
         u8                      bootable;
         unsigned int            extra;
         struct ide_pci_device_s *next;
-        u8                      flags;
+        u8                      host_flags;
+        u8                      pio_mask;
         u8                      udma_mask;
 } ide_pci_device_t;
 
@@ -1275,16 +1292,24 @@ void ide_init_sg_cmd(ide_drive_t *, struct request *);
 #define BAD_DMA_DRIVE           0
 #define GOOD_DMA_DRIVE          1
 
-#ifdef CONFIG_BLK_DEV_IDEDMA
 struct drive_list_entry {
         const char *id_model;
         const char *id_firmware;
 };
 
 int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *);
+
+#ifdef CONFIG_BLK_DEV_IDEDMA
 int __ide_dma_bad_drive(ide_drive_t *);
 int __ide_dma_good_drive(ide_drive_t *);
-u8 ide_max_dma_mode(ide_drive_t *);
+
+u8 ide_find_dma_mode(ide_drive_t *, u8);
+
+static inline u8 ide_max_dma_mode(ide_drive_t *drive)
+{
+        return ide_find_dma_mode(drive, XFER_UDMA_6);
+}
+
 int ide_tune_dma(ide_drive_t *);
 void ide_dma_off(ide_drive_t *);
 void ide_dma_verbose(ide_drive_t *);
@@ -1302,7 +1327,6 @@ void ide_dma_host_off(ide_drive_t *);
 void ide_dma_off_quietly(ide_drive_t *);
 void ide_dma_host_on(ide_drive_t *);
 extern int __ide_dma_on(ide_drive_t *);
-extern int __ide_dma_check(ide_drive_t *);
 extern int ide_dma_setup(ide_drive_t *);
 extern void ide_dma_start(ide_drive_t *);
 extern int __ide_dma_end(ide_drive_t *);
@@ -1311,6 +1335,7 @@ extern void ide_dma_timeout(ide_drive_t *);
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
 
 #else
+static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; }
 static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; }
 static inline int ide_tune_dma(ide_drive_t *drive) { return 0; }
 static inline void ide_dma_off(ide_drive_t *drive) { ; }
@@ -1327,11 +1352,13 @@ extern int ide_acpi_exec_tfs(ide_drive_t *drive);
 extern void ide_acpi_get_timing(ide_hwif_t *hwif);
 extern void ide_acpi_push_timing(ide_hwif_t *hwif);
 extern void ide_acpi_init(ide_hwif_t *hwif);
+extern void ide_acpi_set_state(ide_hwif_t *hwif, int on);
 #else
 static inline int ide_acpi_exec_tfs(ide_drive_t *drive) { return 0; }
 static inline void ide_acpi_get_timing(ide_hwif_t *hwif) { ; }
 static inline void ide_acpi_push_timing(ide_hwif_t *hwif) { ; }
 static inline void ide_acpi_init(ide_hwif_t *hwif) { ; }
+static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}
 #endif
 
 extern int ide_hwif_request_regions(ide_hwif_t *hwif);
@@ -1357,12 +1384,29 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
 }
 
 /* ide-lib.c */
-u8 ide_rate_filter(ide_drive_t *, u8);
 extern char *ide_xfer_verbose(u8 xfer_rate);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
 extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
 int ide_use_fast_pio(ide_drive_t *);
 
+static inline int ide_dev_has_iordy(struct hd_driveid *id)
+{
+        return ((id->field_valid & 2) && (id->capability & 8)) ? 1 : 0;
+}
+
+static inline int ide_dev_is_sata(struct hd_driveid *id)
+{
+        /*
+         * See if word 93 is 0 AND drive is at least ATA-5 compatible
+         * verifying that word 80 by casting it to a signed type --
+         * this trick allows us to filter out the reserved values of
+         * 0x0000 and 0xffff along with the earlier ATA revisions...
+         */
+        if (id->hw_config == 0 && (short)id->major_rev_num >= 0x0020)
+                return 1;
+        return 0;
+}
+
 u8 ide_dump_status(ide_drive_t *, const char *, u8);
 
 typedef struct ide_pio_timings_s {
@@ -1372,16 +1416,16 @@ typedef struct ide_pio_timings_s {
                                 /* active + recovery (+ setup for some chips) */
 } ide_pio_timings_t;
 
-typedef struct ide_pio_data_s {
-        u8 pio_mode;
-        u8 use_iordy;
-        u8 overridden;
-        unsigned int cycle_time;
-} ide_pio_data_t;
-
-extern u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_pio_data_t *d);
+unsigned int ide_pio_cycle_time(ide_drive_t *, u8);
+u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
 extern const ide_pio_timings_t ide_pio_timings[6];
 
+void ide_set_pio(ide_drive_t *, u8);
+
+static inline void ide_set_max_pio(ide_drive_t *drive)
+{
+        ide_set_pio(drive, 255);
+}
 
 extern spinlock_t ide_lock;
 extern struct mutex ide_cfg_mtx;
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 272f8c8c90da..30621c27159f 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -16,6 +16,7 @@
 #define IEEE80211_H
 
 #include <linux/types.h>
+#include <asm/byteorder.h>
 
 #define FCS_LEN 4
 
@@ -350,4 +351,64 @@ enum ieee80211_eid {
 
 #define WLAN_MAX_KEY_LEN                32
 
+/**
+ * ieee80211_get_SA - get pointer to SA
+ *
+ * Given an 802.11 frame, this function returns the offset
+ * to the source address (SA). It does not verify that the
+ * header is long enough to contain the address, and the
+ * header must be long enough to contain the frame control
+ * field.
+ *
+ * @hdr: the frame
+ */
+static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr)
+{
+        u8 *raw = (u8 *) hdr;
+        u8 tofrom = (*(raw+1)) & 3; /* get the TODS and FROMDS bits */
+
+        switch (tofrom) {
+                case 2:
+                        return hdr->addr3;
+                case 3:
+                        return hdr->addr4;
+        }
+        return hdr->addr2;
+}
+
+/**
+ * ieee80211_get_DA - get pointer to DA
+ *
+ * Given an 802.11 frame, this function returns the offset
+ * to the destination address (DA). It does not verify that
+ * the header is long enough to contain the address, and the
+ * header must be long enough to contain the frame control
+ * field.
+ *
+ * @hdr: the frame
+ */
+static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
+{
+        u8 *raw = (u8 *) hdr;
+        u8 to_ds = (*(raw+1)) & 1; /* get the TODS bit */
+
+        if (to_ds)
+                return hdr->addr3;
+        return hdr->addr1;
+}
+
+/**
+ * ieee80211_get_morefrag - determine whether the MOREFRAGS bit is set
+ *
+ * This function determines whether the "more fragments" bit is set
+ * in the frame.
+ *
+ * @hdr: the frame
+ */
+static inline int ieee80211_get_morefrag(struct ieee80211_hdr *hdr)
+{
+        return (le16_to_cpu(hdr->frame_control) &
+                IEEE80211_FCTL_MOREFRAGS) != 0;
+}
+
 #endif /* IEEE80211_H */
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index af380cb876a0..27ea2ac445ad 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -59,7 +59,7 @@ struct arc_rfc1201
 {
     uint8_t  proto;             /* protocol ID field - varies           */
     uint8_t  split_flag;        /* for use with split packets           */
-    uint16_t sequence;          /* sequence number                      */
+    __be16   sequence;          /* sequence number                      */
     uint8_t  payload[0];        /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 4ff211d98769..99e3a1a00099 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -104,7 +104,7 @@ struct __fdb_entry
 
 #include <linux/netdevice.h>
 
-extern void brioctl_set(int (*ioctl_hook)(unsigned int, void __user *));
+extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
 extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,
                                                struct sk_buff *skb);
 extern int (*br_should_route_hook)(struct sk_buff **pskb);
diff --git a/include/linux/if_eql.h b/include/linux/if_eql.h
index b68752fdc5c4..79c4f268410d 100644
--- a/include/linux/if_eql.h
+++ b/include/linux/if_eql.h
@@ -58,7 +58,6 @@ typedef struct equalizer {
         slave_queue_t           queue;
         int                     min_slaves;
         int                     max_slaves;
-        struct net_device_stats stats;
         struct timer_list       timer;
 } equalizer_t;  
 
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 3213f6f4aa58..5f9297793661 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -117,9 +117,19 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb)
         return (struct ethhdr *)skb_mac_header(skb);
 }
 
+int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);
+
 #ifdef CONFIG_SYSCTL
 extern struct ctl_table ether_table[];
 #endif
+
+/*
+ *      Display a 6 byte device address (MAC) in a readable format.
+ */
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
+extern char *print_mac(char *buf, const u8 *addr);
+#define DECLARE_MAC_BUF(var) char var[18] __maybe_unused
+
 #endif
 
 #endif  /* _LINUX_IF_ETHER_H */
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 422084d18ce1..84c3492ae5cb 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -78,6 +78,7 @@ enum
         IFLA_LINKMODE,
         IFLA_LINKINFO,
 #define IFLA_LINKINFO IFLA_LINKINFO
+        IFLA_NET_NS_PID,
         __IFLA_MAX
 };
 
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 516203b6fdeb..a7d6a2234b31 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -32,8 +32,8 @@ struct pppol2tp_addr
 
         struct sockaddr_in addr;        /* IP address and port to send to */
 
-        __be16 s_tunnel, s_session;     /* For matching incoming packets */
-        __be16 d_tunnel, d_session;     /* For sending outgoing packets */
+        __u16 s_tunnel, s_session;      /* For matching incoming packets */
+        __u16 d_tunnel, d_session;      /* For sending outgoing packets */
 };
 
 /* Socket options:
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 25652545ba6e..40743e032845 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -40,7 +40,7 @@
 /************************************************************************ 
  * PPPoE addressing definition 
  */ 
-typedef __u16 sid_t; 
+typedef __be16 sid_t;
 struct pppoe_addr{ 
        sid_t           sid;                    /* Session identifier */ 
        unsigned char   remote[ETH_ALEN];       /* Remote address */ 
@@ -90,8 +90,8 @@ struct sockaddr_pppol2tp {
 #define PADS_CODE       0x65
 #define PADT_CODE       0xa7
 struct pppoe_tag {
-        __u16 tag_type;
-        __u16 tag_len;
+        __be16 tag_type;
+        __be16 tag_len;
         char tag_data[0];
 } __attribute ((packed));
 
@@ -118,8 +118,8 @@ struct pppoe_hdr {
 #error  "Please fix <asm/byteorder.h>"
 #endif
         __u8 code;
-        __u16 sid;
-        __u16 length;
+        __be16 sid;
+        __be16 length;
         struct pppoe_tag tag[0];
 } __attribute__ ((packed));
 
@@ -152,7 +152,7 @@ struct pppox_sock {
         union {
                 struct pppoe_opt pppoe;
         } proto;
-        unsigned short          num;
+        __be16                  num;
 };
 #define pppoe_dev       proto.pppoe.dev
 #define pppoe_ifindex   proto.pppoe.ifindex
@@ -172,7 +172,7 @@ static inline struct sock *sk_pppox(struct pppox_sock *po)
 struct module;
 
 struct pppox_proto {
-        int             (*create)(struct socket *sock);
+        int             (*create)(struct net *net, struct socket *sock);
         int             (*ioctl)(struct socket *sock, unsigned int cmd,
                                  unsigned long arg);
         struct module   *owner;
diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
index 68c896a36a34..3b1b7ba19825 100644
--- a/include/linux/if_shaper.h
+++ b/include/linux/if_shaper.h
@@ -24,19 +24,7 @@ struct shaper
         unsigned long recovery; /* Time we can next clock a packet out on
                                    an empty queue */
         spinlock_t lock;
-        struct net_device_stats stats;
         struct net_device *dev;
-        int  (*hard_start_xmit) (struct sk_buff *skb,
-                struct net_device *dev);
-        int  (*hard_header) (struct sk_buff *skb,
-                struct net_device *dev,
-                unsigned short type,
-                void *daddr,
-                void *saddr,
-                unsigned len);
-        int  (*rebuild_header)(struct sk_buff *skb);
-        int (*hard_header_cache)(struct neighbour *neigh, struct hh_cache *hh);
-        void (*header_cache_update)(struct hh_cache *hh, struct net_device *dev, unsigned char *  haddr);
         struct net_device_stats* (*get_stats)(struct net_device *dev);
         struct timer_list timer;
 };
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 42eb6945b93e..33e489d5bb33 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -42,7 +42,6 @@ struct tun_struct {
         struct sk_buff_head     readq;
 
         struct net_device       *dev;
-        struct net_device_stats stats;
 
         struct fasync_struct    *fasync;
 
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f8443fdb124a..976d4b1067d1 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -62,7 +62,7 @@ struct vlan_hdr {
 #define VLAN_VID_MASK   0xfff
 
 /* found in socket.c */
-extern void vlan_ioctl_set(int (*hook)(void __user *));
+extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
 
 #define VLAN_NAME "vlan"
 
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h
new file mode 100644
index 000000000000..e1fc1d16d3cd
--- /dev/null
+++ b/include/linux/inet_lro.h
@@ -0,0 +1,177 @@
+/*
+ *  linux/include/linux/inet_lro.h
+ *
+ *  Large Receive Offload (ipv4 / tcp)
+ *
+ *  (C) Copyright IBM Corp. 2007
+ *
+ *  Authors:
+ *       Jan-Bernd Themann <themann@de.ibm.com>
+ *       Christoph Raisch <raisch@de.ibm.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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __INET_LRO_H_
+#define __INET_LRO_H_
+
+#include <net/ip.h>
+#include <net/tcp.h>
+
+/*
+ * LRO statistics
+ */
+
+struct net_lro_stats {
+        unsigned long aggregated;
+        unsigned long flushed;
+        unsigned long no_desc;
+};
+
+/*
+ * LRO descriptor for a tcp session
+ */
+struct net_lro_desc {
+        struct sk_buff *parent;
+        struct sk_buff *last_skb;
+        struct skb_frag_struct *next_frag;
+        struct iphdr *iph;
+        struct tcphdr *tcph;
+        struct vlan_group *vgrp;
+        __wsum  data_csum;
+        u32 tcp_rcv_tsecr;
+        u32 tcp_rcv_tsval;
+        u32 tcp_ack;
+        u32 tcp_next_seq;
+        u32 skb_tot_frags_len;
+        u16 ip_tot_len;
+        u16 tcp_saw_tstamp;             /* timestamps enabled */
+        u16 tcp_window;
+        u16 vlan_tag;
+        int pkt_aggr_cnt;               /* counts aggregated packets */
+        int vlan_packet;
+        int mss;
+        int active;
+};
+
+/*
+ * Large Receive Offload (LRO) Manager
+ *
+ * Fields must be set by driver
+ */
+
+struct net_lro_mgr {
+        struct net_device *dev;
+        struct net_lro_stats stats;
+
+        /* LRO features */
+        unsigned long features;
+#define LRO_F_NAPI            1  /* Pass packets to stack via NAPI */
+#define LRO_F_EXTRACT_VLAN_ID 2  /* Set flag if VLAN IDs are extracted
+                                    from received packets and eth protocol
+                                    is still ETH_P_8021Q */
+
+        u32 ip_summed;      /* Set in non generated SKBs in page mode */
+        u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY
+                             * or CHECKSUM_NONE */
+
+        int max_desc; /* Max number of LRO descriptors  */
+        int max_aggr; /* Max number of LRO packets to be aggregated */
+
+        struct net_lro_desc *lro_arr; /* Array of LRO descriptors */
+
+        /*
+         * Optimized driver functions
+         *
+         * get_skb_header: returns tcp and ip header for packet in SKB
+         */
+        int (*get_skb_header)(struct sk_buff *skb, void **ip_hdr,
+                              void **tcpudp_hdr, u64 *hdr_flags, void *priv);
+
+        /* hdr_flags: */
+#define LRO_IPV4 1 /* ip_hdr is IPv4 header */
+#define LRO_TCP  2 /* tcpudp_hdr is TCP header */
+
+        /*
+         * get_frag_header: returns mac, tcp and ip header for packet in SKB
+         *
+         * @hdr_flags: Indicate what kind of LRO has to be done
+         *             (IPv4/IPv6/TCP/UDP)
+         */
+        int (*get_frag_header)(struct skb_frag_struct *frag, void **mac_hdr,
+                               void **ip_hdr, void **tcpudp_hdr, u64 *hdr_flags,
+                               void *priv);
+};
+
+/*
+ * Processes a SKB
+ *
+ * @lro_mgr: LRO manager to use
+ * @skb: SKB to aggregate
+ * @priv: Private data that may be used by driver functions
+ *        (for example get_tcp_ip_hdr)
+ */
+
+void lro_receive_skb(struct net_lro_mgr *lro_mgr,
+                     struct sk_buff *skb,
+                     void *priv);
+
+/*
+ * Processes a SKB with VLAN HW acceleration support
+ */
+
+void lro_vlan_hwaccel_receive_skb(struct net_lro_mgr *lro_mgr,
+                                  struct sk_buff *skb,
+                                  struct vlan_group *vgrp,
+                                  u16 vlan_tag,
+                                  void *priv);
+
+/*
+ * Processes a fragment list
+ *
+ * This functions aggregate fragments and generate SKBs do pass
+ * the packets to the stack.
+ *
+ * @lro_mgr: LRO manager to use
+ * @frags: Fragment to be processed. Must contain entire header in first
+ *         element.
+ * @len: Length of received data
+ * @true_size: Actual size of memory the fragment is consuming
+ * @priv: Private data that may be used by driver functions
+ *        (for example get_tcp_ip_hdr)
+ */
+
+void lro_receive_frags(struct net_lro_mgr *lro_mgr,
+                       struct skb_frag_struct *frags,
+                       int len, int true_size, void *priv, __wsum sum);
+
+void lro_vlan_hwaccel_receive_frags(struct net_lro_mgr *lro_mgr,
+                                    struct skb_frag_struct *frags,
+                                    int len, int true_size,
+                                    struct vlan_group *vgrp,
+                                    u16 vlan_tag,
+                                    void *priv, __wsum sum);
+
+/*
+ * Forward all aggregated SKBs held by lro_mgr to network stack
+ */
+
+void lro_flush_all(struct net_lro_mgr *lro_mgr);
+
+void lro_flush_pkt(struct net_lro_mgr *lro_mgr,
+                   struct iphdr *iph, struct tcphdr *tcph);
+
+#endif
diff --git a/include/linux/init.h b/include/linux/init.h
index 5b5285316339..f8d9d0b5cffc 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -40,7 +40,7 @@
 
 /* These are for everybody (although not all archs will actually
    discard it in modules) */
-#define __init          __attribute__ ((__section__ (".init.text")))
+#define __init          __attribute__ ((__section__ (".init.text"))) __cold
 #define __initdata      __attribute__ ((__section__ (".init.data")))
 #define __exitdata      __attribute__ ((__section__(".exit.data")))
 #define __exit_call     __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
@@ -57,11 +57,12 @@
  * The markers follow same syntax rules as __init / __initdata. */
 #define __init_refok     noinline __attribute__ ((__section__ (".text.init.refok")))
 #define __initdata_refok          __attribute__ ((__section__ (".data.init.refok")))
+#define __exit_refok     noinline __attribute__ ((__section__ (".exit.text.refok")))
 
 #ifdef MODULE
-#define __exit          __attribute__ ((__section__(".exit.text")))
+#define __exit          __attribute__ ((__section__(".exit.text"))) __cold
 #else
-#define __exit          __attribute_used__ __attribute__ ((__section__(".exit.text")))
+#define __exit          __attribute_used__ __attribute__ ((__section__(".exit.text"))) __cold
 #endif
 
 /* For assembly routines */
@@ -114,7 +115,7 @@ void prepare_namespace(void);
  *
  * This only exists for built-in code, not for modules.
  */
-#define pure_initcall(fn)               __define_initcall("0",fn,1)
+#define pure_initcall(fn)               __define_initcall("0",fn,0)
 
 #define core_initcall(fn)               __define_initcall("1",fn,1)
 #define core_initcall_sync(fn)          __define_initcall("1s",fn,1s)
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index cab741c2d603..513bc3e489f0 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -9,6 +9,7 @@
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
+#include <net/net_namespace.h>
 
 #define INIT_FDTABLE \
 {                                                       \
@@ -78,6 +79,7 @@ extern struct nsproxy init_nsproxy;
         .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
         .uts_ns         = &init_uts_ns,                                 \
         .mnt_ns         = NULL,                                         \
+        INIT_NET_NS(net_ns)                                             \
         INIT_IPC_NS(ipc_ns)                                             \
         .user_ns        = &init_user_ns,                                \
 }
@@ -86,7 +88,7 @@ extern struct nsproxy init_nsproxy;
         .count          = ATOMIC_INIT(1),                               \
         .action         = { { { .sa_handler = NULL, } }, },             \
         .siglock        = __SPIN_LOCK_UNLOCKED(sighand.siglock),        \
-        .signalfd_list  = LIST_HEAD_INIT(sighand.signalfd_list),        \
+        .signalfd_wqh   = __WAIT_QUEUE_HEAD_INITIALIZER(sighand.signalfd_wqh),  \
 }
 
 extern struct group_info init_groups;
diff --git a/include/linux/input.h b/include/linux/input.h
index d09e5e8be325..125e925320fd 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -360,9 +360,16 @@ struct input_absinfo {
 
 #define KEY_BLUETOOTH           237
 #define KEY_WLAN                238
+#define KEY_UWB                 239
 
 #define KEY_UNKNOWN             240
 
+#define KEY_VIDEO_NEXT          241     /* drive next video source */
+#define KEY_VIDEO_PREV          242     /* drive previous video source */
+#define KEY_BRIGHTNESS_CYCLE    243     /* brightness up, after max is min */
+#define KEY_BRIGHTNESS_ZERO     244     /* brightness off, use ambient */
+#define KEY_DISPLAY_OFF         245     /* display device to off state */
+
 #define BTN_MISC                0x100
 #define BTN_0                   0x100
 #define BTN_1                   0x101
@@ -552,6 +559,8 @@ struct input_absinfo {
 #define KEY_BRL_DOT6            0x1f6
 #define KEY_BRL_DOT7            0x1f7
 #define KEY_BRL_DOT8            0x1f8
+#define KEY_BRL_DOT9            0x1f9
+#define KEY_BRL_DOT10           0x1fa
 
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING     KEY_MUTE
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5323f6275854..5523f19d88d2 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -11,8 +11,6 @@
 #include <linux/hardirq.h>
 #include <linux/sched.h>
 #include <linux/irqflags.h>
-#include <linux/bottom_half.h>
-#include <linux/device.h>
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -97,6 +95,8 @@ extern int __must_check request_irq(unsigned int, irq_handler_t handler,
                        unsigned long, const char *, void *);
 extern void free_irq(unsigned int, void *);
 
+struct device;
+
 extern int __must_check devm_request_irq(struct device *dev, unsigned int irq,
                             irq_handler_t handler, unsigned long irqflags,
                             const char *devname, void *dev_id);
@@ -120,11 +120,11 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
 # define local_irq_enable_in_hardirq()  local_irq_enable()
 #endif
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 extern void disable_irq_nosync(unsigned int irq);
 extern void disable_irq(unsigned int irq);
 extern void enable_irq(unsigned int irq);
 
+#ifdef CONFIG_GENERIC_HARDIRQS
 /*
  * Special lockdep variants of irq disabling/enabling.
  * These should be used for locking constructs that
diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h
index 2eaa142cd061..baf29387cab4 100644
--- a/include/linux/ioprio.h
+++ b/include/linux/ioprio.h
@@ -53,6 +53,14 @@ static inline int task_ioprio(struct task_struct *task)
         return IOPRIO_NORM;
 }
 
+static inline int task_ioprio_class(struct task_struct *task)
+{
+        if (ioprio_valid(task->ioprio))
+                return IOPRIO_PRIO_CLASS(task->ioprio);
+
+        return IOPRIO_CLASS_BE;
+}
+
 static inline int task_nice_ioprio(struct task_struct *task)
 {
         return (task_nice(task) + 20) / 5;
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 97983dc9df13..5d35a4cc3bff 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -96,27 +96,6 @@ struct ipv6_destopt_hao {
         struct in6_addr         addr;
 } __attribute__ ((__packed__));
 
-struct ipv6_auth_hdr {
-        __u8  nexthdr;
-        __u8  hdrlen;           /* This one is measured in 32 bit units! */
-        __be16 reserved;
-        __be32 spi;
-        __be32 seq_no;           /* Sequence number */
-        __u8  auth_data[0];     /* Length variable but >=4. Mind the 64 bit alignment! */
-};
-
-struct ipv6_esp_hdr {
-        __be32 spi;
-        __be32 seq_no;           /* Sequence number */
-        __u8  enc_data[0];      /* Length variable but >=8. Mind the 64 bit alignment! */
-};
-
-struct ipv6_comp_hdr {
-        __u8 nexthdr;
-        __u8 flags;
-        __be16 cpi;
-};
-
 /*
  *      IPv6 fixed header
  *
@@ -219,7 +198,6 @@ enum {
 #include <linux/tcp.h>
 #include <linux/udp.h>
 
-#include <net/if_inet6.h>       /* struct ipv6_mc_socklist */
 #include <net/inet_sock.h>
 
 static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
@@ -273,6 +251,10 @@ struct tcp6_request_sock {
         struct inet6_request_sock tcp6rsk_inet6;
 };
 
+struct ipv6_mc_socklist;
+struct ipv6_ac_socklist;
+struct ipv6_fl_socklist;
+
 /**
  * struct ipv6_pinfo - ipv6 private area
  *
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 8e3735714c1c..28f88ecba344 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -77,6 +77,7 @@ typedef enum {
         IRDA_ACT200L_DONGLE      = 10,
         IRDA_MA600_DONGLE        = 11,
         IRDA_TOIM3232_DONGLE     = 12,
+        IRDA_EP7211_DONGLE       = 13,
 } IRDA_DONGLE;
 
 /* Protocol types to be used for SOCK_DGRAM */
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 44657197fcb0..efc88538b2ba 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -140,6 +140,7 @@ struct irq_chip {
  * @wake_depth:         enable depth, for multiple set_irq_wake() callers
  * @irq_count:          stats field to detect stalled irqs
  * @irqs_unhandled:     stats field for spurious unhandled interrupts
+ * @last_unhandled:     aging timer for unhandled count
  * @lock:               locking for SMP
  * @affinity:           IRQ affinity on SMP
  * @cpu:                cpu index useful for balancing
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 1b855335cb11..b0270e3814c8 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -22,7 +22,18 @@ struct isa_driver {
 
 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
 
+#ifdef CONFIG_ISA
 int isa_register_driver(struct isa_driver *, unsigned int);
 void isa_unregister_driver(struct isa_driver *);
+#else
+static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
+{
+        return 0;
+}
+
+static inline void isa_unregister_driver(struct isa_driver *d)
+{
+}
+#endif
 
 #endif /* __LINUX_ISA_H */
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 3c7875b7ab5b..ad09506554a3 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -353,13 +353,6 @@ typedef struct isdn_net_local_s {
                                        /* a particular channel (including  */
                                        /* the frame_cnt                    */
 
-  int                    (*org_hhc)(
-                                    struct neighbour *neigh,
-                                    struct hh_cache *hh);
-                                       /* Ptr to orig. header_cache_update */
-  void                   (*org_hcu)(struct hh_cache *,
-                                    struct net_device *,
-                                    unsigned char *);
   int  pppbind;                        /* ippp device for bindings         */
   int                                   dialtimeout;    /* How long shall we try on dialing? (jiffies) */
   int                                   dialwait;               /* How long shall we wait after failed attempt? (jiffies) */
@@ -389,7 +382,7 @@ typedef struct isdn_net_dev_s {
                                           online                           */
   spinlock_t queue_lock;               /* lock to protect queue            */
   void *next;                          /* Pointer to next isdn-interface   */
-  struct net_device dev;               /* interface to upper levels        */
+  struct net_device *dev;              /* interface to upper levels        */
 #ifdef CONFIG_ISDN_PPP
   ippp_bundle * pb;             /* pointer to the common bundle structure
                                  * with the per-bundle data */
diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
new file mode 100644
index 000000000000..794b8daa9378
--- /dev/null
+++ b/include/linux/ivtv.h
@@ -0,0 +1,72 @@
+/*
+    Public ivtv API header
+    Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
+    Copyright (C) 2004-2007  Hans Verkuil <hverkuil@xs4all.nl>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LINUX_IVTV_H__
+#define __LINUX_IVTV_H__
+
+#ifdef __KERNEL__
+#include <linux/compiler.h> /* need __user */
+#else
+#define __user
+#endif
+#include <linux/types.h>
+
+/* ivtv knows several distinct output modes: MPEG streaming,
+   YUV streaming, YUV updates through user DMA and the passthrough
+   mode.
+
+   In order to clearly tell the driver that we are in user DMA
+   YUV mode you need to call IVTV_IOC_DMA_FRAME with y_source == NULL
+   first (althrough if you don't then the first time
+   DMA_FRAME is called the mode switch is done automatically).
+
+   When you close the file handle the user DMA mode is exited again.
+
+   While in one mode, you cannot use another mode (EBUSY is returned).
+
+   All this means that if you want to change the YUV interlacing
+   for the user DMA YUV mode you first need to do call IVTV_IOC_DMA_FRAME
+   with y_source == NULL before you can set the correct format using
+   VIDIOC_S_FMT.
+
+   Eventually all this should be replaced with a proper V4L2 API,
+   but for now we have to do it this way. */
+
+struct ivtv_dma_frame {
+        enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */
+        __u32 pixelformat;       /* 0 == same as destination */
+        void __user *y_source;   /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
+                                    then just switch to user DMA YUV output mode */
+        void __user *uv_source;  /* Unused for RGB pixelformats */
+        struct v4l2_rect src;
+        struct v4l2_rect dst;
+        __u32 src_width;
+        __u32 src_height;
+};
+
+#define IVTV_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
+
+/* These are the VBI types as they appear in the embedded VBI private packets. */
+#define IVTV_SLICED_TYPE_TELETEXT_B     (1)
+#define IVTV_SLICED_TYPE_CAPTION_525    (4)
+#define IVTV_SLICED_TYPE_WSS_625        (5)
+#define IVTV_SLICED_TYPE_VPS            (7)
+
+#endif /* _LINUX_IVTV_H */
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
new file mode 100644
index 000000000000..e980ba62ddcc
--- /dev/null
+++ b/include/linux/ivtvfb.h
@@ -0,0 +1,42 @@
+/*
+    On Screen Display cx23415 Framebuffer driver
+
+    Copyright (C) 2006, 2007  Ian Armstrong <ian@iarmst.demon.co.uk>
+
+    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
+ */
+
+#ifndef __LINUX_IVTVFB_H__
+#define __LINUX_IVTVFB_H__
+
+#ifdef __KERNEL__
+#include <linux/compiler.h> /* need __user */
+#else
+#define __user
+#endif
+#include <linux/types.h>
+
+/* Framebuffer external API */
+
+struct ivtvfb_dma_frame {
+        void __user *source;
+        unsigned long dest_offset;
+        int count;
+};
+
+#define IVTVFB_IOC_DMA_FRAME    _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
+#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, u_int32_t)
+
+#endif
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 0e0fedd2039a..260d6d76c5f3 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -50,14 +50,14 @@
  */
 #define JBD_DEFAULT_MAX_COMMIT_AGE 5
 
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
 /*
  * Define JBD_EXPENSIVE_CHECKING to enable more expensive internal
  * consistency checks.  By default we don't do this unless
- * CONFIG_JBD_DEBUG is on.
+ * CONFIG_JBD2_DEBUG is on.
  */
 #define JBD_EXPENSIVE_CHECKING
-extern int jbd2_journal_enable_debug;
+extern u8 jbd2_journal_enable_debug;
 
 #define jbd_debug(n, f, a...)                                           \
         do {                                                            \
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index c080f61fb024..d7a5e034c3a2 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -36,8 +36,6 @@
 /* LATCH is used in the interval timer and ftape setup. */
 #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)  /* For divider */
 
-#define LATCH_HPET ((HPET_TICK_RATE + HZ/2) / HZ)
-
 /* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, the we can
  * improve accuracy by shifting LSH bits, hence calculating:
  *     (NOM << LSH) / DEN
@@ -53,13 +51,9 @@
 /* HZ is the requested value. ACTHZ is actual HZ ("<< 8" is for accuracy) */
 #define ACTHZ (SH_DIV (CLOCK_TICK_RATE, LATCH, 8))
 
-#define ACTHZ_HPET (SH_DIV (HPET_TICK_RATE, LATCH_HPET, 8))
-
 /* TICK_NSEC is the time between ticks in nsec assuming real ACTHZ */
 #define TICK_NSEC (SH_DIV (1000000UL * 1000, ACTHZ, 8))
 
-#define TICK_NSEC_HPET (SH_DIV(1000000UL * 1000, ACTHZ_HPET, 8))
-
 /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
 #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
 
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index 506ad20c18f8..8bdb16bfe5fb 100644
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -161,4 +161,7 @@ static inline void con_schedule_flip(struct tty_struct *t)
         schedule_delayed_work(&t->buf.work, 0);
 }
 
+/* mac_hid.c */
+extern int mac_hid_mouse_emulate_buttons(int, unsigned int, int);
+
 #endif
diff --git a/include/linux/kdebug.h b/include/linux/kdebug.h
index 5db38d6d8b92..ed815090b3bc 100644
--- a/include/linux/kdebug.h
+++ b/include/linux/kdebug.h
@@ -3,6 +3,8 @@
 
 #include <asm/kdebug.h>
 
+struct notifier_block;
+
 struct die_args {
         struct pt_regs *regs;
         const char *str;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 1eb9cde550c4..d9725a28a265 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -34,6 +34,7 @@ extern const char linux_proc_banner[];
 
 #define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
 #define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
+#define PTR_ALIGN(p, a)         ((typeof(p))ALIGN((unsigned long)(p), (a)))
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
 
@@ -41,6 +42,20 @@ extern const char linux_proc_banner[];
 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
 
+#ifdef CONFIG_LBD
+# include <asm/div64.h>
+# define sector_div(a, b) do_div(a, b)
+#else
+# define sector_div(n, b)( \
+{ \
+        int _res; \
+        _res = (n) % (b); \
+        (n) /= (b); \
+        _res; \
+} \
+)
+#endif
+
 /**
  * upper_32_bits - return bits 32-63 of a number
  * @n: the number we're accessing
@@ -106,7 +121,7 @@ extern int cond_resched(void);
 extern struct atomic_notifier_head panic_notifier_list;
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
-        __attribute__ ((NORET_AND format (printf, 1, 2)));
+        __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
 extern void oops_enter(void);
 extern void oops_exit(void);
 extern int oops_may_print(void);
@@ -155,14 +170,14 @@ extern void dump_thread(struct pt_regs *regs, struct user *dump);
 asmlinkage int vprintk(const char *fmt, va_list args)
         __attribute__ ((format (printf, 1, 0)));
 asmlinkage int printk(const char * fmt, ...)
-        __attribute__ ((format (printf, 1, 2)));
+        __attribute__ ((format (printf, 1, 2))) __cold;
 #else
 static inline int vprintk(const char *s, va_list args)
         __attribute__ ((format (printf, 1, 0)));
 static inline int vprintk(const char *s, va_list args) { return 0; }
 static inline int printk(const char *s, ...)
         __attribute__ ((format (printf, 1, 2)));
-static inline int printk(const char *s, ...) { return 0; }
+static inline int __cold printk(const char *s, ...) { return 0; }
 #endif
 
 unsigned long int_sqrt(unsigned long);
@@ -212,7 +227,7 @@ extern enum system_states {
 #define TAINT_USER                      (1<<6)
 #define TAINT_DIE                       (1<<7)
 
-extern void dump_stack(void);
+extern void dump_stack(void) __cold;
 
 enum {
         DUMP_PREFIX_NONE,
@@ -224,9 +239,9 @@ extern void hex_dump_to_buffer(const void *buf, size_t len,
                                 char *linebuf, size_t linebuflen, bool ascii);
 extern void print_hex_dump(const char *level, const char *prefix_str,
                                 int prefix_type, int rowsize, int groupsize,
-                                void *buf, size_t len, bool ascii);
+                                const void *buf, size_t len, bool ascii);
 extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
-                        void *buf, size_t len);
+                        const void *buf, size_t len);
 #define hex_asc(x)      "0123456789abcdef"[x]
 
 #ifdef DEBUG
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h
index f892b272f3ff..33b5c2e325b9 100644
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
@@ -439,8 +439,10 @@ extern unsigned short plain_map[NR_KEYS];
 #define K_BRL_DOT6      K(KT_BRL, 6)
 #define K_BRL_DOT7      K(KT_BRL, 7)
 #define K_BRL_DOT8      K(KT_BRL, 8)
+#define K_BRL_DOT9      K(KT_BRL, 9)
+#define K_BRL_DOT10     K(KT_BRL, 10)
 
-#define NR_BRL          9
+#define NR_BRL          11
 
 #define MAX_DIACR       256
 #endif
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 10f505c8431d..5dc13848891b 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -36,13 +36,57 @@ static inline int request_module(const char * name, ...) { return -ENOSYS; }
 #define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
 
 struct key;
-extern int call_usermodehelper_keys(char *path, char *argv[], char *envp[],
-                                    struct key *session_keyring, int wait);
+struct file;
+struct subprocess_info;
+
+/* Allocate a subprocess_info structure */
+struct subprocess_info *call_usermodehelper_setup(char *path,
+                                                  char **argv, char **envp);
+
+/* Set various pieces of state into the subprocess_info structure */
+void call_usermodehelper_setkeys(struct subprocess_info *info,
+                                 struct key *session_keyring);
+int call_usermodehelper_stdinpipe(struct subprocess_info *sub_info,
+                                  struct file **filp);
+void call_usermodehelper_setcleanup(struct subprocess_info *info,
+                                    void (*cleanup)(char **argv, char **envp));
+
+enum umh_wait {
+        UMH_NO_WAIT = -1,       /* don't wait at all */
+        UMH_WAIT_EXEC = 0,      /* wait for the exec, but not the process */
+        UMH_WAIT_PROC = 1,      /* wait for the process to complete */
+};
+
+/* Actually execute the sub-process */
+int call_usermodehelper_exec(struct subprocess_info *info, enum umh_wait wait);
+
+/* Free the subprocess_info. This is only needed if you're not going
+   to call call_usermodehelper_exec */
+void call_usermodehelper_freeinfo(struct subprocess_info *info);
 
 static inline int
-call_usermodehelper(char *path, char **argv, char **envp, int wait)
+call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
 {
-        return call_usermodehelper_keys(path, argv, envp, NULL, wait);
+        struct subprocess_info *info;
+
+        info = call_usermodehelper_setup(path, argv, envp);
+        if (info == NULL)
+                return -ENOMEM;
+        return call_usermodehelper_exec(info, wait);
+}
+
+static inline int
+call_usermodehelper_keys(char *path, char **argv, char **envp,
+                         struct key *session_keyring, enum umh_wait wait)
+{
+        struct subprocess_info *info;
+
+        info = call_usermodehelper_setup(path, argv, envp);
+        if (info == NULL)
+                return -ENOMEM;
+
+        call_usermodehelper_setkeys(info, session_keyring);
+        return call_usermodehelper_exec(info, wait);
 }
 
 extern void usermodehelper_init(void);
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 06cbf41d32d2..4a0d27f475d7 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -1,8 +1,10 @@
 /*
  * kobject.h - generic kernel object infrastructure.
  *
- * Copyright (c) 2002-2003      Patrick Mochel
- * Copyright (c) 2002-2003      Open Source Development Labs
+ * Copyright (c) 2002-2003 Patrick Mochel
+ * Copyright (c) 2002-2003 Open Source Development Labs
+ * Copyright (c) 2006-2007 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (c) 2006-2007 Novell Inc.
  *
  * This file is released under the GPLv2.
  *
@@ -29,6 +31,8 @@
 
 #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 */
 
 /* path to the userspace helper executed on an event */
 extern char uevent_helper[];
@@ -36,27 +40,34 @@ extern char uevent_helper[];
 /* counter to tag the uevent, read only except for the kobject core */
 extern u64 uevent_seqnum;
 
-/* the actions here must match the proper string in lib/kobject_uevent.c */
-typedef int __bitwise kobject_action_t;
+/*
+ * The actions here must match the index to the string array
+ * in lib/kobject_uevent.c
+ *
+ * Do not add new actions here without checking with the driver-core
+ * maintainers. Action strings are not meant to express subsystem
+ * or device specific properties. In most cases you want to send a
+ * kobject_uevent_env(kobj, KOBJ_CHANGE, env) with additional event
+ * specific variables added to the event environment.
+ */
 enum kobject_action {
-        KOBJ_ADD        = (__force kobject_action_t) 0x01,      /* exclusive to core */
-        KOBJ_REMOVE     = (__force kobject_action_t) 0x02,      /* exclusive to core */
-        KOBJ_CHANGE     = (__force kobject_action_t) 0x03,      /* device state change */
-        KOBJ_OFFLINE    = (__force kobject_action_t) 0x04,      /* device offline */
-        KOBJ_ONLINE     = (__force kobject_action_t) 0x05,      /* device online */
-        KOBJ_MOVE       = (__force kobject_action_t) 0x06,      /* device move */
+        KOBJ_ADD,
+        KOBJ_REMOVE,
+        KOBJ_CHANGE,
+        KOBJ_MOVE,
+        KOBJ_ONLINE,
+        KOBJ_OFFLINE,
+        KOBJ_MAX
 };
 
 struct kobject {
         const char              * k_name;
-        char                    name[KOBJ_NAME_LEN];
         struct kref             kref;
         struct list_head        entry;
         struct kobject          * parent;
         struct kset             * kset;
         struct kobj_type        * ktype;
         struct sysfs_dirent     * sd;
-        wait_queue_head_t       poll;
 };
 
 extern int kobject_set_name(struct kobject *, const char *, ...)
@@ -71,14 +82,9 @@ extern void kobject_init(struct kobject *);
 extern void kobject_cleanup(struct kobject *);
 
 extern int __must_check kobject_add(struct kobject *);
-extern int __must_check kobject_shadow_add(struct kobject *kobj,
-                                           struct sysfs_dirent *shadow_parent);
 extern void kobject_del(struct kobject *);
 
 extern int __must_check kobject_rename(struct kobject *, const char *new_name);
-extern int __must_check kobject_shadow_rename(struct kobject *kobj,
-                                              struct sysfs_dirent *new_parent,
-                                              const char *new_name);
 extern int __must_check kobject_move(struct kobject *, struct kobject *);
 
 extern int __must_check kobject_register(struct kobject *);
@@ -99,37 +105,44 @@ struct kobj_type {
         struct attribute        ** default_attrs;
 };
 
+struct kobj_uevent_env {
+        char *envp[UEVENT_NUM_ENVP];
+        int envp_idx;
+        char buf[UEVENT_BUFFER_SIZE];
+        int buflen;
+};
 
-/**
- *      kset - a set of kobjects of a specific type, belonging
- *      to a specific subsystem.
- *
- *      All kobjects of a kset should be embedded in an identical 
- *      type. This type may have a descriptor, which the kset points
- *      to. This allows there to exist sets of objects of the same
- *      type in different subsystems.
- *
- *      A subsystem does not have to be a list of only one type 
- *      of object; multiple ksets can belong to one subsystem. All 
- *      ksets of a subsystem share the subsystem's lock.
- *
- *      Each kset can support specific event variables; it can
- *      supress the event generation or add subsystem specific
- *      variables carried with the event.
- */
 struct kset_uevent_ops {
         int (*filter)(struct kset *kset, struct kobject *kobj);
         const char *(*name)(struct kset *kset, struct kobject *kobj);
-        int (*uevent)(struct kset *kset, struct kobject *kobj, char **envp,
-                        int num_envp, char *buffer, int buffer_size);
+        int (*uevent)(struct kset *kset, struct kobject *kobj,
+                      struct kobj_uevent_env *env);
 };
 
+/**
+ * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
+ *
+ * A kset defines a group of kobjects.  They can be individually
+ * different "types" but overall these kobjects all want to be grouped
+ * together and operated on in the same manner.  ksets are used to
+ * define the attribute callbacks and other common events that happen to
+ * a kobject.
+ *
+ * @ktype: the struct kobj_type for this specific kset
+ * @list: the list of all kobjects for this kset
+ * @list_lock: a lock for iterating over the kobjects
+ * @kobj: the embedded kobject for this kset (recursion, isn't it fun...)
+ * @uevent_ops: the set of uevent operations for this kset.  These are
+ * called whenever a kobject has something happen to it so that the kset
+ * can add new environment variables, or filter out the uevents if so
+ * desired.
+ */
 struct kset {
-        struct kobj_type        * ktype;
+        struct kobj_type        *ktype;
         struct list_head        list;
         spinlock_t              list_lock;
         struct kobject          kobj;
-        struct kset_uevent_ops  * uevent_ops;
+        struct kset_uevent_ops  *uevent_ops;
 };
 
 
@@ -164,22 +177,22 @@ static inline struct kobj_type * get_ktype(struct kobject * k)
 extern struct kobject * kset_find_obj(struct kset *, const char *);
 
 
-/**
+/*
  * Use this when initializing an embedded kset with no other 
  * fields to initialize.
  */
-#define set_kset_name(str)      .kset = { .kobj = { .name = str } }
+#define set_kset_name(str)      .kset = { .kobj = { .k_name = str } }
 
 
 #define decl_subsys(_name,_type,_uevent_ops) \
 struct kset _name##_subsys = { \
-        .kobj = { .name = __stringify(_name) }, \
+        .kobj = { .k_name = __stringify(_name) }, \
         .ktype = _type, \
         .uevent_ops =_uevent_ops, \
 }
 #define decl_subsys_name(_varname,_name,_type,_uevent_ops) \
 struct kset _varname##_subsys = { \
-        .kobj = { .name = __stringify(_name) }, \
+        .kobj = { .k_name = __stringify(_name) }, \
         .ktype = _type, \
         .uevent_ops =_uevent_ops, \
 }
@@ -189,7 +202,7 @@ extern struct kset kernel_subsys;
 /* The global /sys/hypervisor/ subsystem  */
 extern struct kset hypervisor_subsys;
 
-/**
+/*
  * Helpers for setting the kset of registered objects.
  * Often, a registered object belongs to a kset embedded in a 
  * subsystem. These do no magic, just make the resulting code
@@ -207,49 +220,9 @@ extern struct kset hypervisor_subsys;
 #define kobj_set_kset_s(obj,subsys) \
         (obj)->kobj.kset = &(subsys)
 
-/**
- *      kset_set_kset_s(obj,subsys) - set kset for embedded kset.
- *      @obj:           ptr to some object type.
- *      @subsys:        a subsystem object (not a ptr).
- *
- *      Can be used for any object type with an embedded ->kset.
- *      Sets the kset of @obj's  embedded kobject (via its embedded
- *      kset) to @subsys.kset. This makes @obj a member of that 
- *      kset.
- */
-
-#define kset_set_kset_s(obj,subsys) \
-        (obj)->kset.kobj.kset = &(subsys)
-
-/**
- *      subsys_set_kset(obj,subsys) - set kset for subsystem
- *      @obj:           ptr to some object type.
- *      @subsys:        a subsystem object (not a ptr).
- *
- *      Can be used for any object type with an embedded ->subsys.
- *      Sets the kset of @obj's kobject to @subsys.kset. This makes
- *      the object a member of that kset.
- */
-
-#define subsys_set_kset(obj,_subsys) \
-        (obj)->subsys.kobj.kset = &(_subsys)
-
-extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);
 
-static inline struct kset *subsys_get(struct kset *s)
-{
-        if (s)
-                return kset_get(s);
-        return NULL;
-}
-
-static inline void subsys_put(struct kset *s)
-{
-        kset_put(s);
-}
-
 struct subsys_attribute {
         struct attribute attr;
         ssize_t (*show)(struct kset *, char *);
@@ -264,10 +237,11 @@ int kobject_uevent(struct kobject *kobj, enum kobject_action action);
 int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                         char *envp[]);
 
-int add_uevent_var(char **envp, int num_envp, int *cur_index,
-                        char *buffer, int buffer_size, int *cur_len,
-                        const char *format, ...)
-        __attribute__((format (printf, 7, 8)));
+int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
+        __attribute__((format (printf, 2, 3)));
+
+int kobject_action_type(const char *buf, size_t count,
+                        enum kobject_action *type);
 #else
 static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action)
 { return 0; }
@@ -276,10 +250,12 @@ static inline int kobject_uevent_env(struct kobject *kobj,
                                       char *envp[])
 { return 0; }
 
-static inline int add_uevent_var(char **envp, int num_envp, int *cur_index,
-                                      char *buffer, int buffer_size, int *cur_len, 
-                                      const char *format, ...)
+static inline int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
 { return 0; }
+
+static inline int kobject_action_type(const char *buf, size_t count,
+                        enum kobject_action *type)
+{ return -EINVAL; }
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 23adf6075ae4..51464d12a4e5 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -116,9 +116,12 @@ struct kprobe {
  */
 struct jprobe {
         struct kprobe kp;
-        kprobe_opcode_t *entry; /* probe handling code to jump to */
+        void *entry;    /* probe handling code to jump to */
 };
 
+/* For backward compatibility with old code using JPROBE_ENTRY() */
+#define JPROBE_ENTRY(handler)   (handler)
+
 DECLARE_PER_CPU(struct kprobe *, current_kprobe);
 DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
@@ -211,6 +214,7 @@ int longjmp_break_handler(struct kprobe *, struct pt_regs *);
 int register_jprobe(struct jprobe *p);
 void unregister_jprobe(struct jprobe *p);
 void jprobe_return(void);
+unsigned long arch_deref_entry_point(void *);
 
 int register_kretprobe(struct kretprobe *rp);
 void unregister_kretprobe(struct kretprobe *rp);
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index dae7143644fe..a6ddec141f96 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -102,6 +102,13 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
 #define ktime_add_ns(kt, nsval) \
                 ({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; })
 
+/*
+ * Subtract a scalar nanosecod from a ktime_t variable
+ * res = kt - nsval:
+ */
+#define ktime_sub_ns(kt, nsval) \
+                ({ (ktime_t){ .tv64 = (kt).tv64 - (nsval) }; })
+
 /* convert a timespec to ktime_t format: */
 static inline ktime_t timespec_to_ktime(struct timespec ts)
 {
@@ -200,6 +207,15 @@ static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
 extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
 
 /**
+ * ktime_sub_ns - Subtract a scalar nanoseconds value from a ktime_t variable
+ * @kt:         minuend
+ * @nsec:       the scalar nsec value to subtract
+ *
+ * Returns the subtraction of @nsec from @kt in ktime_t format
+ */
+extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
+
+/**
  * timespec_to_ktime - convert a timespec to ktime_t format
  * @ts:         the timespec variable to convert
  *
@@ -289,6 +305,11 @@ static inline ktime_t ktime_add_us(const ktime_t kt, const u64 usec)
         return ktime_add_ns(kt, usec * 1000);
 }
 
+static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
+{
+        return ktime_sub_ns(kt, usec * 1000);
+}
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 598793c0745b..1d379787f2e7 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -62,8 +62,8 @@ struct lcd_device {
         struct mutex update_lock;
         /* The framebuffer notifier block */
         struct notifier_block fb_notif;
-        /* The class device structure */
-        struct class_device class_dev;
+
+        struct device dev;
 };
 
 static inline void lcd_set_power(struct lcd_device *ld, int power)
@@ -75,9 +75,15 @@ static inline void lcd_set_power(struct lcd_device *ld, int power)
 }
 
 extern struct lcd_device *lcd_device_register(const char *name,
-        void *devdata, struct lcd_ops *ops);
+        struct device *parent, void *devdata, struct lcd_ops *ops);
 extern void lcd_device_unregister(struct lcd_device *ld);
 
-#define to_lcd_device(obj) container_of(obj, struct lcd_device, class_dev)
+#define to_lcd_device(obj) container_of(obj, struct lcd_device, dev)
+
+static inline void * lcd_get_data(struct lcd_device *ld_dev)
+{
+        return dev_get_drvdata(&ld_dev->dev);
+}
+
 
 #endif
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 494bed7c2fc1..dc1178f6184b 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -13,9 +13,9 @@
 #define __LINUX_LEDS_H_INCLUDED
 
 #include <linux/list.h>
+#include <linux/spinlock.h>
 
 struct device;
-struct class_device;
 /*
  * LED Core
  */
@@ -37,7 +37,7 @@ struct led_classdev {
         void            (*brightness_set)(struct led_classdev *led_cdev,
                                           enum led_brightness brightness);
 
-        struct class_device     *class_dev;
+        struct device           *dev;
         struct list_head         node;                  /* LED Device list */
         char                    *default_trigger;       /* Trigger to use */
 
@@ -109,4 +109,18 @@ extern void ledtrig_ide_activity(void);
 #define ledtrig_ide_activity() do {} while(0)
 #endif
 
+/* For the leds-gpio driver */
+struct gpio_led {
+        const char *name;
+        char *default_trigger;
+        unsigned        gpio;
+        u8              active_low;
+};
+
+struct gpio_led_platform_data {
+        int             num_leds;
+        struct gpio_led *leds;
+};
+
+
 #endif          /* __LINUX_LEDS_H_INCLUDED */
diff --git a/include/linux/lguest.h b/include/linux/lguest.h
new file mode 100644
index 000000000000..157ad64aa7ce
--- /dev/null
+++ b/include/linux/lguest.h
@@ -0,0 +1,116 @@
+/* Things the lguest guest needs to know.  Note: like all lguest interfaces,
+ * this is subject to wild and random change between versions. */
+#ifndef _ASM_LGUEST_H
+#define _ASM_LGUEST_H
+
+#ifndef __ASSEMBLY__
+#include <asm/irq.h>
+
+#define LHCALL_FLUSH_ASYNC      0
+#define LHCALL_LGUEST_INIT      1
+#define LHCALL_CRASH            2
+#define LHCALL_LOAD_GDT         3
+#define LHCALL_NEW_PGTABLE      4
+#define LHCALL_FLUSH_TLB        5
+#define LHCALL_LOAD_IDT_ENTRY   6
+#define LHCALL_SET_STACK        7
+#define LHCALL_TS               8
+#define LHCALL_SET_CLOCKEVENT   9
+#define LHCALL_HALT             10
+#define LHCALL_BIND_DMA         12
+#define LHCALL_SEND_DMA         13
+#define LHCALL_SET_PTE          14
+#define LHCALL_SET_PMD          15
+#define LHCALL_LOAD_TLS         16
+
+#define LG_CLOCK_MIN_DELTA      100UL
+#define LG_CLOCK_MAX_DELTA      ULONG_MAX
+
+/*G:031 First, how does our Guest contact the Host to ask for privileged
+ * operations?  There are two ways: the direct way is to make a "hypercall",
+ * to make requests of the Host Itself.
+ *
+ * Our hypercall mechanism uses the highest unused trap code (traps 32 and
+ * above are used by real hardware interrupts).  Seventeen hypercalls are
+ * available: the hypercall number is put in the %eax register, and the
+ * arguments (when required) are placed in %edx, %ebx and %ecx.  If a return
+ * value makes sense, it's returned in %eax.
+ *
+ * Grossly invalid calls result in Sudden Death at the hands of the vengeful
+ * Host, rather than returning failure.  This reflects Winston Churchill's
+ * definition of a gentleman: "someone who is only rude intentionally". */
+#define LGUEST_TRAP_ENTRY 0x1F
+
+static inline unsigned long
+hcall(unsigned long call,
+      unsigned long arg1, unsigned long arg2, unsigned long arg3)
+{
+        /* "int" is the Intel instruction to trigger a trap. */
+        asm volatile("int $" __stringify(LGUEST_TRAP_ENTRY)
+                       /* The call is in %eax (aka "a"), and can be replaced */
+                     : "=a"(call)
+                       /* The other arguments are in %eax, %edx, %ebx & %ecx */
+                     : "a"(call), "d"(arg1), "b"(arg2), "c"(arg3)
+                       /* "memory" means this might write somewhere in memory.
+                        * This isn't true for all calls, but it's safe to tell
+                        * gcc that it might happen so it doesn't get clever. */
+                     : "memory");
+        return call;
+}
+/*:*/
+
+void async_hcall(unsigned long call,
+                 unsigned long arg1, unsigned long arg2, unsigned long arg3);
+
+/* Can't use our min() macro here: needs to be a constant */
+#define LGUEST_IRQS (NR_IRQS < 32 ? NR_IRQS: 32)
+
+#define LHCALL_RING_SIZE 64
+struct hcall_ring
+{
+        u32 eax, edx, ebx, ecx;
+};
+
+/*G:032 The second method of communicating with the Host is to via "struct
+ * lguest_data".  The Guest's very first hypercall is to tell the Host where
+ * this is, and then the Guest and Host both publish information in it. :*/
+struct lguest_data
+{
+        /* 512 == enabled (same as eflags in normal hardware).  The Guest
+         * changes interrupts so often that a hypercall is too slow. */
+        unsigned int irq_enabled;
+        /* Fine-grained interrupt disabling by the Guest */
+        DECLARE_BITMAP(blocked_interrupts, LGUEST_IRQS);
+
+        /* The Host writes the virtual address of the last page fault here,
+         * which saves the Guest a hypercall.  CR2 is the native register where
+         * this address would normally be found. */
+        unsigned long cr2;
+
+        /* Wallclock time set by the Host. */
+        struct timespec time;
+
+        /* Async hypercall ring.  Instead of directly making hypercalls, we can
+         * place them in here for processing the next time the Host wants.
+         * This batching can be quite efficient. */
+
+        /* 0xFF == done (set by Host), 0 == pending (set by Guest). */
+        u8 hcall_status[LHCALL_RING_SIZE];
+        /* The actual registers for the hypercalls. */
+        struct hcall_ring hcalls[LHCALL_RING_SIZE];
+
+/* Fields initialized by the Host at boot: */
+        /* Memory not to try to access */
+        unsigned long reserve_mem;
+        /* ID of this Guest (used by network driver to set ethernet address) */
+        u16 guestid;
+        /* KHz for the TSC clock. */
+        u32 tsc_khz;
+
+/* Fields initialized by the Guest at boot: */
+        /* Instruction range to suppress interrupts even if enabled */
+        unsigned long noirq_start, noirq_end;
+};
+extern struct lguest_data lguest_data;
+#endif /* __ASSEMBLY__ */
+#endif  /* _ASM_LGUEST_H */
diff --git a/include/linux/lguest_bus.h b/include/linux/lguest_bus.h
new file mode 100644
index 000000000000..d27853ddc644
--- /dev/null
+++ b/include/linux/lguest_bus.h
@@ -0,0 +1,51 @@
+#ifndef _ASM_LGUEST_DEVICE_H
+#define _ASM_LGUEST_DEVICE_H
+/* Everything you need to know about lguest devices. */
+#include <linux/device.h>
+#include <linux/lguest.h>
+#include <linux/lguest_launcher.h>
+
+struct lguest_device {
+        /* Unique busid, and index into lguest_page->devices[] */
+        unsigned int index;
+
+        struct device dev;
+
+        /* Driver can hang data off here. */
+        void *private;
+};
+
+/*D:380 Since interrupt numbers are arbitrary, we use a convention: each device
+ * can use the interrupt number corresponding to its index.  The +1 is because
+ * interrupt 0 is not usable (it's actually the timer interrupt). */
+static inline int lgdev_irq(const struct lguest_device *dev)
+{
+        return dev->index + 1;
+}
+/*:*/
+
+/* dma args must not be vmalloced! */
+void lguest_send_dma(unsigned long key, struct lguest_dma *dma);
+int lguest_bind_dma(unsigned long key, struct lguest_dma *dmas,
+                    unsigned int num, u8 irq);
+void lguest_unbind_dma(unsigned long key, struct lguest_dma *dmas);
+
+/* Map the virtual device space */
+void *lguest_map(unsigned long phys_addr, unsigned long pages);
+void lguest_unmap(void *);
+
+struct lguest_driver {
+        const char *name;
+        struct module *owner;
+        u16 device_type;
+        int (*probe)(struct lguest_device *dev);
+        void (*remove)(struct lguest_device *dev);
+
+        struct device_driver drv;
+};
+
+extern int register_lguest_driver(struct lguest_driver *drv);
+extern void unregister_lguest_driver(struct lguest_driver *drv);
+
+extern struct lguest_device_desc *lguest_devices; /* Just past max_pfn */
+#endif /* _ASM_LGUEST_DEVICE_H */
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h
new file mode 100644
index 000000000000..641670579446
--- /dev/null
+++ b/include/linux/lguest_launcher.h
@@ -0,0 +1,127 @@
+#ifndef _ASM_LGUEST_USER
+#define _ASM_LGUEST_USER
+/* Everything the "lguest" userspace program needs to know. */
+/* They can register up to 32 arrays of lguest_dma. */
+#define LGUEST_MAX_DMA          32
+/* At most we can dma 16 lguest_dma in one op. */
+#define LGUEST_MAX_DMA_SECTIONS 16
+
+/* How many devices?  Assume each one wants up to two dma arrays per device. */
+#define LGUEST_MAX_DEVICES (LGUEST_MAX_DMA/2)
+
+/*D:200
+ * Lguest I/O
+ *
+ * The lguest I/O mechanism is the only way Guests can talk to devices.  There
+ * are two hypercalls involved: SEND_DMA for output and BIND_DMA for input.  In
+ * each case, "struct lguest_dma" describes the buffer: this contains 16
+ * addr/len pairs, and if there are fewer buffer elements the len array is
+ * terminated with a 0.
+ *
+ * I/O is organized by keys: BIND_DMA attaches buffers to a particular key, and
+ * SEND_DMA transfers to buffers bound to particular key.  By convention, keys
+ * correspond to a physical address within the device's page.  This means that
+ * devices will never accidentally end up with the same keys, and allows the
+ * Host use The Futex Trick (as we'll see later in our journey).
+ *
+ * SEND_DMA simply indicates a key to send to, and the physical address of the
+ * "struct lguest_dma" to send.  The Host will write the number of bytes
+ * transferred into the "struct lguest_dma"'s used_len member.
+ *
+ * BIND_DMA indicates a key to bind to, a pointer to an array of "struct
+ * lguest_dma"s ready for receiving, the size of that array, and an interrupt
+ * to trigger when data is received.  The Host will only allow transfers into
+ * buffers with a used_len of zero: it then sets used_len to the number of
+ * bytes transferred and triggers the interrupt for the Guest to process the
+ * new input. */
+struct lguest_dma
+{
+        /* 0 if free to be used, filled by the Host. */
+        u32 used_len;
+        unsigned long addr[LGUEST_MAX_DMA_SECTIONS];
+        u16 len[LGUEST_MAX_DMA_SECTIONS];
+};
+/*:*/
+
+/*D:460 This is the layout of a block device memory page.  The Launcher sets up
+ * the num_sectors initially to tell the Guest the size of the disk.  The Guest
+ * puts the type, sector and length of the request in the first three fields,
+ * then DMAs to the Host.  The Host processes the request, sets up the result,
+ * then DMAs back to the Guest. */
+struct lguest_block_page
+{
+        /* 0 is a read, 1 is a write. */
+        int type;
+        u32 sector;     /* Offset in device = sector * 512. */
+        u32 bytes;      /* Length expected to be read/written in bytes */
+        /* 0 = pending, 1 = done, 2 = done, error */
+        int result;
+        u32 num_sectors; /* Disk length = num_sectors * 512 */
+};
+
+/*D:520 The network device is basically a memory page where all the Guests on
+ * the network publish their MAC (ethernet) addresses: it's an array of "struct
+ * lguest_net": */
+struct lguest_net
+{
+        /* Simply the mac address (with multicast bit meaning promisc). */
+        unsigned char mac[6];
+};
+/*:*/
+
+/* Where the Host expects the Guest to SEND_DMA console output to. */
+#define LGUEST_CONSOLE_DMA_KEY 0
+
+/*D:010
+ * Drivers
+ *
+ * The Guest needs devices to do anything useful.  Since we don't let it touch
+ * real devices (think of the damage it could do!) we provide virtual devices.
+ * We could emulate a PCI bus with various devices on it, but that is a fairly
+ * complex burden for the Host and suboptimal for the Guest, so we have our own
+ * "lguest" bus and simple drivers.
+ *
+ * Devices are described by an array of LGUEST_MAX_DEVICES of these structs,
+ * placed by the Launcher just above the top of physical memory:
+ */
+struct lguest_device_desc {
+        /* The device type: console, network, disk etc. */
+        u16 type;
+#define LGUEST_DEVICE_T_CONSOLE 1
+#define LGUEST_DEVICE_T_NET     2
+#define LGUEST_DEVICE_T_BLOCK   3
+
+        /* The specific features of this device: these depends on device type
+         * except for LGUEST_DEVICE_F_RANDOMNESS. */
+        u16 features;
+#define LGUEST_NET_F_NOCSUM             0x4000 /* Don't bother checksumming */
+#define LGUEST_DEVICE_F_RANDOMNESS      0x8000 /* IRQ is fairly random */
+
+        /* This is how the Guest reports status of the device: the Host can set
+         * LGUEST_DEVICE_S_REMOVED to indicate removal, but the rest are only
+         * ever manipulated by the Guest, and only ever set. */
+        u16 status;
+/* 256 and above are device specific. */
+#define LGUEST_DEVICE_S_ACKNOWLEDGE     1 /* We have seen device. */
+#define LGUEST_DEVICE_S_DRIVER          2 /* We have found a driver */
+#define LGUEST_DEVICE_S_DRIVER_OK       4 /* Driver says OK! */
+#define LGUEST_DEVICE_S_REMOVED         8 /* Device has gone away. */
+#define LGUEST_DEVICE_S_REMOVED_ACK     16 /* Driver has been told. */
+#define LGUEST_DEVICE_S_FAILED          128 /* Something actually failed */
+
+        /* Each device exists somewhere in Guest physical memory, over some
+         * number of pages. */
+        u16 num_pages;
+        u32 pfn;
+};
+/*:*/
+
+/* Write command first word is a request. */
+enum lguest_req
+{
+        LHREQ_INITIALIZE, /* + pfnlimit, pgdir, start, pageoffset */
+        LHREQ_GETDMA, /* + addr (returns &lguest_dma, irq in ->used_len) */
+        LHREQ_IRQ, /* + irq */
+        LHREQ_BREAK, /* + on/off flag (on blocks until someone does off) */
+};
+#endif /* _ASM_LGUEST_USER */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 47cd2a1c5544..229a9ff9f924 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -28,7 +28,6 @@
 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <asm/scatterlist.h>
 #include <linux/io.h>
@@ -107,12 +106,6 @@ static inline u32 ata_msg_init(int dval, int default_msg_enable_bits)
 /* defines only for the constants which don't work well as enums */
 #define ATA_TAG_POISON          0xfafbfcfdU
 
-/* move to PCI layer? */
-static inline struct device *pci_dev_to_dev(struct pci_dev *pdev)
-{
-        return &pdev->dev;
-}
-
 enum {
         /* various global constants */
         LIBATA_MAX_PRD          = ATA_MAX_PRD / 2,
@@ -139,11 +132,12 @@ enum {
         ATA_DFLAG_FLUSH_EXT     = (1 << 4), /* do FLUSH_EXT instead of FLUSH */
         ATA_DFLAG_ACPI_PENDING  = (1 << 5), /* ACPI resume action pending */
         ATA_DFLAG_ACPI_FAILED   = (1 << 6), /* ACPI on devcfg has failed */
-        ATA_DFLAG_CFG_MASK      = (1 << 8) - 1,
+        ATA_DFLAG_AN            = (1 << 7), /* AN configured */
+        ATA_DFLAG_CFG_MASK      = (1 << 12) - 1,
 
-        ATA_DFLAG_PIO           = (1 << 8), /* device limited to PIO mode */
-        ATA_DFLAG_NCQ_OFF       = (1 << 9), /* device limited to non-NCQ mode */
-        ATA_DFLAG_SPUNDOWN      = (1 << 10), /* XXX: for spindown_compat */
+        ATA_DFLAG_PIO           = (1 << 12), /* device limited to PIO mode */
+        ATA_DFLAG_NCQ_OFF       = (1 << 13), /* device limited to non-NCQ mode */
+        ATA_DFLAG_SPUNDOWN      = (1 << 14), /* XXX: for spindown_compat */
         ATA_DFLAG_INIT_MASK     = (1 << 16) - 1,
 
         ATA_DFLAG_DETACH        = (1 << 16),
@@ -154,7 +148,22 @@ enum {
         ATA_DEV_ATA_UNSUP       = 2,    /* ATA device (unsupported) */
         ATA_DEV_ATAPI           = 3,    /* ATAPI device */
         ATA_DEV_ATAPI_UNSUP     = 4,    /* ATAPI device (unsupported) */
-        ATA_DEV_NONE            = 5,    /* no device */
+        ATA_DEV_PMP             = 5,    /* SATA port multiplier */
+        ATA_DEV_PMP_UNSUP       = 6,    /* SATA port multiplier (unsupported) */
+        ATA_DEV_SEMB            = 7,    /* SEMB */
+        ATA_DEV_SEMB_UNSUP      = 8,    /* SEMB (unsupported) */
+        ATA_DEV_NONE            = 9,    /* no device */
+
+        /* struct ata_link flags */
+        ATA_LFLAG_HRST_TO_RESUME = (1 << 0), /* hardreset to resume link */
+        ATA_LFLAG_SKIP_D2H_BSY  = (1 << 1), /* can't wait for the first D2H
+                                             * Register FIS clearing BSY */
+        ATA_LFLAG_NO_SRST       = (1 << 2), /* avoid softreset */
+        ATA_LFLAG_ASSUME_ATA    = (1 << 3), /* assume ATA class */
+        ATA_LFLAG_ASSUME_SEMB   = (1 << 4), /* assume SEMB class */
+        ATA_LFLAG_ASSUME_CLASS  = ATA_LFLAG_ASSUME_ATA | ATA_LFLAG_ASSUME_SEMB,
+        ATA_LFLAG_NO_RETRY      = (1 << 5), /* don't retry this link */
+        ATA_LFLAG_DISABLED      = (1 << 6), /* link is disabled */
 
         /* struct ata_port flags */
         ATA_FLAG_SLAVE_POSS     = (1 << 0), /* host supports slave dev */
@@ -170,13 +179,12 @@ enum {
         ATA_FLAG_PIO_POLLING    = (1 << 9), /* use polling PIO if LLD
                                              * doesn't handle PIO interrupts */
         ATA_FLAG_NCQ            = (1 << 10), /* host supports NCQ */
-        ATA_FLAG_HRST_TO_RESUME = (1 << 11), /* hardreset to resume phy */
-        ATA_FLAG_SKIP_D2H_BSY   = (1 << 12), /* can't wait for the first D2H
-                                              * Register FIS clearing BSY */
         ATA_FLAG_DEBUGMSG       = (1 << 13),
         ATA_FLAG_IGN_SIMPLEX    = (1 << 15), /* ignore SIMPLEX */
         ATA_FLAG_NO_IORDY       = (1 << 16), /* controller lacks iordy */
         ATA_FLAG_ACPI_SATA      = (1 << 17), /* need native SATA ACPI layout */
+        ATA_FLAG_AN             = (1 << 18), /* controller supports AN */
+        ATA_FLAG_PMP            = (1 << 19), /* controller supports PMP */
 
         /* The following flag belongs to ap->pflags but is kept in
          * ap->flags because it's referenced in many LLDs and will be
@@ -195,6 +203,7 @@ enum {
         ATA_PFLAG_UNLOADING     = (1 << 5), /* module is unloading */
         ATA_PFLAG_SCSI_HOTPLUG  = (1 << 6), /* SCSI hotplug scheduled */
         ATA_PFLAG_INITIALIZING  = (1 << 7), /* being initialized, don't touch */
+        ATA_PFLAG_RESETTING     = (1 << 8), /* reset in progress */
 
         ATA_PFLAG_SUSPENDED     = (1 << 17), /* port is suspended (power) */
         ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
@@ -207,6 +216,7 @@ enum {
         ATA_QCFLAG_DMAMAP       = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE,
         ATA_QCFLAG_IO           = (1 << 3), /* standard IO command */
         ATA_QCFLAG_RESULT_TF    = (1 << 4), /* result TF requested */
+        ATA_QCFLAG_CLEAR_EXCL   = (1 << 5), /* clear excl_link on completion */
 
         ATA_QCFLAG_FAILED       = (1 << 16), /* cmd failed and is owned by EH */
         ATA_QCFLAG_SENSE_VALID  = (1 << 17), /* sense data valid */
@@ -216,6 +226,8 @@ enum {
         ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
         ATA_HOST_STARTED        = (1 << 1),     /* Host started */
 
+        /* bits 24:31 of host->flags are reserved for LLD specific flags */
+
         /* various lengths of time */
         ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
@@ -261,6 +273,10 @@ enum {
         /* ering size */
         ATA_ERING_SIZE          = 32,
 
+        /* return values for ->qc_defer */
+        ATA_DEFER_LINK          = 1,
+        ATA_DEFER_PORT          = 2,
+
         /* desc_len for ata_eh_info and context */
         ATA_EH_DESC_LEN         = 80,
 
@@ -268,6 +284,7 @@ enum {
         ATA_EH_REVALIDATE       = (1 << 0),
         ATA_EH_SOFTRESET        = (1 << 1),
         ATA_EH_HARDRESET        = (1 << 2),
+        ATA_EH_ENABLE_LINK      = (1 << 3),
 
         ATA_EH_RESET_MASK       = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
         ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE,
@@ -287,12 +304,16 @@ enum {
         ATA_EHI_DID_RESET       = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
         ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
 
-        /* max repeat if error condition is still set after ->error_handler */
-        ATA_EH_MAX_REPEAT       = 5,
+        /* max tries if error condition is still set after ->error_handler */
+        ATA_EH_MAX_TRIES        = 5,
 
         /* how hard are we gonna try to probe/recover devices */
         ATA_PROBE_MAX_TRIES     = 3,
         ATA_EH_DEV_TRIES        = 3,
+        ATA_EH_PMP_TRIES        = 5,
+        ATA_EH_PMP_LINK_TRIES   = 3,
+
+        SATA_PMP_SCR_TIMEOUT    = 250,
 
         /* Horkage types. May be set by libata or controller on drives
            (some horkage may be drive/controller pair dependant */
@@ -301,6 +322,15 @@ enum {
         ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
         ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
         ATA_HORKAGE_MAX_SEC_128 = (1 << 3),     /* Limit max sects to 128 */
+        ATA_HORKAGE_BROKEN_HPA  = (1 << 4),     /* Broken HPA */
+        ATA_HORKAGE_SKIP_PM     = (1 << 5),     /* Skip PM operations */
+        ATA_HORKAGE_HPA_SIZE    = (1 << 6),     /* native size off by one */
+
+         /* DMA mask for user DMA control: User visible values; DO NOT 
+            renumber */
+        ATA_DMA_MASK_ATA        = (1 << 0),     /* DMA on ATA Disk */
+        ATA_DMA_MASK_ATAPI      = (1 << 1),     /* DMA on ATAPI */
+        ATA_DMA_MASK_CFA        = (1 << 2),     /* DMA on CF Card */
 };
 
 enum hsm_task_states {
@@ -323,20 +353,22 @@ enum ata_completion_errors {
         AC_ERR_INVALID          = (1 << 7), /* invalid argument */
         AC_ERR_OTHER            = (1 << 8), /* unknown */
         AC_ERR_NODEV_HINT       = (1 << 9), /* polling device detection hint */
+        AC_ERR_NCQ              = (1 << 10), /* marker for offending NCQ qc */
 };
 
 /* forward declarations */
 struct scsi_device;
 struct ata_port_operations;
 struct ata_port;
+struct ata_link;
 struct ata_queued_cmd;
 
 /* typedefs */
 typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
-typedef int (*ata_prereset_fn_t)(struct ata_port *ap, unsigned long deadline);
-typedef int (*ata_reset_fn_t)(struct ata_port *ap, unsigned int *classes,
+typedef int (*ata_prereset_fn_t)(struct ata_link *link, unsigned long deadline);
+typedef int (*ata_reset_fn_t)(struct ata_link *link, unsigned int *classes,
                               unsigned long deadline);
-typedef void (*ata_postreset_fn_t)(struct ata_port *ap, unsigned int *classes);
+typedef void (*ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes);
 
 struct ata_ioports {
         void __iomem            *cmd_addr;
@@ -359,8 +391,6 @@ struct ata_ioports {
 struct ata_host {
         spinlock_t              lock;
         struct device           *dev;
-        unsigned long           irq;
-        unsigned long           irq2;
         void __iomem * const    *iomap;
         unsigned int            n_ports;
         void                    *private_data;
@@ -411,6 +441,7 @@ struct ata_queued_cmd {
         ata_qc_cb_t             complete_fn;
 
         void                    *private_data;
+        void                    *lldd_task;
 };
 
 struct ata_port_stats {
@@ -431,7 +462,7 @@ struct ata_ering {
 };
 
 struct ata_device {
-        struct ata_port         *ap;
+        struct ata_link         *link;
         unsigned int            devno;          /* 0 or 1 */
         unsigned long           flags;          /* ATA_DFLAG_xxx */
         unsigned int            horkage;        /* List of broken features */
@@ -442,7 +473,12 @@ struct ata_device {
         /* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */
         u64                     n_sectors;      /* size of device, if ATA */
         unsigned int            class;          /* ATA_DEV_xxx */
-        u16                     id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
+
+        union {
+                u16             id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
+                u32             gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */
+        };
+
         u8                      pio_mode;
         u8                      dma_mode;
         u8                      xfer_mode;
@@ -505,6 +541,27 @@ struct ata_acpi_gtm {
         u32 flags;
 } __packed;
 
+struct ata_link {
+        struct ata_port         *ap;
+        int                     pmp;            /* port multiplier port # */
+
+        unsigned int            active_tag;     /* active tag on this link */
+        u32                     sactive;        /* active NCQ commands */
+
+        unsigned int            flags;          /* ATA_LFLAG_xxx */
+
+        unsigned int            hw_sata_spd_limit;
+        unsigned int            sata_spd_limit;
+        unsigned int            sata_spd;       /* current SATA PHY speed */
+
+        /* record runtime error info, protected by host_set lock */
+        struct ata_eh_info      eh_info;
+        /* EH context */
+        struct ata_eh_context   eh_context;
+
+        struct ata_device       device[ATA_MAX_DEVICES];
+};
+
 struct ata_port {
         struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
         const struct ata_port_operations *ops;
@@ -528,22 +585,17 @@ struct ata_port {
         unsigned int            mwdma_mask;
         unsigned int            udma_mask;
         unsigned int            cbl;    /* cable type; ATA_CBL_xxx */
-        unsigned int            hw_sata_spd_limit;
-        unsigned int            sata_spd_limit; /* SATA PHY speed limit */
-
-        /* record runtime error info, protected by host lock */
-        struct ata_eh_info      eh_info;
-        /* EH context owned by EH */
-        struct ata_eh_context   eh_context;
-
-        struct ata_device       device[ATA_MAX_DEVICES];
 
         struct ata_queued_cmd   qcmd[ATA_MAX_QUEUE];
         unsigned long           qc_allocated;
         unsigned int            qc_active;
+        int                     nr_active_links; /* #links with active qcs */
+
+        struct ata_link         link;   /* host default link */
 
-        unsigned int            active_tag;
-        u32                     sactive;
+        int                     nr_pmp_links;   /* nr of available PMP links */
+        struct ata_link         *pmp_link;      /* array of PMP links */
+        struct ata_link         *excl_link;     /* for PMP qc exclusion */
 
         struct ata_port_stats   stats;
         struct ata_host         *host;
@@ -559,10 +611,14 @@ struct ata_port {
         u32                     msg_enable;
         struct list_head        eh_done_q;
         wait_queue_head_t       eh_wait_q;
+        int                     eh_tries;
 
         pm_message_t            pm_mesg;
         int                     *pm_result;
 
+        struct timer_list       fastdrain_timer;
+        unsigned long           fastdrain_cnt;
+
         void                    *private_data;
 
 #ifdef CONFIG_ATA_ACPI
@@ -573,8 +629,6 @@ struct ata_port {
 };
 
 struct ata_port_operations {
-        void (*port_disable) (struct ata_port *);
-
         void (*dev_config) (struct ata_device *);
 
         void (*set_piomode) (struct ata_port *, struct ata_device *);
@@ -590,7 +644,7 @@ struct ata_port_operations {
         void (*dev_select)(struct ata_port *ap, unsigned int device);
 
         void (*phy_reset) (struct ata_port *ap); /* obsolete */
-        int  (*set_mode) (struct ata_port *ap, struct ata_device **r_failed_dev);
+        int  (*set_mode) (struct ata_link *link, struct ata_device **r_failed_dev);
 
         int (*cable_detect) (struct ata_port *ap);
 
@@ -601,9 +655,14 @@ struct ata_port_operations {
 
         void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);
 
+        int (*qc_defer) (struct ata_queued_cmd *qc);
         void (*qc_prep) (struct ata_queued_cmd *qc);
         unsigned int (*qc_issue) (struct ata_queued_cmd *qc);
 
+        /* port multiplier */
+        void (*pmp_attach) (struct ata_port *ap);
+        void (*pmp_detach) (struct ata_port *ap);
+
         /* Error handlers.  ->error_handler overrides ->eng_timeout and
          * indicates that new-style EH is in place.
          */
@@ -617,11 +676,9 @@ struct ata_port_operations {
         irq_handler_t irq_handler;
         void (*irq_clear) (struct ata_port *);
         u8 (*irq_on) (struct ata_port *);
-        u8 (*irq_ack) (struct ata_port *ap, unsigned int chk_drq);
 
-        u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg);
-        void (*scr_write) (struct ata_port *ap, unsigned int sc_reg,
-                           u32 val);
+        int (*scr_read) (struct ata_port *ap, unsigned int sc_reg, u32 *val);
+        int (*scr_write) (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
         int (*port_suspend) (struct ata_port *ap, pm_message_t mesg);
         int (*port_resume) (struct ata_port *ap);
@@ -638,6 +695,7 @@ struct ata_port_operations {
 struct ata_port_info {
         struct scsi_host_template       *sht;
         unsigned long           flags;
+        unsigned long           link_flags;
         unsigned long           pio_mask;
         unsigned long           mwdma_mask;
         unsigned long           udma_mask;
@@ -681,38 +739,27 @@ static inline int ata_port_is_dummy(struct ata_port *ap)
         return ap->ops == &ata_dummy_port_ops;
 }
 
-extern void sata_print_link_status(struct ata_port *ap);
+extern void sata_print_link_status(struct ata_link *link);
 extern void ata_port_probe(struct ata_port *);
 extern void __sata_phy_reset(struct ata_port *ap);
 extern void sata_phy_reset(struct ata_port *ap);
 extern void ata_bus_reset(struct ata_port *ap);
-extern int sata_set_spd(struct ata_port *ap);
-extern int sata_phy_debounce(struct ata_port *ap, const unsigned long *param,
-                             unsigned long deadline);
-extern int sata_phy_resume(struct ata_port *ap, const unsigned long *param,
-                           unsigned long deadline);
-extern int ata_std_prereset(struct ata_port *ap, unsigned long deadline);
-extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes,
+extern int sata_set_spd(struct ata_link *link);
+extern int sata_link_debounce(struct ata_link *link,
+                        const unsigned long *params, unsigned long deadline);
+extern int sata_link_resume(struct ata_link *link, const unsigned long *params,
+                            unsigned long deadline);
+extern int ata_std_prereset(struct ata_link *link, unsigned long deadline);
+extern int ata_std_softreset(struct ata_link *link, unsigned int *classes,
                              unsigned long deadline);
-extern int sata_port_hardreset(struct ata_port *ap, const unsigned long *timing,
-                               unsigned long deadline);
-extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class,
+extern int sata_link_hardreset(struct ata_link *link,
+                        const unsigned long *timing, unsigned long deadline);
+extern int sata_std_hardreset(struct ata_link *link, unsigned int *class,
                               unsigned long deadline);
-extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes);
+extern void ata_std_postreset(struct ata_link *link, unsigned int *classes);
 extern void ata_port_disable(struct ata_port *);
 extern void ata_std_ports(struct ata_ioports *ioaddr);
-#ifdef CONFIG_PCI
-extern int ata_pci_init_one (struct pci_dev *pdev,
-                             const struct ata_port_info * const * ppi);
-extern void ata_pci_remove_one (struct pci_dev *pdev);
-#ifdef CONFIG_PM
-extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
-extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);
-extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
-extern int ata_pci_device_resume(struct pci_dev *pdev);
-#endif
-extern int ata_pci_clear_simplex(struct pci_dev *pdev);
-#endif /* CONFIG_PCI */
+
 extern struct ata_host *ata_host_alloc(struct device *dev, int max_ports);
 extern struct ata_host *ata_host_alloc_pinfo(struct device *dev,
                         const struct ata_port_info * const * ppi, int n_ports);
@@ -738,12 +785,12 @@ extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);
 extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
                             struct ata_port *ap);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
-extern int sata_scr_valid(struct ata_port *ap);
-extern int sata_scr_read(struct ata_port *ap, int reg, u32 *val);
-extern int sata_scr_write(struct ata_port *ap, int reg, u32 val);
-extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);
-extern int ata_port_online(struct ata_port *ap);
-extern int ata_port_offline(struct ata_port *ap);
+extern int sata_scr_valid(struct ata_link *link);
+extern int sata_scr_read(struct ata_link *link, int reg, u32 *val);
+extern int sata_scr_write(struct ata_link *link, int reg, u32 val);
+extern int sata_scr_write_flush(struct ata_link *link, int reg, u32 val);
+extern int ata_link_online(struct ata_link *link);
+extern int ata_link_offline(struct ata_link *link);
 #ifdef CONFIG_PM
 extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
@@ -757,14 +804,16 @@ extern void ata_port_queue_task(struct ata_port *ap, work_func_t fn,
 extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
                              unsigned long interval_msec,
                              unsigned long timeout_msec);
-extern unsigned int ata_dev_try_classify(struct ata_port *, unsigned int, u8 *);
+extern unsigned int ata_dev_try_classify(struct ata_device *dev, int present,
+                                         u8 *r_err);
 
 /*
  * Default driver ops implementations
  */
 extern void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf);
 extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
-extern void ata_tf_to_fis(const struct ata_taskfile *tf, u8 *fis, u8 pmp);
+extern void ata_tf_to_fis(const struct ata_taskfile *tf,
+                          u8 pmp, int is_cmd, u8 *fis);
 extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf);
 extern void ata_noop_dev_select (struct ata_port *ap, unsigned int device);
 extern void ata_std_dev_select (struct ata_port *ap, unsigned int device);
@@ -778,6 +827,7 @@ extern void ata_data_xfer(struct ata_device *adev, unsigned char *buf,
                           unsigned int buflen, int write_data);
 extern void ata_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,
                                 unsigned int buflen, int write_data);
+extern int ata_std_qc_defer(struct ata_queued_cmd *qc);
 extern void ata_dumb_qc_prep(struct ata_queued_cmd *qc);
 extern void ata_qc_prep(struct ata_queued_cmd *qc);
 extern void ata_noop_qc_prep(struct ata_queued_cmd *qc);
@@ -821,11 +871,8 @@ extern void ata_scsi_slave_destroy(struct scsi_device *sdev);
 extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
                                        int queue_depth);
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
-extern int ata_do_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);
+extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
 extern u8 ata_irq_on(struct ata_port *ap);
-extern u8 ata_dummy_irq_on(struct ata_port *ap);
-extern u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq);
-extern u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 
 extern int ata_cable_40wire(struct ata_port *ap);
 extern int ata_cable_80wire(struct ata_port *ap);
@@ -860,8 +907,29 @@ enum {
                                   ATA_TIMING_CYCLE | ATA_TIMING_UDMA,
 };
 
+/* libata-acpi.c */
+#ifdef CONFIG_ATA_ACPI
+extern int ata_acpi_cbl_80wire(struct ata_port *ap);
+int ata_acpi_stm(const struct ata_port *ap, struct ata_acpi_gtm *stm);
+int ata_acpi_gtm(const struct ata_port *ap, struct ata_acpi_gtm *stm);
+#else
+static inline int ata_acpi_cbl_80wire(struct ata_port *ap) { return 0; }
+#endif
 
 #ifdef CONFIG_PCI
+struct pci_dev;
+
+extern int ata_pci_init_one (struct pci_dev *pdev,
+                             const struct ata_port_info * const * ppi);
+extern void ata_pci_remove_one (struct pci_dev *pdev);
+#ifdef CONFIG_PM
+extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
+extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);
+extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
+extern int ata_pci_device_resume(struct pci_dev *pdev);
+#endif
+extern int ata_pci_clear_simplex(struct pci_dev *pdev);
+
 struct pci_bits {
         unsigned int            reg;    /* PCI config register to read */
         unsigned int            width;  /* 1 (8 bit), 2 (16 bit), 4 (32 bit) */
@@ -879,13 +947,29 @@ extern unsigned long ata_pci_default_filter(struct ata_device *, unsigned long);
 #endif /* CONFIG_PCI */
 
 /*
+ * PMP
+ */
+extern int sata_pmp_qc_defer_cmd_switch(struct ata_queued_cmd *qc);
+extern int sata_pmp_std_prereset(struct ata_link *link, unsigned long deadline);
+extern int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class,
+                                  unsigned long deadline);
+extern void sata_pmp_std_postreset(struct ata_link *link, unsigned int *class);
+extern void sata_pmp_do_eh(struct ata_port *ap,
+                ata_prereset_fn_t prereset, ata_reset_fn_t softreset,
+                ata_reset_fn_t hardreset, ata_postreset_fn_t postreset,
+                ata_prereset_fn_t pmp_prereset, ata_reset_fn_t pmp_softreset,
+                ata_reset_fn_t pmp_hardreset, ata_postreset_fn_t pmp_postreset);
+
+/*
  * EH
  */
 extern void ata_eng_timeout(struct ata_port *ap);
 
 extern void ata_port_schedule_eh(struct ata_port *ap);
+extern int ata_link_abort(struct ata_link *link);
 extern int ata_port_abort(struct ata_port *ap);
 extern int ata_port_freeze(struct ata_port *ap);
+extern int sata_async_notification(struct ata_port *ap);
 
 extern void ata_eh_freeze_port(struct ata_port *ap);
 extern void ata_eh_thaw_port(struct ata_port *ap);
@@ -903,37 +987,53 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
 #define ata_port_printk(ap, lv, fmt, args...) \
         printk(lv"ata%u: "fmt, (ap)->print_id , ##args)
 
+#define ata_link_printk(link, lv, fmt, args...) do { \
+        if ((link)->ap->nr_pmp_links) \
+                printk(lv"ata%u.%02u: "fmt, (link)->ap->print_id, \
+                       (link)->pmp , ##args); \
+        else \
+                printk(lv"ata%u: "fmt, (link)->ap->print_id , ##args); \
+        } while(0)
+
 #define ata_dev_printk(dev, lv, fmt, args...) \
-        printk(lv"ata%u.%02u: "fmt, (dev)->ap->print_id, (dev)->devno , ##args)
+        printk(lv"ata%u.%02u: "fmt, (dev)->link->ap->print_id, \
+               (dev)->link->pmp + (dev)->devno , ##args)
 
 /*
  * ata_eh_info helpers
  */
-#define ata_ehi_push_desc(ehi, fmt, args...) do { \
-        (ehi)->desc_len += scnprintf((ehi)->desc + (ehi)->desc_len, \
-                                     ATA_EH_DESC_LEN - (ehi)->desc_len, \
-                                     fmt , ##args); \
-} while (0)
-
-#define ata_ehi_clear_desc(ehi) do { \
-        (ehi)->desc[0] = '\0'; \
-        (ehi)->desc_len = 0; \
-} while (0)
-
-static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi)
+extern void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
+
+static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi)
 {
-        ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK;
+        ehi->flags |= ATA_EHI_RESUME_LINK;
         ehi->action |= ATA_EH_SOFTRESET;
         ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
 }
 
 static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
 {
-        __ata_ehi_hotplugged(ehi);
+        ata_ehi_schedule_probe(ehi);
+        ehi->flags |= ATA_EHI_HOTPLUGGED;
+        ehi->action |= ATA_EH_ENABLE_LINK;
         ehi->err_mask |= AC_ERR_ATA_BUS;
 }
 
 /*
+ * port description helpers
+ */
+extern void ata_port_desc(struct ata_port *ap, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+#ifdef CONFIG_PCI
+extern void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset,
+                               const char *name);
+#endif
+
+/*
  * qc helpers
  */
 static inline int
@@ -988,12 +1088,14 @@ static inline unsigned int ata_tag_internal(unsigned int tag)
  */
 static inline unsigned int ata_class_enabled(unsigned int class)
 {
-        return class == ATA_DEV_ATA || class == ATA_DEV_ATAPI;
+        return class == ATA_DEV_ATA || class == ATA_DEV_ATAPI ||
+                class == ATA_DEV_PMP || class == ATA_DEV_SEMB;
 }
 
 static inline unsigned int ata_class_disabled(unsigned int class)
 {
-        return class == ATA_DEV_ATA_UNSUP || class == ATA_DEV_ATAPI_UNSUP;
+        return class == ATA_DEV_ATA_UNSUP || class == ATA_DEV_ATAPI_UNSUP ||
+                class == ATA_DEV_PMP_UNSUP || class == ATA_DEV_SEMB_UNSUP;
 }
 
 static inline unsigned int ata_class_absent(unsigned int class)
@@ -1017,15 +1119,62 @@ static inline unsigned int ata_dev_absent(const struct ata_device *dev)
 }
 
 /*
- * port helpers
+ * link helpers
  */
-static inline int ata_port_max_devices(const struct ata_port *ap)
+static inline int ata_is_host_link(const struct ata_link *link)
+{
+        return link == &link->ap->link;
+}
+
+static inline int ata_link_max_devices(const struct ata_link *link)
 {
-        if (ap->flags & ATA_FLAG_SLAVE_POSS)
+        if (ata_is_host_link(link) && link->ap->flags & ATA_FLAG_SLAVE_POSS)
                 return 2;
         return 1;
 }
 
+static inline int ata_link_active(struct ata_link *link)
+{
+        return ata_tag_valid(link->active_tag) || link->sactive;
+}
+
+static inline struct ata_link *ata_port_first_link(struct ata_port *ap)
+{
+        if (ap->nr_pmp_links)
+                return ap->pmp_link;
+        return &ap->link;
+}
+
+static inline struct ata_link *ata_port_next_link(struct ata_link *link)
+{
+        struct ata_port *ap = link->ap;
+
+        if (link == &ap->link) {
+                if (!ap->nr_pmp_links)
+                        return NULL;
+                return ap->pmp_link;
+        }
+
+        if (++link - ap->pmp_link < ap->nr_pmp_links)
+                return link;
+        return NULL;
+}
+
+#define __ata_port_for_each_link(lk, ap) \
+        for ((lk) = &(ap)->link; (lk); (lk) = ata_port_next_link(lk))
+
+#define ata_port_for_each_link(link, ap) \
+        for ((link) = ata_port_first_link(ap); (link); \
+             (link) = ata_port_next_link(link))
+
+#define ata_link_for_each_dev(dev, link) \
+        for ((dev) = (link)->device; \
+             (dev) < (link)->device + ata_link_max_devices(link) || ((dev) = NULL); \
+             (dev)++)
+
+#define ata_link_for_each_dev_reverse(dev, link) \
+        for ((dev) = (link)->device + ata_link_max_devices(link) - 1; \
+             (dev) >= (link)->device || ((dev) = NULL); (dev)--)
 
 static inline u8 ata_chk_status(struct ata_port *ap)
 {
@@ -1107,9 +1256,11 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
 {
         u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
+#ifdef ATA_DEBUG
         if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
-                DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n",
-                        status, ap->ioaddr.status_addr);
+                ata_port_printk(ap, KERN_DEBUG, "abnormal Status 0x%X\n",
+                                status);
+#endif
 
         return status;
 }
@@ -1146,7 +1297,7 @@ static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf)
 {
         memset(tf, 0, sizeof(*tf));
 
-        tf->ctl = dev->ap->ctl;
+        tf->ctl = dev->link->ap->ctl;
         if (dev->devno == 0)
                 tf->device = ATA_DEVICE_OBS;
         else
diff --git a/include/linux/list.h b/include/linux/list.h
index f29fc9c1a964..ad9dcb9e3375 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -525,6 +525,20 @@ static inline void list_splice_init_rcu(struct list_head *list,
              pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:        the type * to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)         \
+        for (pos = list_entry(pos->member.prev, typeof(*pos), member);  \
+             prefetch(pos->member.prev), &pos->member != (head);        \
+             pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
  * list_for_each_entry_from - iterate over list of given type from the current point
  * @pos:        the type * to use as a loop cursor.
  * @head:       the head for your list.
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 14c937d345cb..0e843bf65877 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -1,7 +1,8 @@
 /*
  * Runtime locking correctness validator
  *
- *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
+ *  Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
+ *  Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
  *
  * see Documentation/lockdep-design.txt for more details.
  */
@@ -9,6 +10,7 @@
 #define __LINUX_LOCKDEP_H
 
 struct task_struct;
+struct lockdep_map;
 
 #ifdef CONFIG_LOCKDEP
 
@@ -114,8 +116,44 @@ struct lock_class {
 
         const char                      *name;
         int                             name_version;
+
+#ifdef CONFIG_LOCK_STAT
+        unsigned long                   contention_point[4];
+#endif
+};
+
+#ifdef CONFIG_LOCK_STAT
+struct lock_time {
+        s64                             min;
+        s64                             max;
+        s64                             total;
+        unsigned long                   nr;
+};
+
+enum bounce_type {
+        bounce_acquired_write,
+        bounce_acquired_read,
+        bounce_contended_write,
+        bounce_contended_read,
+        nr_bounce_types,
+
+        bounce_acquired = bounce_acquired_write,
+        bounce_contended = bounce_contended_write,
 };
 
+struct lock_class_stats {
+        unsigned long                   contention_point[4];
+        struct lock_time                read_waittime;
+        struct lock_time                write_waittime;
+        struct lock_time                read_holdtime;
+        struct lock_time                write_holdtime;
+        unsigned long                   bounces[nr_bounce_types];
+};
+
+struct lock_class_stats lock_stats(struct lock_class *class);
+void clear_lock_stats(struct lock_class *class);
+#endif
+
 /*
  * Map the lock object (the lock instance) to the lock-class object.
  * This is embedded into specific lock instances:
@@ -124,6 +162,9 @@ struct lockdep_map {
         struct lock_class_key           *key;
         struct lock_class               *class_cache;
         const char                      *name;
+#ifdef CONFIG_LOCK_STAT
+        int                             cpu;
+#endif
 };
 
 /*
@@ -165,6 +206,10 @@ struct held_lock {
         unsigned long                   acquire_ip;
         struct lockdep_map              *instance;
 
+#ifdef CONFIG_LOCK_STAT
+        u64                             waittime_stamp;
+        u64                             holdtime_stamp;
+#endif
         /*
          * The lock-stack is unified in that the lock chains of interrupt
          * contexts nest ontop of process context chains, but we 'separate'
@@ -281,6 +326,30 @@ struct lock_class_key { };
 
 #endif /* !LOCKDEP */
 
+#ifdef CONFIG_LOCK_STAT
+
+extern void lock_contended(struct lockdep_map *lock, unsigned long ip);
+extern void lock_acquired(struct lockdep_map *lock);
+
+#define LOCK_CONTENDED(_lock, try, lock)                        \
+do {                                                            \
+        if (!try(_lock)) {                                      \
+                lock_contended(&(_lock)->dep_map, _RET_IP_);    \
+                lock(_lock);                                    \
+        }                                                       \
+        lock_acquired(&(_lock)->dep_map);                       \
+} while (0)
+
+#else /* CONFIG_LOCK_STAT */
+
+#define lock_contended(lockdep_map, ip) do {} while (0)
+#define lock_acquired(lockdep_map) do {} while (0)
+
+#define LOCK_CONTENDED(_lock, try, lock) \
+        lock(_lock)
+
+#endif /* CONFIG_LOCK_STAT */
+
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
 extern void early_init_irq_lock_class(void);
 #else
diff --git a/include/linux/loop.h b/include/linux/loop.h
index 0b99b31f017b..26a0a103898f 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -63,7 +63,7 @@ struct loop_device {
         struct task_struct      *lo_thread;
         wait_queue_head_t       lo_event;
 
-        request_queue_t         *lo_queue;
+        struct request_queue    *lo_queue;
         struct gendisk          *lo_disk;
         struct list_head        lo_list;
 };
diff --git a/include/linux/major.h b/include/linux/major.h
index 7e7c9093919a..0cb98053537a 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -158,6 +158,8 @@
 #define VXSPEC_MAJOR            200     /* VERITAS volume config driver */
 #define VXDMP_MAJOR             201     /* VERITAS volume multipath driver */
 
+#define XENVBD_MAJOR            202     /* Xen virtual block device */
+
 #define MSR_MAJOR               202
 #define CPUID_MAJOR             203
 
diff --git a/include/linux/mdio-bitbang.h b/include/linux/mdio-bitbang.h
new file mode 100644
index 000000000000..8ea9a42a4c02
--- /dev/null
+++ b/include/linux/mdio-bitbang.h
@@ -0,0 +1,42 @@
+#ifndef __LINUX_MDIO_BITBANG_H
+#define __LINUX_MDIO_BITBANG_H
+
+#include <linux/phy.h>
+#include <linux/module.h>
+
+struct mdiobb_ctrl;
+
+struct mdiobb_ops {
+        struct module *owner;
+
+        /* Set the Management Data Clock high if level is one,
+         * low if level is zero.
+         */
+        void (*set_mdc)(struct mdiobb_ctrl *ctrl, int level);
+
+        /* Configure the Management Data I/O pin as an input if
+         * "output" is zero, or an output if "output" is one.
+         */
+        void (*set_mdio_dir)(struct mdiobb_ctrl *ctrl, int output);
+
+        /* Set the Management Data I/O pin high if value is one,
+         * low if "value" is zero.  This may only be called
+         * when the MDIO pin is configured as an output.
+         */
+        void (*set_mdio_data)(struct mdiobb_ctrl *ctrl, int value);
+
+        /* Retrieve the state Management Data I/O pin. */
+        int (*get_mdio_data)(struct mdiobb_ctrl *ctrl);
+};
+
+struct mdiobb_ctrl {
+        const struct mdiobb_ops *ops;
+};
+
+/* The returned bus is not yet registered with the phy layer. */
+struct mii_bus *alloc_mdio_bitbang(struct mdiobb_ctrl *ctrl);
+
+/* The bus must already have been unregistered. */
+void free_mdio_bitbang(struct mii_bus *bus);
+
+#endif
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index e147cf50529f..a020eb2d4e2a 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -159,14 +159,14 @@ extern void mpol_fix_fork_child_flag(struct task_struct *p);
 
 extern struct mempolicy default_policy;
 extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,
-                unsigned long addr, gfp_t gfp_flags);
+                unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol);
 extern unsigned slab_node(struct mempolicy *policy);
 
 extern enum zone_type policy_zone;
 
 static inline void check_highest_zone(enum zone_type k)
 {
-        if (k > policy_zone)
+        if (k > policy_zone && k != ZONE_MOVABLE)
                 policy_zone = k;
 }
 
@@ -256,7 +256,7 @@ static inline void mpol_fix_fork_child_flag(struct task_struct *p)
 #define set_cpuset_being_rebound(x) do {} while (0)
 
 static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,
-                unsigned long addr, gfp_t gfp_flags)
+                unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol)
 {
         return NODE_DATA(0)->node_zonelists + gfp_zone(gfp_flags);
 }
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index cfb78fb2c046..222815d91c40 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -49,6 +49,10 @@ enum {
 };
 
 enum {
+        MLX4_BOARD_ID_LEN = 64
+};
+
+enum {
         MLX4_DEV_CAP_FLAG_RC            = 1 <<  0,
         MLX4_DEV_CAP_FLAG_UC            = 1 <<  1,
         MLX4_DEV_CAP_FLAG_UD            = 1 <<  2,
@@ -210,6 +214,17 @@ struct mlx4_mr {
         int                     enabled;
 };
 
+struct mlx4_fmr {
+        struct mlx4_mr          mr;
+        struct mlx4_mpt_entry  *mpt;
+        __be64                 *mtts;
+        dma_addr_t              dma_handle;
+        int                     max_pages;
+        int                     max_maps;
+        int                     maps;
+        u8                      page_shift;
+};
+
 struct mlx4_uar {
         unsigned long           pfn;
         int                     index;
@@ -272,6 +287,8 @@ struct mlx4_dev {
         unsigned long           flags;
         struct mlx4_caps        caps;
         struct radix_tree_root  qp_table_tree;
+        u32                     rev_id;
+        char                    board_id[MLX4_BOARD_ID_LEN];
 };
 
 struct mlx4_init_port_param {
@@ -331,4 +348,14 @@ int mlx4_CLOSE_PORT(struct mlx4_dev *dev, int port);
 int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16]);
 int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16]);
 
+int mlx4_map_phys_fmr(struct mlx4_dev *dev, struct mlx4_fmr *fmr, u64 *page_list,
+                      int npages, u64 iova, u32 *lkey, u32 *rkey);
+int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
+                   int max_maps, u8 page_shift, struct mlx4_fmr *fmr);
+int mlx4_fmr_enable(struct mlx4_dev *dev, struct mlx4_fmr *fmr);
+void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr,
+                    u32 *lkey, u32 *rkey);
+int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr);
+int mlx4_SYNC_TPT(struct mlx4_dev *dev);
+
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a5c451816fdc..1692dd6cb915 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -10,7 +10,6 @@
 #include <linux/mmzone.h>
 #include <linux/rbtree.h>
 #include <linux/prio_tree.h>
-#include <linux/fs.h>
 #include <linux/mutex.h>
 #include <linux/debug_locks.h>
 #include <linux/backing-dev.h>
@@ -18,7 +17,9 @@
 
 struct mempolicy;
 struct anon_vma;
+struct file_ra_state;
 struct user_struct;
+struct writeback_control;
 
 #ifndef CONFIG_DISCONTIGMEM          /* Don't use mapnrs, do it properly */
 extern unsigned long max_mapnr;
@@ -168,6 +169,8 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_INSERTPAGE   0x02000000      /* The vma has had "vm_insert_page()" done on it */
 #define VM_ALWAYSDUMP   0x04000000      /* Always include in core dumps */
 
+#define VM_CAN_NONLINEAR 0x08000000     /* Has ->fault & does nonlinear pages */
+
 #ifndef VM_STACK_DEFAULT_FLAGS          /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
 #endif
@@ -190,6 +193,30 @@ extern unsigned int kobjsize(const void *objp);
  */
 extern pgprot_t protection_map[16];
 
+#define FAULT_FLAG_WRITE        0x01    /* Fault was a write access */
+#define FAULT_FLAG_NONLINEAR    0x02    /* Fault was via a nonlinear mapping */
+
+
+/*
+ * vm_fault is filled by the the pagefault handler and passed to the vma's
+ * ->fault function. The vma's ->fault is responsible for returning a bitmask
+ * of VM_FAULT_xxx flags that give details about how the fault was handled.
+ *
+ * pgoff should be used in favour of virtual_address, if possible. If pgoff
+ * is used, one may set VM_CAN_NONLINEAR in the vma->vm_flags to get nonlinear
+ * mapping support.
+ */
+struct vm_fault {
+        unsigned int flags;             /* FAULT_FLAG_xxx flags */
+        pgoff_t pgoff;                  /* Logical page offset based on vma */
+        void __user *virtual_address;   /* Faulting virtual address */
+
+        struct page *page;              /* ->fault handlers should return a
+                                         * page here, unless VM_FAULT_NOPAGE
+                                         * is set (which is also implied by
+                                         * VM_FAULT_ERROR).
+                                         */
+};
 
 /*
  * These are the virtual MM functions - opening of an area, closing and
@@ -199,9 +226,11 @@ extern pgprot_t protection_map[16];
 struct vm_operations_struct {
         void (*open)(struct vm_area_struct * area);
         void (*close)(struct vm_area_struct * area);
-        struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int *type);
-        unsigned long (*nopfn)(struct vm_area_struct * area, unsigned long address);
-        int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
+        int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
+        struct page *(*nopage)(struct vm_area_struct *area,
+                        unsigned long address, int *type);
+        unsigned long (*nopfn)(struct vm_area_struct *area,
+                        unsigned long address);
 
         /* notification that a previously read-only page is about to become
          * writable, if an error is returned it will cause a SIGBUS */
@@ -655,7 +684,6 @@ static inline int page_mapped(struct page *page)
  */
 #define NOPAGE_SIGBUS   (NULL)
 #define NOPAGE_OOM      ((struct page *) (-1))
-#define NOPAGE_REFAULT  ((struct page *) (-2))  /* Return to userspace, rerun */
 
 /*
  * Error return values for the *_nopfn functions
@@ -669,16 +697,18 @@ static inline int page_mapped(struct page *page)
  * Used to decide whether a process gets delivered SIGBUS or
  * just gets major/minor fault counters bumped up.
  */
-#define VM_FAULT_OOM    0x00
-#define VM_FAULT_SIGBUS 0x01
-#define VM_FAULT_MINOR  0x02
-#define VM_FAULT_MAJOR  0x03
-
-/* 
- * Special case for get_user_pages.
- * Must be in a distinct bit from the above VM_FAULT_ flags.
- */
-#define VM_FAULT_WRITE  0x10
+
+#define VM_FAULT_MINOR  0 /* For backwards compat. Remove me quickly. */
+
+#define VM_FAULT_OOM    0x0001
+#define VM_FAULT_SIGBUS 0x0002
+#define VM_FAULT_MAJOR  0x0004
+#define VM_FAULT_WRITE  0x0008  /* Special case for get_user_pages */
+
+#define VM_FAULT_NOPAGE 0x0100  /* ->fault installed the pte, not return page */
+#define VM_FAULT_LOCKED 0x0200  /* ->fault locked the returned page */
+
+#define VM_FAULT_ERROR  (VM_FAULT_OOM | VM_FAULT_SIGBUS)
 
 #define offset_in_page(p)       ((unsigned long)(p) & ~PAGE_MASK)
 
@@ -762,20 +792,10 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
 
 extern int vmtruncate(struct inode * inode, loff_t offset);
 extern int vmtruncate_range(struct inode * inode, loff_t offset, loff_t end);
-extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot);
-extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot);
 
 #ifdef CONFIG_MMU
-extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma,
+extern int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                         unsigned long address, int write_access);
-
-static inline int handle_mm_fault(struct mm_struct *mm,
-                        struct vm_area_struct *vma, unsigned long address,
-                        int write_access)
-{
-        return __handle_mm_fault(mm, vma, address, write_access) &
-                                (~VM_FAULT_WRITE);
-}
 #else
 static inline int handle_mm_fault(struct mm_struct *mm,
                         struct vm_area_struct *vma, unsigned long address,
@@ -789,7 +809,6 @@ static inline int handle_mm_fault(struct mm_struct *mm,
 
 extern int make_pages_present(unsigned long addr, unsigned long end);
 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
-void install_arg_page(struct vm_area_struct *, struct page *, unsigned long);
 
 int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start,
                 int len, int write, int force, struct page **pages, struct vm_area_struct **vmas);
@@ -806,9 +825,15 @@ int FASTCALL(set_page_dirty(struct page *page));
 int set_page_dirty_lock(struct page *page);
 int clear_page_dirty_for_io(struct page *page);
 
+extern unsigned long move_page_tables(struct vm_area_struct *vma,
+                unsigned long old_addr, struct vm_area_struct *new_vma,
+                unsigned long new_addr, unsigned long len);
 extern unsigned long do_mremap(unsigned long addr,
                                unsigned long old_len, unsigned long new_len,
                                unsigned long flags, unsigned long new_addr);
+extern int mprotect_fixup(struct vm_area_struct *vma,
+                          struct vm_area_struct **pprev, unsigned long start,
+                          unsigned long end, unsigned long newflags);
 
 /*
  * A callback you can register to apply pressure to ageable caches.
@@ -837,38 +862,7 @@ struct shrinker {
 extern void register_shrinker(struct shrinker *);
 extern void unregister_shrinker(struct shrinker *);
 
-/*
- * Some shared mappigns will want the pages marked read-only
- * to track write events. If so, we'll downgrade vm_page_prot
- * to the private version (using protection_map[] without the
- * VM_SHARED bit).
- */
-static inline int vma_wants_writenotify(struct vm_area_struct *vma)
-{
-        unsigned int vm_flags = vma->vm_flags;
-
-        /* If it was private or non-writable, the write bit is already clear */
-        if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
-                return 0;
-
-        /* The backer wishes to know when pages are first written to? */
-        if (vma->vm_ops && vma->vm_ops->page_mkwrite)
-                return 1;
-
-        /* The open routine did something to the protections already? */
-        if (pgprot_val(vma->vm_page_prot) !=
-            pgprot_val(protection_map[vm_flags &
-                    (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]))
-                return 0;
-
-        /* Specialty mapping? */
-        if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE))
-                return 0;
-
-        /* Can the mapping track the dirty pages? */
-        return vma->vm_file && vma->vm_file->f_mapping &&
-                mapping_cap_account_dirty(vma->vm_file->f_mapping);
-}
+int vma_wants_writenotify(struct vm_area_struct *vma);
 
 extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl));
 
@@ -1048,7 +1042,7 @@ static inline void vma_nonlinear_insert(struct vm_area_struct *vma,
 }
 
 /* mmap.c */
-extern int __vm_enough_memory(long pages, int cap_sys_admin);
+extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin);
 extern void vma_adjust(struct vm_area_struct *vma, unsigned long start,
         unsigned long end, pgoff_t pgoff, struct vm_area_struct *insert);
 extern struct vm_area_struct *vma_merge(struct mm_struct *,
@@ -1104,9 +1098,7 @@ extern void truncate_inode_pages_range(struct address_space *,
                                        loff_t lstart, loff_t lend);
 
 /* generic vm_area_ops exported for stackable file systems */
-extern struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int *);
-extern int filemap_populate(struct vm_area_struct *, unsigned long,
-                unsigned long, pgprot_t, unsigned long, int);
+extern int filemap_fault(struct vm_area_struct *, struct vm_fault *);
 
 /* mm/page-writeback.c */
 int write_one_page(struct page *page, int wait);
@@ -1121,13 +1113,20 @@ int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
                         pgoff_t offset, unsigned long nr_to_read);
 int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
                         pgoff_t offset, unsigned long nr_to_read);
-unsigned long page_cache_readahead(struct address_space *mapping,
-                          struct file_ra_state *ra,
-                          struct file *filp,
-                          pgoff_t offset,
-                          unsigned long size);
-void handle_ra_miss(struct address_space *mapping, 
-                    struct file_ra_state *ra, pgoff_t offset);
+
+void page_cache_sync_readahead(struct address_space *mapping,
+                               struct file_ra_state *ra,
+                               struct file *filp,
+                               pgoff_t offset,
+                               unsigned long size);
+
+void page_cache_async_readahead(struct address_space *mapping,
+                                struct file_ra_state *ra,
+                                struct file *filp,
+                                struct page *pg,
+                                pgoff_t offset,
+                                unsigned long size);
+
 unsigned long max_sane_readahead(unsigned long nr);
 
 /* Do stack extension */
@@ -1135,6 +1134,8 @@ extern int expand_stack(struct vm_area_struct *vma, unsigned long address);
 #ifdef CONFIG_IA64
 extern int expand_upwards(struct vm_area_struct *vma, unsigned long address);
 #endif
+extern int expand_stack_downwards(struct vm_area_struct *vma,
+                                  unsigned long address);
 
 /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
 extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr);
@@ -1215,7 +1216,7 @@ void drop_slab(void);
 extern int randomize_va_space;
 #endif
 
-__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma);
+const char * arch_vma_name(struct vm_area_struct *vma);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index badf702fcff4..0d508ac17d64 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -55,7 +55,28 @@ struct sd_switch_caps {
         unsigned int            hs_max_dtr;
 };
 
+struct sdio_cccr {
+        unsigned int            sdio_vsn;
+        unsigned int            sd_vsn;
+        unsigned int            multi_block:1,
+                                low_speed:1,
+                                wide_bus:1,
+                                high_power:1,
+                                high_speed:1;
+};
+
+struct sdio_cis {
+        unsigned short          vendor;
+        unsigned short          device;
+        unsigned short          blksize;
+        unsigned int            max_dtr;
+};
+
 struct mmc_host;
+struct sdio_func;
+struct sdio_func_tuple;
+
+#define SDIO_MAX_FUNCS          7
 
 /*
  * MMC device
@@ -67,11 +88,13 @@ struct mmc_card {
         unsigned int            type;           /* card type */
 #define MMC_TYPE_MMC            0               /* MMC card */
 #define MMC_TYPE_SD             1               /* SD card */
+#define MMC_TYPE_SDIO           2               /* SDIO card */
         unsigned int            state;          /* (our) card state */
 #define MMC_STATE_PRESENT       (1<<0)          /* present in sysfs */
 #define MMC_STATE_READONLY      (1<<1)          /* card is read-only */
 #define MMC_STATE_HIGHSPEED     (1<<2)          /* card is in high speed mode */
 #define MMC_STATE_BLOCKADDR     (1<<3)          /* card uses block-addressing */
+
         u32                     raw_cid[4];     /* raw card CID */
         u32                     raw_csd[4];     /* raw card CSD */
         u32                     raw_scr[2];     /* raw card SCR */
@@ -80,10 +103,19 @@ struct mmc_card {
         struct mmc_ext_csd      ext_csd;        /* mmc v4 extended card specific */
         struct sd_scr           scr;            /* extra SD information */
         struct sd_switch_caps   sw_caps;        /* switch (CMD6) caps */
+
+        unsigned int            sdio_funcs;     /* number of SDIO functions */
+        struct sdio_cccr        cccr;           /* common card info */
+        struct sdio_cis         cis;            /* common tuple info */
+        struct sdio_func        *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
+        unsigned                num_info;       /* number of info strings */
+        const char              **info;         /* info strings */
+        struct sdio_func_tuple  *tuples;        /* unknown common tuples */
 };
 
 #define mmc_card_mmc(c)         ((c)->type == MMC_TYPE_MMC)
 #define mmc_card_sd(c)          ((c)->type == MMC_TYPE_SD)
+#define mmc_card_sdio(c)        ((c)->type == MMC_TYPE_SDIO)
 
 #define mmc_card_present(c)     ((c)->state & MMC_STATE_PRESENT)
 #define mmc_card_readonly(c)    ((c)->state & MMC_STATE_READONLY)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 04bbe12fae8d..d0c3abed74c2 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -25,14 +25,20 @@ struct mmc_command {
 #define MMC_RSP_CRC     (1 << 2)                /* expect valid crc */
 #define MMC_RSP_BUSY    (1 << 3)                /* card may send busy */
 #define MMC_RSP_OPCODE  (1 << 4)                /* response contains opcode */
-#define MMC_CMD_MASK    (3 << 5)                /* command type */
+
+#define MMC_CMD_MASK    (3 << 5)                /* non-SPI command type */
 #define MMC_CMD_AC      (0 << 5)
 #define MMC_CMD_ADTC    (1 << 5)
 #define MMC_CMD_BC      (2 << 5)
 #define MMC_CMD_BCR     (3 << 5)
 
+#define MMC_RSP_SPI_S1  (1 << 7)                /* one status byte */
+#define MMC_RSP_SPI_S2  (1 << 8)                /* second byte */
+#define MMC_RSP_SPI_B4  (1 << 9)                /* four data bytes */
+#define MMC_RSP_SPI_BUSY (1 << 10)              /* card may send busy */
+
 /*
- * These are the response types, and correspond to valid bit
+ * These are the native response types, and correspond to valid bit
  * patterns of the above flags.  One additional valid pattern
  * is all zeros, which means we don't expect a response.
  */
@@ -41,12 +47,30 @@ struct mmc_command {
 #define MMC_RSP_R1B     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
 #define MMC_RSP_R2      (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
 #define MMC_RSP_R3      (MMC_RSP_PRESENT)
+#define MMC_RSP_R4      (MMC_RSP_PRESENT)
+#define MMC_RSP_R5      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 #define MMC_RSP_R6      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 #define MMC_RSP_R7      (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 
 #define mmc_resp_type(cmd)      ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))
 
 /*
+ * These are the SPI response types for MMC, SD, and SDIO cards.
+ * Commands return R1, with maybe more info.  Zero is an error type;
+ * callers must always provide the appropriate MMC_RSP_SPI_Rx flags.
+ */
+#define MMC_RSP_SPI_R1  (MMC_RSP_SPI_S1)
+#define MMC_RSP_SPI_R1B (MMC_RSP_SPI_S1|MMC_RSP_SPI_BUSY)
+#define MMC_RSP_SPI_R2  (MMC_RSP_SPI_S1|MMC_RSP_SPI_S2)
+#define MMC_RSP_SPI_R3  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+#define MMC_RSP_SPI_R4  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+#define MMC_RSP_SPI_R5  (MMC_RSP_SPI_S1|MMC_RSP_SPI_S2)
+#define MMC_RSP_SPI_R7  (MMC_RSP_SPI_S1|MMC_RSP_SPI_B4)
+
+#define mmc_spi_resp_type(cmd)  ((cmd)->flags & \
+                (MMC_RSP_SPI_S1|MMC_RSP_SPI_BUSY|MMC_RSP_SPI_S2|MMC_RSP_SPI_B4))
+
+/*
  * These are the command types.
  */
 #define mmc_cmd_type(cmd)       ((cmd)->flags & MMC_CMD_MASK)
@@ -54,12 +78,19 @@ struct mmc_command {
         unsigned int            retries;        /* max number of retries */
         unsigned int            error;          /* command error */
 
-#define MMC_ERR_NONE    0
-#define MMC_ERR_TIMEOUT 1
-#define MMC_ERR_BADCRC  2
-#define MMC_ERR_FIFO    3
-#define MMC_ERR_FAILED  4
-#define MMC_ERR_INVALID 5
+/*
+ * Standard errno values are used for errors, but some have specific
+ * meaning in the MMC layer:
+ *
+ * ETIMEDOUT    Card took too long to respond
+ * EILSEQ       Basic format problem with the received or sent data
+ *              (e.g. CRC check failed, incorrect opcode in response
+ *              or bad end bit)
+ * EINVAL       Request cannot be performed because of restrictions
+ *              in hardware and/or the driver
+ * ENOMEDIUM    Host can determine that the slot is empty and is
+ *              actively failing requests
+ */
 
         struct mmc_data         *data;          /* data segment associated with cmd */
         struct mmc_request      *mrq;           /* associated request */
@@ -76,7 +107,6 @@ struct mmc_data {
 #define MMC_DATA_WRITE  (1 << 8)
 #define MMC_DATA_READ   (1 << 9)
 #define MMC_DATA_STREAM (1 << 10)
-#define MMC_DATA_MULTI  (1 << 11)
 
         unsigned int            bytes_xfered;
 
@@ -99,14 +129,25 @@ struct mmc_request {
 struct mmc_host;
 struct mmc_card;
 
-extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
+extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
 extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
 
-extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
+extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
 
-extern void mmc_claim_host(struct mmc_host *host);
+extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
 
+/**
+ *      mmc_claim_host - exclusively claim a host
+ *      @host: mmc host to claim
+ *
+ *      Claim a host for a set of operations.
+ */
+static inline void mmc_claim_host(struct mmc_host *host)
+{
+        __mmc_claim_host(host, NULL);
+}
+
 #endif
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index b1350dfd3e91..125eee1407ff 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -10,6 +10,8 @@
 #ifndef LINUX_MMC_HOST_H
 #define LINUX_MMC_HOST_H
 
+#include <linux/leds.h>
+
 #include <linux/mmc/core.h>
 
 struct mmc_ios {
@@ -51,6 +53,7 @@ struct mmc_host_ops {
         void    (*request)(struct mmc_host *host, struct mmc_request *req);
         void    (*set_ios)(struct mmc_host *host, struct mmc_ios *ios);
         int     (*get_ro)(struct mmc_host *host);
+        void    (*enable_sdio_irq)(struct mmc_host *host, int enable);
 };
 
 struct mmc_card;
@@ -87,9 +90,10 @@ struct mmc_host {
 
 #define MMC_CAP_4_BIT_DATA      (1 << 0)        /* Can the host do 4 bit transfers */
 #define MMC_CAP_MULTIWRITE      (1 << 1)        /* Can accurately report bytes sent to card on error */
-#define MMC_CAP_BYTEBLOCK       (1 << 2)        /* Can do non-log2 block sizes */
-#define MMC_CAP_MMC_HIGHSPEED   (1 << 3)        /* Can do MMC high-speed timing */
-#define MMC_CAP_SD_HIGHSPEED    (1 << 4)        /* Can do SD high-speed timing */
+#define MMC_CAP_MMC_HIGHSPEED   (1 << 2)        /* Can do MMC high-speed timing */
+#define MMC_CAP_SD_HIGHSPEED    (1 << 3)        /* Can do SD high-speed timing */
+#define MMC_CAP_SDIO_IRQ        (1 << 4)        /* Can signal pending SDIO IRQs */
+#define MMC_CAP_SPI             (1 << 5)        /* Talks only SPI protocols */
 
         /* host specific block data */
         unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
@@ -106,6 +110,14 @@ struct mmc_host {
         struct mmc_ios          ios;            /* current io bus settings */
         u32                     ocr;            /* the current OCR setting */
 
+        /* group bitfields together to minimize padding */
+        unsigned int            use_spi_crc:1;
+        unsigned int            claimed:1;      /* host exclusively claimed */
+        unsigned int            bus_dead:1;     /* bus has been released */
+#ifdef CONFIG_MMC_DEBUG
+        unsigned int            removed:1;      /* host is being removed */
+#endif
+
         unsigned int            mode;           /* current card mode of host */
 #define MMC_MODE_MMC            0
 #define MMC_MODE_SD             1
@@ -113,16 +125,19 @@ struct mmc_host {
         struct mmc_card         *card;          /* device attached to this host */
 
         wait_queue_head_t       wq;
-        unsigned int            claimed:1;      /* host exclusively claimed */
 
         struct delayed_work     detect;
-#ifdef CONFIG_MMC_DEBUG
-        unsigned int            removed:1;      /* host is being removed */
-#endif
 
         const struct mmc_bus_ops *bus_ops;      /* current bus driver */
         unsigned int            bus_refs;       /* reference counter */
-        unsigned int            bus_dead:1;     /* bus has been released */
+
+        unsigned int            sdio_irqs;
+        struct task_struct      *sdio_irq_thread;
+        atomic_t                sdio_irq_thread_abort;
+
+#ifdef CONFIG_LEDS_TRIGGERS
+        struct led_trigger      *led;           /* activity led */
+#endif
 
         unsigned long           private[0] ____cacheline_aligned;
 };
@@ -137,6 +152,8 @@ static inline void *mmc_priv(struct mmc_host *host)
         return (void *)host->private;
 }
 
+#define mmc_host_is_spi(host)   ((host)->caps & MMC_CAP_SPI)
+
 #define mmc_dev(x)      ((x)->parent)
 #define mmc_classdev(x) (&(x)->class_dev)
 #define mmc_hostname(x) ((x)->class_dev.bus_id)
@@ -147,5 +164,11 @@ extern int mmc_resume_host(struct mmc_host *);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
 
+static inline void mmc_signal_sdio_irq(struct mmc_host *host)
+{
+        host->ops->enable_sdio_irq(host, 0);
+        wake_up_process(host->sdio_irq_thread);
+}
+
 #endif
 
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index e3ed9b95040e..4236fbf0b6fb 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -27,7 +27,7 @@
 
 /* Standard MMC commands (4.1)           type  argument     response */
    /* class 1 */
-#define MMC_GO_IDLE_STATE         0   /* bc                          */
+#define MMC_GO_IDLE_STATE         0   /* bc                          */
 #define MMC_SEND_OP_COND          1   /* bcr  [31:0] OCR         R3  */
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
@@ -39,8 +39,10 @@
 #define MMC_SEND_CID             10   /* ac   [31:16] RCA        R2  */
 #define MMC_READ_DAT_UNTIL_STOP  11   /* adtc [31:0] dadr        R1  */
 #define MMC_STOP_TRANSMISSION    12   /* ac                      R1b */
-#define MMC_SEND_STATUS          13   /* ac   [31:16] RCA        R1  */
+#define MMC_SEND_STATUS          13   /* ac   [31:16] RCA        R1  */
 #define MMC_GO_INACTIVE_STATE    15   /* ac   [31:16] RCA            */
+#define MMC_SPI_READ_OCR         58   /* spi                  spi_R3 */
+#define MMC_SPI_CRC_ON_OFF       59   /* spi  [0:0] flag      spi_R1 */
 
   /* class 2 */
 #define MMC_SET_BLOCKLEN         16   /* ac   [31:0] block len   R1  */
@@ -90,15 +92,15 @@
  */
 
 /*
-  MMC status in R1
+  MMC status in R1, for native mode (SPI bits are different)
   Type
-        e : error bit
+        e : error bit
         s : status bit
         r : detected and set for the actual command response
         x : detected and set during command execution. the host must poll
             the card by sending status command in order to read these bits.
   Clear condition
-        a : according to the card state
+        a : according to the card state
         b : always related to the previous command. Reception of
             a valid command will clear it (with a delay of one command)
         c : clear by read
@@ -124,10 +126,33 @@
 #define R1_CARD_ECC_DISABLED    (1 << 14)       /* sx, a */
 #define R1_ERASE_RESET          (1 << 13)       /* sr, c */
 #define R1_STATUS(x)            (x & 0xFFFFE000)
-#define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
+#define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 
+/*
+ * MMC/SD in SPI mode reports R1 status always, and R2 for SEND_STATUS
+ * R1 is the low order byte; R2 is the next highest byte, when present.
+ */
+#define R1_SPI_IDLE             (1 << 0)
+#define R1_SPI_ERASE_RESET      (1 << 1)
+#define R1_SPI_ILLEGAL_COMMAND  (1 << 2)
+#define R1_SPI_COM_CRC          (1 << 3)
+#define R1_SPI_ERASE_SEQ        (1 << 4)
+#define R1_SPI_ADDRESS          (1 << 5)
+#define R1_SPI_PARAMETER        (1 << 6)
+/* R1 bit 7 is always zero */
+#define R2_SPI_CARD_LOCKED      (1 << 8)
+#define R2_SPI_WP_ERASE_SKIP    (1 << 9)        /* or lock/unlock fail */
+#define R2_SPI_LOCK_UNLOCK_FAIL R2_SPI_WP_ERASE_SKIP
+#define R2_SPI_ERROR            (1 << 10)
+#define R2_SPI_CC_ERROR         (1 << 11)
+#define R2_SPI_CARD_ECC_ERROR   (1 << 12)
+#define R2_SPI_WP_VIOLATION     (1 << 13)
+#define R2_SPI_ERASE_PARAM      (1 << 14)
+#define R2_SPI_OUT_OF_RANGE     (1 << 15)       /* or CSD overwrite */
+#define R2_SPI_CSD_OVERWRITE    R2_SPI_OUT_OF_RANGE
+
 /* These are unpacked versions of the actual responses */
 
 struct _mmc_csd {
@@ -182,6 +207,7 @@ struct _mmc_csd {
  */
 #define CCC_BASIC               (1<<0)  /* (0) Basic protocol functions */
                                         /* (CMD0,1,2,3,4,7,9,10,12,13,15) */
+                                        /* (and for SPI, CMD58,59) */
 #define CCC_STREAM_READ         (1<<1)  /* (1) Stream read commands */
                                         /* (CMD11) */
 #define CCC_BLOCK_READ          (1<<2)  /* (2) Block read commands */
@@ -227,6 +253,7 @@ struct _mmc_csd {
 #define EXT_CSD_BUS_WIDTH       183     /* R/W */
 #define EXT_CSD_HS_TIMING       185     /* R/W */
 #define EXT_CSD_CARD_TYPE       196     /* RO */
+#define EXT_CSD_REV             192     /* RO */
 #define EXT_CSD_SEC_CNT         212     /* RO, 4 bytes */
 
 /*
diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
new file mode 100644
index 000000000000..47ba464f5170
--- /dev/null
+++ b/include/linux/mmc/sdio.h
@@ -0,0 +1,159 @@
+/*
+ *  include/linux/mmc/sdio.h
+ *
+ *  Copyright 2006-2007 Pierre Ossman
+ *
+ * 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 MMC_SDIO_H
+#define MMC_SDIO_H
+
+/* SDIO commands                         type  argument     response */
+#define SD_IO_SEND_OP_COND          5 /* bcr  [23:0] OCR         R4  */
+#define SD_IO_RW_DIRECT            52 /* ac   [31:0] See below   R5  */
+#define SD_IO_RW_EXTENDED          53 /* adtc [31:0] See below   R5  */
+
+/*
+ * SD_IO_RW_DIRECT argument format:
+ *
+ *      [31] R/W flag
+ *      [30:28] Function number
+ *      [27] RAW flag
+ *      [25:9] Register address
+ *      [7:0] Data
+ */
+
+/*
+ * SD_IO_RW_EXTENDED argument format:
+ *
+ *      [31] R/W flag
+ *      [30:28] Function number
+ *      [27] Block mode
+ *      [26] Increment address
+ *      [25:9] Register address
+ *      [8:0] Byte/block count
+ */
+
+/*
+  SDIO status in R5
+  Type
+        e : error bit
+        s : status bit
+        r : detected and set for the actual command response
+        x : detected and set during command execution. the host must poll
+            the card by sending status command in order to read these bits.
+  Clear condition
+        a : according to the card state
+        b : always related to the previous command. Reception of
+            a valid command will clear it (with a delay of one command)
+        c : clear by read
+ */
+
+#define R5_COM_CRC_ERROR        (1 << 15)       /* er, b */
+#define R5_ILLEGAL_COMMAND      (1 << 14)       /* er, b */
+#define R5_ERROR                (1 << 11)       /* erx, c */
+#define R5_FUNCTION_NUMBER      (1 << 9)        /* er, c */
+#define R5_OUT_OF_RANGE         (1 << 8)        /* er, c */
+#define R5_STATUS(x)            (x & 0xCB00)
+#define R5_IO_CURRENT_STATE(x)  ((x & 0x3000) >> 12) /* s, b */
+
+/*
+ * Card Common Control Registers (CCCR)
+ */
+
+#define SDIO_CCCR_CCCR          0x00
+
+#define  SDIO_CCCR_REV_1_00     0       /* CCCR/FBR Version 1.00 */
+#define  SDIO_CCCR_REV_1_10     1       /* CCCR/FBR Version 1.10 */
+#define  SDIO_CCCR_REV_1_20     2       /* CCCR/FBR Version 1.20 */
+
+#define  SDIO_SDIO_REV_1_00     0       /* SDIO Spec Version 1.00 */
+#define  SDIO_SDIO_REV_1_10     1       /* SDIO Spec Version 1.10 */
+#define  SDIO_SDIO_REV_1_20     2       /* SDIO Spec Version 1.20 */
+#define  SDIO_SDIO_REV_2_00     3       /* SDIO Spec Version 2.00 */
+
+#define SDIO_CCCR_SD            0x01
+
+#define  SDIO_SD_REV_1_01       0       /* SD Physical Spec Version 1.01 */
+#define  SDIO_SD_REV_1_10       1       /* SD Physical Spec Version 1.10 */
+#define  SDIO_SD_REV_2_00       2       /* SD Physical Spec Version 2.00 */
+
+#define SDIO_CCCR_IOEx          0x02
+#define SDIO_CCCR_IORx          0x03
+
+#define SDIO_CCCR_IENx          0x04    /* Function/Master Interrupt Enable */
+#define SDIO_CCCR_INTx          0x05    /* Function Interrupt Pending */
+
+#define SDIO_CCCR_ABORT         0x06    /* function abort/card reset */
+
+#define SDIO_CCCR_IF            0x07    /* bus interface controls */
+
+#define  SDIO_BUS_WIDTH_1BIT    0x00
+#define  SDIO_BUS_WIDTH_4BIT    0x02
+
+#define  SDIO_BUS_CD_DISABLE     0x80   /* disable pull-up on DAT3 (pin 1) */
+
+#define SDIO_CCCR_CAPS          0x08
+
+#define  SDIO_CCCR_CAP_SDC      0x01    /* can do CMD52 while data transfer */
+#define  SDIO_CCCR_CAP_SMB      0x02    /* can do multi-block xfers (CMD53) */
+#define  SDIO_CCCR_CAP_SRW      0x04    /* supports read-wait protocol */
+#define  SDIO_CCCR_CAP_SBS      0x08    /* supports suspend/resume */
+#define  SDIO_CCCR_CAP_S4MI     0x10    /* interrupt during 4-bit CMD53 */
+#define  SDIO_CCCR_CAP_E4MI     0x20    /* enable ints during 4-bit CMD53 */
+#define  SDIO_CCCR_CAP_LSC      0x40    /* low speed card */
+#define  SDIO_CCCR_CAP_4BLS     0x80    /* 4 bit low speed card */
+
+#define SDIO_CCCR_CIS           0x09    /* common CIS pointer (3 bytes) */
+
+/* Following 4 regs are valid only if SBS is set */
+#define SDIO_CCCR_SUSPEND       0x0c
+#define SDIO_CCCR_SELx          0x0d
+#define SDIO_CCCR_EXECx         0x0e
+#define SDIO_CCCR_READYx        0x0f
+
+#define SDIO_CCCR_BLKSIZE       0x10
+
+#define SDIO_CCCR_POWER         0x12
+
+#define  SDIO_POWER_SMPC        0x01    /* Supports Master Power Control */
+#define  SDIO_POWER_EMPC        0x02    /* Enable Master Power Control */
+
+#define SDIO_CCCR_SPEED         0x13
+
+#define  SDIO_SPEED_SHS         0x01    /* Supports High-Speed mode */
+#define  SDIO_SPEED_EHS         0x02    /* Enable High-Speed mode */
+
+/*
+ * Function Basic Registers (FBR)
+ */
+
+#define SDIO_FBR_BASE(f)        ((f) * 0x100) /* base of function f's FBRs */
+
+#define SDIO_FBR_STD_IF         0x00
+
+#define  SDIO_FBR_SUPPORTS_CSA  0x40    /* supports Code Storage Area */
+#define  SDIO_FBR_ENABLE_CSA    0x80    /* enable Code Storage Area */
+
+#define SDIO_FBR_STD_IF_EXT     0x01
+
+#define SDIO_FBR_POWER          0x02
+
+#define  SDIO_FBR_POWER_SPS     0x01    /* Supports Power Selection */
+#define  SDIO_FBR_POWER_EPS     0x02    /* Enable (low) Power Selection */
+
+#define SDIO_FBR_CIS            0x09    /* CIS pointer (3 bytes) */
+
+
+#define SDIO_FBR_CSA            0x0C    /* CSA pointer (3 bytes) */
+
+#define SDIO_FBR_CSA_DATA       0x0F
+
+#define SDIO_FBR_BLKSIZE        0x10    /* block size (2 bytes) */
+
+#endif
+
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
new file mode 100644
index 000000000000..b050f4d7b41f
--- /dev/null
+++ b/include/linux/mmc/sdio_func.h
@@ -0,0 +1,153 @@
+/*
+ *  include/linux/mmc/sdio_func.h
+ *
+ *  Copyright 2007 Pierre Ossman
+ *
+ * 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 MMC_SDIO_FUNC_H
+#define MMC_SDIO_FUNC_H
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+
+struct mmc_card;
+struct sdio_func;
+
+typedef void (sdio_irq_handler_t)(struct sdio_func *);
+
+/*
+ * SDIO function CIS tuple (unknown to the core)
+ */
+struct sdio_func_tuple {
+        struct sdio_func_tuple *next;
+        unsigned char code;
+        unsigned char size;
+        unsigned char data[0];
+};
+
+/*
+ * SDIO function devices
+ */
+struct sdio_func {
+        struct mmc_card         *card;          /* the card this device belongs to */
+        struct device           dev;            /* the device */
+        sdio_irq_handler_t      *irq_handler;   /* IRQ callback */
+        unsigned int            num;            /* function number */
+
+        unsigned char           class;          /* standard interface class */
+        unsigned short          vendor;         /* vendor id */
+        unsigned short          device;         /* device id */
+
+        unsigned                max_blksize;    /* maximum block size */
+        unsigned                cur_blksize;    /* current block size */
+
+        unsigned int            state;          /* function state */
+#define SDIO_STATE_PRESENT      (1<<0)          /* present in sysfs */
+
+        u8                      tmpbuf[4];      /* DMA:able scratch buffer */
+
+        unsigned                num_info;       /* number of info strings */
+        const char              **info;         /* info strings */
+
+        struct sdio_func_tuple *tuples;
+};
+
+#define sdio_func_present(f)    ((f)->state & SDIO_STATE_PRESENT)
+
+#define sdio_func_set_present(f) ((f)->state |= SDIO_STATE_PRESENT)
+
+#define sdio_func_id(f)         ((f)->dev.bus_id)
+
+#define sdio_get_drvdata(f)     dev_get_drvdata(&(f)->dev)
+#define sdio_set_drvdata(f,d)   dev_set_drvdata(&(f)->dev, d)
+
+/*
+ * SDIO function device driver
+ */
+struct sdio_driver {
+        char *name;
+        const struct sdio_device_id *id_table;
+
+        int (*probe)(struct sdio_func *, const struct sdio_device_id *);
+        void (*remove)(struct sdio_func *);
+
+        struct device_driver drv;
+};
+
+/**
+ * SDIO_DEVICE - macro used to describe a specific SDIO device
+ * @vend: the 16 bit manufacturer code
+ * @dev: the 16 bit function id
+ *
+ * This macro is used to create a struct sdio_device_id that matches a
+ * specific device. The class field will be set to SDIO_ANY_ID.
+ */
+#define SDIO_DEVICE(vend,dev) \
+        .class = SDIO_ANY_ID, \
+        .vendor = (vend), .device = (dev)
+
+/**
+ * SDIO_DEVICE_CLASS - macro used to describe a specific SDIO device class
+ * @dev_class: the 8 bit standard interface code
+ *
+ * This macro is used to create a struct sdio_device_id that matches a
+ * specific standard SDIO function type.  The vendor and device fields will
+ * be set to SDIO_ANY_ID.
+ */
+#define SDIO_DEVICE_CLASS(dev_class) \
+        .class = (dev_class), \
+        .vendor = SDIO_ANY_ID, .device = SDIO_ANY_ID
+
+extern int sdio_register_driver(struct sdio_driver *);
+extern void sdio_unregister_driver(struct sdio_driver *);
+
+/*
+ * SDIO I/O operations
+ */
+extern void sdio_claim_host(struct sdio_func *func);
+extern void sdio_release_host(struct sdio_func *func);
+
+extern int sdio_enable_func(struct sdio_func *func);
+extern int sdio_disable_func(struct sdio_func *func);
+
+extern int sdio_set_block_size(struct sdio_func *func, unsigned blksz);
+
+extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler);
+extern int sdio_release_irq(struct sdio_func *func);
+
+extern unsigned char sdio_readb(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern unsigned short sdio_readw(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern unsigned long sdio_readl(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+
+extern int sdio_memcpy_fromio(struct sdio_func *func, void *dst,
+        unsigned int addr, int count);
+extern int sdio_readsb(struct sdio_func *func, void *dst,
+        unsigned int addr, int count);
+
+extern void sdio_writeb(struct sdio_func *func, unsigned char b,
+        unsigned int addr, int *err_ret);
+extern void sdio_writew(struct sdio_func *func, unsigned short b,
+        unsigned int addr, int *err_ret);
+extern void sdio_writel(struct sdio_func *func, unsigned long b,
+        unsigned int addr, int *err_ret);
+
+extern int sdio_memcpy_toio(struct sdio_func *func, unsigned int addr,
+        void *src, int count);
+extern int sdio_writesb(struct sdio_func *func, unsigned int addr,
+        void *src, int count);
+
+extern unsigned char sdio_f0_readb(struct sdio_func *func,
+        unsigned int addr, int *err_ret);
+extern void sdio_f0_writeb(struct sdio_func *func, unsigned char b,
+        unsigned int addr, int *err_ret);
+
+#endif
+
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
new file mode 100644
index 000000000000..09306d47ff5e
--- /dev/null
+++ b/include/linux/mmc/sdio_ids.h
@@ -0,0 +1,23 @@
+/*
+ * SDIO Classes, Interface Types, Manufacturer IDs, etc.
+ */
+
+#ifndef MMC_SDIO_IDS_H
+#define MMC_SDIO_IDS_H
+
+/*
+ * Standard SDIO Function Interfaces
+ */
+
+#define SDIO_CLASS_NONE         0x00    /* Not a SDIO standard interface */
+#define SDIO_CLASS_UART         0x01    /* standard UART interface */
+#define SDIO_CLASS_BT_A         0x02    /* Type-A BlueTooth std interface */
+#define SDIO_CLASS_BT_B         0x03    /* Type-B BlueTooth std interface */
+#define SDIO_CLASS_GPS          0x04    /* GPS standard interface */
+#define SDIO_CLASS_CAMERA       0x05    /* Camera standard interface */
+#define SDIO_CLASS_PHS          0x06    /* PHS standard interface */
+#define SDIO_CLASS_WLAN         0x07    /* WLAN interface */
+#define SDIO_CLASS_ATA          0x08    /* Embedded SDIO-ATA std interface */
+
+
+#endif
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index da8eb8ad9e9b..4e5627379b09 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -120,7 +120,6 @@ enum zone_type {
          * ---------------------------
          * parisc, ia64, sparc  <4G
          * s390                 <2G
-         * arm26                <48M
          * arm                  Various
          * alpha                Unlimited or 0-16MB.
          *
@@ -411,6 +410,24 @@ struct zonelist {
 #endif
 };
 
+#ifdef CONFIG_NUMA
+/*
+ * Only custom zonelists like MPOL_BIND need to be filtered as part of
+ * policies. As described in the comment for struct zonelist_cache, these
+ * zonelists will not have a zlcache so zlcache_ptr will not be set. Use
+ * that to determine if the zonelists needs to be filtered or not.
+ */
+static inline int alloc_should_filter_zonelist(struct zonelist *zonelist)
+{
+        return !zonelist->zlcache_ptr;
+}
+#else
+static inline int alloc_should_filter_zonelist(struct zonelist *zonelist)
+{
+        return 0;
+}
+#endif /* CONFIG_NUMA */
+
 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP
 struct node_active_region {
         unsigned long start_pfn;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index af04a555b52c..74523d999f7a 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -159,6 +159,13 @@ struct ap_device_id {
 
 #define AP_DEVICE_ID_MATCH_DEVICE_TYPE          0x01
 
+#define ACPI_ID_LEN     16 /* only 9 bytes needed here, 16 bytes are used */
+                           /* to workaround crosscompile issues */
+
+struct acpi_device_id {
+        __u8 id[ACPI_ID_LEN];
+        kernel_ulong_t driver_data;
+};
 
 #define PNP_ID_LEN      8
 #define PNP_MAX_DEVICES 8
@@ -333,4 +340,30 @@ struct parisc_device_id {
 #define PA_HVERSION_ANY_ID      0xffff
 #define PA_SVERSION_ANY_ID      0xffffffff
 
+/* SDIO */
+
+#define SDIO_ANY_ID (~0)
+
+struct sdio_device_id {
+        __u8    class;                  /* Standard interface or SDIO_ANY_ID */
+        __u16   vendor;                 /* Vendor or SDIO_ANY_ID */
+        __u16   device;                 /* Device ID or SDIO_ANY_ID */
+        kernel_ulong_t driver_data;     /* Data private to the driver */
+};
+
+/* SSB core, see drivers/ssb/ */
+struct ssb_device_id {
+        __u16   vendor;
+        __u16   coreid;
+        __u8    revision;
+};
+#define SSB_DEVICE(_vendor, _coreid, _revision)  \
+        { .vendor = _vendor, .coreid = _coreid, .revision = _revision, }
+#define SSB_DEVTABLE_END  \
+        { 0, },
+
+#define SSB_ANY_VENDOR          0xFFFF
+#define SSB_ANY_ID              0xFFFF
+#define SSB_ANY_REV             0xFF
+
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index b021b3a2b65a..9c8049005052 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -1302,4 +1302,12 @@ struct mv643xx_eth_platform_data {
         u8              mac_addr[6];    /* mac address if non-zero*/
 };
 
+/* Watchdog Platform Device, Driver Data */
+#define MV64x60_WDT_NAME                        "mv64x60_wdt"
+
+struct mv64x60_wdt_pdata {
+        int     timeout;        /* watchdog expiry in seconds, default 10 */
+        int     bus_clk;        /* bus clock in MHz, default 133 */
+};
+
 #endif /* __ASM_MV643XX_H */
diff --git a/include/linux/namei.h b/include/linux/namei.h
index b7dd24917f0d..6c38efbd810f 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -69,8 +69,8 @@ extern int FASTCALL(__user_walk_fd(int dfd, const char __user *, unsigned, struc
 #define user_path_walk_link(name,nd) \
         __user_walk_fd(AT_FDCWD, name, 0, nd)
 extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
-extern int FASTCALL(path_walk(const char *, struct nameidata *));
-extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
+extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+                           const char *, unsigned int, struct nameidata *);
 extern void path_release(struct nameidata *);
 extern void path_release_on_umount(struct nameidata *);
 
diff --git a/include/linux/net.h b/include/linux/net.h
index efc45177b503..c136abce7ef6 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -23,6 +23,7 @@
 
 struct poll_table_struct;
 struct inode;
+struct net;
 
 #define NPROTO          34              /* should be enough for now..   */
 
@@ -169,7 +170,7 @@ struct proto_ops {
 
 struct net_proto_family {
         int             family;
-        int             (*create)(struct socket *sock, int protocol);
+        int             (*create)(struct net *net, struct socket *sock, int protocol);
         struct module   *owner;
 };
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index da7a13c97eb8..5a11f889e56a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -31,6 +31,7 @@
 
 #ifdef __KERNEL__
 #include <linux/timer.h>
+#include <linux/delay.h>
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
@@ -38,6 +39,9 @@
 #include <linux/device.h>
 #include <linux/percpu.h>
 #include <linux/dmaengine.h>
+#include <linux/workqueue.h>
+
+#include <net/net_namespace.h>
 
 struct vlan_group;
 struct ethtool_ops;
@@ -246,6 +250,19 @@ struct hh_cache
 #define LL_RESERVED_SPACE_EXTRA(dev,extra) \
         ((((dev)->hard_header_len+extra)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
 
+struct header_ops {
+        int     (*create) (struct sk_buff *skb, struct net_device *dev,
+                           unsigned short type, const void *daddr,
+                           const void *saddr, unsigned len);
+        int     (*parse)(const struct sk_buff *skb, unsigned char *haddr);
+        int     (*rebuild)(struct sk_buff *skb);
+#define HAVE_HEADER_CACHE
+        int     (*cache)(const struct neighbour *neigh, struct hh_cache *hh);
+        void    (*cache_update)(struct hh_cache *hh,
+                                const struct net_device *dev,
+                                const unsigned char *haddr);
+};
+
 /* These flag bits are private to the generic network queueing
  * layer, they may not be explicitly referenced by any other
  * code.
@@ -258,7 +275,6 @@ enum netdev_state_t
         __LINK_STATE_PRESENT,
         __LINK_STATE_SCHED,
         __LINK_STATE_NOCARRIER,
-        __LINK_STATE_RX_SCHED,
         __LINK_STATE_LINKWATCH_PENDING,
         __LINK_STATE_DORMANT,
         __LINK_STATE_QDISC_RUNNING,
@@ -278,6 +294,120 @@ struct netdev_boot_setup {
 extern int __init netdev_boot_setup(char *str);
 
 /*
+ * Structure for NAPI scheduling similar to tasklet but with weighting
+ */
+struct napi_struct {
+        /* The poll_list must only be managed by the entity which
+         * changes the state of the NAPI_STATE_SCHED bit.  This means
+         * whoever atomically sets that bit can add this napi_struct
+         * to the per-cpu poll_list, and whoever clears that bit
+         * can remove from the list right before clearing the bit.
+         */
+        struct list_head        poll_list;
+
+        unsigned long           state;
+        int                     weight;
+        int                     (*poll)(struct napi_struct *, int);
+#ifdef CONFIG_NETPOLL
+        spinlock_t              poll_lock;
+        int                     poll_owner;
+        struct net_device       *dev;
+        struct list_head        dev_list;
+#endif
+};
+
+enum
+{
+        NAPI_STATE_SCHED,       /* Poll is scheduled */
+};
+
+extern void FASTCALL(__napi_schedule(struct napi_struct *n));
+
+/**
+ *      napi_schedule_prep - check if napi can be scheduled
+ *      @n: napi context
+ *
+ * Test if NAPI routine is already running, and if not mark
+ * it as running.  This is used as a condition variable
+ * insure only one NAPI poll instance runs
+ */
+static inline int napi_schedule_prep(struct napi_struct *n)
+{
+        return !test_and_set_bit(NAPI_STATE_SCHED, &n->state);
+}
+
+/**
+ *      napi_schedule - schedule NAPI poll
+ *      @n: napi context
+ *
+ * Schedule NAPI poll routine to be called if it is not already
+ * running.
+ */
+static inline void napi_schedule(struct napi_struct *n)
+{
+        if (napi_schedule_prep(n))
+                __napi_schedule(n);
+}
+
+/* Try to reschedule poll. Called by dev->poll() after napi_complete().  */
+static inline int napi_reschedule(struct napi_struct *napi)
+{
+        if (napi_schedule_prep(napi)) {
+                __napi_schedule(napi);
+                return 1;
+        }
+        return 0;
+}
+
+/**
+ *      napi_complete - NAPI processing complete
+ *      @n: napi context
+ *
+ * Mark NAPI processing as complete.
+ */
+static inline void __napi_complete(struct napi_struct *n)
+{
+        BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
+        list_del(&n->poll_list);
+        smp_mb__before_clear_bit();
+        clear_bit(NAPI_STATE_SCHED, &n->state);
+}
+
+static inline void napi_complete(struct napi_struct *n)
+{
+        local_irq_disable();
+        __napi_complete(n);
+        local_irq_enable();
+}
+
+/**
+ *      napi_disable - prevent NAPI from scheduling
+ *      @n: napi context
+ *
+ * Stop NAPI from being scheduled on this context.
+ * Waits till any outstanding processing completes.
+ */
+static inline void napi_disable(struct napi_struct *n)
+{
+        while (test_and_set_bit(NAPI_STATE_SCHED, &n->state))
+                msleep_interruptible(1);
+}
+
+/**
+ *      napi_enable - enable NAPI scheduling
+ *      @n: napi context
+ *
+ * Resume NAPI from being scheduled on this context.
+ * Must be paired with napi_disable.
+ */
+static inline void napi_enable(struct napi_struct *n)
+{
+        BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
+        smp_mb__before_clear_bit();
+        clear_bit(NAPI_STATE_SCHED, &n->state);
+}
+
+/*
  *      The DEVICE structure.
  *      Actually, this whole structure is a big mistake.  It mixes I/O
  *      data with strictly "high-level" data, and it has to know about
@@ -319,6 +449,9 @@ struct net_device
         unsigned long           state;
 
         struct list_head        dev_list;
+#ifdef CONFIG_NETPOLL
+        struct list_head        napi_list;
+#endif
         
         /* The device initialization function. Called only once. */
         int                     (*init)(struct net_device *dev);
@@ -339,8 +472,11 @@ struct net_device
 #define NETIF_F_HW_VLAN_FILTER  512     /* Receive filtering on VLAN */
 #define NETIF_F_VLAN_CHALLENGED 1024    /* Device cannot handle VLAN packets */
 #define NETIF_F_GSO             2048    /* Enable software GSO. */
-#define NETIF_F_LLTX            4096    /* LockLess TX */
+#define NETIF_F_LLTX            4096    /* LockLess TX - deprecated. Please */
+                                        /* do not use LLTX in new drivers */
+#define NETIF_F_NETNS_LOCAL     8192    /* Does not change network namespaces */
 #define NETIF_F_MULTI_QUEUE     16384   /* Has multiple TX/RX queues */
+#define NETIF_F_LRO             32768   /* large receive offload */
 
         /* Segmentation offload features */
 #define NETIF_F_GSO_SHIFT       16
@@ -379,6 +515,9 @@ struct net_device
 #endif
         const struct ethtool_ops *ethtool_ops;
 
+        /* Hardware header description */
+        const struct header_ops *header_ops;
+
         /*
          * This marks the end of the "visible" part of the structure. All
          * fields hereafter are internal to the system, and may change at
@@ -430,12 +569,6 @@ struct net_device
 /*
  * Cache line mostly used on receive path (including eth_type_trans())
  */
-        struct list_head        poll_list ____cacheline_aligned_in_smp;
-                                        /* Link to poll list    */
-
-        int                     (*poll) (struct net_device *dev, int *quota);
-        int                     quota;
-        int                     weight;
         unsigned long           last_rx;        /* Time of last Rx      */
         /* Interface address info used in eth_type_trans() */
         unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast 
@@ -508,13 +641,6 @@ struct net_device
         int                     (*open)(struct net_device *dev);
         int                     (*stop)(struct net_device *dev);
 #define HAVE_NETDEV_POLL
-        int                     (*hard_header) (struct sk_buff *skb,
-                                                struct net_device *dev,
-                                                unsigned short type,
-                                                void *daddr,
-                                                void *saddr,
-                                                unsigned len);
-        int                     (*rebuild_header)(struct sk_buff *skb);
 #define HAVE_CHANGE_RX_FLAGS
         void                    (*change_rx_flags)(struct net_device *dev,
                                                    int flags);
@@ -531,12 +657,6 @@ struct net_device
 #define HAVE_SET_CONFIG
         int                     (*set_config)(struct net_device *dev,
                                               struct ifmap *map);
-#define HAVE_HEADER_CACHE
-        int                     (*hard_header_cache)(struct neighbour *neigh,
-                                                     struct hh_cache *hh);
-        void                    (*header_cache_update)(struct hh_cache *hh,
-                                                       struct net_device *dev,
-                                                       unsigned char *  haddr);
 #define HAVE_CHANGE_MTU
         int                     (*change_mtu)(struct net_device *dev, int new_mtu);
 
@@ -550,8 +670,6 @@ struct net_device
         void                    (*vlan_rx_kill_vid)(struct net_device *dev,
                                                     unsigned short vid);
 
-        int                     (*hard_header_parse)(struct sk_buff *skb,
-                                                     unsigned char *haddr);
         int                     (*neigh_setup)(struct net_device *dev, struct neigh_parms *);
 #ifdef CONFIG_NETPOLL
         struct netpoll_info     *npinfo;
@@ -560,6 +678,9 @@ struct net_device
         void                    (*poll_controller)(struct net_device *dev);
 #endif
 
+        /* Network namespace this network device is inside */
+        struct net              *nd_net;
+
         /* bridge stuff */
         struct net_bridge_port  *br_port;
         /* macvlan */
@@ -575,24 +696,46 @@ struct net_device
 
         /* The TX queue control structures */
         unsigned int                    egress_subqueue_count;
-        struct net_device_subqueue      egress_subqueue[0];
+        struct net_device_subqueue      egress_subqueue[1];
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
 
 #define NETDEV_ALIGN            32
 #define NETDEV_ALIGN_CONST      (NETDEV_ALIGN - 1)
 
+/**
+ *      netdev_priv - access network device private data
+ *      @dev: network device
+ *
+ * Get network device private data
+ */
 static inline void *netdev_priv(const struct net_device *dev)
 {
         return dev->priv;
 }
 
-#define SET_MODULE_OWNER(dev) do { } while (0)
 /* Set the sysfs physical device reference for the network logical device
  * if set prior to registration will cause a symlink during initialization.
  */
 #define SET_NETDEV_DEV(net, pdev)       ((net)->dev.parent = (pdev))
 
+static inline void netif_napi_add(struct net_device *dev,
+                                  struct napi_struct *napi,
+                                  int (*poll)(struct napi_struct *, int),
+                                  int weight)
+{
+        INIT_LIST_HEAD(&napi->poll_list);
+        napi->poll = poll;
+        napi->weight = weight;
+#ifdef CONFIG_NETPOLL
+        napi->dev = dev;
+        list_add(&napi->dev_list, &dev->napi_list);
+        spin_lock_init(&napi->poll_lock);
+        napi->poll_owner = -1;
+#endif
+        set_bit(NAPI_STATE_SCHED, &napi->state);
+}
+
 struct packet_type {
         __be16                  type;   /* This is really htons(ether_type). */
         struct net_device       *dev;   /* NULL is wildcarded here           */
@@ -610,45 +753,46 @@ struct packet_type {
 #include <linux/interrupt.h>
 #include <linux/notifier.h>
 
-extern struct net_device                loopback_dev;           /* The loopback */
-extern struct list_head                 dev_base_head;          /* All devices */
 extern rwlock_t                         dev_base_lock;          /* Device list lock */
 
-#define for_each_netdev(d)              \
-                list_for_each_entry(d, &dev_base_head, dev_list)
-#define for_each_netdev_safe(d, n)      \
-                list_for_each_entry_safe(d, n, &dev_base_head, dev_list)
-#define for_each_netdev_continue(d)             \
-                list_for_each_entry_continue(d, &dev_base_head, dev_list)
+
+#define for_each_netdev(net, d)         \
+                list_for_each_entry(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_safe(net, d, n) \
+                list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_continue(net, d)                \
+                list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
 #define net_device_entry(lh)    list_entry(lh, struct net_device, dev_list)
 
 static inline struct net_device *next_net_device(struct net_device *dev)
 {
         struct list_head *lh;
+        struct net *net;
 
+        net = dev->nd_net;
         lh = dev->dev_list.next;
-        return lh == &dev_base_head ? NULL : net_device_entry(lh);
+        return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
 }
 
-static inline struct net_device *first_net_device(void)
+static inline struct net_device *first_net_device(struct net *net)
 {
-        return list_empty(&dev_base_head) ? NULL :
-                net_device_entry(dev_base_head.next);
+        return list_empty(&net->dev_base_head) ? NULL :
+                net_device_entry(net->dev_base_head.next);
 }
 
 extern int                      netdev_boot_setup_check(struct net_device *dev);
 extern unsigned long            netdev_boot_base(const char *prefix, int unit);
-extern struct net_device    *dev_getbyhwaddr(unsigned short type, char *hwaddr);
-extern struct net_device *dev_getfirstbyhwtype(unsigned short type);
-extern struct net_device *__dev_getfirstbyhwtype(unsigned short type);
+extern struct net_device    *dev_getbyhwaddr(struct net *net, unsigned short type, char *hwaddr);
+extern struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type);
+extern struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type);
 extern void             dev_add_pack(struct packet_type *pt);
 extern void             dev_remove_pack(struct packet_type *pt);
 extern void             __dev_remove_pack(struct packet_type *pt);
 
-extern struct net_device        *dev_get_by_flags(unsigned short flags,
+extern struct net_device        *dev_get_by_flags(struct net *net, unsigned short flags,
                                                   unsigned short mask);
-extern struct net_device        *dev_get_by_name(const char *name);
-extern struct net_device        *__dev_get_by_name(const char *name);
+extern struct net_device        *dev_get_by_name(struct net *net, const char *name);
+extern struct net_device        *__dev_get_by_name(struct net *net, const char *name);
 extern int              dev_alloc_name(struct net_device *dev, const char *name);
 extern int              dev_open(struct net_device *dev);
 extern int              dev_close(struct net_device *dev);
@@ -659,14 +803,35 @@ extern void		free_netdev(struct net_device *dev);
 extern void             synchronize_net(void);
 extern int              register_netdevice_notifier(struct notifier_block *nb);
 extern int              unregister_netdevice_notifier(struct notifier_block *nb);
-extern int              call_netdevice_notifiers(unsigned long val, void *v);
-extern struct net_device        *dev_get_by_index(int ifindex);
-extern struct net_device        *__dev_get_by_index(int ifindex);
+extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
+extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
+extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
 extern int              dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
 #endif
 
+static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
+                                  unsigned short type,
+                                  const void *daddr, const void *saddr,
+                                  unsigned len)
+{
+        if (!dev->header_ops)
+                return 0;
+
+        return dev->header_ops->create(skb, dev, type, daddr, saddr, len);
+}
+
+static inline int dev_parse_header(const struct sk_buff *skb,
+                                   unsigned char *haddr)
+{
+        const struct net_device *dev = skb->dev;
+
+        if (!dev->header_ops->parse)
+                return 0;
+        return dev->header_ops->parse(skb, haddr);
+}
+
 typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
 extern int              register_gifconf(unsigned int family, gifconf_func_t * gifconf);
 static inline int unregister_gifconf(unsigned int family)
@@ -678,7 +843,6 @@ static inline int unregister_gifconf(unsigned int family)
  * Incoming packets are placed on per-cpu queues so that
  * no locking is needed.
  */
-
 struct softnet_data
 {
         struct net_device       *output_queue;
@@ -686,7 +850,7 @@ struct softnet_data
         struct list_head        poll_list;
         struct sk_buff          *completion_queue;
 
-        struct net_device       backlog_dev;    /* Sorry. 8) */
+        struct napi_struct      backlog;
 #ifdef CONFIG_NET_DMA
         struct dma_chan         *net_dma;
 #endif
@@ -704,11 +868,24 @@ static inline void netif_schedule(struct net_device *dev)
                 __netif_schedule(dev);
 }
 
+/**
+ *      netif_start_queue - allow transmit
+ *      @dev: network device
+ *
+ *      Allow upper layers to call the device hard_start_xmit routine.
+ */
 static inline void netif_start_queue(struct net_device *dev)
 {
         clear_bit(__LINK_STATE_XOFF, &dev->state);
 }
 
+/**
+ *      netif_wake_queue - restart transmit
+ *      @dev: network device
+ *
+ *      Allow upper layers to call the device hard_start_xmit routine.
+ *      Used for flow control when transmit resources are available.
+ */
 static inline void netif_wake_queue(struct net_device *dev)
 {
 #ifdef CONFIG_NETPOLL_TRAP
@@ -721,16 +898,35 @@ static inline void netif_wake_queue(struct net_device *dev)
                 __netif_schedule(dev);
 }
 
+/**
+ *      netif_stop_queue - stop transmitted packets
+ *      @dev: network device
+ *
+ *      Stop upper layers calling the device hard_start_xmit routine.
+ *      Used for flow control when transmit resources are unavailable.
+ */
 static inline void netif_stop_queue(struct net_device *dev)
 {
         set_bit(__LINK_STATE_XOFF, &dev->state);
 }
 
+/**
+ *      netif_queue_stopped - test if transmit queue is flowblocked
+ *      @dev: network device
+ *
+ *      Test if transmit queue on device is currently unable to send.
+ */
 static inline int netif_queue_stopped(const struct net_device *dev)
 {
         return test_bit(__LINK_STATE_XOFF, &dev->state);
 }
 
+/**
+ *      netif_running - test if up
+ *      @dev: network device
+ *
+ *      Test if the device has been brought up.
+ */
 static inline int netif_running(const struct net_device *dev)
 {
         return test_bit(__LINK_STATE_START, &dev->state);
@@ -742,6 +938,14 @@ static inline int netif_running(const struct net_device *dev)
  * done at the overall netdevice level.
  * Also test the device if we're multiqueue.
  */
+
+/**
+ *      netif_start_subqueue - allow sending packets on subqueue
+ *      @dev: network device
+ *      @queue_index: sub queue index
+ *
+ * Start individual transmit queue of a device with multiple transmit queues.
+ */
 static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
@@ -749,6 +953,13 @@ static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
 #endif
 }
 
+/**
+ *      netif_stop_subqueue - stop sending packets on subqueue
+ *      @dev: network device
+ *      @queue_index: sub queue index
+ *
+ * Stop individual transmit queue of a device with multiple transmit queues.
+ */
 static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
@@ -760,6 +971,13 @@ static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
 #endif
 }
 
+/**
+ *      netif_subqueue_stopped - test status of subqueue
+ *      @dev: network device
+ *      @queue_index: sub queue index
+ *
+ * Check individual transmit queue of a device with multiple transmit queues.
+ */
 static inline int netif_subqueue_stopped(const struct net_device *dev,
                                          u16 queue_index)
 {
@@ -771,6 +989,14 @@ static inline int netif_subqueue_stopped(const struct net_device *dev,
 #endif
 }
 
+
+/**
+ *      netif_wake_subqueue - allow sending packets on subqueue
+ *      @dev: network device
+ *      @queue_index: sub queue index
+ *
+ * Resume individual transmit queue of a device with multiple transmit queues.
+ */
 static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
@@ -784,6 +1010,13 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 #endif
 }
 
+/**
+ *      netif_is_multiqueue - test if device has multiple transmit queues
+ *      @dev: network device
+ *
+ * Check if device has multiple transmit queues
+ * Always falls if NETDEVICE_MULTIQUEUE is not configured
+ */
 static inline int netif_is_multiqueue(const struct net_device *dev)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
@@ -796,20 +1029,7 @@ static inline int netif_is_multiqueue(const struct net_device *dev)
 /* Use this variant when it is known for sure that it
  * is executing from interrupt context.
  */
-static inline void dev_kfree_skb_irq(struct sk_buff *skb)
-{
-        if (atomic_dec_and_test(&skb->users)) {
-                struct softnet_data *sd;
-                unsigned long flags;
-
-                local_irq_save(flags);
-                sd = &__get_cpu_var(softnet_data);
-                skb->next = sd->completion_queue;
-                sd->completion_queue = skb;
-                raise_softirq_irqoff(NET_TX_SOFTIRQ);
-                local_irq_restore(flags);
-        }
-}
+extern void dev_kfree_skb_irq(struct sk_buff *skb);
 
 /* Use this variant in places where it could be invoked
  * either from interrupt or non-interrupt context.
@@ -822,29 +1042,41 @@ extern int		netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int              netif_receive_skb(struct sk_buff *skb);
 extern int              dev_valid_name(const char *name);
-extern int              dev_ioctl(unsigned int cmd, void __user *);
-extern int              dev_ethtool(struct ifreq *);
+extern int              dev_ioctl(struct net *net, unsigned int cmd, void __user *);
+extern int              dev_ethtool(struct net *net, struct ifreq *);
 extern unsigned         dev_get_flags(const struct net_device *);
 extern int              dev_change_flags(struct net_device *, unsigned);
 extern int              dev_change_name(struct net_device *, char *);
+extern int              dev_change_net_namespace(struct net_device *,
+                                                 struct net *, const char *);
 extern int              dev_set_mtu(struct net_device *, int);
 extern int              dev_set_mac_address(struct net_device *,
                                             struct sockaddr *);
 extern int              dev_hard_start_xmit(struct sk_buff *skb,
                                             struct net_device *dev);
 
-extern void             dev_init(void);
-
 extern int              netdev_budget;
 
 /* Called by rtnetlink.c:rtnl_unlock() */
 extern void netdev_run_todo(void);
 
+/**
+ *      dev_put - release reference to device
+ *      @dev: network device
+ *
+ * Release reference to device to allow it to be freed.
+ */
 static inline void dev_put(struct net_device *dev)
 {
         atomic_dec(&dev->refcnt);
 }
 
+/**
+ *      dev_hold - get reference to device
+ *      @dev: network device
+ *
+ * Hold reference to device to keep it from being freed.
+ */
 static inline void dev_hold(struct net_device *dev)
 {
         atomic_inc(&dev->refcnt);
@@ -861,6 +1093,12 @@ static inline void dev_hold(struct net_device *dev)
 
 extern void linkwatch_fire_event(struct net_device *dev);
 
+/**
+ *      netif_carrier_ok - test if carrier present
+ *      @dev: network device
+ *
+ * Check if carrier is present on device
+ */
 static inline int netif_carrier_ok(const struct net_device *dev)
 {
         return !test_bit(__LINK_STATE_NOCARRIER, &dev->state);
@@ -872,30 +1110,66 @@ extern void netif_carrier_on(struct net_device *dev);
 
 extern void netif_carrier_off(struct net_device *dev);
 
+/**
+ *      netif_dormant_on - mark device as dormant.
+ *      @dev: network device
+ *
+ * Mark device as dormant (as per RFC2863).
+ *
+ * The dormant state indicates that the relevant interface is not
+ * actually in a condition to pass packets (i.e., it is not 'up') but is
+ * in a "pending" state, waiting for some external event.  For "on-
+ * demand" interfaces, this new state identifies the situation where the
+ * interface is waiting for events to place it in the up state.
+ *
+ */
 static inline void netif_dormant_on(struct net_device *dev)
 {
         if (!test_and_set_bit(__LINK_STATE_DORMANT, &dev->state))
                 linkwatch_fire_event(dev);
 }
 
+/**
+ *      netif_dormant_off - set device as not dormant.
+ *      @dev: network device
+ *
+ * Device is not in dormant state.
+ */
 static inline void netif_dormant_off(struct net_device *dev)
 {
         if (test_and_clear_bit(__LINK_STATE_DORMANT, &dev->state))
                 linkwatch_fire_event(dev);
 }
 
+/**
+ *      netif_dormant - test if carrier present
+ *      @dev: network device
+ *
+ * Check if carrier is present on device
+ */
 static inline int netif_dormant(const struct net_device *dev)
 {
         return test_bit(__LINK_STATE_DORMANT, &dev->state);
 }
 
 
+/**
+ *      netif_oper_up - test if device is operational
+ *      @dev: network device
+ *
+ * Check if carrier is operational
+ */
 static inline int netif_oper_up(const struct net_device *dev) {
         return (dev->operstate == IF_OPER_UP ||
                 dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
 }
 
-/* Hot-plugging. */
+/**
+ *      netif_device_present - is device available or removed
+ *      @dev: network device
+ *
+ * Check if device has not been removed from system.
+ */
 static inline int netif_device_present(struct net_device *dev)
 {
         return test_bit(__LINK_STATE_PRESENT, &dev->state);
@@ -955,46 +1229,38 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
         return (1 << debug_value) - 1;
 }
 
-/* Test if receive needs to be scheduled */
-static inline int __netif_rx_schedule_prep(struct net_device *dev)
-{
-        return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
-}
-
 /* Test if receive needs to be scheduled but only if up */
-static inline int netif_rx_schedule_prep(struct net_device *dev)
+static inline int netif_rx_schedule_prep(struct net_device *dev,
+                                         struct napi_struct *napi)
 {
-        return netif_running(dev) && __netif_rx_schedule_prep(dev);
+        return netif_running(dev) && napi_schedule_prep(napi);
 }
 
 /* Add interface to tail of rx poll list. This assumes that _prep has
  * already been called and returned 1.
  */
-
-extern void __netif_rx_schedule(struct net_device *dev);
+static inline void __netif_rx_schedule(struct net_device *dev,
+                                       struct napi_struct *napi)
+{
+        dev_hold(dev);
+        __napi_schedule(napi);
+}
 
 /* Try to reschedule poll. Called by irq handler. */
 
-static inline void netif_rx_schedule(struct net_device *dev)
+static inline void netif_rx_schedule(struct net_device *dev,
+                                     struct napi_struct *napi)
 {
-        if (netif_rx_schedule_prep(dev))
-                __netif_rx_schedule(dev);
+        if (netif_rx_schedule_prep(dev, napi))
+                __netif_rx_schedule(dev, napi);
 }
 
-/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().
- * Do not inline this?
- */
-static inline int netif_rx_reschedule(struct net_device *dev, int undo)
+/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().  */
+static inline int netif_rx_reschedule(struct net_device *dev,
+                                      struct napi_struct *napi)
 {
-        if (netif_rx_schedule_prep(dev)) {
-                unsigned long flags;
-
-                dev->quota += undo;
-
-                local_irq_save(flags);
-                list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list);
-                __raise_softirq_irqoff(NET_RX_SOFTIRQ);
-                local_irq_restore(flags);
+        if (napi_schedule_prep(napi)) {
+                __netif_rx_schedule(dev, napi);
                 return 1;
         }
         return 0;
@@ -1003,12 +1269,11 @@ static inline int netif_rx_reschedule(struct net_device *dev, int undo)
 /* same as netif_rx_complete, except that local_irq_save(flags)
  * has already been issued
  */
-static inline void __netif_rx_complete(struct net_device *dev)
+static inline void __netif_rx_complete(struct net_device *dev,
+                                       struct napi_struct *napi)
 {
-        BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));
-        list_del(&dev->poll_list);
-        smp_mb__before_clear_bit();
-        clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
+        __napi_complete(napi);
+        dev_put(dev);
 }
 
 /* Remove interface from poll list: it must be in the poll list
@@ -1016,32 +1281,31 @@ static inline void __netif_rx_complete(struct net_device *dev)
  * it completes the work. The device cannot be out of poll list at this
  * moment, it is BUG().
  */
-static inline void netif_rx_complete(struct net_device *dev)
+static inline void netif_rx_complete(struct net_device *dev,
+                                     struct napi_struct *napi)
 {
         unsigned long flags;
 
         local_irq_save(flags);
-        __netif_rx_complete(dev);
+        __netif_rx_complete(dev, napi);
         local_irq_restore(flags);
 }
 
-static inline void netif_poll_disable(struct net_device *dev)
-{
-        while (test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state))
-                /* No hurry. */
-                schedule_timeout_interruptible(1);
-}
-
-static inline void netif_poll_enable(struct net_device *dev)
+/**
+ *      netif_tx_lock - grab network device transmit lock
+ *      @dev: network device
+ *
+ * Get network device transmit lock
+ */
+static inline void __netif_tx_lock(struct net_device *dev, int cpu)
 {
-        smp_mb__before_clear_bit();
-        clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
+        spin_lock(&dev->_xmit_lock);
+        dev->xmit_lock_owner = cpu;
 }
 
 static inline void netif_tx_lock(struct net_device *dev)
 {
-        spin_lock(&dev->_xmit_lock);
-        dev->xmit_lock_owner = smp_processor_id();
+        __netif_tx_lock(dev, smp_processor_id());
 }
 
 static inline void netif_tx_lock_bh(struct net_device *dev)
@@ -1070,6 +1334,18 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
         spin_unlock_bh(&dev->_xmit_lock);
 }
 
+#define HARD_TX_LOCK(dev, cpu) {                        \
+        if ((dev->features & NETIF_F_LLTX) == 0) {      \
+                __netif_tx_lock(dev, cpu);                      \
+        }                                               \
+}
+
+#define HARD_TX_UNLOCK(dev) {                           \
+        if ((dev->features & NETIF_F_LLTX) == 0) {      \
+                netif_tx_unlock(dev);                   \
+        }                                               \
+}
+
 static inline void netif_tx_disable(struct net_device *dev)
 {
         netif_tx_lock_bh(dev);
@@ -1098,16 +1374,14 @@ extern int 		dev_mc_delete(struct net_device *dev, void *addr, int alen, int all
 extern int              dev_mc_add(struct net_device *dev, void *addr, int alen, int newonly);
 extern int              dev_mc_sync(struct net_device *to, struct net_device *from);
 extern void             dev_mc_unsync(struct net_device *to, struct net_device *from);
-extern void             dev_mc_discard(struct net_device *dev);
 extern int              __dev_addr_delete(struct dev_addr_list **list, int *count, void *addr, int alen, int all);
 extern int              __dev_addr_add(struct dev_addr_list **list, int *count, void *addr, int alen, int newonly);
-extern void             __dev_addr_discard(struct dev_addr_list **list);
 extern void             dev_set_promiscuity(struct net_device *dev, int inc);
 extern void             dev_set_allmulti(struct net_device *dev, int inc);
 extern void             netdev_state_change(struct net_device *dev);
 extern void             netdev_features_change(struct net_device *dev);
 /* Load a device via the kmod */
-extern void             dev_load(const char *name);
+extern void             dev_load(struct net *net, const char *name);
 extern void             dev_mcast_init(void);
 extern int              netdev_max_backlog;
 extern int              weight_p;
@@ -1133,6 +1407,8 @@ extern void dev_seq_stop(struct seq_file *seq, void *v);
 
 extern void linkwatch_run_queue(void);
 
+extern int netdev_compute_features(unsigned long all, unsigned long one);
+
 static inline int net_gso_ok(int features, int gso_type)
 {
         int feature = gso_type << NETIF_F_GSO_SHIFT;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 0eed0b7ab2df..1dd075eda595 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -88,9 +88,8 @@ struct nf_sockopt_ops
         int (*compat_get)(struct sock *sk, int optval,
                         void __user *user, int *len);
 
-        /* Number of users inside set() or get(). */
-        unsigned int use;
-        struct task_struct *cleanup_task;
+        /* Use the module struct to lock set/get code in place */
+        struct module *owner;
 };
 
 /* Each queued (to userspace) skbuff has one of these. */
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 43397a414cd6..f2eaea2234ec 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -28,6 +28,7 @@ header-y += xt_policy.h
 header-y += xt_realm.h
 header-y += xt_sctp.h
 header-y += xt_state.h
+header-y += xt_statistic.h
 header-y += xt_string.h
 header-y += xt_tcpmss.h
 header-y += xt_tcpudp.h
@@ -39,5 +40,6 @@ unifdef-y += nf_conntrack_common.h
 unifdef-y += nf_conntrack_ftp.h
 unifdef-y += nf_conntrack_tcp.h
 unifdef-y += nfnetlink.h
+unifdef-y += nfnetlink_compat.h
 unifdef-y += x_tables.h
 unifdef-y += xt_physdev.h
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 0f9311df1559..0d8424f76899 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -1,16 +1,7 @@
 #ifndef _NFNETLINK_H
 #define _NFNETLINK_H
 #include <linux/types.h>
-
-#ifndef __KERNEL__
-/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */
-#define NF_NETLINK_CONNTRACK_NEW                0x00000001
-#define NF_NETLINK_CONNTRACK_UPDATE             0x00000002
-#define NF_NETLINK_CONNTRACK_DESTROY            0x00000004
-#define NF_NETLINK_CONNTRACK_EXP_NEW            0x00000008
-#define NF_NETLINK_CONNTRACK_EXP_UPDATE         0x00000010
-#define NF_NETLINK_CONNTRACK_EXP_DESTROY        0x00000020
-#endif
+#include <linux/netfilter/nfnetlink_compat.h>
 
 enum nfnetlink_groups {
         NFNLGRP_NONE,
@@ -31,48 +22,6 @@ enum nfnetlink_groups {
 };
 #define NFNLGRP_MAX     (__NFNLGRP_MAX - 1)
 
-/* Generic structure for encapsulation optional netfilter information.
- * It is reminiscent of sockaddr, but with sa_family replaced
- * with attribute type. 
- * ! This should someday be put somewhere generic as now rtnetlink and
- * ! nfnetlink use the same attributes methods. - J. Schulist.
- */
-
-struct nfattr
-{
-        u_int16_t nfa_len;
-        u_int16_t nfa_type;     /* we use 15 bits for the type, and the highest
-                                 * bit to indicate whether the payload is nested */
-};
-
-/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
- * rtnetlink.h, it's time to put this in a generic file */
-
-#define NFNL_NFA_NEST   0x8000
-#define NFA_TYPE(attr)  ((attr)->nfa_type & 0x7fff)
-
-#define NFA_ALIGNTO     4
-#define NFA_ALIGN(len)  (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
-#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \
-        && (nfa)->nfa_len <= (len))
-#define NFA_NEXT(nfa,attrlen)   ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
-        (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
-#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len))
-#define NFA_SPACE(len)  NFA_ALIGN(NFA_LENGTH(len))
-#define NFA_DATA(nfa)   ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
-#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
-#define NFA_NEST(skb, type) \
-({      struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \
-        NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \
-        __start;  })
-#define NFA_NEST_END(skb, start) \
-({      (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
-        (skb)->len; })
-#define NFA_NEST_CANCEL(skb, start) \
-({      if (start) \
-                skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
-        -1; })
-
 /* General form of address family dependent message.
  */
 struct nfgenmsg {
@@ -83,10 +32,6 @@ struct nfgenmsg {
 
 #define NFNETLINK_V0    0
 
-#define NFM_NFA(n)      ((struct nfattr *)(((char *)(n)) \
-        + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
-#define NFM_PAYLOAD(n)  NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
-
 /* netfilter netlink message types are split in two pieces:
  * 8 bit subsystem, 8bit operation.
  */
@@ -107,49 +52,26 @@ struct nfgenmsg {
 
 #include <linux/netlink.h>
 #include <linux/capability.h>
+#include <net/netlink.h>
 
 struct nfnl_callback
 {
         int (*call)(struct sock *nl, struct sk_buff *skb, 
-                struct nlmsghdr *nlh, struct nfattr *cda[]);
-        u_int16_t attr_count;   /* number of nfattr's */
+                struct nlmsghdr *nlh, struct nlattr *cda[]);
+        const struct nla_policy *policy;        /* netlink attribute policy */
+        const u_int16_t attr_count;             /* number of nlattr's */
 };
 
 struct nfnetlink_subsystem
 {
         const char *name;
-        __u8 subsys_id;         /* nfnetlink subsystem ID */
-        __u8 cb_count;          /* number of callbacks */
-        struct nfnl_callback *cb; /* callback for individual types */
+        __u8 subsys_id;                 /* nfnetlink subsystem ID */
+        __u8 cb_count;                  /* number of callbacks */
+        const struct nfnl_callback *cb; /* callback for individual types */
 };
 
-extern void __nfa_fill(struct sk_buff *skb, int attrtype,
-        int attrlen, const void *data);
-#define NFA_PUT(skb, attrtype, attrlen, data) \
-({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \
-   __nfa_fill(skb, attrtype, attrlen, data); })
-
-extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
-extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
-
-extern void nfattr_parse(struct nfattr *tb[], int maxattr, 
-                        struct nfattr *nfa, int len);
-
-#define nfattr_parse_nested(tb, max, nfa) \
-        nfattr_parse((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
-
-#define nfattr_bad_size(tb, max, cta_min)                               \
-({      int __i, __res = 0;                                             \
-        for (__i=0; __i<max; __i++) {                                   \
-                if (!cta_min[__i])                                      \
-                        continue;                                       \
-                if (tb[__i] && NFA_PAYLOAD(tb[__i]) < cta_min[__i]){    \
-                        __res = 1;                                      \
-                        break;                                          \
-                }                                                       \
-        }                                                               \
-        __res;                                                          \
-})
+extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
+extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
 
 extern int nfnetlink_has_listeners(unsigned int group);
 extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/linux/netfilter/nfnetlink_compat.h
new file mode 100644
index 000000000000..02a42d875cf7
--- /dev/null
+++ b/include/linux/netfilter/nfnetlink_compat.h
@@ -0,0 +1,61 @@
+#ifndef _NFNETLINK_COMPAT_H
+#define _NFNETLINK_COMPAT_H
+#ifndef __KERNEL
+/* Old nfnetlink macros for userspace */
+
+/* nfnetlink groups: Up to 32 maximum */
+#define NF_NETLINK_CONNTRACK_NEW                0x00000001
+#define NF_NETLINK_CONNTRACK_UPDATE             0x00000002
+#define NF_NETLINK_CONNTRACK_DESTROY            0x00000004
+#define NF_NETLINK_CONNTRACK_EXP_NEW            0x00000008
+#define NF_NETLINK_CONNTRACK_EXP_UPDATE         0x00000010
+#define NF_NETLINK_CONNTRACK_EXP_DESTROY        0x00000020
+
+/* Generic structure for encapsulation optional netfilter information.
+ * It is reminiscent of sockaddr, but with sa_family replaced
+ * with attribute type.
+ * ! This should someday be put somewhere generic as now rtnetlink and
+ * ! nfnetlink use the same attributes methods. - J. Schulist.
+ */
+
+struct nfattr
+{
+        u_int16_t nfa_len;
+        u_int16_t nfa_type;     /* we use 15 bits for the type, and the highest
+                                 * bit to indicate whether the payload is nested */
+};
+
+/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
+ * rtnetlink.h, it's time to put this in a generic file */
+
+#define NFNL_NFA_NEST   0x8000
+#define NFA_TYPE(attr)  ((attr)->nfa_type & 0x7fff)
+
+#define NFA_ALIGNTO     4
+#define NFA_ALIGN(len)  (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
+#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \
+        && (nfa)->nfa_len <= (len))
+#define NFA_NEXT(nfa,attrlen)   ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
+        (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
+#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len))
+#define NFA_SPACE(len)  NFA_ALIGN(NFA_LENGTH(len))
+#define NFA_DATA(nfa)   ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
+#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
+#define NFA_NEST(skb, type) \
+({      struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \
+        NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \
+        __start;  })
+#define NFA_NEST_END(skb, start) \
+({      (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
+        (skb)->len; })
+#define NFA_NEST_CANCEL(skb, start) \
+({      if (start) \
+                skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
+        -1; })
+
+#define NFM_NFA(n)      ((struct nfattr *)(((char *)(n)) \
+        + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
+#define NFM_PAYLOAD(n)  NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
+
+#endif /* ! __KERNEL__ */
+#endif /* _NFNETLINK_COMPAT_H */
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index d7c35039721e..4affa3fe78e0 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -36,6 +36,7 @@ enum ctattr_type {
         CTA_USE,
         CTA_ID,
         CTA_NAT_DST,
+        CTA_TUPLE_MASTER,
         __CTA_MAX
 };
 #define CTA_MAX (__CTA_MAX - 1)
diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 90ae8b474cb8..37e933c9987d 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -5,8 +5,8 @@ struct xt_connlimit_data;
 
 struct xt_connlimit_info {
         union {
-                u_int32_t v4_mask;
-                u_int32_t v6_mask[4];
+                __be32 v4_mask;
+                __be32 v6_mask[4];
         };
         unsigned int limit, inverse;
 
diff --git a/include/linux/netfilter/xt_time.h b/include/linux/netfilter/xt_time.h
new file mode 100644
index 000000000000..14b6df412c9f
--- /dev/null
+++ b/include/linux/netfilter/xt_time.h
@@ -0,0 +1,25 @@
+#ifndef _XT_TIME_H
+#define _XT_TIME_H 1
+
+struct xt_time_info {
+        u_int32_t date_start;
+        u_int32_t date_stop;
+        u_int32_t daytime_start;
+        u_int32_t daytime_stop;
+        u_int32_t monthdays_match;
+        u_int8_t weekdays_match;
+        u_int8_t flags;
+};
+
+enum {
+        /* Match against local time (instead of UTC) */
+        XT_TIME_LOCAL_TZ = 1 << 0,
+
+        /* Shortcuts */
+        XT_TIME_ALL_MONTHDAYS = 0xFFFFFFFE,
+        XT_TIME_ALL_WEEKDAYS  = 0xFE,
+        XT_TIME_MIN_DAYTIME   = 0,
+        XT_TIME_MAX_DAYTIME   = 24 * 60 * 60 - 1,
+};
+
+#endif /* _XT_TIME_H */
diff --git a/include/linux/netfilter_ipv4/ipt_iprange.h b/include/linux/netfilter_ipv4/ipt_iprange.h
index 34ab0fb736e2..a92fefc3c7ec 100644
--- a/include/linux/netfilter_ipv4/ipt_iprange.h
+++ b/include/linux/netfilter_ipv4/ipt_iprange.h
@@ -1,6 +1,8 @@
 #ifndef _IPT_IPRANGE_H
 #define _IPT_IPRANGE_H
 
+#include <linux/types.h>
+
 #define IPRANGE_SRC             0x01    /* Match source IP address */
 #define IPRANGE_DST             0x02    /* Match destination IP address */
 #define IPRANGE_SRC_INV         0x10    /* Negate the condition */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2e23353c28a5..7c1f3b1d2ee5 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -27,6 +27,8 @@
 
 #define MAX_LINKS 32            
 
+struct net;
+
 struct sockaddr_nl
 {
         sa_family_t     nl_family;      /* AF_NETLINK   */
@@ -129,6 +131,20 @@ struct nlattr
         __u16           nla_type;
 };
 
+/*
+ * nla_type (16 bits)
+ * +---+---+-------------------------------+
+ * | N | O | Attribute Type                |
+ * +---+---+-------------------------------+
+ * N := Carries nested attributes
+ * O := Payload stored in network byte order
+ *
+ * Note: The N and O flag are mutually exclusive.
+ */
+#define NLA_F_NESTED            (1 << 15)
+#define NLA_F_NET_BYTEORDER     (1 << 14)
+#define NLA_TYPE_MASK           ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)
+
 #define NLA_ALIGNTO             4
 #define NLA_ALIGN(len)          (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
 #define NLA_HDRLEN              ((int) NLA_ALIGN(sizeof(struct nlattr)))
@@ -157,10 +173,13 @@ struct netlink_skb_parms
 #define NETLINK_CREDS(skb)      (&NETLINK_CB((skb)).creds)
 
 
-extern struct sock *netlink_kernel_create(int unit, unsigned int groups,
-                                          void (*input)(struct sock *sk, int len),
+extern struct sock *netlink_kernel_create(struct net *net,
+                                          int unit,unsigned int groups,
+                                          void (*input)(struct sk_buff *skb),
                                           struct mutex *cb_mutex,
                                           struct module *module);
+extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);
+extern void netlink_clear_multicast_users(struct sock *sk, unsigned int group);
 extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
 extern int netlink_has_listeners(struct sock *sk, unsigned int group);
 extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock);
@@ -175,7 +194,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp);
 int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
                 long timeo, struct sock *ssk);
 void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
-int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol);
+int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
 
 /*
  *      skb should fit one page. This choice is good for headerless malloc.
@@ -204,6 +223,7 @@ struct netlink_callback
 
 struct netlink_notify
 {
+        struct net *net;
         int pid;
         int protocol;
 };
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 29930b71a9aa..20250d963d72 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -25,8 +25,6 @@ struct netpoll {
 
 struct netpoll_info {
         atomic_t refcnt;
-        spinlock_t poll_lock;
-        int poll_owner;
         int rx_flags;
         spinlock_t rx_lock;
         struct netpoll *rx_np; /* netpoll that registered an rx_hook */
@@ -37,6 +35,7 @@ struct netpoll_info {
 
 void netpoll_poll(struct netpoll *np);
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
+void netpoll_print_options(struct netpoll *np);
 int netpoll_parse_options(struct netpoll *np, char *opt);
 int netpoll_setup(struct netpoll *np);
 int netpoll_trap(void);
@@ -64,32 +63,61 @@ static inline int netpoll_rx(struct sk_buff *skb)
         return ret;
 }
 
-static inline void *netpoll_poll_lock(struct net_device *dev)
+static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
+        if (!list_empty(&skb->dev->napi_list))
+                return netpoll_rx(skb);
+        return 0;
+}
+
+static inline void *netpoll_poll_lock(struct napi_struct *napi)
+{
+        struct net_device *dev = napi->dev;
+
         rcu_read_lock(); /* deal with race on ->npinfo */
-        if (dev->npinfo) {
-                spin_lock(&dev->npinfo->poll_lock);
-                dev->npinfo->poll_owner = smp_processor_id();
-                return dev->npinfo;
+        if (dev && dev->npinfo) {
+                spin_lock(&napi->poll_lock);
+                napi->poll_owner = smp_processor_id();
+                return napi;
         }
         return NULL;
 }
 
 static inline void netpoll_poll_unlock(void *have)
 {
-        struct netpoll_info *npi = have;
+        struct napi_struct *napi = have;
 
-        if (npi) {
-                npi->poll_owner = -1;
-                spin_unlock(&npi->poll_lock);
+        if (napi) {
+                napi->poll_owner = -1;
+                spin_unlock(&napi->poll_lock);
         }
         rcu_read_unlock();
 }
 
+static inline void netpoll_netdev_init(struct net_device *dev)
+{
+        INIT_LIST_HEAD(&dev->napi_list);
+}
+
 #else
-#define netpoll_rx(a) 0
-#define netpoll_poll_lock(a) NULL
-#define netpoll_poll_unlock(a)
+static inline int netpoll_rx(struct sk_buff *skb)
+{
+        return 0;
+}
+static inline int netpoll_receive_skb(struct sk_buff *skb)
+{
+        return 0;
+}
+static inline void *netpoll_poll_lock(struct napi_struct *napi)
+{
+        return NULL;
+}
+static inline void netpoll_poll_unlock(void *have)
+{
+}
+static inline void netpoll_netdev_init(struct net_device *dev)
+{
+}
 #endif
 
 #endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index c098ae194f79..7250eeadd7b5 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -71,7 +71,7 @@ struct nfs_access_entry {
 
 struct nfs4_state;
 struct nfs_open_context {
-        struct kref kref;
+        atomic_t count;
         struct path path;
         struct rpc_cred *cred;
         struct nfs4_state *state;
@@ -407,8 +407,8 @@ extern void nfs_release_automount_timer(void);
 /*
  * linux/fs/nfs/unlink.c
  */
-extern int  nfs_async_unlink(struct dentry *);
-extern void nfs_complete_unlink(struct dentry *);
+extern int  nfs_async_unlink(struct inode *dir, struct dentry *dentry);
+extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
 
 /*
  * linux/fs/nfs/write.c
@@ -431,6 +431,7 @@ extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);
 extern int nfs_wb_all(struct inode *inode);
 extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);
+extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_inode(struct inode *, int);
 extern struct nfs_write_data *nfs_commit_alloc(void);
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 38d77681cf27..cf74a4db84a5 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -278,6 +278,21 @@ struct nfs_writeres {
 };
 
 /*
+ * Common arguments to the unlink call
+ */
+struct nfs_removeargs {
+        const struct nfs_fh     *fh;
+        struct qstr             name;
+        const u32 *             bitmask;
+};
+
+struct nfs_removeres {
+        const struct nfs_server *server;
+        struct nfs4_change_info cinfo;
+        struct nfs_fattr        dir_attr;
+};
+
+/*
  * Argument struct for decode_entry function
  */
 struct nfs_entry {
@@ -631,18 +646,6 @@ struct nfs4_readlink {
         struct page **                  pages;   /* zero-copy data */
 };
 
-struct nfs4_remove_arg {
-        const struct nfs_fh *           fh;
-        const struct qstr *             name;
-        const u32 *                     bitmask;
-};
-
-struct nfs4_remove_res {
-        const struct nfs_server *       server;
-        struct nfs4_change_info         cinfo;
-        struct nfs_fattr *              dir_attr;
-};
-
 struct nfs4_rename_arg {
         const struct nfs_fh *           old_dir;
         const struct nfs_fh *           new_dir;
@@ -788,9 +791,8 @@ struct nfs_rpc_ops {
         int     (*create)  (struct inode *, struct dentry *,
                             struct iattr *, int, struct nameidata *);
         int     (*remove)  (struct inode *, struct qstr *);
-        int     (*unlink_setup)  (struct rpc_message *,
-                            struct dentry *, struct qstr *);
-        int     (*unlink_done) (struct dentry *, struct rpc_task *);
+        void    (*unlink_setup)  (struct rpc_message *, struct inode *dir);
+        int     (*unlink_done) (struct rpc_task *, struct inode *);
         int     (*rename)  (struct inode *, struct qstr *,
                             struct inode *, struct qstr *);
         int     (*link)    (struct inode *, struct inode *, struct qstr *);
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 78feb7beff75..5cd192469096 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -116,18 +116,7 @@ struct svc_expkey {
 #define EX_NOHIDE(exp)          ((exp)->ex_flags & NFSEXP_NOHIDE)
 #define EX_WGATHER(exp)         ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)
 
-static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)
-{
-        struct exp_flavor_info *f;
-        struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
-
-        for (f = exp->ex_flavors; f < end; f++) {
-                if (f->pseudoflavor == rqstp->rq_flavor)
-                        return f->flags & NFSEXP_READONLY;
-        }
-        return exp->ex_flags & NFSEXP_READONLY;
-}
-
+int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp);
 __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
 
 /*
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 9a30ba2ca75e..538ee1dd3d0a 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -7,7 +7,97 @@
  */
 
 /**
+ * enum nl80211_commands - supported nl80211 commands
+ *
+ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
+ *
+ * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
+ *      to get a list of all present wiphys.
+ * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
+ *      %NL80211_ATTR_WIPHY_NAME.
+ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
+ *      or rename notification. Has attributes %NL80211_ATTR_WIPHY and
+ *      %NL80211_ATTR_WIPHY_NAME.
+ * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
+ *      %NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
+ *
+ * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
+ *      either a dump request on a %NL80211_ATTR_WIPHY or a specific get
+ *      on an %NL80211_ATTR_IFINDEX is supported.
+ * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
+ *      %NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
+ * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
+ *      to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
+ *      %NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
+ *      be sent from userspace to request creation of a new virtual interface,
+ *      then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
+ *      %NL80211_ATTR_IFNAME.
+ * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
+ *      %NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
+ *      userspace to request deletion of a virtual interface, then requires
+ *      attribute %NL80211_ATTR_IFINDEX.
+ *
+ * @NL80211_CMD_MAX: highest used command number
+ * @__NL80211_CMD_AFTER_LAST: internal use
+ */
+enum nl80211_commands {
+/* don't change the order or add anything inbetween, this is ABI! */
+        NL80211_CMD_UNSPEC,
+
+        NL80211_CMD_GET_WIPHY,          /* can dump */
+        NL80211_CMD_SET_WIPHY,
+        NL80211_CMD_NEW_WIPHY,
+        NL80211_CMD_DEL_WIPHY,
+
+        NL80211_CMD_GET_INTERFACE,      /* can dump */
+        NL80211_CMD_SET_INTERFACE,
+        NL80211_CMD_NEW_INTERFACE,
+        NL80211_CMD_DEL_INTERFACE,
+
+        /* add commands here */
+
+        /* used to define NL80211_CMD_MAX below */
+        __NL80211_CMD_AFTER_LAST,
+        NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
+};
+
+
+/**
+ * enum nl80211_attrs - nl80211 netlink attributes
+ *
+ * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
+ *
+ * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
+ *      /sys/class/ieee80211/<phyname>/index
+ * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
+ *
+ * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
+ * @NL80211_ATTR_IFNAME: network interface name
+ * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
+ *
+ * @NL80211_ATTR_MAX: highest attribute number currently defined
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+ */
+enum nl80211_attrs {
+/* don't change the order or add anything inbetween, this is ABI! */
+        NL80211_ATTR_UNSPEC,
+
+        NL80211_ATTR_WIPHY,
+        NL80211_ATTR_WIPHY_NAME,
+
+        NL80211_ATTR_IFINDEX,
+        NL80211_ATTR_IFNAME,
+        NL80211_ATTR_IFTYPE,
+
+        /* add attributes here, update the policy in nl80211.c */
+
+        __NL80211_ATTR_AFTER_LAST,
+        NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
+};
+
+/**
  * enum nl80211_iftype - (virtual) interface types
+ *
  * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
  * @NL80211_IFTYPE_ADHOC: independent BSS member
  * @NL80211_IFTYPE_STATION: managed BSS member
@@ -15,9 +105,10 @@
  * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
  * @NL80211_IFTYPE_WDS: wireless distribution interface
  * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
+ * @NL80211_IFTYPE_MAX: highest interface type number currently defined
  * @__NL80211_IFTYPE_AFTER_LAST: internal use
  *
- * These values are used with the NL80211_ATTR_IFTYPE
+ * These values are used with the %NL80211_ATTR_IFTYPE
  * to set the type of an interface.
  *
  */
@@ -31,8 +122,8 @@ enum nl80211_iftype {
         NL80211_IFTYPE_MONITOR,
 
         /* keep last */
-        __NL80211_IFTYPE_AFTER_LAST
+        __NL80211_IFTYPE_AFTER_LAST,
+        NL80211_IFTYPE_MAX = __NL80211_IFTYPE_AFTER_LAST - 1
 };
-#define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
 
 #endif /* __LINUX_NL80211_H */
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 576f2bb34cc8..fad7ff17e468 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -157,6 +157,19 @@ extern int __srcu_notifier_call_chain(struct srcu_notifier_head *nh,
  */
 #define NOTIFY_STOP             (NOTIFY_OK|NOTIFY_STOP_MASK)
 
+/* Encapsulate (negative) errno value (in particular, NOTIFY_BAD <=> EPERM). */
+static inline int notifier_from_errno(int err)
+{
+        return NOTIFY_STOP_MASK | (NOTIFY_OK - err);
+}
+
+/* Restore (negative) errno value from notify return value. */
+static inline int notifier_to_errno(int ret)
+{
+        ret &= ~NOTIFY_STOP_MASK;
+        return ret > NOTIFY_OK ? NOTIFY_OK - ret : 0;
+}
+
 /*
  *      Declared notifiers so far. I can imagine quite a few more chains
  *      over time (eg laptop power reset chains, reboot chain (to clean 
@@ -212,5 +225,11 @@ extern int __srcu_notifier_call_chain(struct srcu_notifier_head *nh,
 #define CPU_DEAD_FROZEN         (CPU_DEAD | CPU_TASKS_FROZEN)
 #define CPU_DYING_FROZEN        (CPU_DYING | CPU_TASKS_FROZEN)
 
+/* Hibernation and suspend events */
+#define PM_HIBERNATION_PREPARE  0x0001 /* Going to hibernate */
+#define PM_POST_HIBERNATION     0x0002 /* Hibernation finished */
+#define PM_SUSPEND_PREPARE      0x0003 /* Going to suspend the system */
+#define PM_POST_SUSPEND         0x0004 /* Suspend finished */
+
 #endif /* __KERNEL__ */
 #endif /* _LINUX_NOTIFIER_H */
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index ce06188b7a56..bec4485e3d76 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -29,6 +29,7 @@ struct nsproxy {
         struct mnt_namespace *mnt_ns;
         struct pid_namespace *pid_ns;
         struct user_namespace *user_ns;
+        struct net           *net_ns;
 };
 extern struct nsproxy init_nsproxy;
 
diff --git a/include/linux/of.h b/include/linux/of.h
new file mode 100644
index 000000000000..6df80e985914
--- /dev/null
+++ b/include/linux/of.h
@@ -0,0 +1,60 @@
+#ifndef _LINUX_OF_H
+#define _LINUX_OF_H
+/*
+ * Definitions for talking to the Open Firmware PROM on
+ * Power Macintosh and other computers.
+ *
+ * Copyright (C) 1996-2005 Paul Mackerras.
+ *
+ * Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp.
+ * Updates for SPARC64 by David S. Miller
+ * Derived from PowerPC and Sparc prom.h files by Stephen Rothwell, IBM Corp.
+ *
+ * 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.
+ */
+#include <linux/types.h>
+
+#include <asm/bitops.h>
+#include <asm/prom.h>
+
+/* flag descriptions */
+#define OF_DYNAMIC      1 /* node and properties were allocated via kmalloc */
+#define OF_DETACHED     2 /* node has been detached from the device tree */
+
+#define OF_BAD_ADDR     ((u64)-1)
+
+extern struct device_node *of_find_node_by_name(struct device_node *from,
+        const char *name);
+#define for_each_node_by_name(dn, name) \
+        for (dn = of_find_node_by_name(NULL, name); dn; \
+             dn = of_find_node_by_name(dn, name))
+extern struct device_node *of_find_node_by_type(struct device_node *from,
+        const char *type);
+#define for_each_node_by_type(dn, type) \
+        for (dn = of_find_node_by_type(NULL, type); dn; \
+             dn = of_find_node_by_type(dn, type))
+extern struct device_node *of_find_compatible_node(struct device_node *from,
+        const char *type, const char *compat);
+#define for_each_compatible_node(dn, type, compatible) \
+        for (dn = of_find_compatible_node(NULL, type, compatible); dn; \
+             dn = of_find_compatible_node(dn, type, compatible))
+extern struct device_node *of_find_node_by_path(const char *path);
+extern struct device_node *of_find_node_by_phandle(phandle handle);
+extern struct device_node *of_get_parent(const struct device_node *node);
+extern struct device_node *of_get_next_child(const struct device_node *node,
+                                             struct device_node *prev);
+extern struct property *of_find_property(const struct device_node *np,
+                                         const char *name,
+                                         int *lenp);
+extern int of_device_is_compatible(const struct device_node *device,
+                                   const char *);
+extern const void *of_get_property(const struct device_node *node,
+                                const char *name,
+                                int *lenp);
+extern int of_n_addr_cells(struct device_node *np);
+extern int of_n_size_cells(struct device_node *np);
+
+#endif /* _LINUX_OF_H */
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
new file mode 100644
index 000000000000..91bf84b9d144
--- /dev/null
+++ b/include/linux/of_device.h
@@ -0,0 +1,26 @@
+#ifndef _LINUX_OF_DEVICE_H
+#define _LINUX_OF_DEVICE_H
+#ifdef __KERNEL__
+
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/mod_devicetable.h>
+
+#include <asm/of_device.h>
+
+#define to_of_device(d) container_of(d, struct of_device, dev)
+
+extern const struct of_device_id *of_match_node(
+        const struct of_device_id *matches, const struct device_node *node);
+extern const struct of_device_id *of_match_device(
+        const struct of_device_id *matches, const struct of_device *dev);
+
+extern struct of_device *of_dev_get(struct of_device *dev);
+extern void of_dev_put(struct of_device *dev);
+
+extern int of_device_register(struct of_device *ofdev);
+extern void of_device_unregister(struct of_device *ofdev);
+extern void of_release_dev(struct device *dev);
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_OF_DEVICE_H */
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
new file mode 100644
index 000000000000..448f70b30a0c
--- /dev/null
+++ b/include/linux/of_platform.h
@@ -0,0 +1,57 @@
+#ifndef _LINUX_OF_PLATFORM_H
+#define _LINUX_OF_PLATFORM_H
+/*
+ *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
+ *                       <benh@kernel.crashing.org>
+ *
+ *  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.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/pm.h>
+#include <linux/of_device.h>
+
+/*
+ * The of_platform_bus_type is a bus type used by drivers that do not
+ * attach to a macio or similar bus but still use OF probing
+ * mechanism
+ */
+extern struct bus_type of_platform_bus_type;
+
+/*
+ * An of_platform_driver driver is attached to a basic of_device on
+ * the "platform bus" (of_platform_bus_type) (or ISA, EBUS and SBUS
+ * busses on sparc).
+ */
+struct of_platform_driver
+{
+        const char              *name;
+        const struct of_device_id       *match_table;
+        struct module           *owner;
+
+        int     (*probe)(struct of_device* dev,
+                         const struct of_device_id *match);
+        int     (*remove)(struct of_device* dev);
+
+        int     (*suspend)(struct of_device* dev, pm_message_t state);
+        int     (*resume)(struct of_device* dev);
+        int     (*shutdown)(struct of_device* dev);
+
+        struct device_driver    driver;
+};
+#define to_of_platform_driver(drv) \
+        container_of(drv,struct of_platform_driver, driver)
+
+#include <asm/of_platform.h>
+
+extern struct of_device *of_find_device_by_node(struct device_node *np);
+
+extern int of_bus_type_init(struct bus_type *bus, const char *name);
+
+#endif  /* _LINUX_OF_PLATFORM_H */
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 0d514b252454..041bb31100f4 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -17,6 +17,26 @@
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
  
+/* Each escaped entry is prefixed by ESCAPE_CODE
+ * then one of the following codes, then the
+ * relevant data.
+ * These #defines live in this file so that arch-specific
+ * buffer sync'ing code can access them.
+ */
+#define ESCAPE_CODE                     ~0UL
+#define CTX_SWITCH_CODE                 1
+#define CPU_SWITCH_CODE                 2
+#define COOKIE_SWITCH_CODE              3
+#define KERNEL_ENTER_SWITCH_CODE        4
+#define KERNEL_EXIT_SWITCH_CODE         5
+#define MODULE_LOADED_CODE              6
+#define CTX_TGID_CODE                   7
+#define TRACE_BEGIN_CODE                8
+#define TRACE_END_CODE                  9
+#define XEN_ENTER_SWITCH_CODE           10
+#define SPU_PROFILING_CODE              11
+#define SPU_CTX_SWITCH_CODE             12
+
 struct super_block;
 struct dentry;
 struct file_operations;
@@ -35,6 +55,14 @@ struct oprofile_operations {
         int (*start)(void);
         /* Stop delivering interrupts. */
         void (*stop)(void);
+        /* Arch-specific buffer sync functions.
+         * Return value = 0:  Success
+         * Return value = -1: Failure
+         * Return value = 1:  Run generic sync function
+         */
+        int (*sync_start)(void);
+        int (*sync_stop)(void);
+
         /* Initiate a stack backtrace. Optional. */
         void (*backtrace)(struct pt_regs * const regs, unsigned int depth);
         /* CPU identification string. */
@@ -56,6 +84,13 @@ int oprofile_arch_init(struct oprofile_operations * ops);
 void oprofile_arch_exit(void);
 
 /**
+ * Add data to the event buffer.
+ * The data passed is free-form, but typically consists of
+ * file offsets, dcookies, context information, and ESCAPE codes.
+ */
+void add_event_entry(unsigned long data);
+
+/**
  * Add a sample. This may be called from any context. Pass
  * smp_processor_id() as cpu.
  */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index ae2d79f2107e..209d3a47f50f 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -90,8 +90,12 @@
 #define PG_reclaim              17      /* To be reclaimed asap */
 #define PG_buddy                19      /* Page is free, on buddy lists */
 
+/* PG_readahead is only used for file reads; PG_reclaim is only for writes */
+#define PG_readahead            PG_reclaim /* Reminder to do async read-ahead */
+
 /* PG_owner_priv_1 users should have descriptive aliases */
 #define PG_checked              PG_owner_priv_1 /* Used by some filesystems */
+#define PG_pinned               PG_owner_priv_1 /* Xen pinned pagetable */
 
 #if (BITS_PER_LONG > 32)
 /*
@@ -170,6 +174,10 @@ static inline void SetPageUptodate(struct page *page)
 #define SetPageChecked(page)    set_bit(PG_checked, &(page)->flags)
 #define ClearPageChecked(page)  clear_bit(PG_checked, &(page)->flags)
 
+#define PagePinned(page)        test_bit(PG_pinned, &(page)->flags)
+#define SetPagePinned(page)     set_bit(PG_pinned, &(page)->flags)
+#define ClearPagePinned(page)   clear_bit(PG_pinned, &(page)->flags)
+
 #define PageReserved(page)      test_bit(PG_reserved, &(page)->flags)
 #define SetPageReserved(page)   set_bit(PG_reserved, &(page)->flags)
 #define ClearPageReserved(page) clear_bit(PG_reserved, &(page)->flags)
@@ -181,37 +189,15 @@ static inline void SetPageUptodate(struct page *page)
 #define __SetPagePrivate(page)  __set_bit(PG_private, &(page)->flags)
 #define __ClearPagePrivate(page) __clear_bit(PG_private, &(page)->flags)
 
+/*
+ * Only test-and-set exist for PG_writeback.  The unconditional operators are
+ * risky: they bypass page accounting.
+ */
 #define PageWriteback(page)     test_bit(PG_writeback, &(page)->flags)
-#define SetPageWriteback(page)                                          \
-        do {                                                            \
-                if (!test_and_set_bit(PG_writeback,                     \
-                                &(page)->flags))                        \
-                        inc_zone_page_state(page, NR_WRITEBACK);        \
-        } while (0)
-#define TestSetPageWriteback(page)                                      \
-        ({                                                              \
-                int ret;                                                \
-                ret = test_and_set_bit(PG_writeback,                    \
-                                        &(page)->flags);                \
-                if (!ret)                                               \
-                        inc_zone_page_state(page, NR_WRITEBACK);        \
-                ret;                                                    \
-        })
-#define ClearPageWriteback(page)                                        \
-        do {                                                            \
-                if (test_and_clear_bit(PG_writeback,                    \
-                                &(page)->flags))                        \
-                        dec_zone_page_state(page, NR_WRITEBACK);        \
-        } while (0)
-#define TestClearPageWriteback(page)                                    \
-        ({                                                              \
-                int ret;                                                \
-                ret = test_and_clear_bit(PG_writeback,                  \
-                                &(page)->flags);                        \
-                if (ret)                                                \
-                        dec_zone_page_state(page, NR_WRITEBACK);        \
-                ret;                                                    \
-        })
+#define TestSetPageWriteback(page) test_and_set_bit(PG_writeback,       \
+                                                        &(page)->flags)
+#define TestClearPageWriteback(page) test_and_clear_bit(PG_writeback,   \
+                                                        &(page)->flags)
 
 #define PageBuddy(page)         test_bit(PG_buddy, &(page)->flags)
 #define __SetPageBuddy(page)    __set_bit(PG_buddy, &(page)->flags)
@@ -221,6 +207,10 @@ static inline void SetPageUptodate(struct page *page)
 #define SetPageMappedToDisk(page) set_bit(PG_mappedtodisk, &(page)->flags)
 #define ClearPageMappedToDisk(page) clear_bit(PG_mappedtodisk, &(page)->flags)
 
+#define PageReadahead(page)     test_bit(PG_readahead, &(page)->flags)
+#define SetPageReadahead(page)  set_bit(PG_readahead, &(page)->flags)
+#define ClearPageReadahead(page) clear_bit(PG_readahead, &(page)->flags)
+
 #define PageReclaim(page)       test_bit(PG_reclaim, &(page)->flags)
 #define SetPageReclaim(page)    set_bit(PG_reclaim, &(page)->flags)
 #define ClearPageReclaim(page)  clear_bit(PG_reclaim, &(page)->flags)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 5e84f2e8d54c..768b93359f90 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -534,6 +534,7 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
 
 int __must_check pci_enable_device(struct pci_dev *dev);
 int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
 
@@ -556,6 +557,7 @@ int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
 int pcix_get_max_mmrbc(struct pci_dev *dev);
 int pcix_get_mmrbc(struct pci_dev *dev);
 int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc);
+int pcie_get_readrq(struct pci_dev *dev);
 int pcie_set_readrq(struct pci_dev *dev, int rq);
 void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
 int __must_check pci_assign_resource(struct pci_dev *dev, int i);
@@ -577,6 +579,9 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
 pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
 int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);
 
+/* Functions for PCI Hotplug drivers to use */
+int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
+
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
 void pci_bus_assign_resources(struct pci_bus *bus);
 void pci_bus_size_bridges(struct pci_bus *bus);
@@ -680,13 +685,16 @@ extern void pci_unblock_user_cfg_access(struct pci_dev *dev);
  * a PCI domain is defined to be a set of PCI busses which share
  * configuration space.
  */
-#ifndef CONFIG_PCI_DOMAINS
+#ifdef CONFIG_PCI_DOMAINS
+extern int pci_domains_supported;
+#else
+enum { pci_domains_supported = 0 };
 static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
         return 0;
 }
-#endif
+#endif /* CONFIG_PCI_DOMAINS */
 
 #else /* CONFIG_PCI is not enabled */
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2c7add169539..87439ad94685 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -360,6 +360,9 @@
 #define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
 #define PCI_DEVICE_ID_ATI_RS400_200     0x5a33
 #define PCI_DEVICE_ID_ATI_RS480         0x5950
+#define PCI_DEVICE_ID_ATI_RD580         0x5952
+#define PCI_DEVICE_ID_ATI_RX790         0x5957
+#define PCI_DEVICE_ID_ATI_RS690         0x7910
 /* ATI IXP Chipset */
 #define PCI_DEVICE_ID_ATI_IXP200_IDE    0x4349
 #define PCI_DEVICE_ID_ATI_IXP200_SMBUS  0x4353
@@ -371,10 +374,9 @@
 #define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
 #define PCI_DEVICE_ID_ATI_IXP400_SATA2  0x437a
 #define PCI_DEVICE_ID_ATI_IXP600_SATA   0x4380
-#define PCI_DEVICE_ID_ATI_IXP600_SMBUS  0x4385
+#define PCI_DEVICE_ID_ATI_SBX00_SMBUS   0x4385
 #define PCI_DEVICE_ID_ATI_IXP600_IDE    0x438c
 #define PCI_DEVICE_ID_ATI_IXP700_SATA   0x4390
-#define PCI_DEVICE_ID_ATI_IXP700_SMBUS  0x4395
 #define PCI_DEVICE_ID_ATI_IXP700_IDE    0x439c
 
 #define PCI_VENDOR_ID_VLSI              0x1004
@@ -495,6 +497,8 @@
 
 #define PCI_VENDOR_ID_AMD               0x1022
 #define PCI_DEVICE_ID_AMD_K8_NB         0x1100
+#define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101
+#define PCI_DEVICE_ID_AMD_K8_NB_MEMCTL  0x1102
 #define PCI_DEVICE_ID_AMD_K8_NB_MISC    0x1103
 #define PCI_DEVICE_ID_AMD_LANCE         0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME    0x2001
@@ -609,7 +613,6 @@
 #define PCI_DEVICE_ID_NEC_CBUS_3        0x003b
 #define PCI_DEVICE_ID_NEC_NAPCCARD      0x003e
 #define PCI_DEVICE_ID_NEC_PCX2          0x0046 /* PowerVR */
-#define PCI_DEVICE_ID_NEC_NILE4         0x005a
 #define PCI_DEVICE_ID_NEC_VRC5476       0x009b
 #define PCI_DEVICE_ID_NEC_VRC4173       0x00a5
 #define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
@@ -826,6 +829,9 @@
 #define PCI_DEVICE_ID_UMC_UM8886BF      0x673a
 #define PCI_DEVICE_ID_UMC_UM8886A       0x886a
 
+#define PCI_VENDOR_ID_PICOPOWER         0x1066
+#define PCI_DEVICE_ID_PICOPOWER_PT86C523        0x0002
+#define PCI_DEVICE_ID_PICOPOWER_PT86C523BBP     0x8002
 
 #define PCI_VENDOR_ID_MYLEX             0x1069
 #define PCI_DEVICE_ID_MYLEX_DAC960_P    0x0001
@@ -1223,6 +1229,10 @@
 #define PCI_DEVICE_ID_NVIDIA_NVENET_25              0x054D
 #define PCI_DEVICE_ID_NVIDIA_NVENET_26              0x054E
 #define PCI_DEVICE_ID_NVIDIA_NVENET_27              0x054F
+#define PCI_DEVICE_ID_NVIDIA_NVENET_28              0x07DC
+#define PCI_DEVICE_ID_NVIDIA_NVENET_29              0x07DD
+#define PCI_DEVICE_ID_NVIDIA_NVENET_30              0x07DE
+#define PCI_DEVICE_ID_NVIDIA_NVENET_31              0x07DF
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE       0x0560
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE       0x056C
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE       0x0759
@@ -1282,6 +1292,7 @@
 #define PCI_DEVICE_ID_VIA_VT3324        0x0324
 #define PCI_DEVICE_ID_VIA_VT3336        0x0336
 #define PCI_DEVICE_ID_VIA_VT3351        0x0351
+#define PCI_DEVICE_ID_VIA_VT3364        0x0364
 #define PCI_DEVICE_ID_VIA_8371_0        0x0391
 #define PCI_DEVICE_ID_VIA_8501_0        0x0501
 #define PCI_DEVICE_ID_VIA_82C561        0x0561
@@ -1335,6 +1346,7 @@
 #define PCI_DEVICE_ID_VIA_8231_4        0x8235
 #define PCI_DEVICE_ID_VIA_8365_1        0x8305
 #define PCI_DEVICE_ID_VIA_CX700         0x8324
+#define PCI_DEVICE_ID_VIA_VX800         0x8353
 #define PCI_DEVICE_ID_VIA_8371_1        0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
 #define PCI_DEVICE_ID_VIA_838X_1        0xB188
@@ -1462,6 +1474,8 @@
 #define PCI_DEVICE_ID_RICOH_RL5C476     0x0476
 #define PCI_DEVICE_ID_RICOH_RL5C478     0x0478
 #define PCI_DEVICE_ID_RICOH_R5C822      0x0822
+#define PCI_DEVICE_ID_RICOH_R5C832      0x0832
+#define PCI_DEVICE_ID_RICOH_R5C843      0x0843
 
 #define PCI_VENDOR_ID_DLINK             0x1186
 #define PCI_DEVICE_ID_DLINK_DGE510T     0x4c00
@@ -1727,6 +1741,11 @@
 
 #define PCI_VENDOR_ID_RADISYS           0x1331
 
+#define PCI_VENDOR_ID_MICRO_MEMORY              0x1332
+#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN       0x5415
+#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN       0x5425
+#define PCI_DEVICE_ID_MICRO_MEMORY_6155         0x6155
+
 #define PCI_VENDOR_ID_DOMEX             0x134a
 #define PCI_DEVICE_ID_DOMEX_DMX3191D    0x0001
 
@@ -1832,6 +1851,8 @@
 #define PCI_VENDOR_ID_ABOCOM            0x13D1
 #define PCI_DEVICE_ID_ABOCOM_2BD1       0x2BD1
 
+#define PCI_VENDOR_ID_SUNDANCE          0x13f0
+
 #define PCI_VENDOR_ID_CMEDIA            0x13f6
 #define PCI_DEVICE_ID_CMEDIA_CM8338A    0x0100
 #define PCI_DEVICE_ID_CMEDIA_CM8338B    0x0101
@@ -1939,8 +1960,12 @@
 #define PCI_DEVICE_ID_TIGON3_5751M      0x167d
 #define PCI_DEVICE_ID_TIGON3_5751F      0x167e
 #define PCI_DEVICE_ID_TIGON3_5787F      0x167f
+#define PCI_DEVICE_ID_TIGON3_5761E      0x1680
+#define PCI_DEVICE_ID_TIGON3_5761       0x1681
+#define PCI_DEVICE_ID_TIGON3_5764       0x1684
 #define PCI_DEVICE_ID_TIGON3_5787M      0x1693
 #define PCI_DEVICE_ID_TIGON3_5782       0x1696
+#define PCI_DEVICE_ID_TIGON3_5784       0x1698
 #define PCI_DEVICE_ID_TIGON3_5786       0x169a
 #define PCI_DEVICE_ID_TIGON3_5787       0x169b
 #define PCI_DEVICE_ID_TIGON3_5788       0x169c
@@ -1970,6 +1995,8 @@
 #define PCI_VENDOR_ID_ENE               0x1524
 #define PCI_DEVICE_ID_ENE_CB712_SD      0x0550
 #define PCI_DEVICE_ID_ENE_CB712_SD_2    0x0551
+#define PCI_DEVICE_ID_ENE_CB714_SD      0x0750
+#define PCI_DEVICE_ID_ENE_CB714_SD_2    0x0751
 #define PCI_DEVICE_ID_ENE_1211          0x1211
 #define PCI_DEVICE_ID_ENE_1225          0x1225
 #define PCI_DEVICE_ID_ENE_1410          0x1410
@@ -2017,6 +2044,8 @@
 
 #define PCI_VENDOR_ID_ARIMA             0x161f
 
+#define PCI_VENDOR_ID_BROCADE           0x1657
+
 #define PCI_VENDOR_ID_SIBYTE            0x166d
 #define PCI_DEVICE_ID_BCM1250_PCI       0x0001
 #define PCI_DEVICE_ID_BCM1250_HT        0x0002
@@ -2038,6 +2067,8 @@
 #define PCI_DEVICE_ID_ALTIMA_AC9100     0x03ea
 #define PCI_DEVICE_ID_ALTIMA_AC1003     0x03eb
 
+#define PCI_VENDOR_ID_LENOVO            0x17aa
+
 #define PCI_VENDOR_ID_ARECA             0x17d3
 #define PCI_DEVICE_ID_ARECA_1110        0x1110
 #define PCI_DEVICE_ID_ARECA_1120        0x1120
@@ -2069,6 +2100,28 @@
 #define PCI_VENDOR_ID_TDI               0x192E
 #define PCI_DEVICE_ID_TDI_EHCI          0x0101
 
+#define PCI_VENDOR_ID_FREESCALE         0x1957
+#define PCI_DEVICE_ID_MPC8548E          0x0012
+#define PCI_DEVICE_ID_MPC8548           0x0013
+#define PCI_DEVICE_ID_MPC8543E          0x0014
+#define PCI_DEVICE_ID_MPC8543           0x0015
+#define PCI_DEVICE_ID_MPC8547E          0x0018
+#define PCI_DEVICE_ID_MPC8545E          0x0019
+#define PCI_DEVICE_ID_MPC8545           0x001a
+#define PCI_DEVICE_ID_MPC8568E          0x0020
+#define PCI_DEVICE_ID_MPC8568           0x0021
+#define PCI_DEVICE_ID_MPC8567E          0x0022
+#define PCI_DEVICE_ID_MPC8567           0x0023
+#define PCI_DEVICE_ID_MPC8533E          0x0030
+#define PCI_DEVICE_ID_MPC8533           0x0031
+#define PCI_DEVICE_ID_MPC8544E          0x0032
+#define PCI_DEVICE_ID_MPC8544           0x0033
+#define PCI_DEVICE_ID_MPC8572E          0x0040
+#define PCI_DEVICE_ID_MPC8572           0x0041
+#define PCI_DEVICE_ID_MPC8641           0x7010
+#define PCI_DEVICE_ID_MPC8641D          0x7011
+#define PCI_DEVICE_ID_MPC8610           0x7018
+
 #define PCI_VENDOR_ID_PASEMI            0x1959
 
 #define PCI_VENDOR_ID_ATTANSIC          0x1969
@@ -2089,6 +2142,11 @@
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
 
+#define PCI_VENDOR_ID_TEHUTI            0x1fc9
+#define PCI_DEVICE_ID_TEHUTI_3009       0x3009
+#define PCI_DEVICE_ID_TEHUTI_3010       0x3010
+#define PCI_DEVICE_ID_TEHUTI_3014       0x3014
+
 #define PCI_VENDOR_ID_HINT             0x3388
 #define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013
 
@@ -2187,6 +2245,7 @@
 #define PCI_DEVICE_ID_INTEL_82801EB_5   0x24d5
 #define PCI_DEVICE_ID_INTEL_82801EB_6   0x24d6
 #define PCI_DEVICE_ID_INTEL_82801EB_11  0x24db
+#define PCI_DEVICE_ID_INTEL_82801EB_12  0x24dc
 #define PCI_DEVICE_ID_INTEL_82801EB_13  0x24dd
 #define PCI_DEVICE_ID_INTEL_ESB_1       0x25a1
 #define PCI_DEVICE_ID_INTEL_ESB_2       0x25a2
@@ -2209,6 +2268,7 @@
 #define PCI_DEVICE_ID_INTEL_82915GM_IG  0x2592
 #define PCI_DEVICE_ID_INTEL_82945G_HB   0x2770
 #define PCI_DEVICE_ID_INTEL_82945G_IG   0x2772
+#define PCI_DEVICE_ID_INTEL_3000_HB     0x2778
 #define PCI_DEVICE_ID_INTEL_82945GM_HB  0x27A0
 #define PCI_DEVICE_ID_INTEL_82945GM_IG  0x27A2
 #define PCI_DEVICE_ID_INTEL_ICH6_0      0x2640
@@ -2258,6 +2318,8 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC      0x3599
 #define PCI_DEVICE_ID_INTEL_MCH_PC1     0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH   0x359e
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_0   0x5031
+#define PCI_DEVICE_ID_INTEL_TOLAPAI_1   0x5032
 #define PCI_DEVICE_ID_INTEL_82371SB_0   0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1   0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2   0x7020
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 495d368390e0..c1914a8b94a9 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -147,7 +147,7 @@
 #define PCI_BRIDGE_CONTROL      0x3e
 #define  PCI_BRIDGE_CTL_PARITY  0x01    /* Enable parity detection on secondary interface */
 #define  PCI_BRIDGE_CTL_SERR    0x02    /* The same for SERR forwarding */
-#define  PCI_BRIDGE_CTL_NO_ISA  0x04    /* Disable bridging of ISA ports */
+#define  PCI_BRIDGE_CTL_ISA     0x04    /* Enable ISA mode */
 #define  PCI_BRIDGE_CTL_VGA     0x08    /* Forward VGA addresses */
 #define  PCI_BRIDGE_CTL_MASTER_ABORT    0x20  /* Report master aborts */
 #define  PCI_BRIDGE_CTL_BUS_RESET       0x40    /* Secondary bus reset */
@@ -202,8 +202,12 @@
 #define  PCI_CAP_ID_CHSWP       0x06    /* CompactPCI HotSwap */
 #define  PCI_CAP_ID_PCIX        0x07    /* PCI-X */
 #define  PCI_CAP_ID_HT          0x08    /* HyperTransport */
-#define  PCI_CAP_ID_VNDR        0x09    /* Vendor specific capability */
+#define  PCI_CAP_ID_VNDR        0x09    /* Vendor specific */
+#define  PCI_CAP_ID_DBG         0x0A    /* Debug port */
+#define  PCI_CAP_ID_CCRC        0x0B    /* CompactPCI Central Resource Control */
 #define  PCI_CAP_ID_SHPC        0x0C    /* PCI Standard Hot-Plug Controller */
+#define  PCI_CAP_ID_SSVID       0x0D    /* Bridge subsystem vendor/device ID */
+#define  PCI_CAP_ID_AGP3        0x0E    /* AGP Target PCI-PCI bridge */
 #define  PCI_CAP_ID_EXP         0x10    /* PCI Express */
 #define  PCI_CAP_ID_MSIX        0x11    /* MSI-X */
 #define PCI_CAP_LIST_NEXT       1       /* Next capability in the list */
@@ -316,7 +320,20 @@
 #define PCI_X_CMD               2       /* Modes & Features */
 #define  PCI_X_CMD_DPERR_E      0x0001  /* Data Parity Error Recovery Enable */
 #define  PCI_X_CMD_ERO          0x0002  /* Enable Relaxed Ordering */
+#define  PCI_X_CMD_READ_512     0x0000  /* 512 byte maximum read byte count */
+#define  PCI_X_CMD_READ_1K      0x0004  /* 1Kbyte maximum read byte count */
+#define  PCI_X_CMD_READ_2K      0x0008  /* 2Kbyte maximum read byte count */
+#define  PCI_X_CMD_READ_4K      0x000c  /* 4Kbyte maximum read byte count */
 #define  PCI_X_CMD_MAX_READ     0x000c  /* Max Memory Read Byte Count */
+                                /* Max # of outstanding split transactions */
+#define  PCI_X_CMD_SPLIT_1      0x0000  /* Max 1 */
+#define  PCI_X_CMD_SPLIT_2      0x0010  /* Max 2 */
+#define  PCI_X_CMD_SPLIT_3      0x0020  /* Max 3 */
+#define  PCI_X_CMD_SPLIT_4      0x0030  /* Max 4 */
+#define  PCI_X_CMD_SPLIT_8      0x0040  /* Max 8 */
+#define  PCI_X_CMD_SPLIT_12     0x0050  /* Max 12 */
+#define  PCI_X_CMD_SPLIT_16     0x0060  /* Max 16 */
+#define  PCI_X_CMD_SPLIT_32     0x0070  /* Max 32 */
 #define  PCI_X_CMD_MAX_SPLIT    0x0070  /* Max Outstanding Split Transactions */
 #define  PCI_X_CMD_VERSION(x)   (((x) >> 12) & 3) /* Version */
 #define PCI_X_STATUS            4       /* PCI-X capabilities */
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 2a659789f9ca..f0742b6aaa64 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -25,6 +25,8 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 
+#include <asm/atomic.h>
+
 #define PHY_BASIC_FEATURES      (SUPPORTED_10baseT_Half | \
                                  SUPPORTED_10baseT_Full | \
                                  SUPPORTED_100baseT_Half | \
@@ -281,6 +283,7 @@ struct phy_device {
         /* Interrupt and Polling infrastructure */
         struct work_struct phy_queue;
         struct timer_list phy_timer;
+        atomic_t irq_disable;
 
         spinlock_t lock;
 
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
new file mode 100644
index 000000000000..04ba70d49fb8
--- /dev/null
+++ b/include/linux/phy_fixed.h
@@ -0,0 +1,38 @@
+#ifndef __PHY_FIXED_H
+#define __PHY_FIXED_H
+
+#define MII_REGS_NUM    29
+
+/* max number of virtual phy stuff */
+#define MAX_PHY_AMNT    10
+/*
+    The idea is to emulate normal phy behavior by responding with
+    pre-defined values to mii BMCR read, so that read_status hook could
+    take all the needed info.
+*/
+
+struct fixed_phy_status {
+        u8 link;
+        u16 speed;
+        u8 duplex;
+};
+
+/*-----------------------------------------------------------------------------
+ *  Private information hoder for mii_bus
+ *-----------------------------------------------------------------------------*/
+struct fixed_info {
+        u16 *regs;
+        u8 regs_num;
+        struct fixed_phy_status phy_status;
+        struct phy_device *phydev;      /* pointer to the container */
+        /* link & speed cb */
+        int (*link_update) (struct net_device *, struct fixed_phy_status *);
+
+};
+
+
+int fixed_mdio_set_link_update(struct phy_device *,
+       int (*link_update) (struct net_device *, struct fixed_phy_status *));
+struct fixed_info *fixed_mdio_get_phydev (int phydev_ind);
+
+#endif /* __PHY_FIXED_H */
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 268c51599eb8..919af93b7059 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -77,8 +77,8 @@ struct tc_ratespec
 {
         unsigned char   cell_log;
         unsigned char   __reserved;
-        unsigned short  feature;
-        short           addend;
+        unsigned short  overhead;
+        short           cell_align;
         unsigned short  mpu;
         __u32           rate;
 };
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 8bbd459eafdc..e80804316cdb 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -15,7 +15,7 @@
 
 struct platform_device {
         const char      * name;
-        u32             id;
+        int             id;
         struct device   dev;
         u32             num_resources;
         struct resource * resource;
@@ -35,9 +35,10 @@ extern struct resource *platform_get_resource_byname(struct platform_device *, u
 extern int platform_get_irq_byname(struct platform_device *, char *);
 extern int platform_add_devices(struct platform_device **, int);
 
-extern struct platform_device *platform_device_register_simple(char *, unsigned int, struct resource *, unsigned int);
+extern struct platform_device *platform_device_register_simple(char *, int id,
+                                        struct resource *, unsigned int);
 
-extern struct platform_device *platform_device_alloc(const char *name, unsigned int id);
+extern struct platform_device *platform_device_alloc(const char *name, int id);
 extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num);
 extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 273781c82e4d..48b71badfb4c 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -25,6 +25,7 @@
 
 #include <linux/list.h>
 #include <asm/atomic.h>
+#include <asm/errno.h>
 
 /*
  * Power management requests... these are passed to pm_send_all() and friends.
@@ -101,6 +102,7 @@ struct pm_dev
  */
 extern void (*pm_idle)(void);
 extern void (*pm_power_off)(void);
+extern void (*pm_power_off_prepare)(void);
 
 typedef int __bitwise suspend_state_t;
 
@@ -164,6 +166,7 @@ struct pm_ops {
         int (*finish)(suspend_state_t state);
 };
 
+#ifdef CONFIG_SUSPEND
 extern struct pm_ops *pm_ops;
 
 /**
@@ -192,6 +195,12 @@ extern void arch_suspend_disable_irqs(void);
 extern void arch_suspend_enable_irqs(void);
 
 extern int pm_suspend(suspend_state_t state);
+#else /* !CONFIG_SUSPEND */
+#define suspend_valid_only_mem  NULL
+
+static inline void pm_set_ops(struct pm_ops *pm_ops) {}
+static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
+#endif /* !CONFIG_SUSPEND */
 
 /*
  * Device power management
@@ -265,7 +274,7 @@ typedef struct pm_message {
 struct dev_pm_info {
         pm_message_t            power_state;
         unsigned                can_wakeup:1;
-#ifdef  CONFIG_PM
+#ifdef  CONFIG_PM_SLEEP
         unsigned                should_wakeup:1;
         struct list_head        entry;
 #endif
@@ -275,7 +284,7 @@ extern int device_power_down(pm_message_t state);
 extern void device_power_up(void);
 extern void device_resume(void);
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 extern int device_suspend(pm_message_t state);
 extern int device_prepare_suspend(pm_message_t state);
 
@@ -284,8 +293,6 @@ extern int device_prepare_suspend(pm_message_t state);
 #define device_may_wakeup(dev) \
         (device_can_wakeup(dev) && (dev)->power.should_wakeup)
 
-extern int dpm_runtime_suspend(struct device *, pm_message_t);
-extern void dpm_runtime_resume(struct device *);
 extern void __suspend_report_result(const char *function, void *fn, int ret);
 
 #define suspend_report_result(fn, ret)                                  \
@@ -307,7 +314,7 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
         return 0;
 }
 
-#else /* !CONFIG_PM */
+#else /* !CONFIG_PM_SLEEP */
 
 static inline int device_suspend(pm_message_t state)
 {
@@ -317,15 +324,6 @@ static inline int device_suspend(pm_message_t state)
 #define device_set_wakeup_enable(dev,val)       do{}while(0)
 #define device_may_wakeup(dev)                  (0)
 
-static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
-{
-        return 0;
-}
-
-static inline void dpm_runtime_resume(struct device * dev)
-{
-}
-
 #define suspend_report_result(fn, ret) do { } while (0)
 
 static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
@@ -333,7 +331,7 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
         return 0;
 }
 
-#endif
+#endif /* !CONFIG_PM_SLEEP */
 
 /* changes to device_may_wakeup take effect on the next pm state change.
  * by default, devices should wakeup if they can.
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 5ad913ff02b2..b7824c215354 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -226,7 +226,7 @@ extern unsigned int pmu_power_flags;
 extern void pmu_backlight_init(void);
 
 /* some code needs to know if the PMU was suspended for hibernation */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 extern int pmu_sys_suspended;
 #else
 /* if power management is not configured it can't be suspended */
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 2a1897e6f937..16b46aace349 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -1,7 +1,6 @@
 /*
  * Linux Plug and Play Support
  * Copyright by Adam Belay <ambx1@neo.rr.com>
- *
  */
 
 #ifndef _LINUX_PNP_H
@@ -23,7 +22,6 @@
 struct pnp_protocol;
 struct pnp_dev;
 
-
 /*
  * Resource Management
  */
@@ -73,37 +71,37 @@ struct pnp_dev;
 #define PNP_PORT_FLAG_FIXED     (1<<1)
 
 struct pnp_port {
-        unsigned short min;             /* min base number */
-        unsigned short max;             /* max base number */
-        unsigned char align;            /* align boundary */
-        unsigned char size;             /* size of range */
-        unsigned char flags;            /* port flags */
-        unsigned char pad;              /* pad */
-        struct pnp_port *next;          /* next port */
+        unsigned short min;     /* min base number */
+        unsigned short max;     /* max base number */
+        unsigned char align;    /* align boundary */
+        unsigned char size;     /* size of range */
+        unsigned char flags;    /* port flags */
+        unsigned char pad;      /* pad */
+        struct pnp_port *next;  /* next port */
 };
 
 #define PNP_IRQ_NR 256
 struct pnp_irq {
-        DECLARE_BITMAP(map, PNP_IRQ_NR); /* bitmaks for IRQ lines */
-        unsigned char flags;            /* IRQ flags */
-        unsigned char pad;              /* pad */
-        struct pnp_irq *next;           /* next IRQ */
+        DECLARE_BITMAP(map, PNP_IRQ_NR);        /* bitmask for IRQ lines */
+        unsigned char flags;    /* IRQ flags */
+        unsigned char pad;      /* pad */
+        struct pnp_irq *next;   /* next IRQ */
 };
 
 struct pnp_dma {
-        unsigned char map;              /* bitmask for DMA channels */
-        unsigned char flags;            /* DMA flags */
-        struct pnp_dma *next;           /* next port */
+        unsigned char map;      /* bitmask for DMA channels */
+        unsigned char flags;    /* DMA flags */
+        struct pnp_dma *next;   /* next port */
 };
 
 struct pnp_mem {
-        unsigned int min;               /* min base number */
-        unsigned int max;               /* max base number */
-        unsigned int align;             /* align boundary */
-        unsigned int size;              /* size of range */
-        unsigned char flags;            /* memory flags */
-        unsigned char pad;              /* pad */
-        struct pnp_mem *next;           /* next memory resource */
+        unsigned int min;       /* min base number */
+        unsigned int max;       /* max base number */
+        unsigned int align;     /* align boundary */
+        unsigned int size;      /* size of range */
+        unsigned char flags;    /* memory flags */
+        unsigned char pad;      /* pad */
+        struct pnp_mem *next;   /* next memory resource */
 };
 
 #define PNP_RES_PRIORITY_PREFERRED      0
@@ -127,7 +125,6 @@ struct pnp_resource_table {
         struct resource irq_resource[PNP_MAX_IRQ];
 };
 
-
 /*
  * Device Managemnt
  */
@@ -139,14 +136,14 @@ struct pnp_card {
         struct list_head protocol_list; /* node in protocol's list of cards */
         struct list_head devices;       /* devices attached to the card */
 
-        struct pnp_protocol * protocol;
-        struct pnp_id * id;             /* contains supported EISA IDs*/
+        struct pnp_protocol *protocol;
+        struct pnp_id *id;              /* contains supported EISA IDs */
 
         char name[PNP_NAME_LEN];        /* contains a human-readable name */
-        unsigned char   pnpver;         /* Plug & Play version */
-        unsigned char   productver;     /* product version */
-        unsigned int    serial;         /* serial number */
-        unsigned char   checksum;       /* if zero - checksum passed */
+        unsigned char pnpver;           /* Plug & Play version */
+        unsigned char productver;       /* product version */
+        unsigned int serial;            /* serial number */
+        unsigned char checksum;         /* if zero - checksum passed */
         struct proc_dir_entry *procdir; /* directory entry in /proc/bus/isapnp */
 };
 
@@ -159,18 +156,18 @@ struct pnp_card {
         (card) = global_to_pnp_card((card)->global_list.next))
 
 struct pnp_card_link {
-        struct pnp_card * card;
-        struct pnp_card_driver * driver;
-        void * driver_data;
+        struct pnp_card *card;
+        struct pnp_card_driver *driver;
+        void *driver_data;
         pm_message_t pm_state;
 };
 
-static inline void *pnp_get_card_drvdata (struct pnp_card_link *pcard)
+static inline void *pnp_get_card_drvdata(struct pnp_card_link *pcard)
 {
         return pcard->driver_data;
 }
 
-static inline void pnp_set_card_drvdata (struct pnp_card_link *pcard, void *data)
+static inline void pnp_set_card_drvdata(struct pnp_card_link *pcard, void *data)
 {
         pcard->driver_data = data;
 }
@@ -186,22 +183,22 @@ struct pnp_dev {
         struct list_head card_list;     /* node in card's list of devices */
         struct list_head rdev_list;     /* node in cards list of requested devices */
 
-        struct pnp_protocol * protocol;
-        struct pnp_card * card;         /* card the device is attached to, none if NULL */
-        struct pnp_driver * driver;
-        struct pnp_card_link * card_link;
+        struct pnp_protocol *protocol;
+        struct pnp_card *card;  /* card the device is attached to, none if NULL */
+        struct pnp_driver *driver;
+        struct pnp_card_link *card_link;
 
-        struct pnp_id   * id;   /* supported EISA IDs*/
+        struct pnp_id *id;              /* supported EISA IDs */
 
         int active;
         int capabilities;
-        struct pnp_option * independent;
-        struct pnp_option * dependent;
+        struct pnp_option *independent;
+        struct pnp_option *dependent;
         struct pnp_resource_table res;
 
         char name[PNP_NAME_LEN];        /* contains a human-readable name */
-        unsigned short  regs;           /* ISAPnP: supported registers */
-        int             flags;          /* used by protocols */
+        unsigned short regs;            /* ISAPnP: supported registers */
+        int flags;                      /* used by protocols */
         struct proc_dir_entry *procent; /* device entry in /proc/bus/isapnp */
         void *data;
 };
@@ -220,19 +217,19 @@ struct pnp_dev {
         (dev) = card_to_pnp_dev((dev)->card_list.next))
 #define pnp_dev_name(dev) (dev)->name
 
-static inline void *pnp_get_drvdata (struct pnp_dev *pdev)
+static inline void *pnp_get_drvdata(struct pnp_dev *pdev)
 {
         return dev_get_drvdata(&pdev->dev);
 }
 
-static inline void pnp_set_drvdata (struct pnp_dev *pdev, void *data)
+static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
 {
         dev_set_drvdata(&pdev->dev, data);
 }
 
 struct pnp_fixup {
         char id[7];
-        void (*quirk_function)(struct pnp_dev *dev);    /* fixup function */
+        void (*quirk_function) (struct pnp_dev * dev);  /* fixup function */
 };
 
 /* config parameters */
@@ -269,7 +266,6 @@ extern struct pnp_protocol pnpbios_protocol;
 #define pnp_device_is_pnpbios(dev) 0
 #endif
 
-
 /* status */
 #define PNP_READY               0x0000
 #define PNP_ATTACHED            0x0001
@@ -287,17 +283,17 @@ extern struct pnp_protocol pnpbios_protocol;
 
 struct pnp_id {
         char id[PNP_ID_LEN];
-        struct pnp_id * next;
+        struct pnp_id *next;
 };
 
 struct pnp_driver {
-        char * name;
+        char *name;
         const struct pnp_device_id *id_table;
         unsigned int flags;
-        int  (*probe)  (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
+        int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
         void (*remove) (struct pnp_dev *dev);
-        int  (*suspend) (struct pnp_dev *dev, pm_message_t state);
-        int  (*resume) (struct pnp_dev *dev);
+        int (*suspend) (struct pnp_dev *dev, pm_message_t state);
+        int (*resume) (struct pnp_dev *dev);
         struct device_driver driver;
 };
 
@@ -305,13 +301,14 @@ struct pnp_driver {
 
 struct pnp_card_driver {
         struct list_head global_list;
-        char * name;
+        char *name;
         const struct pnp_card_device_id *id_table;
         unsigned int flags;
-        int  (*probe)  (struct pnp_card_link *card, const struct pnp_card_device_id *card_id);
+        int (*probe) (struct pnp_card_link *card,
+                      const struct pnp_card_device_id *card_id);
         void (*remove) (struct pnp_card_link *card);
-        int  (*suspend) (struct pnp_card_link *card, pm_message_t state);
-        int  (*resume) (struct pnp_card_link *card);
+        int (*suspend) (struct pnp_card_link *card, pm_message_t state);
+        int (*resume) (struct pnp_card_link *card);
         struct pnp_driver link;
 };
 
@@ -321,25 +318,28 @@ struct pnp_card_driver {
 #define PNP_DRIVER_RES_DO_NOT_CHANGE    0x0001  /* do not change the state of the device */
 #define PNP_DRIVER_RES_DISABLE          0x0003  /* ensure the device is disabled */
 
-
 /*
  * Protocol Management
  */
 
 struct pnp_protocol {
-        struct list_head        protocol_list;
-        char                  * name;
+        struct list_head protocol_list;
+        char *name;
 
         /* resource control functions */
-        int (*get)(struct pnp_dev *dev, struct pnp_resource_table *res);
-        int (*set)(struct pnp_dev *dev, struct pnp_resource_table *res);
-        int (*disable)(struct pnp_dev *dev);
+        int (*get) (struct pnp_dev *dev, struct pnp_resource_table *res);
+        int (*set) (struct pnp_dev *dev, struct pnp_resource_table *res);
+        int (*disable) (struct pnp_dev *dev);
+
+        /* protocol specific suspend/resume */
+        int (*suspend) (struct pnp_dev * dev, pm_message_t state);
+        int (*resume) (struct pnp_dev * dev);
 
         /* used by pnp layer only (look but don't touch) */
-        unsigned char           number;         /* protocol number*/
-        struct device           dev;            /* link to driver model */
-        struct list_head        cards;
-        struct list_head        devices;
+        unsigned char number;   /* protocol number */
+        struct device dev;      /* link to driver model */
+        struct list_head cards;
+        struct list_head devices;
 };
 
 #define to_pnp_protocol(n) list_entry(n, struct pnp_protocol, protocol_list)
@@ -352,7 +352,6 @@ struct pnp_protocol {
         (dev) != protocol_to_pnp_dev(&(protocol)->devices); \
         (dev) = protocol_to_pnp_dev((dev)->protocol_list.next))
 
-
 extern struct bus_type pnp_bus_type;
 
 #if defined(CONFIG_PNP)
@@ -372,21 +371,25 @@ void pnp_remove_card(struct pnp_card *card);
 int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
 void pnp_remove_card_device(struct pnp_dev *dev);
 int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card);
-struct pnp_dev * pnp_request_card_device(struct pnp_card_link *clink, const char * id, struct pnp_dev * from);
-void pnp_release_card_device(struct pnp_dev * dev);
-int pnp_register_card_driver(struct pnp_card_driver * drv);
-void pnp_unregister_card_driver(struct pnp_card_driver * drv);
+struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
+                                        const char *id, struct pnp_dev *from);
+void pnp_release_card_device(struct pnp_dev *dev);
+int pnp_register_card_driver(struct pnp_card_driver *drv);
+void pnp_unregister_card_driver(struct pnp_card_driver *drv);
 extern struct list_head pnp_cards;
 
 /* resource management */
-struct pnp_option * pnp_register_independent_option(struct pnp_dev *dev);
-struct pnp_option * pnp_register_dependent_option(struct pnp_dev *dev, int priority);
+struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
+struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
+                                                 int priority);
 int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data);
 int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data);
-int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data);
+int pnp_register_port_resource(struct pnp_option *option,
+                               struct pnp_port *data);
 int pnp_register_mem_resource(struct pnp_option *option, struct pnp_mem *data);
 void pnp_init_resource_table(struct pnp_resource_table *table);
-int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res, int mode);
+int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
+                          int mode);
 int pnp_auto_config_dev(struct pnp_dev *dev);
 int pnp_validate_config(struct pnp_dev *dev);
 int pnp_start_dev(struct pnp_dev *dev);
@@ -394,11 +397,11 @@ int pnp_stop_dev(struct pnp_dev *dev);
 int pnp_activate_dev(struct pnp_dev *dev);
 int pnp_disable_dev(struct pnp_dev *dev);
 void pnp_resource_change(struct resource *resource, resource_size_t start,
-                                resource_size_t size);
+                         resource_size_t size);
 
 /* protocol helpers */
-int pnp_is_active(struct pnp_dev * dev);
-int compare_pnp_id(struct pnp_id * pos, const char * id);
+int pnp_is_active(struct pnp_dev *dev);
+int compare_pnp_id(struct pnp_id *pos, const char *id);
 int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev);
 int pnp_register_driver(struct pnp_driver *drv);
 void pnp_unregister_driver(struct pnp_driver *drv);
@@ -411,23 +414,24 @@ static inline void pnp_unregister_protocol(struct pnp_protocol *protocol) { }
 static inline int pnp_init_device(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_add_device(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_device_attach(struct pnp_dev *pnp_dev) { return -ENODEV; }
-static inline void pnp_device_detach(struct pnp_dev *pnp_dev) { ; }
+static inline void pnp_device_detach(struct pnp_dev *pnp_dev) { }
+
 #define pnp_platform_devices 0
 
 /* multidevice card support */
 static inline int pnp_add_card(struct pnp_card *card) { return -ENODEV; }
-static inline void pnp_remove_card(struct pnp_card *card) { ; }
+static inline void pnp_remove_card(struct pnp_card *card) { }
 static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; }
-static inline void pnp_remove_card_device(struct pnp_dev *dev) { ; }
+static inline void pnp_remove_card_device(struct pnp_dev *dev) { }
 static inline int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) { return -ENODEV; }
-static inline struct pnp_dev * pnp_request_card_device(struct pnp_card_link *clink, const char * id, struct pnp_dev * from) { return NULL; }
-static inline void pnp_release_card_device(struct pnp_dev * dev) { ; }
-static inline int pnp_register_card_driver(struct pnp_card_driver * drv) { return -ENODEV; }
-static inline void pnp_unregister_card_driver(struct pnp_card_driver * drv) { ; }
+static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; }
+static inline void pnp_release_card_device(struct pnp_dev *dev) { }
+static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; }
+static inline void pnp_unregister_card_driver(struct pnp_card_driver *drv) { }
 
 /* resource management */
-static inline struct pnp_option * pnp_register_independent_option(struct pnp_dev *dev) { return NULL; }
-static inline struct pnp_option * pnp_register_dependent_option(struct pnp_dev *dev, int priority) { return NULL; }
+static inline struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev) { return NULL; }
+static inline struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev, int priority) { return NULL; }
 static inline int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data) { return -ENODEV; }
 static inline int pnp_register_dma_resource(struct pnp_option *option, struct pnp_dma *data) { return -ENODEV; }
 static inline int pnp_register_port_resource(struct pnp_option *option, struct pnp_port *data) { return -ENODEV; }
@@ -440,20 +444,17 @@ static inline int pnp_start_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_stop_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_disable_dev(struct pnp_dev *dev) { return -ENODEV; }
-static inline void pnp_resource_change(struct resource *resource,
-                                        resource_size_t start,
-                                        resource_size_t size) { }
+static inline void pnp_resource_change(struct resource *resource, resource_size_t start, resource_size_t size) { }
 
 /* protocol helpers */
-static inline int pnp_is_active(struct pnp_dev * dev) { return 0; }
-static inline int compare_pnp_id(struct pnp_id * pos, const char * id) { return -ENODEV; }
+static inline int pnp_is_active(struct pnp_dev *dev) { return 0; }
+static inline int compare_pnp_id(struct pnp_id *pos, const char *id) { return -ENODEV; }
 static inline int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) { return -ENODEV; }
 static inline int pnp_register_driver(struct pnp_driver *drv) { return -ENODEV; }
-static inline void pnp_unregister_driver(struct pnp_driver *drv) { ; }
+static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
 
 #endif /* CONFIG_PNP */
 
-
 #define pnp_err(format, arg...) printk(KERN_ERR "pnp: " format "\n" , ## arg)
 #define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg)
 #define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg)
diff --git a/include/linux/pnpbios.h b/include/linux/pnpbios.h
index 0a282ac1f6b2..329192adc9dd 100644
--- a/include/linux/pnpbios.h
+++ b/include/linux/pnpbios.h
@@ -99,32 +99,32 @@
 
 #pragma pack(1)
 struct pnp_dev_node_info {
-        __u16   no_nodes;
-        __u16   max_node_size;
+        __u16 no_nodes;
+        __u16 max_node_size;
 };
 struct pnp_docking_station_info {
-        __u32   location_id;
-        __u32   serial;
-        __u16   capabilities;
+        __u32 location_id;
+        __u32 serial;
+        __u16 capabilities;
 };
 struct pnp_isa_config_struc {
-        __u8    revision;
-        __u8    no_csns;
-        __u16   isa_rd_data_port;
-        __u16   reserved;
+        __u8 revision;
+        __u8 no_csns;
+        __u16 isa_rd_data_port;
+        __u16 reserved;
 };
 struct escd_info_struc {
-        __u16   min_escd_write_size;
-        __u16   escd_size;
-        __u32   nv_storage_base;
+        __u16 min_escd_write_size;
+        __u16 escd_size;
+        __u32 nv_storage_base;
 };
 struct pnp_bios_node {
-        __u16   size;
-        __u8    handle;
-        __u32   eisa_id;
-        __u8    type_code[3];
-        __u16   flags;
-        __u8    data[0];
+        __u16 size;
+        __u8 handle;
+        __u32 eisa_id;
+        __u8 type_code[3];
+        __u16 flags;
+        __u8 data[0];
 };
 #pragma pack()
 
@@ -133,22 +133,16 @@ struct pnp_bios_node {
 /* non-exported */
 extern struct pnp_dev_node_info node_info;
 
-extern int pnp_bios_dev_node_info (struct pnp_dev_node_info *data);
-extern int pnp_bios_get_dev_node (u8 *nodenum, char config, struct pnp_bios_node *data);
-extern int pnp_bios_set_dev_node (u8 nodenum, char config, struct pnp_bios_node *data);
-extern int pnp_bios_get_stat_res (char *info);
-extern int pnp_bios_isapnp_config (struct pnp_isa_config_struc *data);
-extern int pnp_bios_escd_info (struct escd_info_struc *data);
-extern int pnp_bios_read_escd (char *data, u32 nvram_base);
+extern int pnp_bios_dev_node_info(struct pnp_dev_node_info *data);
+extern int pnp_bios_get_dev_node(u8 *nodenum, char config,
+                                 struct pnp_bios_node *data);
+extern int pnp_bios_set_dev_node(u8 nodenum, char config,
+                                 struct pnp_bios_node *data);
+extern int pnp_bios_get_stat_res(char *info);
+extern int pnp_bios_isapnp_config(struct pnp_isa_config_struc *data);
+extern int pnp_bios_escd_info(struct escd_info_struc *data);
+extern int pnp_bios_read_escd(char *data, u32 nvram_base);
 extern int pnp_bios_dock_station_info(struct pnp_docking_station_info *data);
-#define needed 0
-#if needed
-extern int pnp_bios_get_event (u16 *message);
-extern int pnp_bios_send_message (u16 message);
-extern int pnp_bios_set_stat_res (char *info);
-extern int pnp_bios_apm_id_table (char *table, u16 *size);
-extern int pnp_bios_write_escd (char *data, u32 nvram_base);
-#endif
 
 #endif /* CONFIG_PNPBIOS */
 
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 27690798623f..16d813b364ef 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -21,6 +21,8 @@
 #define WQUEUES_STACK_ALLOC     (MAX_STACK_ALLOC - FRONTEND_STACK_ALLOC)
 #define N_INLINE_POLL_ENTRIES   (WQUEUES_STACK_ALLOC / sizeof(struct poll_table_entry))
 
+#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
+
 struct poll_table_struct;
 
 /* 
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index d0926d63406c..484988ed301e 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -8,6 +8,7 @@
 
 #include <linux/thread_info.h>
 #include <linux/linkage.h>
+#include <linux/list.h>
 
 #ifdef CONFIG_DEBUG_PREEMPT
   extern void fastcall add_preempt_count(int val);
@@ -60,4 +61,47 @@ do { \
 
 #endif
 
+#ifdef CONFIG_PREEMPT_NOTIFIERS
+
+struct preempt_notifier;
+
+/**
+ * preempt_ops - notifiers called when a task is preempted and rescheduled
+ * @sched_in: we're about to be rescheduled:
+ *    notifier: struct preempt_notifier for the task being scheduled
+ *    cpu:  cpu we're scheduled on
+ * @sched_out: we've just been preempted
+ *    notifier: struct preempt_notifier for the task being preempted
+ *    next: the task that's kicking us out
+ */
+struct preempt_ops {
+        void (*sched_in)(struct preempt_notifier *notifier, int cpu);
+        void (*sched_out)(struct preempt_notifier *notifier,
+                          struct task_struct *next);
+};
+
+/**
+ * preempt_notifier - key for installing preemption notifiers
+ * @link: internal use
+ * @ops: defines the notifier functions to be called
+ *
+ * Usually used in conjunction with container_of().
+ */
+struct preempt_notifier {
+        struct hlist_node link;
+        struct preempt_ops *ops;
+};
+
+void preempt_notifier_register(struct preempt_notifier *notifier);
+void preempt_notifier_unregister(struct preempt_notifier *notifier);
+
+static inline void preempt_notifier_init(struct preempt_notifier *notifier,
+                                     struct preempt_ops *ops)
+{
+        INIT_HLIST_NODE(&notifier->link);
+        notifier->ops = ops;
+}
+
+#endif
+
 #endif /* __LINUX_PREEMPT_H */
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 28e3664fdf1b..20741f668f7b 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -7,6 +7,7 @@
 #include <linux/magic.h>
 #include <asm/atomic.h>
 
+struct net;
 struct completion;
 
 /*
@@ -75,7 +76,6 @@ struct proc_dir_entry {
         write_proc_t *write_proc;
         atomic_t count;         /* use count */
         int deleted;            /* delete flag */
-        void *set;
         int pde_users;  /* number of callers into module in progress */
         spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
         struct completion *pde_unload_completion;
@@ -98,8 +98,6 @@ struct vmcore {
 
 extern struct proc_dir_entry proc_root;
 extern struct proc_dir_entry *proc_root_fs;
-extern struct proc_dir_entry *proc_net;
-extern struct proc_dir_entry *proc_net_stat;
 extern struct proc_dir_entry *proc_bus;
 extern struct proc_dir_entry *proc_root_driver;
 extern struct proc_dir_entry *proc_root_kcore;
@@ -193,36 +191,21 @@ static inline struct proc_dir_entry *create_proc_info_entry(const char *name,
         if (res) res->get_info=get_info;
         return res;
 }
- 
-static inline struct proc_dir_entry *proc_net_create(const char *name,
-        mode_t mode, get_info_t *get_info)
-{
-        return create_proc_info_entry(name,mode,proc_net,get_info);
-}
 
-static inline struct proc_dir_entry *proc_net_fops_create(const char *name,
-        mode_t mode, const struct file_operations *fops)
-{
-        struct proc_dir_entry *res = create_proc_entry(name, mode, proc_net);
-        if (res)
-                res->proc_fops = fops;
-        return res;
-}
-
-static inline void proc_net_remove(const char *name)
-{
-        remove_proc_entry(name,proc_net);
-}
+extern struct proc_dir_entry *proc_net_create(struct net *net,
+        const char *name, mode_t mode, get_info_t *get_info);
+extern struct proc_dir_entry *proc_net_fops_create(struct net *net,
+        const char *name, mode_t mode, const struct file_operations *fops);
+extern void proc_net_remove(struct net *net, const char *name);
 
 #else
 
 #define proc_root_driver NULL
-#define proc_net NULL
 #define proc_bus NULL
 
-#define proc_net_fops_create(name, mode, fops)  ({ (void)(mode), NULL; })
-#define proc_net_create(name, mode, info)       ({ (void)(mode), NULL; })
-static inline void proc_net_remove(const char *name) {}
+#define proc_net_fops_create(net, name, mode, fops)  ({ (void)(mode), NULL; })
+#define proc_net_create(net, name, mode, info)  ({ (void)(mode), NULL; })
+static inline void proc_net_remove(struct net *net, const char *name) {}
 
 static inline void proc_flush_task(struct task_struct *task) { }
 
@@ -282,6 +265,13 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
         return PROC_I(inode)->pde;
 }
 
+static inline struct net *PDE_NET(struct proc_dir_entry *pde)
+{
+        return pde->parent->data;
+}
+
+struct net *get_proc_net(const struct inode *inode);
+
 struct proc_maps_private {
         struct pid *pid;
         struct task_struct *task;
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 28ac632b42dd..dcb729244f47 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -227,7 +227,7 @@ struct mddev_s
         unsigned int                    safemode_delay;
         struct timer_list               safemode_timer;
         atomic_t                        writes_pending; 
-        request_queue_t                 *queue; /* for plugging ... */
+        struct request_queue            *queue; /* for plugging ... */
 
         atomic_t                        write_behind; /* outstanding async IO */
         unsigned int                    max_write_behind; /* 0 = sync */
@@ -265,7 +265,7 @@ struct mdk_personality
         int level;
         struct list_head list;
         struct module *owner;
-        int (*make_request)(request_queue_t *q, struct bio *bio);
+        int (*make_request)(struct request_queue *q, struct bio *bio);
         int (*run)(mddev_t *mddev);
         int (*stop)(mddev_t *mddev);
         void (*status)(struct seq_file *seq, mddev_t *mddev);
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index c6b7485eac7c..fe17d7d750c2 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -281,7 +281,6 @@ extern void FASTCALL(call_rcu(struct rcu_head *head,
 extern void FASTCALL(call_rcu_bh(struct rcu_head *head,
                                 void (*func)(struct rcu_head *head)));
 extern void synchronize_rcu(void);
-void synchronize_idle(void);
 extern void rcu_barrier(void);
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 1dd1c707311f..85ea63f462af 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -67,6 +67,11 @@ extern void kernel_power_off(void);
 
 void ctrl_alt_del(void);
 
+#define POWEROFF_CMD_PATH_LEN   256
+extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
+
+extern int orderly_poweroff(bool force);
+
 /*
  * Emergency restart, callable from an interrupt handler.
  */
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 965d5b3ea9eb..180a9d832dde 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -81,14 +81,16 @@ void reiserfs_warning(struct super_block *s, const char *fmt, ...);
 /* assertions handling */
 
 /** always check a condition and panic if it's false. */
-#define RASSERT( cond, format, args... )                                        \
+#define __RASSERT( cond, scond, format, args... )                                       \
 if( !( cond ) )                                                                 \
-  reiserfs_panic( NULL, "reiserfs[%i]: assertion " #cond " failed at "  \
+  reiserfs_panic( NULL, "reiserfs[%i]: assertion " scond " failed at "  \
                   __FILE__ ":%i:%s: " format "\n",              \
                   in_interrupt() ? -1 : current -> pid, __LINE__ , __FUNCTION__ , ##args )
 
+#define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args)
+
 #if defined( CONFIG_REISERFS_CHECK )
-#define RFALSE( cond, format, args... ) RASSERT( !( cond ), format, ##args )
+#define RFALSE(cond, format, args...) __RASSERT(!(cond), "!(" #cond ")", format, ##args)
 #else
 #define RFALSE( cond, format, args... ) do {;} while( 0 )
 #endif
diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h
index 81e9299ca148..f3f4f28c6960 100644
--- a/include/linux/resume-trace.h
+++ b/include/linux/resume-trace.h
@@ -2,6 +2,7 @@
 #define RESUME_TRACE_H
 
 #ifdef CONFIG_PM_TRACE
+#include <asm/resume-trace.h>
 
 extern int pm_trace_enabled;
 
@@ -9,20 +10,10 @@ struct device;
 extern void set_trace_device(struct device *);
 extern void generate_resume_trace(void *tracedata, unsigned int user);
 
-#define TRACE_DEVICE(dev) set_trace_device(dev)
-#define TRACE_RESUME(user) do {                                 \
-        if (pm_trace_enabled) {                                 \
-                void *tracedata;                                \
-                asm volatile("movl $1f,%0\n"                    \
-                        ".section .tracedata,\"a\"\n"           \
-                        "1:\t.word %c1\n"                       \
-                        "\t.long %c2\n"                         \
-                        ".previous"                             \
-                        :"=r" (tracedata)                       \
-                        : "i" (__LINE__), "i" (__FILE__));      \
-                generate_resume_trace(tracedata, user);         \
-        }                                                       \
-} while (0)
+#define TRACE_DEVICE(dev) do { \
+        if (pm_trace_enabled) \
+                set_trace_device(dev); \
+        } while(0)
 
 #else
 
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index a8a6ea809da0..0ce5e0b52dbd 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -2,7 +2,7 @@
 #define __RFKILL_H
 
 /*
- * Copyright (C) 2006 Ivo van Doorn
+ * Copyright (C) 2006 - 2007 Ivo van Doorn
  * Copyright (C) 2007 Dmitry Torokhov
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,18 +26,19 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/leds.h>
 
 /**
  * enum rfkill_type - type of rfkill switch.
- * RFKILL_TYPE_WLAN: switch is no a Wireless network devices.
- * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device.
- * RFKILL_TYPE_IRDA: switch is on an infrared devices.
+ * RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
+ * RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
+ * RFKILL_TYPE_UWB: switch is on a ultra wideband device.
  */
 enum rfkill_type {
-        RFKILL_TYPE_WLAN = 0,
-        RFKILL_TYPE_BLUETOOTH = 1,
-        RFKILL_TYPE_IRDA = 2,
-        RFKILL_TYPE_MAX = 3,
+        RFKILL_TYPE_WLAN ,
+        RFKILL_TYPE_BLUETOOTH,
+        RFKILL_TYPE_UWB,
+        RFKILL_TYPE_MAX,
 };
 
 enum rfkill_state {
@@ -51,11 +52,14 @@ enum rfkill_state {
  * @type: Radio type which the button controls, the value stored
  *      here should be a value from enum rfkill_type.
  * @state: State of the switch (on/off).
+ * @user_claim_unsupported: Whether the hardware supports exclusive
+ *      RF-kill control by userspace. Set this before registering.
  * @user_claim: Set when the switch is controlled exlusively by userspace.
  * @mutex: Guards switch state transitions
  * @data: Pointer to the RF button drivers private data which will be
  *      passed along when toggling radio state.
  * @toggle_radio(): Mandatory handler to control state of the radio.
+ * @led_trigger: A LED trigger for this button's LED.
  * @dev: Device structure integrating the switch into device tree.
  * @node: Used to place switch into list of all switches known to the
  *      the system.
@@ -67,6 +71,7 @@ struct rfkill {
         enum rfkill_type type;
 
         enum rfkill_state state;
+        bool user_claim_unsupported;
         bool user_claim;
 
         struct mutex mutex;
@@ -74,6 +79,10 @@ struct rfkill {
         void *data;
         int (*toggle_radio)(void *data, enum rfkill_state state);
 
+#ifdef CONFIG_RFKILL_LEDS
+        struct led_trigger led_trigger;
+#endif
+
         struct device dev;
         struct list_head node;
 };
@@ -84,6 +93,19 @@ void rfkill_free(struct rfkill *rfkill);
 int rfkill_register(struct rfkill *rfkill);
 void rfkill_unregister(struct rfkill *rfkill);
 
-void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state);
+/**
+ * rfkill_get_led_name - Get the LED trigger name for the button's LED.
+ * This function might return a NULL pointer if registering of the
+ * LED trigger failed.
+ * Use this as "default_trigger" for the LED.
+ */
+static inline char *rfkill_get_led_name(struct rfkill *rfkill)
+{
+#ifdef CONFIG_RFKILL_LEDS
+        return (char *)(rfkill->led_trigger.name);
+#else
+        return NULL;
+#endif
+}
 
 #endif /* RFKILL_H */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index c91476ce314a..5bf618241ab9 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -97,6 +97,9 @@ enum {
         RTM_SETNEIGHTBL,
 #define RTM_SETNEIGHTBL RTM_SETNEIGHTBL
 
+        RTM_NEWNDUSEROPT = 68,
+#define RTM_NEWNDUSEROPT RTM_NEWNDUSEROPT
+
         __RTM_MAX,
 #define RTM_MAX         (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -351,6 +354,8 @@ enum
 #define RTAX_INITCWND RTAX_INITCWND
         RTAX_FEATURES,
 #define RTAX_FEATURES RTAX_FEATURES
+        RTAX_RTO_MIN,
+#define RTAX_RTO_MIN RTAX_RTO_MIN
         __RTAX_MAX
 };
 
@@ -477,6 +482,30 @@ enum
 #define TCA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcmsg))))
 #define TCA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcmsg))
 
+/********************************************************************
+ *              Neighbor Discovery userland options
+ ****/
+
+struct nduseroptmsg
+{
+        unsigned char   nduseropt_family;
+        unsigned char   nduseropt_pad1;
+        unsigned short  nduseropt_opts_len;     /* Total length of options */
+        __u8            nduseropt_icmp_type;
+        __u8            nduseropt_icmp_code;
+        unsigned short  nduseropt_pad2;
+        /* Followed by one or more ND options */
+};
+
+enum
+{
+        NDUSEROPT_UNSPEC,
+        NDUSEROPT_SRCADDR,
+        __NDUSEROPT_MAX
+};
+
+#define NDUSEROPT_MAX   (__NDUSEROPT_MAX - 1)
+
 #ifndef __KERNEL__
 /* RTnetlink multicast groups - backwards compatibility for userspace */
 #define RTMGRP_LINK             1
@@ -540,6 +569,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
         RTNLGRP_IPV6_RULE,
 #define RTNLGRP_IPV6_RULE       RTNLGRP_IPV6_RULE
+        RTNLGRP_ND_USEROPT,
+#define RTNLGRP_ND_USEROPT      RTNLGRP_ND_USEROPT
         __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 731edaca8ffd..833f7dc2b8de 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -27,6 +27,7 @@
 #define CLONE_NEWUTS            0x04000000      /* New utsname group? */
 #define CLONE_NEWIPC            0x08000000      /* New ipcs */
 #define CLONE_NEWUSER           0x10000000      /* New user namespace */
+#define CLONE_NEWNET            0x40000000      /* New network namespace */
 
 /*
  * Scheduling policies
@@ -113,7 +114,7 @@ extern unsigned long avenrun[];		/* Load averages */
 
 #define FSHIFT          11              /* nr of bits of precision */
 #define FIXED_1         (1<<FSHIFT)     /* 1.0 as fixed-point */
-#define LOAD_FREQ       (5*HZ)          /* 5 sec intervals */
+#define LOAD_FREQ       (5*HZ+1)        /* 5 sec intervals */
 #define EXP_1           1884            /* 1/exp(5sec/1min) as fixed-point */
 #define EXP_5           2014            /* 1/exp(5sec/5min) */
 #define EXP_15          2037            /* 1/exp(5sec/15min) */
@@ -139,7 +140,7 @@ struct cfs_rq;
 extern void proc_sched_show_task(struct task_struct *p, struct seq_file *m);
 extern void proc_sched_set_task(struct task_struct *p);
 extern void
-print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq, u64 now);
+print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq);
 #else
 static inline void
 proc_sched_show_task(struct task_struct *p, struct seq_file *m)
@@ -149,7 +150,7 @@ static inline void proc_sched_set_task(struct task_struct *p)
 {
 }
 static inline void
-print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq, u64 now)
+print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 {
 }
 #endif
@@ -345,6 +346,27 @@ typedef unsigned long mm_counter_t;
                 (mm)->hiwater_vm = (mm)->total_vm;      \
 } while (0)
 
+extern void set_dumpable(struct mm_struct *mm, int value);
+extern int get_dumpable(struct mm_struct *mm);
+
+/* mm flags */
+/* dumpable bits */
+#define MMF_DUMPABLE      0  /* core dump is permitted */
+#define MMF_DUMP_SECURELY 1  /* core file is readable only by root */
+#define MMF_DUMPABLE_BITS 2
+
+/* coredump filter bits */
+#define MMF_DUMP_ANON_PRIVATE   2
+#define MMF_DUMP_ANON_SHARED    3
+#define MMF_DUMP_MAPPED_PRIVATE 4
+#define MMF_DUMP_MAPPED_SHARED  5
+#define MMF_DUMP_FILTER_SHIFT   MMF_DUMPABLE_BITS
+#define MMF_DUMP_FILTER_BITS    4
+#define MMF_DUMP_FILTER_MASK \
+        (((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT)
+#define MMF_DUMP_FILTER_DEFAULT \
+        ((1 << MMF_DUMP_ANON_PRIVATE) | (1 << MMF_DUMP_ANON_SHARED))
+
 struct mm_struct {
         struct vm_area_struct * mmap;           /* list of VMAs */
         struct rb_root mm_rb;
@@ -402,7 +424,7 @@ struct mm_struct {
         unsigned int token_priority;
         unsigned int last_interval;
 
-        unsigned char dumpable:2;
+        unsigned long flags; /* Must use atomic bitops to access the bits */
 
         /* coredumping support */
         int core_waiters;
@@ -417,7 +439,7 @@ struct sighand_struct {
         atomic_t                count;
         struct k_sigaction      action[_NSIG];
         spinlock_t              siglock;
-        struct list_head        signalfd_list;
+        wait_queue_head_t       signalfd_wqh;
 };
 
 struct pacct_struct {
@@ -572,7 +594,7 @@ struct user_struct {
 #endif
 
         /* Hash table maintenance information */
-        struct list_head uidhash_list;
+        struct hlist_node uidhash_node;
         uid_t uid;
 };
 
@@ -660,7 +682,7 @@ enum cpu_idle_type {
 #define SCHED_LOAD_SHIFT        10
 #define SCHED_LOAD_SCALE        (1L << SCHED_LOAD_SHIFT)
 
-#define SCHED_LOAD_SCALE_FUZZ   (SCHED_LOAD_SCALE >> 5)
+#define SCHED_LOAD_SCALE_FUZZ   SCHED_LOAD_SCALE
 
 #ifdef CONFIG_SMP
 #define SD_LOAD_BALANCE         1       /* Do load balancing on this domain. */
@@ -713,7 +735,6 @@ struct sched_domain {
         unsigned long max_interval;     /* Maximum balance interval ms */
         unsigned int busy_factor;       /* less balancing by factor if busy */
         unsigned int imbalance_pct;     /* No balance until over watermark */
-        unsigned long long cache_hot_time; /* Task considered cache hot (ns) */
         unsigned int cache_nice_tries;  /* Leave cache hot tasks for # tries */
         unsigned int busy_idx;
         unsigned int idle_idx;
@@ -765,6 +786,22 @@ extern int partition_sched_domains(cpumask_t *partition1,
 
 #endif  /* CONFIG_SMP */
 
+/*
+ * A runqueue laden with a single nice 0 task scores a weighted_cpuload of
+ * SCHED_LOAD_SCALE. This function returns 1 if any cpu is laden with a
+ * task of nice 0 or enough lower priority tasks to bring up the
+ * weighted_cpuload
+ */
+static inline int above_background_load(void)
+{
+        unsigned long cpu;
+
+        for_each_online_cpu(cpu) {
+                if (weighted_cpuload(cpu) >= SCHED_LOAD_SCALE)
+                        return 1;
+        }
+        return 0;
+}
 
 struct io_context;                      /* See blkdev.h */
 struct cpuset;
@@ -819,22 +856,20 @@ struct sched_domain;
 struct sched_class {
         struct sched_class *next;
 
-        void (*enqueue_task) (struct rq *rq, struct task_struct *p,
-                              int wakeup, u64 now);
-        void (*dequeue_task) (struct rq *rq, struct task_struct *p,
-                              int sleep, u64 now);
+        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int wakeup);
+        void (*dequeue_task) (struct rq *rq, struct task_struct *p, int sleep);
         void (*yield_task) (struct rq *rq, struct task_struct *p);
 
         void (*check_preempt_curr) (struct rq *rq, struct task_struct *p);
 
-        struct task_struct * (*pick_next_task) (struct rq *rq, u64 now);
-        void (*put_prev_task) (struct rq *rq, struct task_struct *p, u64 now);
+        struct task_struct * (*pick_next_task) (struct rq *rq);
+        void (*put_prev_task) (struct rq *rq, struct task_struct *p);
 
-        int (*load_balance) (struct rq *this_rq, int this_cpu,
+        unsigned long (*load_balance) (struct rq *this_rq, int this_cpu,
                         struct rq *busiest,
                         unsigned long max_nr_move, unsigned long max_load_move,
                         struct sched_domain *sd, enum cpu_idle_type idle,
-                        int *all_pinned, unsigned long *total_load_moved);
+                        int *all_pinned, int *this_best_prio);
 
         void (*set_curr_task) (struct rq *rq);
         void (*task_tick) (struct rq *rq, struct task_struct *p);
@@ -868,23 +903,29 @@ struct sched_entity {
         struct rb_node          run_node;
         unsigned int            on_rq;
 
+        u64                     exec_start;
+        u64                     sum_exec_runtime;
+        u64                     prev_sum_exec_runtime;
         u64                     wait_start_fair;
+        u64                     sleep_start_fair;
+
+#ifdef CONFIG_SCHEDSTATS
         u64                     wait_start;
-        u64                     exec_start;
+        u64                     wait_max;
+        s64                     sum_wait_runtime;
+
         u64                     sleep_start;
-        u64                     sleep_start_fair;
-        u64                     block_start;
         u64                     sleep_max;
+        s64                     sum_sleep_runtime;
+
+        u64                     block_start;
         u64                     block_max;
         u64                     exec_max;
-        u64                     wait_max;
-        u64                     last_ran;
 
-        u64                     sum_exec_runtime;
-        s64                     sum_wait_runtime;
-        s64                     sum_sleep_runtime;
         unsigned long           wait_runtime_overruns;
         unsigned long           wait_runtime_underruns;
+#endif
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
         struct sched_entity     *parent;
         /* rq on which this entity is (to be) queued: */
@@ -914,6 +955,11 @@ struct task_struct {
         struct sched_class *sched_class;
         struct sched_entity se;
 
+#ifdef CONFIG_PREEMPT_NOTIFIERS
+        /* list of struct preempt_notifier: */
+        struct hlist_head preempt_notifiers;
+#endif
+
         unsigned short ioprio;
 #ifdef CONFIG_BLK_DEV_IO_TRACE
         unsigned int btrace_seq;
@@ -1327,6 +1373,13 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
 #endif
 
 extern unsigned long long sched_clock(void);
+
+/*
+ * For kernel-internal use: high-speed (but slightly incorrect) per-cpu
+ * clock constructed from sched_clock():
+ */
+extern unsigned long long cpu_clock(int cpu);
+
 extern unsigned long long
 task_sched_runtime(struct task_struct *task);
 
@@ -1337,7 +1390,8 @@ extern void sched_exec(void);
 #define sched_exec()   {}
 #endif
 
-extern void sched_clock_unstable_event(void);
+extern void sched_clock_idle_sleep_event(void);
+extern void sched_clock_idle_wakeup_event(u64 delta_ns);
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern void idle_task_exit(void);
@@ -1347,11 +1401,13 @@ static inline void idle_task_exit(void) {}
 
 extern void sched_idle_next(void);
 
-extern unsigned int sysctl_sched_granularity;
+extern unsigned int sysctl_sched_latency;
+extern unsigned int sysctl_sched_min_granularity;
 extern unsigned int sysctl_sched_wakeup_granularity;
 extern unsigned int sysctl_sched_batch_wakeup_granularity;
 extern unsigned int sysctl_sched_stat_granularity;
 extern unsigned int sysctl_sched_runtime_limit;
+extern unsigned int sysctl_sched_compat_yield;
 extern unsigned int sysctl_sched_child_runs_first;
 extern unsigned int sysctl_sched_features;
 
@@ -1418,6 +1474,7 @@ static inline struct user_struct *get_uid(struct user_struct *u)
 }
 extern void free_uid(struct user_struct *);
 extern void switch_uid(struct user_struct *);
+extern void release_uids(struct user_namespace *ns);
 
 #include <asm/current.h>
 
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index d70df61a029f..5eb38cc0e5a4 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -102,6 +102,9 @@ typedef enum {
         SCTP_CID_ECN_CWR                = 13,
         SCTP_CID_SHUTDOWN_COMPLETE      = 14,
 
+        /* AUTH Extension Section 4.1 */
+        SCTP_CID_AUTH                   = 0x0F,
+
         /* PR-SCTP Sec 3.2 */
         SCTP_CID_FWD_TSN                = 0xC0,
 
@@ -180,6 +183,14 @@ typedef enum {
         SCTP_PARAM_SUPPORTED_ADDRESS_TYPES      = __constant_htons(12),
         SCTP_PARAM_ECN_CAPABLE                  = __constant_htons(0x8000),
 
+        /* AUTH Extension Section 3 */
+        SCTP_PARAM_RANDOM                       = __constant_htons(0x8002),
+        SCTP_PARAM_CHUNKS                       = __constant_htons(0x8003),
+        SCTP_PARAM_HMAC_ALGO                    = __constant_htons(0x8004),
+
+        /* Add-IP: Supported Extensions, Section 4.2 */
+        SCTP_PARAM_SUPPORTED_EXT        = __constant_htons(0x8008),
+
         /* PR-SCTP Sec 3.1 */
         SCTP_PARAM_FWD_TSN_SUPPORT      = __constant_htons(0xc000),
 
@@ -296,6 +307,30 @@ typedef struct sctp_adaptation_ind_param {
         __be32 adaptation_ind;
 } __attribute__((packed)) sctp_adaptation_ind_param_t;
 
+/* ADDIP Section 4.2.7 Supported Extensions Parameter */
+typedef struct sctp_supported_ext_param {
+        struct sctp_paramhdr param_hdr;
+        __u8 chunks[0];
+} __attribute__((packed)) sctp_supported_ext_param_t;
+
+/* AUTH Section 3.1 Random */
+typedef struct sctp_random_param {
+        sctp_paramhdr_t param_hdr;
+        __u8 random_val[0];
+} __attribute__((packed)) sctp_random_param_t;
+
+/* AUTH Section 3.2 Chunk List */
+typedef struct sctp_chunks_param {
+        sctp_paramhdr_t param_hdr;
+        __u8 chunks[0];
+} __attribute__((packed)) sctp_chunks_param_t;
+
+/* AUTH Section 3.3 HMAC Algorithm */
+typedef struct sctp_hmac_algo_param {
+        sctp_paramhdr_t param_hdr;
+        __be16 hmac_ids[0];
+} __attribute__((packed)) sctp_hmac_algo_param_t;
+
 /* RFC 2960.  Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
  *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP
  *   association.
@@ -462,7 +497,19 @@ typedef enum {
         SCTP_ERROR_RSRC_LOW     = __constant_htons(0x0101),
         SCTP_ERROR_DEL_SRC_IP   = __constant_htons(0x0102),
         SCTP_ERROR_ASCONF_ACK   = __constant_htons(0x0103),
-        SCTP_ERROR_REQ_REFUSED  = __constant_htons(0x0104)
+        SCTP_ERROR_REQ_REFUSED  = __constant_htons(0x0104),
+
+        /* AUTH Section 4.  New Error Cause
+         *
+         * This section defines a new error cause that will be sent if an AUTH
+         * chunk is received with an unsupported HMAC identifier.
+         * illustrates the new error cause.
+         *
+         * Cause Code      Error Cause Name
+         * --------------------------------------------------------------
+         * 0x0105          Unsupported HMAC Identifier
+         */
+         SCTP_ERROR_UNSUP_HMAC  = __constant_htons(0x0105)
 } sctp_error_t;
 
 
@@ -600,4 +647,64 @@ typedef struct sctp_addip_chunk {
         sctp_addiphdr_t addip_hdr;
 } __attribute__((packed)) sctp_addip_chunk_t;
 
+/* AUTH
+ * Section 4.1  Authentication Chunk (AUTH)
+ *
+ *   This chunk is used to hold the result of the HMAC calculation.
+ *
+ *    0                   1                   2                   3
+ *    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   | Type = 0x0F   |   Flags=0     |             Length            |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |     Shared Key Identifier     |   HMAC Identifier             |
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *   |                                                               |
+ *   \                             HMAC                              /
+ *   /                                                               \
+ *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *
+ *   Type: 1 byte (unsigned integer)
+ *      This value MUST be set to 0x0F for  all AUTH-chunks.
+ *
+ *   Flags: 1 byte (unsigned integer)
+ *      Set to zero on transmit and ignored on receipt.
+ *
+ *   Length: 2 bytes (unsigned integer)
+ *      This value holds the length of the HMAC in bytes plus 8.
+ *
+ *  Shared Key Identifier: 2 bytes (unsigned integer)
+ *      This value describes which endpoint pair shared key is used.
+ *
+ *   HMAC Identifier: 2 bytes (unsigned integer)
+ *      This value describes which message digest is being used.  Table 2
+ *      shows the currently defined values.
+ *
+ *    The following Table 2 shows the currently defined values for HMAC
+ *       identifiers.
+ *
+ *       +-----------------+--------------------------+
+ *       | HMAC Identifier | Message Digest Algorithm |
+ *       +-----------------+--------------------------+
+ *       | 0               | Reserved                 |
+ *       | 1               | SHA-1 defined in [8]     |
+ *       | 2               | Reserved                 |
+ *       | 3               | SHA-256 defined in [8]   |
+ *       +-----------------+--------------------------+
+ *
+ *
+ *   HMAC: n bytes (unsigned integer) This hold the result of the HMAC
+ *      calculation.
+ */
+typedef struct sctp_authhdr {
+        __be16 shkey_id;
+        __be16 hmac_id;
+        __u8   hmac[0];
+} __attribute__((packed)) sctp_authhdr_t;
+
+typedef struct sctp_auth_chunk {
+        sctp_chunkhdr_t chunk_hdr;
+        sctp_authhdr_t auth_hdr;
+} __attribute__((packed)) sctp_auth_chunk_t;
+
 #endif /* __LINUX_SCTP_H__ */
diff --git a/include/linux/security.h b/include/linux/security.h
index c11dc8aa0351..1a15526e9f67 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -54,7 +54,7 @@ extern int cap_inode_removexattr(struct dentry *dentry, char *name);
 extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
 extern void cap_task_reparent_to_init (struct task_struct *p);
 extern int cap_syslog (int type);
-extern int cap_vm_enough_memory (long pages);
+extern int cap_vm_enough_memory (struct mm_struct *mm, long pages);
 
 struct msghdr;
 struct sk_buff;
@@ -1125,6 +1125,7 @@ struct request_sock;
  *      Return 0 if permission is granted.
  * @vm_enough_memory:
  *      Check permissions for allocating a new virtual mapping.
+ *      @mm contains the mm struct it is being added to.
  *      @pages contains the number of pages.
  *      Return 0 if permission is granted.
  *
@@ -1169,7 +1170,7 @@ struct security_operations {
         int (*quota_on) (struct dentry * dentry);
         int (*syslog) (int type);
         int (*settime) (struct timespec *ts, struct timezone *tz);
-        int (*vm_enough_memory) (long pages);
+        int (*vm_enough_memory) (struct mm_struct *mm, long pages);
 
         int (*bprm_alloc_security) (struct linux_binprm * bprm);
         void (*bprm_free_security) (struct linux_binprm * bprm);
@@ -1469,10 +1470,14 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz)
         return security_ops->settime(ts, tz);
 }
 
-
 static inline int security_vm_enough_memory(long pages)
 {
-        return security_ops->vm_enough_memory(pages);
+        return security_ops->vm_enough_memory(current->mm, pages);
+}
+
+static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
+{
+        return security_ops->vm_enough_memory(mm, pages);
 }
 
 static inline int security_bprm_alloc (struct linux_binprm *bprm)
@@ -2219,7 +2224,12 @@ static inline int security_settime(struct timespec *ts, struct timezone *tz)
 
 static inline int security_vm_enough_memory(long pages)
 {
-        return cap_vm_enough_memory(pages);
+        return cap_vm_enough_memory(current->mm, pages);
+}
+
+static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
+{
+        return cap_vm_enough_memory(mm, pages);
 }
 
 static inline int security_bprm_alloc (struct linux_binprm *bprm)
diff --git a/include/linux/selection.h b/include/linux/selection.h
index ed3408b400f1..f9457861937c 100644
--- a/include/linux/selection.h
+++ b/include/linux/selection.h
@@ -10,6 +10,8 @@
 #include <linux/tiocl.h>
 #include <linux/vt_buffer.h>
 
+struct tty_struct;
+
 extern struct vc_data *sel_cons;
 
 extern void clear_selection(void);
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 83783ab0f552..8bf1e05115b4 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -46,6 +46,8 @@ int seq_path(struct seq_file *, struct vfsmount *, struct dentry *, char *);
 
 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
 int single_release(struct inode *, struct file *);
+void *__seq_open_private(struct file *, const struct seq_operations *, int);
+int seq_open_private(struct file *, const struct seq_operations *, int);
 int seq_release_private(struct inode *, struct file *);
 
 #define SEQ_START_TOKEN ((void *)1)
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 706ee9a4c80c..afe0f6d9b9bc 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -20,7 +20,7 @@
 struct plat_serial8250_port {
         unsigned long   iobase;         /* io base address */
         void __iomem    *membase;       /* ioremap cookie or NULL */
-        unsigned long   mapbase;        /* resource base */
+        resource_size_t mapbase;        /* resource base */
         unsigned int    irq;            /* interrupt number */
         unsigned int    uartclk;        /* UART clock rate */
         unsigned char   regshift;       /* register shift */
@@ -60,6 +60,8 @@ void serial8250_unregister_port(int line);
 void serial8250_suspend_port(int line);
 void serial8250_resume_port(int line);
 
+extern int early_serial_setup(struct uart_port *port);
+
 extern int serial8250_find_port(struct uart_port *p);
 extern int serial8250_find_port_for_earlycon(void);
 extern int setup_early_serial8250_console(char *cmdline);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 9c721cd2c9d6..09d17b06bf02 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -62,8 +62,9 @@
 /* NEC v850.  */
 #define PORT_V850E_UART 40
 
-/* DZ */
-#define PORT_DZ         47
+/* DEC */
+#define PORT_DZ         46
+#define PORT_ZS         47
 
 /* Parisc type numbers. */
 #define PORT_MUX        48
@@ -287,7 +288,7 @@ struct uart_port {
         const struct uart_ops   *ops;
         unsigned int            custom_divisor;
         unsigned int            line;                   /* port index */
-        unsigned long           mapbase;                /* for ioremap */
+        resource_size_t         mapbase;                /* for ioremap */
         struct device           *dev;                   /* parent device */
         unsigned char           hub6;                   /* this should be in the 8250 driver */
         unsigned char           unused[3];
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 1c5ed7d92b0f..96c0d93fc2ca 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -118,6 +118,7 @@
 #define UART_LSR_PE             0x04 /* Parity error indicator */
 #define UART_LSR_OE             0x02 /* Overrun error indicator */
 #define UART_LSR_DR             0x01 /* Receiver data ready */
+#define UART_LSR_BRK_ERROR_BITS 0x1E /* BI, FE, PE, OE bits */
 
 #define UART_MSR        6       /* In:  Modem Status Register */
 #define UART_MSR_DCD            0x80 /* Data Carrier Detect */
diff --git a/include/linux/signal.h b/include/linux/signal.h
index ea91abe740da..0ae338866240 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -237,12 +237,15 @@ extern int group_send_sig_info(int sig, struct siginfo *info, struct task_struct
 extern int __group_send_sig_info(int, struct siginfo *, struct task_struct *);
 extern long do_sigpending(void __user *, unsigned long);
 extern int sigprocmask(int, sigset_t *, sigset_t *);
+extern int show_unhandled_signals;
 
 struct pt_regs;
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
 
 extern struct kmem_cache *sighand_cachep;
 
+int unhandled_signal(struct task_struct *tsk, int sig);
+
 /*
  * In POSIX a signal is sent either to a specific thread (Linux task)
  * or to the process as a whole (Linux thread group).  How the signal
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index 510429495690..4c9ff0910ae0 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -45,49 +45,17 @@ struct signalfd_siginfo {
 #ifdef CONFIG_SIGNALFD
 
 /*
- * Deliver the signal to listening signalfd. This must be called
- * with the sighand lock held. Same are the following that end up
- * calling signalfd_deliver().
- */
-void signalfd_deliver(struct task_struct *tsk, int sig);
-
-/*
- * No need to fall inside signalfd_deliver() if no signal listeners
- * are available.
+ * Deliver the signal to listening signalfd.
  */
 static inline void signalfd_notify(struct task_struct *tsk, int sig)
 {
-        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
-                signalfd_deliver(tsk, sig);
-}
-
-/*
- * The signal -1 is used to notify the signalfd that the sighand
- * is on its way to be detached.
- */
-static inline void signalfd_detach_locked(struct task_struct *tsk)
-{
-        if (unlikely(!list_empty(&tsk->sighand->signalfd_list)))
-                signalfd_deliver(tsk, -1);
-}
-
-static inline void signalfd_detach(struct task_struct *tsk)
-{
-        struct sighand_struct *sighand = tsk->sighand;
-
-        if (unlikely(!list_empty(&sighand->signalfd_list))) {
-                spin_lock_irq(&sighand->siglock);
-                signalfd_deliver(tsk, -1);
-                spin_unlock_irq(&sighand->siglock);
-        }
+        if (unlikely(waitqueue_active(&tsk->sighand->signalfd_wqh)))
+                wake_up(&tsk->sighand->signalfd_wqh);
 }
 
 #else /* CONFIG_SIGNALFD */
 
-#define signalfd_deliver(t, s) do { } while (0)
-#define signalfd_notify(t, s) do { } while (0)
-#define signalfd_detach_locked(t) do { } while (0)
-#define signalfd_detach(t) do { } while (0)
+static inline void signalfd_notify(struct task_struct *tsk, int sig) { }
 
 #endif /* CONFIG_SIGNALFD */
 
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ce256438e619..a656cecd373c 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -134,8 +134,8 @@ typedef struct skb_frag_struct skb_frag_t;
 
 struct skb_frag_struct {
         struct page *page;
-        __u16 page_offset;
-        __u16 size;
+        __u32 page_offset;
+        __u32 size;
 };
 
 /* This data is invariant across clones and lives at
@@ -1352,6 +1352,22 @@ static inline int skb_clone_writable(struct sk_buff *skb, int len)
                skb_headroom(skb) + len <= skb->hdr_len;
 }
 
+static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom,
+                            int cloned)
+{
+        int delta = 0;
+
+        if (headroom < NET_SKB_PAD)
+                headroom = NET_SKB_PAD;
+        if (headroom > skb_headroom(skb))
+                delta = headroom - skb_headroom(skb);
+
+        if (delta || cloned)
+                return pskb_expand_head(skb, ALIGN(delta, NET_SKB_PAD), 0,
+                                        GFP_ATOMIC);
+        return 0;
+}
+
 /**
  *      skb_cow - copy header of skb when it is required
  *      @skb: buffer to cow
@@ -1366,16 +1382,22 @@ static inline int skb_clone_writable(struct sk_buff *skb, int len)
  */
 static inline int skb_cow(struct sk_buff *skb, unsigned int headroom)
 {
-        int delta = (headroom > NET_SKB_PAD ? headroom : NET_SKB_PAD) -
-                        skb_headroom(skb);
-
-        if (delta < 0)
-                delta = 0;
+        return __skb_cow(skb, headroom, skb_cloned(skb));
+}
 
-        if (delta || skb_cloned(skb))
-                return pskb_expand_head(skb, (delta + (NET_SKB_PAD-1)) &
-                                ~(NET_SKB_PAD-1), 0, GFP_ATOMIC);
-        return 0;
+/**
+ *      skb_cow_head - skb_cow but only making the head writable
+ *      @skb: buffer to cow
+ *      @headroom: needed headroom
+ *
+ *      This function is identical to skb_cow except that we replace the
+ *      skb_cloned check by skb_header_cloned.  It should be used when
+ *      you only need to push on some header and do not need to modify
+ *      the data.
+ */
+static inline int skb_cow_head(struct sk_buff *skb, unsigned int headroom)
+{
+        return __skb_cow(skb, headroom, skb_header_cloned(skb));
 }
 
 /**
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 0e1d0daef6a2..d859354b9e51 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -40,7 +40,7 @@
  */
 #define ZERO_SIZE_PTR ((void *)16)
 
-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) < \
+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
                                 (unsigned long)ZERO_SIZE_PTR)
 
 /*
@@ -51,7 +51,6 @@ int slab_is_available(void);
 
 struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
                         unsigned long,
-                        void (*)(void *, struct kmem_cache *, unsigned long),
                         void (*)(void *, struct kmem_cache *, unsigned long));
 void kmem_cache_destroy(struct kmem_cache *);
 int kmem_cache_shrink(struct kmem_cache *);
@@ -70,7 +69,7 @@ int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
  */
 #define KMEM_CACHE(__struct, __flags) kmem_cache_create(#__struct,\
                 sizeof(struct __struct), __alignof__(struct __struct),\
-                (__flags), NULL, NULL)
+                (__flags), NULL)
 
 /*
  * The largest kmalloc size supported by the slab allocators is
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 07f7e4cbcee3..74962077f632 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -78,7 +78,7 @@ extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
  * Sorry that the following has to be that ugly but some versions of GCC
  * have trouble with constant propagation and loops.
  */
-static inline int kmalloc_index(size_t size)
+static __always_inline int kmalloc_index(size_t size)
 {
         if (!size)
                 return 0;
@@ -133,7 +133,7 @@ static inline int kmalloc_index(size_t size)
  * This ought to end up with a global pointer to the right cache
  * in kmalloc_caches.
  */
-static inline struct kmem_cache *kmalloc_slab(size_t size)
+static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
 {
         int index = kmalloc_index(size);
 
@@ -160,13 +160,13 @@ static inline struct kmem_cache *kmalloc_slab(size_t size)
 #define SLUB_DMA __GFP_DMA
 #else
 /* Disable DMA functionality */
-#define SLUB_DMA 0
+#define SLUB_DMA (__force gfp_t)0
 #endif
 
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
 void *__kmalloc(size_t size, gfp_t flags);
 
-static inline void *kmalloc(size_t size, gfp_t flags)
+static __always_inline void *kmalloc(size_t size, gfp_t flags)
 {
         if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) {
                 struct kmem_cache *s = kmalloc_slab(size);
@@ -183,7 +183,7 @@ static inline void *kmalloc(size_t size, gfp_t flags)
 void *__kmalloc_node(size_t size, gfp_t flags, int node);
 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
 
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
         if (__builtin_constant_p(size) && !(flags & SLUB_DMA)) {
                 struct kmem_cache *s = kmalloc_slab(size);
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 802b3a38b041..89f0c2b5f405 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -82,6 +82,8 @@ enum
         __ICMP_MIB_MAX
 };
 
+#define __ICMPMSG_MIB_MAX 512   /* Out+In for all 8-bit ICMP types */
+
 /* icmp6 mib definitions */
 /*
  * RFC 2466:  ICMPv6-MIB
@@ -91,35 +93,12 @@ enum
         ICMP6_MIB_NUM = 0,
         ICMP6_MIB_INMSGS,                       /* InMsgs */
         ICMP6_MIB_INERRORS,                     /* InErrors */
-        ICMP6_MIB_INDESTUNREACHS,               /* InDestUnreachs */
-        ICMP6_MIB_INPKTTOOBIGS,                 /* InPktTooBigs */
-        ICMP6_MIB_INTIMEEXCDS,                  /* InTimeExcds */
-        ICMP6_MIB_INPARMPROBLEMS,               /* InParmProblems */
-        ICMP6_MIB_INECHOS,                      /* InEchos */
-        ICMP6_MIB_INECHOREPLIES,                /* InEchoReplies */
-        ICMP6_MIB_INGROUPMEMBQUERIES,           /* InGroupMembQueries */
-        ICMP6_MIB_INGROUPMEMBRESPONSES,         /* InGroupMembResponses */
-        ICMP6_MIB_INGROUPMEMBREDUCTIONS,        /* InGroupMembReductions */
-        ICMP6_MIB_INROUTERSOLICITS,             /* InRouterSolicits */
-        ICMP6_MIB_INROUTERADVERTISEMENTS,       /* InRouterAdvertisements */
-        ICMP6_MIB_INNEIGHBORSOLICITS,           /* InNeighborSolicits */
-        ICMP6_MIB_INNEIGHBORADVERTISEMENTS,     /* InNeighborAdvertisements */
-        ICMP6_MIB_INREDIRECTS,                  /* InRedirects */
         ICMP6_MIB_OUTMSGS,                      /* OutMsgs */
-        ICMP6_MIB_OUTDESTUNREACHS,              /* OutDestUnreachs */
-        ICMP6_MIB_OUTPKTTOOBIGS,                /* OutPktTooBigs */
-        ICMP6_MIB_OUTTIMEEXCDS,                 /* OutTimeExcds */
-        ICMP6_MIB_OUTPARMPROBLEMS,              /* OutParmProblems */
-        ICMP6_MIB_OUTECHOREPLIES,               /* OutEchoReplies */
-        ICMP6_MIB_OUTROUTERSOLICITS,            /* OutRouterSolicits */
-        ICMP6_MIB_OUTNEIGHBORSOLICITS,          /* OutNeighborSolicits */
-        ICMP6_MIB_OUTNEIGHBORADVERTISEMENTS,    /* OutNeighborAdvertisements */
-        ICMP6_MIB_OUTREDIRECTS,                 /* OutRedirects */
-        ICMP6_MIB_OUTGROUPMEMBRESPONSES,        /* OutGroupMembResponses */
-        ICMP6_MIB_OUTGROUPMEMBREDUCTIONS,       /* OutGroupMembReductions */
         __ICMP6_MIB_MAX
 };
 
+#define __ICMP6MSG_MIB_MAX 512 /* Out+In for all 8-bit ICMPv6 types */
+
 /* tcp mib definitions */
 /*
  * RFC 1213:  MIB-II TCP group
@@ -231,6 +210,10 @@ enum
         LINUX_MIB_TCPABORTONLINGER,             /* TCPAbortOnLinger */
         LINUX_MIB_TCPABORTFAILED,               /* TCPAbortFailed */
         LINUX_MIB_TCPMEMORYPRESSURES,           /* TCPMemoryPressures */
+        LINUX_MIB_TCPSACKDISCARD,               /* TCPSACKDiscard */
+        LINUX_MIB_TCPDSACKIGNOREDOLD,           /* TCPSACKIgnoredOld */
+        LINUX_MIB_TCPDSACKIGNOREDNOUNDO,        /* TCPSACKIgnoredNoUndo */
+        LINUX_MIB_TCPSPURIOUSRTOS,              /* TCPSpuriousRTOs */
         __LINUX_MIB_MAX
 };
 
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
new file mode 100644
index 000000000000..e9bbe3ebd721
--- /dev/null
+++ b/include/linux/spi/mmc_spi.h
@@ -0,0 +1,33 @@
+#ifndef __LINUX_SPI_MMC_SPI_H
+#define __LINUX_SPI_MMC_SPI_H
+
+struct device;
+struct mmc_host;
+
+/* Put this in platform_data of a device being used to manage an MMC/SD
+ * card slot.  (Modeled after PXA mmc glue; see that for usage examples.)
+ *
+ * REVISIT This is not a spi-specific notion.  Any card slot should be
+ * able to handle it.  If the MMC core doesn't adopt this kind of notion,
+ * switch the "struct device *" parameters over to "struct spi_device *".
+ */
+struct mmc_spi_platform_data {
+        /* driver activation and (optional) card detect irq hookup */
+        int (*init)(struct device *,
+                irqreturn_t (*)(int, void *),
+                void *);
+        void (*exit)(struct device *, void *);
+
+        /* sense switch on sd cards */
+        int (*get_ro)(struct device *);
+
+        /* how long to debounce card detect, in msecs */
+        u16 detect_delay;
+
+        /* power management */
+        u16 powerup_msecs;              /* delay of up to 250 msec */
+        u32 ocr_mask;                   /* available voltages */
+        void (*setpower)(struct device *, unsigned int maskval);
+};
+
+#endif /* __LINUX_SPI_MMC_SPI_H */
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 302b81d1d117..002a3cddbdd5 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -77,6 +77,7 @@ struct spi_device {
 #define SPI_CS_HIGH     0x04                    /* chipselect active high? */
 #define SPI_LSB_FIRST   0x08                    /* per-word bits-on-wire */
 #define SPI_3WIRE       0x10                    /* SI/SO signals shared */
+#define SPI_LOOP        0x20                    /* loopback mode */
         u8                      bits_per_word;
         int                     irq;
         void                    *controller_state;
@@ -138,6 +139,32 @@ struct spi_message;
 
 
 
+/**
+ * struct spi_driver - Host side "protocol" driver
+ * @probe: Binds this driver to the spi device.  Drivers can verify
+ *      that the device is actually present, and may need to configure
+ *      characteristics (such as bits_per_word) which weren't needed for
+ *      the initial configuration done during system setup.
+ * @remove: Unbinds this driver from the spi device
+ * @shutdown: Standard shutdown callback used during system state
+ *      transitions such as powerdown/halt and kexec
+ * @suspend: Standard suspend callback used during system state transitions
+ * @resume: Standard resume callback used during system state transitions
+ * @driver: SPI device drivers should initialize the name and owner
+ *      field of this structure.
+ *
+ * This represents the kind of device driver that uses SPI messages to
+ * interact with the hardware at the other end of a SPI link.  It's called
+ * a "protocol" driver because it works through messages rather than talking
+ * directly to SPI hardware (which is what the underlying SPI controller
+ * driver does to pass those messages).  These protocols are defined in the
+ * specification for the device(s) supported by the driver.
+ *
+ * As a rule, those device protocols represent the lowest level interface
+ * supported by a driver, and it will support upper level interfaces too.
+ * Examples of such upper levels include frameworks like MTD, networking,
+ * MMC, RTC, filesystem character device nodes, and hardware monitoring.
+ */
 struct spi_driver {
         int                     (*probe)(struct spi_device *spi);
         int                     (*remove)(struct spi_device *spi);
@@ -667,7 +694,37 @@ static inline ssize_t spi_w8r16(struct spi_device *spi, u8 cmd)
  * parport adapters, or microcontrollers acting as USB-to-SPI bridges.
  */
 
-/* board-specific information about each SPI device */
+/**
+ * struct spi_board_info - board-specific template for a SPI device
+ * @modalias: Initializes spi_device.modalias; identifies the driver.
+ * @platform_data: Initializes spi_device.platform_data; the particular
+ *      data stored there is driver-specific.
+ * @controller_data: Initializes spi_device.controller_data; some
+ *      controllers need hints about hardware setup, e.g. for DMA.
+ * @irq: Initializes spi_device.irq; depends on how the board is wired.
+ * @max_speed_hz: Initializes spi_device.max_speed_hz; based on limits
+ *      from the chip datasheet and board-specific signal quality issues.
+ * @bus_num: Identifies which spi_master parents the spi_device; unused
+ *      by spi_new_device(), and otherwise depends on board wiring.
+ * @chip_select: Initializes spi_device.chip_select; depends on how
+ *      the board is wired.
+ * @mode: Initializes spi_device.mode; based on the chip datasheet, board
+ *      wiring (some devices support both 3WIRE and standard modes), and
+ *      possibly presence of an inverter in the chipselect path.
+ *
+ * When adding new SPI devices to the device tree, these structures serve
+ * as a partial device template.  They hold information which can't always
+ * be determined by drivers.  Information that probe() can establish (such
+ * as the default transfer wordsize) is not included here.
+ *
+ * These structures are used in two places.  Their primary role is to
+ * be stored in tables of board-specific device descriptors, which are
+ * declared early in board initialization and then used (much later) to
+ * populate a controller's device tree after the that controller's driver
+ * initializes.  A secondary (and atypical) role is as a parameter to
+ * spi_new_device() call, which happens after those controller drivers
+ * are active in some dynamic board configuration models.
+ */
 struct spi_board_info {
         /* the device name and module name are coupled, like platform_bus;
          * "modalias" is normally the driver name.
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h
index 7d700be57490..c93ef9d42a01 100644
--- a/include/linux/spi/spidev.h
+++ b/include/linux/spi/spidev.h
@@ -35,6 +35,10 @@
 #define SPI_MODE_2              (SPI_CPOL|0)
 #define SPI_MODE_3              (SPI_CPOL|SPI_CPHA)
 
+#define SPI_CS_HIGH             0x04
+#define SPI_LSB_FIRST           0x08
+#define SPI_3WIRE               0x10
+#define SPI_LOOP                0x20
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
index 210549ba4ef4..f6a3a951b79e 100644
--- a/include/linux/spinlock_types.h
+++ b/include/linux/spinlock_types.h
@@ -9,14 +9,14 @@
  * Released under the General Public License (GPL).
  */
 
-#include <linux/lockdep.h>
-
 #if defined(CONFIG_SMP)
 # include <asm/spinlock_types.h>
 #else
 # include <linux/spinlock_types_up.h>
 #endif
 
+#include <linux/lockdep.h>
+
 typedef struct {
         raw_spinlock_t raw_lock;
 #if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)
diff --git a/include/linux/spinlock_types_up.h b/include/linux/spinlock_types_up.h
index 27644af20b7c..04135b0e198e 100644
--- a/include/linux/spinlock_types_up.h
+++ b/include/linux/spinlock_types_up.h
@@ -12,14 +12,10 @@
  * Released under the General Public License (GPL).
  */
 
-#if defined(CONFIG_DEBUG_SPINLOCK) || \
-        defined(CONFIG_DEBUG_LOCK_ALLOC)
+#ifdef CONFIG_DEBUG_SPINLOCK
 
 typedef struct {
         volatile unsigned int slock;
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-        struct lockdep_map dep_map;
-#endif
 } raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED { 1 }
@@ -34,9 +30,6 @@ typedef struct { } raw_spinlock_t;
 
 typedef struct {
         /* no debug version on UP */
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-        struct lockdep_map dep_map;
-#endif
 } raw_rwlock_t;
 
 #define __RAW_RW_LOCK_UNLOCKED { }
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
new file mode 100644
index 000000000000..2b5c312c4960
--- /dev/null
+++ b/include/linux/ssb/ssb.h
@@ -0,0 +1,424 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
+
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/pci.h>
+#include <linux/mod_devicetable.h>
+
+#include <linux/ssb/ssb_regs.h>
+
+
+struct pcmcia_device;
+struct ssb_bus;
+struct ssb_driver;
+
+
+struct ssb_sprom_r1 {
+        u16 pci_spid;           /* Subsystem Product ID for PCI */
+        u16 pci_svid;           /* Subsystem Vendor ID for PCI */
+        u16 pci_pid;            /* Product ID for PCI */
+        u8 il0mac[6];           /* MAC address for 802.11b/g */
+        u8 et0mac[6];           /* MAC address for Ethernet */
+        u8 et1mac[6];           /* MAC address for 802.11a */
+        u8 et0phyaddr:5;        /* MII address for enet0 */
+        u8 et1phyaddr:5;        /* MII address for enet1 */
+        u8 et0mdcport:1;        /* MDIO for enet0 */
+        u8 et1mdcport:1;        /* MDIO for enet1 */
+        u8 board_rev;           /* Board revision */
+        u8 country_code:4;      /* Country Code */
+        u8 antenna_a:2;         /* Antenna 0/1 available for A-PHY */
+        u8 antenna_bg:2;        /* Antenna 0/1 available for B-PHY and G-PHY */
+        u16 pa0b0;
+        u16 pa0b1;
+        u16 pa0b2;
+        u16 pa1b0;
+        u16 pa1b1;
+        u16 pa1b2;
+        u8 gpio0;               /* GPIO pin 0 */
+        u8 gpio1;               /* GPIO pin 1 */
+        u8 gpio2;               /* GPIO pin 2 */
+        u8 gpio3;               /* GPIO pin 3 */
+        u16 maxpwr_a;           /* A-PHY Power Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_bg;          /* B/G-PHY Power Amplifier Max Power (in dBm Q5.2) */
+        u8 itssi_a;             /* Idle TSSI Target for A-PHY */
+        u8 itssi_bg;            /* Idle TSSI Target for B/G-PHY */
+        u16 boardflags_lo;      /* Boardflags (low 16 bits) */
+        u8 antenna_gain_a;      /* A-PHY Antenna gain (in dBm Q5.2) */
+        u8 antenna_gain_bg;     /* B/G-PHY Antenna gain (in dBm Q5.2) */
+        u8 oem[8];              /* OEM string (rev 1 only) */
+};
+
+struct ssb_sprom_r2 {
+        u16 boardflags_hi;      /* Boardflags (high 16 bits) */
+        u8 maxpwr_a_lo;         /* A-PHY Max Power Low */
+        u8 maxpwr_a_hi;         /* A-PHY Max Power High */
+        u16 pa1lob0;            /* A-PHY PA Low Settings */
+        u16 pa1lob1;            /* A-PHY PA Low Settings */
+        u16 pa1lob2;            /* A-PHY PA Low Settings */
+        u16 pa1hib0;            /* A-PHY PA High Settings */
+        u16 pa1hib1;            /* A-PHY PA High Settings */
+        u16 pa1hib2;            /* A-PHY PA High Settings */
+        u8 ofdm_pwr_off;        /* OFDM Power Offset from CCK Level */
+        u8 country_str[2];      /* Two char Country Code */
+};
+
+struct ssb_sprom_r3 {
+        u32 ofdmapo;            /* A-PHY OFDM Mid Power Offset */
+        u32 ofdmalpo;           /* A-PHY OFDM Low Power Offset */
+        u32 ofdmahpo;           /* A-PHY OFDM High Power Offset */
+        u8 gpioldc_on_cnt;      /* GPIO LED Powersave Duty Cycle ON count */
+        u8 gpioldc_off_cnt;     /* GPIO LED Powersave Duty Cycle OFF count */
+        u8 cckpo_1M:4;          /* CCK Power Offset for Rate 1M */
+        u8 cckpo_2M:4;          /* CCK Power Offset for Rate 2M */
+        u8 cckpo_55M:4;         /* CCK Power Offset for Rate 5.5M */
+        u8 cckpo_11M:4;         /* CCK Power Offset for Rate 11M */
+        u32 ofdmgpo;            /* G-PHY OFDM Power Offset */
+};
+
+struct ssb_sprom_r4 {
+        /* TODO */
+};
+
+struct ssb_sprom {
+        u8 revision;
+        u8 crc;
+        /* The valid r# fields are selected by the "revision".
+         * Revision 3 and lower inherit from lower revisions.
+         */
+        union {
+                struct {
+                        struct ssb_sprom_r1 r1;
+                        struct ssb_sprom_r2 r2;
+                        struct ssb_sprom_r3 r3;
+                };
+                struct ssb_sprom_r4 r4;
+        };
+};
+
+/* Information about the PCB the circuitry is soldered on. */
+struct ssb_boardinfo {
+        u16 vendor;
+        u16 type;
+        u16 rev;
+};
+
+
+struct ssb_device;
+/* Lowlevel read/write operations on the device MMIO.
+ * Internal, don't use that outside of ssb. */
+struct ssb_bus_ops {
+        u16 (*read16)(struct ssb_device *dev, u16 offset);
+        u32 (*read32)(struct ssb_device *dev, u16 offset);
+        void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
+        void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
+};
+
+
+/* Core-ID values. */
+#define SSB_DEV_CHIPCOMMON      0x800
+#define SSB_DEV_ILINE20         0x801
+#define SSB_DEV_SDRAM           0x803
+#define SSB_DEV_PCI             0x804
+#define SSB_DEV_MIPS            0x805
+#define SSB_DEV_ETHERNET        0x806
+#define SSB_DEV_V90             0x807
+#define SSB_DEV_USB11_HOSTDEV   0x808
+#define SSB_DEV_ADSL            0x809
+#define SSB_DEV_ILINE100        0x80A
+#define SSB_DEV_IPSEC           0x80B
+#define SSB_DEV_PCMCIA          0x80D
+#define SSB_DEV_INTERNAL_MEM    0x80E
+#define SSB_DEV_MEMC_SDRAM      0x80F
+#define SSB_DEV_EXTIF           0x811
+#define SSB_DEV_80211           0x812
+#define SSB_DEV_MIPS_3302       0x816
+#define SSB_DEV_USB11_HOST      0x817
+#define SSB_DEV_USB11_DEV       0x818
+#define SSB_DEV_USB20_HOST      0x819
+#define SSB_DEV_USB20_DEV       0x81A
+#define SSB_DEV_SDIO_HOST       0x81B
+#define SSB_DEV_ROBOSWITCH      0x81C
+#define SSB_DEV_PARA_ATA        0x81D
+#define SSB_DEV_SATA_XORDMA     0x81E
+#define SSB_DEV_ETHERNET_GBIT   0x81F
+#define SSB_DEV_PCIE            0x820
+#define SSB_DEV_MIMO_PHY        0x821
+#define SSB_DEV_SRAM_CTRLR      0x822
+#define SSB_DEV_MINI_MACPHY     0x823
+#define SSB_DEV_ARM_1176        0x824
+#define SSB_DEV_ARM_7TDMI       0x825
+
+/* Vendor-ID values */
+#define SSB_VENDOR_BROADCOM     0x4243
+
+/* Some kernel subsystems poke with dev->drvdata, so we must use the
+ * following ugly workaround to get from struct device to struct ssb_device */
+struct __ssb_dev_wrapper {
+        struct device dev;
+        struct ssb_device *sdev;
+};
+
+struct ssb_device {
+        /* Having a copy of the ops pointer in each dev struct
+         * is an optimization. */
+        const struct ssb_bus_ops *ops;
+
+        struct device *dev;
+        struct ssb_bus *bus;
+        struct ssb_device_id id;
+
+        u8 core_index;
+        unsigned int irq;
+
+        /* Internal-only stuff follows. */
+        void *drvdata;          /* Per-device data */
+        void *devtypedata;      /* Per-devicetype (eg 802.11) data */
+};
+
+/* Go from struct device to struct ssb_device. */
+static inline
+struct ssb_device * dev_to_ssb_dev(struct device *dev)
+{
+        struct __ssb_dev_wrapper *wrap;
+        wrap = container_of(dev, struct __ssb_dev_wrapper, dev);
+        return wrap->sdev;
+}
+
+/* Device specific user data */
+static inline
+void ssb_set_drvdata(struct ssb_device *dev, void *data)
+{
+        dev->drvdata = data;
+}
+static inline
+void * ssb_get_drvdata(struct ssb_device *dev)
+{
+        return dev->drvdata;
+}
+
+/* Devicetype specific user data. This is per device-type (not per device) */
+void ssb_set_devtypedata(struct ssb_device *dev, void *data);
+static inline
+void * ssb_get_devtypedata(struct ssb_device *dev)
+{
+        return dev->devtypedata;
+}
+
+
+struct ssb_driver {
+        const char *name;
+        const struct ssb_device_id *id_table;
+
+        int (*probe)(struct ssb_device *dev, const struct ssb_device_id *id);
+        void (*remove)(struct ssb_device *dev);
+        int (*suspend)(struct ssb_device *dev, pm_message_t state);
+        int (*resume)(struct ssb_device *dev);
+        void (*shutdown)(struct ssb_device *dev);
+
+        struct device_driver drv;
+};
+#define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
+
+extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
+static inline int ssb_driver_register(struct ssb_driver *drv)
+{
+        return __ssb_driver_register(drv, THIS_MODULE);
+}
+extern void ssb_driver_unregister(struct ssb_driver *drv);
+
+
+
+
+enum ssb_bustype {
+        SSB_BUSTYPE_SSB,        /* This SSB bus is the system bus */
+        SSB_BUSTYPE_PCI,        /* SSB is connected to PCI bus */
+        SSB_BUSTYPE_PCMCIA,     /* SSB is connected to PCMCIA bus */
+};
+
+/* board_vendor */
+#define SSB_BOARDVENDOR_BCM     0x14E4  /* Broadcom */
+#define SSB_BOARDVENDOR_DELL    0x1028  /* Dell */
+#define SSB_BOARDVENDOR_HP      0x0E11  /* HP */
+/* board_type */
+#define SSB_BOARD_BCM94306MP    0x0418
+#define SSB_BOARD_BCM4309G      0x0421
+#define SSB_BOARD_BCM4306CB     0x0417
+#define SSB_BOARD_BCM4309MP     0x040C
+#define SSB_BOARD_MP4318        0x044A
+#define SSB_BOARD_BU4306        0x0416
+#define SSB_BOARD_BU4309        0x040A
+/* chip_package */
+#define SSB_CHIPPACK_BCM4712S   1       /* Small 200pin 4712 */
+#define SSB_CHIPPACK_BCM4712M   2       /* Medium 225pin 4712 */
+#define SSB_CHIPPACK_BCM4712L   0       /* Large 340pin 4712 */
+
+#include <linux/ssb/ssb_driver_chipcommon.h>
+#include <linux/ssb/ssb_driver_mips.h>
+#include <linux/ssb/ssb_driver_extif.h>
+#include <linux/ssb/ssb_driver_pci.h>
+
+struct ssb_bus {
+        /* The MMIO area. */
+        void __iomem *mmio;
+
+        const struct ssb_bus_ops *ops;
+
+        /* The core in the basic address register window. (PCI bus only) */
+        struct ssb_device *mapped_device;
+        /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
+        u8 mapped_pcmcia_seg;
+        /* Lock for core and segment switching. */
+        spinlock_t bar_lock;
+
+        /* The bus this backplane is running on. */
+        enum ssb_bustype bustype;
+        /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
+        struct pci_dev *host_pci;
+        /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
+        struct pcmcia_device *host_pcmcia;
+
+#ifdef CONFIG_SSB_PCIHOST
+        /* Mutex to protect the SPROM writing. */
+        struct mutex pci_sprom_mutex;
+#endif
+
+        /* ID information about the Chip. */
+        u16 chip_id;
+        u16 chip_rev;
+        u8 chip_package;
+
+        /* List of devices (cores) on the backplane. */
+        struct ssb_device devices[SSB_MAX_NR_CORES];
+        u8 nr_devices;
+
+        /* Reference count. Number of suspended devices. */
+        u8 suspend_cnt;
+
+        /* Software ID number for this bus. */
+        unsigned int busnumber;
+
+        /* The ChipCommon device (if available). */
+        struct ssb_chipcommon chipco;
+        /* The PCI-core device (if available). */
+        struct ssb_pcicore pcicore;
+        /* The MIPS-core device (if available). */
+        struct ssb_mipscore mipscore;
+        /* The EXTif-core device (if available). */
+        struct ssb_extif extif;
+
+        /* The following structure elements are not available in early
+         * SSB initialization. Though, they are available for regular
+         * registered drivers at any stage. So be careful when
+         * using them in the ssb core code. */
+
+        /* ID information about the PCB. */
+        struct ssb_boardinfo boardinfo;
+        /* Contents of the SPROM. */
+        struct ssb_sprom sprom;
+
+        /* Internal-only stuff follows. Do not touch. */
+        struct list_head list;
+#ifdef CONFIG_SSB_DEBUG
+        /* Is the bus already powered up? */
+        bool powered_up;
+        int power_warn_count;
+#endif /* DEBUG */
+};
+
+/* The initialization-invariants. */
+struct ssb_init_invariants {
+        struct ssb_boardinfo boardinfo;
+        struct ssb_sprom sprom;
+};
+/* Type of function to fetch the invariants. */
+typedef int (*ssb_invariants_func_t)(struct ssb_bus *bus,
+                                     struct ssb_init_invariants *iv);
+
+/* Register a SSB system bus. get_invariants() is called after the
+ * basic system devices are initialized.
+ * The invariants are usually fetched from some NVRAM.
+ * Put the invariants into the struct pointed to by iv. */
+extern int ssb_bus_ssbbus_register(struct ssb_bus *bus,
+                                   unsigned long baseaddr,
+                                   ssb_invariants_func_t get_invariants);
+#ifdef CONFIG_SSB_PCIHOST
+extern int ssb_bus_pcibus_register(struct ssb_bus *bus,
+                                   struct pci_dev *host_pci);
+#endif /* CONFIG_SSB_PCIHOST */
+#ifdef CONFIG_SSB_PCMCIAHOST
+extern int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
+                                      struct pcmcia_device *pcmcia_dev,
+                                      unsigned long baseaddr);
+#endif /* CONFIG_SSB_PCMCIAHOST */
+
+extern void ssb_bus_unregister(struct ssb_bus *bus);
+
+extern u32 ssb_clockspeed(struct ssb_bus *bus);
+
+/* Is the device enabled in hardware? */
+int ssb_device_is_enabled(struct ssb_device *dev);
+/* Enable a device and pass device-specific SSB_TMSLOW flags.
+ * If no device-specific flags are available, use 0. */
+void ssb_device_enable(struct ssb_device *dev, u32 core_specific_flags);
+/* Disable a device in hardware and pass SSB_TMSLOW flags (if any). */
+void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags);
+
+
+/* Device MMIO register read/write functions. */
+static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
+{
+        return dev->ops->read16(dev, offset);
+}
+static inline u32 ssb_read32(struct ssb_device *dev, u16 offset)
+{
+        return dev->ops->read32(dev, offset);
+}
+static inline void ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
+{
+        dev->ops->write16(dev, offset, value);
+}
+static inline void ssb_write32(struct ssb_device *dev, u16 offset, u32 value)
+{
+        dev->ops->write32(dev, offset, value);
+}
+
+
+/* Translation (routing) bits that need to be ORed to DMA
+ * addresses before they are given to a device. */
+extern u32 ssb_dma_translation(struct ssb_device *dev);
+#define SSB_DMA_TRANSLATION_MASK        0xC0000000
+#define SSB_DMA_TRANSLATION_SHIFT       30
+
+extern int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask);
+
+
+#ifdef CONFIG_SSB_PCIHOST
+/* PCI-host wrapper driver */
+extern int ssb_pcihost_register(struct pci_driver *driver);
+static inline void ssb_pcihost_unregister(struct pci_driver *driver)
+{
+        pci_unregister_driver(driver);
+}
+#endif /* CONFIG_SSB_PCIHOST */
+
+
+/* If a driver is shutdown or suspended, call this to signal
+ * that the bus may be completely powered down. SSB will decide,
+ * if it's really time to power down the bus, based on if there
+ * are other devices that want to run. */
+extern int ssb_bus_may_powerdown(struct ssb_bus *bus);
+/* Before initializing and enabling a device, call this to power-up the bus.
+ * If you want to allow use of dynamic-power-control, pass the flag.
+ * Otherwise static always-on powercontrol will be used. */
+extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
+
+
+/* Various helper functions */
+extern u32 ssb_admatch_base(u32 adm);
+extern u32 ssb_admatch_size(u32 adm);
+
+
+#endif /* LINUX_SSB_H_ */
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
new file mode 100644
index 000000000000..4cb995494662
--- /dev/null
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -0,0 +1,396 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
+
+/* SonicsSiliconBackplane CHIPCOMMON core hardware definitions
+ *
+ * The chipcommon core provides chip identification, SB control,
+ * jtag, 0/1/2 uarts, clock frequency control, a watchdog interrupt timer,
+ * gpio interface, extbus, and support for serial and parallel flashes.
+ *
+ * Copyright 2005, Broadcom Corporation
+ * Copyright 2006, Michael Buesch <mb@bu3sch.de>
+ *
+ * Licensed under the GPL version 2. See COPYING for details.
+ */
+
+/** ChipCommon core registers. **/
+
+#define SSB_CHIPCO_CHIPID               0x0000
+#define  SSB_CHIPCO_IDMASK              0x0000FFFF
+#define  SSB_CHIPCO_REVMASK             0x000F0000
+#define  SSB_CHIPCO_REVSHIFT            16
+#define  SSB_CHIPCO_PACKMASK            0x00F00000
+#define  SSB_CHIPCO_PACKSHIFT           20
+#define  SSB_CHIPCO_NRCORESMASK         0x0F000000
+#define  SSB_CHIPCO_NRCORESSHIFT        24
+#define SSB_CHIPCO_CAP                  0x0004          /* Capabilities */
+#define  SSB_CHIPCO_CAP_NRUART          0x00000003      /* # of UARTs */
+#define  SSB_CHIPCO_CAP_MIPSEB          0x00000004      /* MIPS in BigEndian Mode */
+#define  SSB_CHIPCO_CAP_UARTCLK         0x00000018      /* UART clock select */
+#define   SSB_CHIPCO_CAP_UARTCLK_INT    0x00000008      /* UARTs are driven by internal divided clock */
+#define  SSB_CHIPCO_CAP_UARTGPIO        0x00000020      /* UARTs on GPIO 15-12 */
+#define  SSB_CHIPCO_CAP_EXTBUS          0x000000C0      /* External buses present */
+#define  SSB_CHIPCO_CAP_FLASHT          0x00000700      /* Flash Type */
+#define   SSB_CHIPCO_FLASHT_NONE        0x00000000      /* No flash */
+#define   SSB_CHIPCO_FLASHT_STSER       0x00000100      /* ST serial flash */
+#define   SSB_CHIPCO_FLASHT_ATSER       0x00000200      /* Atmel serial flash */
+#define   SSB_CHIPCO_FLASHT_PARA        0x00000700      /* Parallel flash */
+#define  SSB_CHIPCO_CAP_PLLT            0x00038000      /* PLL Type */
+#define   SSB_PLLTYPE_NONE              0x00000000
+#define   SSB_PLLTYPE_1                 0x00010000      /* 48Mhz base, 3 dividers */
+#define   SSB_PLLTYPE_2                 0x00020000      /* 48Mhz, 4 dividers */
+#define   SSB_PLLTYPE_3                 0x00030000      /* 25Mhz, 2 dividers */
+#define   SSB_PLLTYPE_4                 0x00008000      /* 48Mhz, 4 dividers */
+#define   SSB_PLLTYPE_5                 0x00018000      /* 25Mhz, 4 dividers */
+#define   SSB_PLLTYPE_6                 0x00028000      /* 100/200 or 120/240 only */
+#define   SSB_PLLTYPE_7                 0x00038000      /* 25Mhz, 4 dividers */
+#define  SSB_CHIPCO_CAP_PCTL            0x00040000      /* Power Control */
+#define  SSB_CHIPCO_CAP_OTPS            0x00380000      /* OTP size */
+#define  SSB_CHIPCO_CAP_OTPS_SHIFT      19
+#define  SSB_CHIPCO_CAP_OTPS_BASE       5
+#define  SSB_CHIPCO_CAP_JTAGM           0x00400000      /* JTAG master present */
+#define  SSB_CHIPCO_CAP_BROM            0x00800000      /* Internal boot ROM active */
+#define  SSB_CHIPCO_CAP_64BIT           0x08000000      /* 64-bit Backplane */
+#define SSB_CHIPCO_CORECTL              0x0008
+#define  SSB_CHIPCO_CORECTL_UARTCLK0    0x00000001      /* Drive UART with internal clock */
+#define  SSB_CHIPCO_CORECTL_SE          0x00000002      /* sync clk out enable (corerev >= 3) */
+#define SSB_CHIPCO_BIST                 0x000C
+#define SSB_CHIPCO_OTPS                 0x0010          /* OTP status */
+#define  SSB_CHIPCO_OTPS_PROGFAIL       0x80000000
+#define  SSB_CHIPCO_OTPS_PROTECT        0x00000007
+#define  SSB_CHIPCO_OTPS_HW_PROTECT     0x00000001
+#define  SSB_CHIPCO_OTPS_SW_PROTECT     0x00000002
+#define  SSB_CHIPCO_OTPS_CID_PROTECT    0x00000004
+#define SSB_CHIPCO_OTPC                 0x0014          /* OTP control */
+#define  SSB_CHIPCO_OTPC_RECWAIT        0xFF000000
+#define  SSB_CHIPCO_OTPC_PROGWAIT       0x00FFFF00
+#define  SSB_CHIPCO_OTPC_PRW_SHIFT      8
+#define  SSB_CHIPCO_OTPC_MAXFAIL        0x00000038
+#define  SSB_CHIPCO_OTPC_VSEL           0x00000006
+#define  SSB_CHIPCO_OTPC_SELVL          0x00000001
+#define SSB_CHIPCO_OTPP                 0x0018          /* OTP prog */
+#define  SSB_CHIPCO_OTPP_COL            0x000000FF
+#define  SSB_CHIPCO_OTPP_ROW            0x0000FF00
+#define  SSB_CHIPCO_OTPP_ROW_SHIFT      8
+#define  SSB_CHIPCO_OTPP_READERR        0x10000000
+#define  SSB_CHIPCO_OTPP_VALUE          0x20000000
+#define  SSB_CHIPCO_OTPP_READ           0x40000000
+#define  SSB_CHIPCO_OTPP_START          0x80000000
+#define  SSB_CHIPCO_OTPP_BUSY           0x80000000
+#define SSB_CHIPCO_IRQSTAT              0x0020
+#define SSB_CHIPCO_IRQMASK              0x0024
+#define  SSB_CHIPCO_IRQ_GPIO            0x00000001      /* gpio intr */
+#define  SSB_CHIPCO_IRQ_EXT             0x00000002      /* ro: ext intr pin (corerev >= 3) */
+#define  SSB_CHIPCO_IRQ_WDRESET         0x80000000      /* watchdog reset occurred */
+#define SSB_CHIPCO_CHIPCTL              0x0028          /* Rev >= 11 only */
+#define SSB_CHIPCO_CHIPSTAT             0x002C          /* Rev >= 11 only */
+#define SSB_CHIPCO_JCMD                 0x0030          /* Rev >= 10 only */
+#define  SSB_CHIPCO_JCMD_START          0x80000000
+#define  SSB_CHIPCO_JCMD_BUSY           0x80000000
+#define  SSB_CHIPCO_JCMD_PAUSE          0x40000000
+#define  SSB_CHIPCO_JCMD0_ACC_MASK      0x0000F000
+#define  SSB_CHIPCO_JCMD0_ACC_IRDR      0x00000000
+#define  SSB_CHIPCO_JCMD0_ACC_DR        0x00001000
+#define  SSB_CHIPCO_JCMD0_ACC_IR        0x00002000
+#define  SSB_CHIPCO_JCMD0_ACC_RESET     0x00003000
+#define  SSB_CHIPCO_JCMD0_ACC_IRPDR     0x00004000
+#define  SSB_CHIPCO_JCMD0_ACC_PDR       0x00005000
+#define  SSB_CHIPCO_JCMD0_IRW_MASK      0x00000F00
+#define  SSB_CHIPCO_JCMD_ACC_MASK       0x000F0000      /* Changes for corerev 11 */
+#define  SSB_CHIPCO_JCMD_ACC_IRDR       0x00000000
+#define  SSB_CHIPCO_JCMD_ACC_DR         0x00010000
+#define  SSB_CHIPCO_JCMD_ACC_IR         0x00020000
+#define  SSB_CHIPCO_JCMD_ACC_RESET      0x00030000
+#define  SSB_CHIPCO_JCMD_ACC_IRPDR      0x00040000
+#define  SSB_CHIPCO_JCMD_ACC_PDR        0x00050000
+#define  SSB_CHIPCO_JCMD_IRW_MASK       0x00001F00
+#define  SSB_CHIPCO_JCMD_IRW_SHIFT      8
+#define  SSB_CHIPCO_JCMD_DRW_MASK       0x0000003F
+#define SSB_CHIPCO_JIR                  0x0034          /* Rev >= 10 only */
+#define SSB_CHIPCO_JDR                  0x0038          /* Rev >= 10 only */
+#define SSB_CHIPCO_JCTL                 0x003C          /* Rev >= 10 only */
+#define  SSB_CHIPCO_JCTL_FORCE_CLK      4               /* Force clock */
+#define  SSB_CHIPCO_JCTL_EXT_EN         2               /* Enable external targets */
+#define  SSB_CHIPCO_JCTL_EN             1               /* Enable Jtag master */
+#define SSB_CHIPCO_FLASHCTL             0x0040
+#define  SSB_CHIPCO_FLASHCTL_START      0x80000000
+#define  SSB_CHIPCO_FLASHCTL_BUSY       SSB_CHIPCO_FLASHCTL_START
+#define SSB_CHIPCO_FLASHADDR            0x0044
+#define SSB_CHIPCO_FLASHDATA            0x0048
+#define SSB_CHIPCO_BCAST_ADDR           0x0050
+#define SSB_CHIPCO_BCAST_DATA           0x0054
+#define SSB_CHIPCO_GPIOIN               0x0060
+#define SSB_CHIPCO_GPIOOUT              0x0064
+#define SSB_CHIPCO_GPIOOUTEN            0x0068
+#define SSB_CHIPCO_GPIOCTL              0x006C
+#define SSB_CHIPCO_GPIOPOL              0x0070
+#define SSB_CHIPCO_GPIOIRQ              0x0074
+#define SSB_CHIPCO_WATCHDOG             0x0080
+#define SSB_CHIPCO_GPIOTIMER            0x0088          /* LED powersave (corerev >= 16) */
+#define  SSB_CHIPCO_GPIOTIMER_ONTIME_SHIFT      16
+#define SSB_CHIPCO_GPIOTOUTM            0x008C          /* LED powersave (corerev >= 16) */
+#define SSB_CHIPCO_CLOCK_N              0x0090
+#define SSB_CHIPCO_CLOCK_SB             0x0094
+#define SSB_CHIPCO_CLOCK_PCI            0x0098
+#define SSB_CHIPCO_CLOCK_M2             0x009C
+#define SSB_CHIPCO_CLOCK_MIPS           0x00A0
+#define SSB_CHIPCO_CLKDIV               0x00A4          /* Rev >= 3 only */
+#define  SSB_CHIPCO_CLKDIV_SFLASH       0x0F000000
+#define  SSB_CHIPCO_CLKDIV_SFLASH_SHIFT 24
+#define  SSB_CHIPCO_CLKDIV_OTP          0x000F0000
+#define  SSB_CHIPCO_CLKDIV_OTP_SHIFT    16
+#define  SSB_CHIPCO_CLKDIV_JTAG         0x00000F00
+#define  SSB_CHIPCO_CLKDIV_JTAG_SHIFT   8
+#define  SSB_CHIPCO_CLKDIV_UART         0x000000FF
+#define SSB_CHIPCO_PLLONDELAY           0x00B0          /* Rev >= 4 only */
+#define SSB_CHIPCO_FREFSELDELAY         0x00B4          /* Rev >= 4 only */
+#define SSB_CHIPCO_SLOWCLKCTL           0x00B8          /* 6 <= Rev <= 9 only */
+#define  SSB_CHIPCO_SLOWCLKCTL_SRC      0x00000007      /* slow clock source mask */
+#define   SSB_CHIPCO_SLOWCLKCTL_SRC_LPO         0x00000000      /* source of slow clock is LPO */
+#define   SSB_CHIPCO_SLOWCLKCTL_SRC_XTAL        0x00000001      /* source of slow clock is crystal */
+#define   SSB_CHIPCO_SLOECLKCTL_SRC_PCI         0x00000002      /* source of slow clock is PCI */
+#define  SSB_CHIPCO_SLOWCLKCTL_LPOFREQ  0x00000200      /* LPOFreqSel, 1: 160Khz, 0: 32KHz */
+#define  SSB_CHIPCO_SLOWCLKCTL_LPOPD    0x00000400      /* LPOPowerDown, 1: LPO is disabled, 0: LPO is enabled */
+#define  SSB_CHIPCO_SLOWCLKCTL_FSLOW    0x00000800      /* ForceSlowClk, 1: sb/cores running on slow clock, 0: power logic control */
+#define  SSB_CHIPCO_SLOWCLKCTL_IPLL     0x00001000      /* IgnorePllOffReq, 1/0: power logic ignores/honors PLL clock disable requests from core */
+#define  SSB_CHIPCO_SLOWCLKCTL_ENXTAL   0x00002000      /* XtalControlEn, 1/0: power logic does/doesn't disable crystal when appropriate */
+#define  SSB_CHIPCO_SLOWCLKCTL_XTALPU   0x00004000      /* XtalPU (RO), 1/0: crystal running/disabled */
+#define  SSB_CHIPCO_SLOWCLKCTL_CLKDIV   0xFFFF0000      /* ClockDivider (SlowClk = 1/(4+divisor)) */
+#define  SSB_CHIPCO_SLOWCLKCTL_CLKDIV_SHIFT     16
+#define SSB_CHIPCO_SYSCLKCTL            0x00C0          /* Rev >= 3 only */
+#define  SSB_CHIPCO_SYSCLKCTL_IDLPEN    0x00000001      /* ILPen: Enable Idle Low Power */
+#define  SSB_CHIPCO_SYSCLKCTL_ALPEN     0x00000002      /* ALPen: Enable Active Low Power */
+#define  SSB_CHIPCO_SYSCLKCTL_PLLEN     0x00000004      /* ForcePLLOn */
+#define  SSB_CHIPCO_SYSCLKCTL_FORCEALP  0x00000008      /* Force ALP (or HT if ALPen is not set */
+#define  SSB_CHIPCO_SYSCLKCTL_FORCEHT   0x00000010      /* Force HT */
+#define  SSB_CHIPCO_SYSCLKCTL_CLKDIV    0xFFFF0000      /* ClkDiv  (ILP = 1/(4+divisor)) */
+#define  SSB_CHIPCO_SYSCLKCTL_CLKDIV_SHIFT      16
+#define SSB_CHIPCO_CLKSTSTR             0x00C4          /* Rev >= 3 only */
+#define SSB_CHIPCO_PCMCIA_CFG           0x0100
+#define SSB_CHIPCO_PCMCIA_MEMWAIT       0x0104
+#define SSB_CHIPCO_PCMCIA_ATTRWAIT      0x0108
+#define SSB_CHIPCO_PCMCIA_IOWAIT        0x010C
+#define SSB_CHIPCO_IDE_CFG              0x0110
+#define SSB_CHIPCO_IDE_MEMWAIT          0x0114
+#define SSB_CHIPCO_IDE_ATTRWAIT         0x0118
+#define SSB_CHIPCO_IDE_IOWAIT           0x011C
+#define SSB_CHIPCO_PROG_CFG             0x0120
+#define SSB_CHIPCO_PROG_WAITCNT         0x0124
+#define SSB_CHIPCO_FLASH_CFG            0x0128
+#define SSB_CHIPCO_FLASH_WAITCNT        0x012C
+#define SSB_CHIPCO_UART0_DATA           0x0300
+#define SSB_CHIPCO_UART0_IMR            0x0304
+#define SSB_CHIPCO_UART0_FCR            0x0308
+#define SSB_CHIPCO_UART0_LCR            0x030C
+#define SSB_CHIPCO_UART0_MCR            0x0310
+#define SSB_CHIPCO_UART0_LSR            0x0314
+#define SSB_CHIPCO_UART0_MSR            0x0318
+#define SSB_CHIPCO_UART0_SCRATCH        0x031C
+#define SSB_CHIPCO_UART1_DATA           0x0400
+#define SSB_CHIPCO_UART1_IMR            0x0404
+#define SSB_CHIPCO_UART1_FCR            0x0408
+#define SSB_CHIPCO_UART1_LCR            0x040C
+#define SSB_CHIPCO_UART1_MCR            0x0410
+#define SSB_CHIPCO_UART1_LSR            0x0414
+#define SSB_CHIPCO_UART1_MSR            0x0418
+#define SSB_CHIPCO_UART1_SCRATCH        0x041C
+
+
+
+/** Clockcontrol masks and values **/
+
+/* SSB_CHIPCO_CLOCK_N */
+#define SSB_CHIPCO_CLK_N1               0x0000003F      /* n1 control */
+#define SSB_CHIPCO_CLK_N2               0x00003F00      /* n2 control */
+#define SSB_CHIPCO_CLK_N2_SHIFT         8
+#define SSB_CHIPCO_CLK_PLLC             0x000F0000      /* pll control */
+#define SSB_CHIPCO_CLK_PLLC_SHIFT       16
+
+/* SSB_CHIPCO_CLOCK_SB/PCI/UART */
+#define SSB_CHIPCO_CLK_M1               0x0000003F      /* m1 control */
+#define SSB_CHIPCO_CLK_M2               0x00003F00      /* m2 control */
+#define SSB_CHIPCO_CLK_M2_SHIFT         8
+#define SSB_CHIPCO_CLK_M3               0x003F0000      /* m3 control */
+#define SSB_CHIPCO_CLK_M3_SHIFT         16
+#define SSB_CHIPCO_CLK_MC               0x1F000000      /* mux control */
+#define SSB_CHIPCO_CLK_MC_SHIFT         24
+
+/* N3M Clock control magic field values */
+#define SSB_CHIPCO_CLK_F6_2             0x02            /* A factor of 2 in */
+#define SSB_CHIPCO_CLK_F6_3             0x03            /* 6-bit fields like */
+#define SSB_CHIPCO_CLK_F6_4             0x05            /* N1, M1 or M3 */
+#define SSB_CHIPCO_CLK_F6_5             0x09
+#define SSB_CHIPCO_CLK_F6_6             0x11
+#define SSB_CHIPCO_CLK_F6_7             0x21
+
+#define SSB_CHIPCO_CLK_F5_BIAS          5               /* 5-bit fields get this added */
+
+#define SSB_CHIPCO_CLK_MC_BYPASS        0x08
+#define SSB_CHIPCO_CLK_MC_M1            0x04
+#define SSB_CHIPCO_CLK_MC_M1M2          0x02
+#define SSB_CHIPCO_CLK_MC_M1M2M3        0x01
+#define SSB_CHIPCO_CLK_MC_M1M3          0x11
+
+/* Type 2 Clock control magic field values */
+#define SSB_CHIPCO_CLK_T2_BIAS          2               /* n1, n2, m1 & m3 bias */
+#define SSB_CHIPCO_CLK_T2M2_BIAS        3               /* m2 bias */
+
+#define SSB_CHIPCO_CLK_T2MC_M1BYP       1
+#define SSB_CHIPCO_CLK_T2MC_M2BYP       2
+#define SSB_CHIPCO_CLK_T2MC_M3BYP       4
+
+/* Type 6 Clock control magic field values */
+#define SSB_CHIPCO_CLK_T6_MMASK         1               /* bits of interest in m */
+#define SSB_CHIPCO_CLK_T6_M0            120000000       /* sb clock for m = 0 */
+#define SSB_CHIPCO_CLK_T6_M1            100000000       /* sb clock for m = 1 */
+#define SSB_CHIPCO_CLK_SB2MIPS_T6(sb)   (2 * (sb))
+
+/* Common clock base */
+#define SSB_CHIPCO_CLK_BASE1            24000000        /* Half the clock freq */
+#define SSB_CHIPCO_CLK_BASE2            12500000        /* Alternate crystal on some PLL's */
+
+/* Clock control values for 200Mhz in 5350 */
+#define SSB_CHIPCO_CLK_5350_N           0x0311
+#define SSB_CHIPCO_CLK_5350_M           0x04020009
+
+
+/** Bits in the config registers **/
+
+#define SSB_CHIPCO_CFG_EN               0x0001          /* Enable */
+#define SSB_CHIPCO_CFG_EXTM             0x000E          /* Extif Mode */
+#define  SSB_CHIPCO_CFG_EXTM_ASYNC      0x0002          /* Async/Parallel flash */
+#define  SSB_CHIPCO_CFG_EXTM_SYNC       0x0004          /* Synchronous */
+#define  SSB_CHIPCO_CFG_EXTM_PCMCIA     0x0008          /* PCMCIA */
+#define  SSB_CHIPCO_CFG_EXTM_IDE        0x000A          /* IDE */
+#define SSB_CHIPCO_CFG_DS16             0x0010          /* Data size, 0=8bit, 1=16bit */
+#define SSB_CHIPCO_CFG_CLKDIV           0x0060          /* Sync: Clock divisor */
+#define SSB_CHIPCO_CFG_CLKEN            0x0080          /* Sync: Clock enable */
+#define SSB_CHIPCO_CFG_BSTRO            0x0100          /* Sync: Size/Bytestrobe */
+
+
+/** Flash-specific control/status values */
+
+/* flashcontrol opcodes for ST flashes */
+#define SSB_CHIPCO_FLASHCTL_ST_WREN     0x0006          /* Write Enable */
+#define SSB_CHIPCO_FLASHCTL_ST_WRDIS    0x0004          /* Write Disable */
+#define SSB_CHIPCO_FLASHCTL_ST_RDSR     0x0105          /* Read Status Register */
+#define SSB_CHIPCO_FLASHCTL_ST_WRSR     0x0101          /* Write Status Register */
+#define SSB_CHIPCO_FLASHCTL_ST_READ     0x0303          /* Read Data Bytes */
+#define SSB_CHIPCO_FLASHCTL_ST_PP       0x0302          /* Page Program */
+#define SSB_CHIPCO_FLASHCTL_ST_SE       0x02D8          /* Sector Erase */
+#define SSB_CHIPCO_FLASHCTL_ST_BE       0x00C7          /* Bulk Erase */
+#define SSB_CHIPCO_FLASHCTL_ST_DP       0x00B9          /* Deep Power-down */
+#define SSB_CHIPCO_FLASHCTL_ST_RSIG     0x03AB          /* Read Electronic Signature */
+
+/* Status register bits for ST flashes */
+#define SSB_CHIPCO_FLASHSTA_ST_WIP      0x01            /* Write In Progress */
+#define SSB_CHIPCO_FLASHSTA_ST_WEL      0x02            /* Write Enable Latch */
+#define SSB_CHIPCO_FLASHSTA_ST_BP       0x1C            /* Block Protect */
+#define SSB_CHIPCO_FLASHSTA_ST_BP_SHIFT 2
+#define SSB_CHIPCO_FLASHSTA_ST_SRWD     0x80            /* Status Register Write Disable */
+
+/* flashcontrol opcodes for Atmel flashes */
+#define SSB_CHIPCO_FLASHCTL_AT_READ             0x07E8
+#define SSB_CHIPCO_FLASHCTL_AT_PAGE_READ        0x07D2
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_READ        /* FIXME */
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_READ        /* FIXME */
+#define SSB_CHIPCO_FLASHCTL_AT_STATUS           0x01D7
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_WRITE       0x0384
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_WRITE       0x0387
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_ERASE_PRGM  0x0283  /* Erase program */
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_ERASE_PRGM  0x0286  /* Erase program */
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_PROGRAM     0x0288
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_PROGRAM     0x0289
+#define SSB_CHIPCO_FLASHCTL_AT_PAGE_ERASE       0x0281
+#define SSB_CHIPCO_FLASHCTL_AT_BLOCK_ERASE      0x0250
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_WRER_PRGM   0x0382  /* Write erase program */
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_WRER_PRGM   0x0385  /* Write erase program */
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_LOAD        0x0253
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_LOAD        0x0255
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_COMPARE     0x0260
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_COMPARE     0x0261
+#define SSB_CHIPCO_FLASHCTL_AT_BUF1_REPROGRAM   0x0258
+#define SSB_CHIPCO_FLASHCTL_AT_BUF2_REPROGRAM   0x0259
+
+/* Status register bits for Atmel flashes */
+#define SSB_CHIPCO_FLASHSTA_AT_READY    0x80
+#define SSB_CHIPCO_FLASHSTA_AT_MISMATCH 0x40
+#define SSB_CHIPCO_FLASHSTA_AT_ID       0x38
+#define SSB_CHIPCO_FLASHSTA_AT_ID_SHIFT 3
+
+
+/** OTP **/
+
+/* OTP regions */
+#define SSB_CHIPCO_OTP_HW_REGION        SSB_CHIPCO_OTPS_HW_PROTECT
+#define SSB_CHIPCO_OTP_SW_REGION        SSB_CHIPCO_OTPS_SW_PROTECT
+#define SSB_CHIPCO_OTP_CID_REGION       SSB_CHIPCO_OTPS_CID_PROTECT
+
+/* OTP regions (Byte offsets from otp size) */
+#define SSB_CHIPCO_OTP_SWLIM_OFF        (-8)
+#define SSB_CHIPCO_OTP_CIDBASE_OFF      0
+#define SSB_CHIPCO_OTP_CIDLIM_OFF       8
+
+/* Predefined OTP words (Word offset from otp size) */
+#define SSB_CHIPCO_OTP_BOUNDARY_OFF     (-4)
+#define SSB_CHIPCO_OTP_HWSIGN_OFF       (-3)
+#define SSB_CHIPCO_OTP_SWSIGN_OFF       (-2)
+#define SSB_CHIPCO_OTP_CIDSIGN_OFF      (-1)
+
+#define SSB_CHIPCO_OTP_CID_OFF          0
+#define SSB_CHIPCO_OTP_PKG_OFF          1
+#define SSB_CHIPCO_OTP_FID_OFF          2
+#define SSB_CHIPCO_OTP_RSV_OFF          3
+#define SSB_CHIPCO_OTP_LIM_OFF          4
+
+#define SSB_CHIPCO_OTP_SIGNATURE        0x578A
+#define SSB_CHIPCO_OTP_MAGIC            0x4E56
+
+
+struct ssb_device;
+struct ssb_serial_port;
+
+struct ssb_chipcommon {
+        struct ssb_device *dev;
+        u32 capabilities;
+        /* Fast Powerup Delay constant */
+        u16 fast_pwrup_delay;
+};
+
+extern void ssb_chipcommon_init(struct ssb_chipcommon *cc);
+
+#include <linux/pm.h>
+extern void ssb_chipco_suspend(struct ssb_chipcommon *cc, pm_message_t state);
+extern void ssb_chipco_resume(struct ssb_chipcommon *cc);
+
+extern void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
+                                    u32 *plltype, u32 *n, u32 *m);
+extern void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
+                                        u32 *plltype, u32 *n, u32 *m);
+extern void ssb_chipco_timing_init(struct ssb_chipcommon *cc,
+                                   unsigned long ns_per_cycle);
+
+enum ssb_clkmode {
+        SSB_CLKMODE_SLOW,
+        SSB_CLKMODE_FAST,
+        SSB_CLKMODE_DYNAMIC,
+};
+
+extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
+                                     enum ssb_clkmode mode);
+
+extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
+                                          u32 ticks);
+
+u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
+
+void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
+
+void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
+
+#ifdef CONFIG_SSB_SERIAL
+extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
+                                  struct ssb_serial_port *ports);
+#endif /* CONFIG_SSB_SERIAL */
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
diff --git a/include/linux/ssb/ssb_driver_extif.h b/include/linux/ssb/ssb_driver_extif.h
new file mode 100644
index 000000000000..a9164357b5ae
--- /dev/null
+++ b/include/linux/ssb/ssb_driver_extif.h
@@ -0,0 +1,204 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
+ * for the BCM47xx family of SiliconBackplane-based chips.
+ *
+ * The External Interface core supports a total of three external chip selects
+ * supporting external interfaces. One of the external chip selects is
+ * used for Flash, one is used for PCMCIA, and the other may be
+ * programmed to support either a synchronous interface or an
+ * asynchronous interface. The asynchronous interface can be used to
+ * support external devices such as UARTs and the BCM2019 Bluetooth
+ * baseband processor.
+ * The external interface core also contains 2 on-chip 16550 UARTs, clock
+ * frequency control, a watchdog interrupt timer, and a GPIO interface.
+ *
+ * Copyright 2005, Broadcom Corporation
+ * Copyright 2006, Michael Buesch
+ *
+ * Licensed under the GPL version 2. See COPYING for details.
+ */
+#ifndef LINUX_SSB_EXTIFCORE_H_
+#define LINUX_SSB_EXTIFCORE_H_
+
+/* external interface address space */
+#define SSB_EXTIF_PCMCIA_MEMBASE(x)     (x)
+#define SSB_EXTIF_PCMCIA_IOBASE(x)      ((x) + 0x100000)
+#define SSB_EXTIF_PCMCIA_CFGBASE(x)     ((x) + 0x200000)
+#define SSB_EXTIF_CFGIF_BASE(x)         ((x) + 0x800000)
+#define SSB_EXTIF_FLASH_BASE(x)         ((x) + 0xc00000)
+
+#define SSB_EXTIF_NR_GPIOOUT            5
+/* GPIO NOTE:
+ * The multiple instances of output and output enable registers
+ * are present to allow driver software for multiple cores to control
+ * gpio outputs without needing to share a single register pair.
+ * Use the following helper macro to get a register offset value.
+ */
+#define SSB_EXTIF_GPIO_OUT(index)       ({              \
+        BUILD_BUG_ON(index >= SSB_EXTIF_NR_GPIOOUT);    \
+        SSB_EXTIF_GPIO_OUT_BASE + ((index) * 8);        \
+                                        })
+#define SSB_EXTIF_GPIO_OUTEN(index)     ({              \
+        BUILD_BUG_ON(index >= SSB_EXTIF_NR_GPIOOUT);    \
+        SSB_EXTIF_GPIO_OUTEN_BASE + ((index) * 8);      \
+                                        })
+
+/** EXTIF core registers **/
+
+#define SSB_EXTIF_CTL                   0x0000
+#define  SSB_EXTIF_CTL_UARTEN           (1 << 0) /* UART enable */
+#define SSB_EXTIF_EXTSTAT               0x0004
+#define  SSB_EXTIF_EXTSTAT_EMODE        (1 << 0) /* Endian mode (ro) */
+#define  SSB_EXTIF_EXTSTAT_EIRQPIN      (1 << 1) /* External interrupt pin (ro) */
+#define  SSB_EXTIF_EXTSTAT_GPIOIRQPIN   (1 << 2) /* GPIO interrupt pin (ro) */
+#define SSB_EXTIF_PCMCIA_CFG            0x0010
+#define SSB_EXTIF_PCMCIA_MEMWAIT        0x0014
+#define SSB_EXTIF_PCMCIA_ATTRWAIT       0x0018
+#define SSB_EXTIF_PCMCIA_IOWAIT         0x001C
+#define SSB_EXTIF_PROG_CFG              0x0020
+#define SSB_EXTIF_PROG_WAITCNT          0x0024
+#define SSB_EXTIF_FLASH_CFG             0x0028
+#define SSB_EXTIF_FLASH_WAITCNT         0x002C
+#define SSB_EXTIF_WATCHDOG              0x0040
+#define SSB_EXTIF_CLOCK_N               0x0044
+#define SSB_EXTIF_CLOCK_SB              0x0048
+#define SSB_EXTIF_CLOCK_PCI             0x004C
+#define SSB_EXTIF_CLOCK_MII             0x0050
+#define SSB_EXTIF_GPIO_IN               0x0060
+#define SSB_EXTIF_GPIO_OUT_BASE         0x0064
+#define SSB_EXTIF_GPIO_OUTEN_BASE       0x0068
+#define SSB_EXTIF_EJTAG_OUTEN           0x0090
+#define SSB_EXTIF_GPIO_INTPOL           0x0094
+#define SSB_EXTIF_GPIO_INTMASK          0x0098
+#define SSB_EXTIF_UART_DATA             0x0300
+#define SSB_EXTIF_UART_TIMER            0x0310
+#define SSB_EXTIF_UART_FCR              0x0320
+#define SSB_EXTIF_UART_LCR              0x0330
+#define SSB_EXTIF_UART_MCR              0x0340
+#define SSB_EXTIF_UART_LSR              0x0350
+#define SSB_EXTIF_UART_MSR              0x0360
+#define SSB_EXTIF_UART_SCRATCH          0x0370
+
+
+
+
+/* pcmcia/prog/flash_config */
+#define SSB_EXTCFG_EN                   (1 << 0)        /* enable */
+#define SSB_EXTCFG_MODE                 0xE             /* mode */
+#define SSB_EXTCFG_MODE_SHIFT           1
+#define  SSB_EXTCFG_MODE_FLASH          0x0             /* flash/asynchronous mode */
+#define  SSB_EXTCFG_MODE_SYNC           0x2             /* synchronous mode */
+#define  SSB_EXTCFG_MODE_PCMCIA         0x4             /* pcmcia mode */
+#define SSB_EXTCFG_DS16                 (1 << 4)        /* destsize:  0=8bit, 1=16bit */
+#define SSB_EXTCFG_BSWAP                (1 << 5)        /* byteswap */
+#define SSB_EXTCFG_CLKDIV               0xC0            /* clock divider */
+#define SSB_EXTCFG_CLKDIV_SHIFT         6
+#define  SSB_EXTCFG_CLKDIV_2            0x0             /* backplane/2 */
+#define  SSB_EXTCFG_CLKDIV_3            0x40            /* backplane/3 */
+#define  SSB_EXTCFG_CLKDIV_4            0x80            /* backplane/4 */
+#define SSB_EXTCFG_CLKEN                (1 << 8)        /* clock enable */
+#define SSB_EXTCFG_STROBE               (1 << 9)        /* size/bytestrobe (synch only) */
+
+/* pcmcia_memwait */
+#define SSB_PCMCIA_MEMW_0               0x0000003F      /* waitcount0 */
+#define SSB_PCMCIA_MEMW_1               0x00001F00      /* waitcount1 */
+#define SSB_PCMCIA_MEMW_1_SHIFT         8
+#define SSB_PCMCIA_MEMW_2               0x001F0000      /* waitcount2 */
+#define SSB_PCMCIA_MEMW_2_SHIFT         16
+#define SSB_PCMCIA_MEMW_3               0x1F000000      /* waitcount3 */
+#define SSB_PCMCIA_MEMW_3_SHIFT         24
+
+/* pcmcia_attrwait */
+#define SSB_PCMCIA_ATTW_0               0x0000003F      /* waitcount0 */
+#define SSB_PCMCIA_ATTW_1               0x00001F00      /* waitcount1 */
+#define SSB_PCMCIA_ATTW_1_SHIFT         8
+#define SSB_PCMCIA_ATTW_2               0x001F0000      /* waitcount2 */
+#define SSB_PCMCIA_ATTW_2_SHIFT         16
+#define SSB_PCMCIA_ATTW_3               0x1F000000      /* waitcount3 */
+#define SSB_PCMCIA_ATTW_3_SHIFT         24
+
+/* pcmcia_iowait */
+#define SSB_PCMCIA_IOW_0                0x0000003F      /* waitcount0 */
+#define SSB_PCMCIA_IOW_1                0x00001F00      /* waitcount1 */
+#define SSB_PCMCIA_IOW_1_SHIFT          8
+#define SSB_PCMCIA_IOW_2                0x001F0000      /* waitcount2 */
+#define SSB_PCMCIA_IOW_2_SHIFT          16
+#define SSB_PCMCIA_IOW_3                0x1F000000      /* waitcount3 */
+#define SSB_PCMCIA_IOW_3_SHIFT          24
+
+/* prog_waitcount */
+#define SSB_PROG_WCNT_0                 0x0000001F      /* waitcount0 */
+#define SSB_PROG_WCNT_1                 0x00001F00      /* waitcount1 */
+#define SSB_PROG_WCNT_1_SHIFT           8
+#define SSB_PROG_WCNT_2                 0x001F0000      /* waitcount2 */
+#define SSB_PROG_WCNT_2_SHIFT           16
+#define SSB_PROG_WCNT_3                 0x1F000000      /* waitcount3 */
+#define SSB_PROG_WCNT_3_SHIFT           24
+
+#define SSB_PROG_W0                     0x0000000C
+#define SSB_PROG_W1                     0x00000A00
+#define SSB_PROG_W2                     0x00020000
+#define SSB_PROG_W3                     0x01000000
+
+/* flash_waitcount */
+#define SSB_FLASH_WCNT_0                0x0000001F      /* waitcount0 */
+#define SSB_FLASH_WCNT_1                0x00001F00      /* waitcount1 */
+#define SSB_FLASH_WCNT_1_SHIFT          8
+#define SSB_FLASH_WCNT_2                0x001F0000      /* waitcount2 */
+#define SSB_FLASH_WCNT_2_SHIFT          16
+#define SSB_FLASH_WCNT_3                0x1F000000      /* waitcount3 */
+#define SSB_FLASH_WCNT_3_SHIFT          24
+
+/* watchdog */
+#define SSB_EXTIF_WATCHDOG_CLK          48000000        /* Hz */
+
+
+
+#ifdef CONFIG_SSB_DRIVER_EXTIF
+
+struct ssb_extif {
+        struct ssb_device *dev;
+};
+
+static inline bool ssb_extif_available(struct ssb_extif *extif)
+{
+        return (extif->dev != NULL);
+}
+
+extern void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
+                                       u32 *plltype, u32 *n, u32 *m);
+
+extern void ssb_extif_timing_init(struct ssb_extif *extif,
+                                  unsigned long ns);
+
+u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
+
+void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
+
+void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
+
+#ifdef CONFIG_SSB_SERIAL
+extern int ssb_extif_serial_init(struct ssb_extif *extif,
+                                 struct ssb_serial_port *ports);
+#endif /* CONFIG_SSB_SERIAL */
+
+
+#else /* CONFIG_SSB_DRIVER_EXTIF */
+/* extif disabled */
+
+struct ssb_extif {
+};
+
+static inline bool ssb_extif_available(struct ssb_extif *extif)
+{
+        return 0;
+}
+
+static inline
+void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
+                                u32 *plltype, u32 *n, u32 *m)
+{
+}
+
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
new file mode 100644
index 000000000000..5f44e9740cd2
--- /dev/null
+++ b/include/linux/ssb/ssb_driver_mips.h
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
+
+#ifdef CONFIG_SSB_DRIVER_MIPS
+
+struct ssb_device;
+
+struct ssb_serial_port {
+        void *regs;
+        unsigned long clockspeed;
+        unsigned int irq;
+        unsigned int baud_base;
+        unsigned int reg_shift;
+};
+
+
+struct ssb_mipscore {
+        struct ssb_device *dev;
+
+        int nr_serial_ports;
+        struct ssb_serial_port serial_ports[4];
+
+        u8 flash_buswidth;
+        u32 flash_window;
+        u32 flash_window_size;
+};
+
+extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
+extern u32 ssb_cpu_clock(struct ssb_mipscore *mcore);
+
+extern unsigned int ssb_mips_irq(struct ssb_device *dev);
+
+
+#else /* CONFIG_SSB_DRIVER_MIPS */
+
+struct ssb_mipscore {
+};
+
+static inline
+void ssb_mipscore_init(struct ssb_mipscore *mcore)
+{
+}
+
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
diff --git a/include/linux/ssb/ssb_driver_pci.h b/include/linux/ssb/ssb_driver_pci.h
new file mode 100644
index 000000000000..9cfffb7b1a27
--- /dev/null
+++ b/include/linux/ssb/ssb_driver_pci.h
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
+
+#ifdef CONFIG_SSB_DRIVER_PCICORE
+
+/* PCI core registers. */
+#define SSB_PCICORE_CTL                 0x0000  /* PCI Control */
+#define  SSB_PCICORE_CTL_RST_OE         0x00000001 /* PCI_RESET Output Enable */
+#define  SSB_PCICORE_CTL_RST            0x00000002 /* PCI_RESET driven out to pin */
+#define  SSB_PCICORE_CTL_CLK_OE         0x00000004 /* Clock gate Output Enable */
+#define  SSB_PCICORE_CTL_CLK            0x00000008 /* Gate for clock driven out to pin */
+#define SSB_PCICORE_ARBCTL              0x0010  /* PCI Arbiter Control */
+#define  SSB_PCICORE_ARBCTL_INTERN      0x00000001 /* Use internal arbiter */
+#define  SSB_PCICORE_ARBCTL_EXTERN      0x00000002 /* Use external arbiter */
+#define  SSB_PCICORE_ARBCTL_PARKID      0x00000006 /* Mask, selects which agent is parked on an idle bus */
+#define   SSB_PCICORE_ARBCTL_PARKID_LAST        0x00000000 /* Last requestor */
+#define   SSB_PCICORE_ARBCTL_PARKID_4710        0x00000002 /* 4710 */
+#define   SSB_PCICORE_ARBCTL_PARKID_EXT0        0x00000004 /* External requestor 0 */
+#define   SSB_PCICORE_ARBCTL_PARKID_EXT1        0x00000006 /* External requestor 1 */
+#define SSB_PCICORE_ISTAT               0x0020  /* Interrupt status */
+#define  SSB_PCICORE_ISTAT_INTA         0x00000001 /* PCI INTA# */
+#define  SSB_PCICORE_ISTAT_INTB         0x00000002 /* PCI INTB# */
+#define  SSB_PCICORE_ISTAT_SERR         0x00000004 /* PCI SERR# (write to clear) */
+#define  SSB_PCICORE_ISTAT_PERR         0x00000008 /* PCI PERR# (write to clear) */
+#define  SSB_PCICORE_ISTAT_PME          0x00000010 /* PCI PME# */
+#define SSB_PCICORE_IMASK               0x0024  /* Interrupt mask */
+#define  SSB_PCICORE_IMASK_INTA         0x00000001 /* PCI INTA# */
+#define  SSB_PCICORE_IMASK_INTB         0x00000002 /* PCI INTB# */
+#define  SSB_PCICORE_IMASK_SERR         0x00000004 /* PCI SERR# */
+#define  SSB_PCICORE_IMASK_PERR         0x00000008 /* PCI PERR# */
+#define  SSB_PCICORE_IMASK_PME          0x00000010 /* PCI PME# */
+#define SSB_PCICORE_MBOX                0x0028  /* Backplane to PCI Mailbox */
+#define  SSB_PCICORE_MBOX_F0_0          0x00000100 /* PCI function 0, INT 0 */
+#define  SSB_PCICORE_MBOX_F0_1          0x00000200 /* PCI function 0, INT 1 */
+#define  SSB_PCICORE_MBOX_F1_0          0x00000400 /* PCI function 1, INT 0 */
+#define  SSB_PCICORE_MBOX_F1_1          0x00000800 /* PCI function 1, INT 1 */
+#define  SSB_PCICORE_MBOX_F2_0          0x00001000 /* PCI function 2, INT 0 */
+#define  SSB_PCICORE_MBOX_F2_1          0x00002000 /* PCI function 2, INT 1 */
+#define  SSB_PCICORE_MBOX_F3_0          0x00004000 /* PCI function 3, INT 0 */
+#define  SSB_PCICORE_MBOX_F3_1          0x00008000 /* PCI function 3, INT 1 */
+#define SSB_PCICORE_BCAST_ADDR          0x0050  /* Backplane Broadcast Address */
+#define  SSB_PCICORE_BCAST_ADDR_MASK    0x000000FF
+#define SSB_PCICORE_BCAST_DATA          0x0054  /* Backplane Broadcast Data */
+#define SSB_PCICORE_GPIO_IN             0x0060  /* rev >= 2 only */
+#define SSB_PCICORE_GPIO_OUT            0x0064  /* rev >= 2 only */
+#define SSB_PCICORE_GPIO_ENABLE         0x0068  /* rev >= 2 only */
+#define SSB_PCICORE_GPIO_CTL            0x006C  /* rev >= 2 only */
+#define SSB_PCICORE_SBTOPCI0            0x0100  /* Backplane to PCI translation 0 (sbtopci0) */
+#define  SSB_PCICORE_SBTOPCI0_MASK      0xFC000000
+#define SSB_PCICORE_SBTOPCI1            0x0104  /* Backplane to PCI translation 1 (sbtopci1) */
+#define  SSB_PCICORE_SBTOPCI1_MASK      0xFC000000
+#define SSB_PCICORE_SBTOPCI2            0x0108  /* Backplane to PCI translation 2 (sbtopci2) */
+#define  SSB_PCICORE_SBTOPCI2_MASK      0xC0000000
+
+/* SBtoPCIx */
+#define SSB_PCICORE_SBTOPCI_MEM         0x00000000
+#define SSB_PCICORE_SBTOPCI_IO          0x00000001
+#define SSB_PCICORE_SBTOPCI_CFG0        0x00000002
+#define SSB_PCICORE_SBTOPCI_CFG1        0x00000003
+#define SSB_PCICORE_SBTOPCI_PREF        0x00000004 /* Prefetch enable */
+#define SSB_PCICORE_SBTOPCI_BURST       0x00000008 /* Burst enable */
+#define SSB_PCICORE_SBTOPCI_MRM         0x00000020 /* Memory Read Multiple */
+#define SSB_PCICORE_SBTOPCI_RC          0x00000030 /* Read Command mask (rev >= 11) */
+#define  SSB_PCICORE_SBTOPCI_RC_READ    0x00000000 /* Memory read */
+#define  SSB_PCICORE_SBTOPCI_RC_READL   0x00000010 /* Memory read line */
+#define  SSB_PCICORE_SBTOPCI_RC_READM   0x00000020 /* Memory read multiple */
+
+
+/* PCIcore specific boardflags */
+#define SSB_PCICORE_BFL_NOPCI           0x00000400 /* Board leaves PCI floating */
+
+
+struct ssb_pcicore {
+        struct ssb_device *dev;
+        u8 setup_done:1;
+        u8 hostmode:1;
+        u8 cardbusmode:1;
+};
+
+extern void ssb_pcicore_init(struct ssb_pcicore *pc);
+
+/* Enable IRQ routing for a specific device */
+extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
+                                          struct ssb_device *dev);
+
+
+#else /* CONFIG_SSB_DRIVER_PCICORE */
+
+
+struct ssb_pcicore {
+};
+
+static inline
+void ssb_pcicore_init(struct ssb_pcicore *pc)
+{
+}
+
+static inline
+int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
+                                   struct ssb_device *dev)
+{
+        return 0;
+}
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
new file mode 100644
index 000000000000..47c7c71a5acf
--- /dev/null
+++ b/include/linux/ssb/ssb_regs.h
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
+
+
+/* SiliconBackplane Address Map.
+ * All regions may not exist on all chips.
+ */
+#define SSB_SDRAM_BASE          0x00000000U     /* Physical SDRAM */
+#define SSB_PCI_MEM             0x08000000U     /* Host Mode sb2pcitranslation0 (64 MB) */
+#define SSB_PCI_CFG             0x0c000000U     /* Host Mode sb2pcitranslation1 (64 MB) */
+#define SSB_SDRAM_SWAPPED       0x10000000U     /* Byteswapped Physical SDRAM */
+#define SSB_ENUM_BASE           0x18000000U     /* Enumeration space base */
+#define SSB_ENUM_LIMIT          0x18010000U     /* Enumeration space limit */
+
+#define SSB_FLASH2              0x1c000000U     /* Flash Region 2 (region 1 shadowed here) */
+#define SSB_FLASH2_SZ           0x02000000U     /* Size of Flash Region 2 */
+
+#define SSB_EXTIF_BASE          0x1f000000U     /* External Interface region base address */
+#define SSB_FLASH1              0x1fc00000U     /* Flash Region 1 */
+#define SSB_FLASH1_SZ           0x00400000U     /* Size of Flash Region 1 */
+
+#define SSB_PCI_DMA             0x40000000U     /* Client Mode sb2pcitranslation2 (1 GB) */
+#define SSB_PCI_DMA_SZ          0x40000000U     /* Client Mode sb2pcitranslation2 size in bytes */
+#define SSB_PCIE_DMA_L32        0x00000000U     /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), low 32 bits */
+#define SSB_PCIE_DMA_H32        0x80000000U     /* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */
+#define SSB_EUART               (SSB_EXTIF_BASE + 0x00800000)
+#define SSB_LED                 (SSB_EXTIF_BASE + 0x00900000)
+
+
+/* Enumeration space constants */
+#define SSB_CORE_SIZE           0x1000  /* Size of a core MMIO area */
+#define SSB_MAX_NR_CORES        ((SSB_ENUM_LIMIT - SSB_ENUM_BASE) / SSB_CORE_SIZE)
+
+
+/* mips address */
+#define SSB_EJTAG               0xff200000      /* MIPS EJTAG space (2M) */
+
+
+/* SSB PCI config space registers. */
+#define SSB_PMCSR               0x44
+#define  SSB_PE                 0x100
+#define SSB_BAR0_WIN            0x80    /* Backplane address space 0 */
+#define SSB_BAR1_WIN            0x84    /* Backplane address space 1 */
+#define SSB_SPROMCTL            0x88    /* SPROM control */
+#define  SSB_SPROMCTL_WE        0x10    /* SPROM write enable */
+#define SSB_BAR1_CONTROL        0x8c    /* Address space 1 burst control */
+#define SSB_PCI_IRQS            0x90    /* PCI interrupts */
+#define SSB_PCI_IRQMASK         0x94    /* PCI IRQ control and mask (pcirev >= 6 only) */
+#define SSB_BACKPLANE_IRQS      0x98    /* Backplane Interrupts */
+#define SSB_GPIO_IN             0xB0    /* GPIO Input (pcirev >= 3 only) */
+#define SSB_GPIO_OUT            0xB4    /* GPIO Output (pcirev >= 3 only) */
+#define SSB_GPIO_OUT_ENABLE     0xB8    /* GPIO Output Enable/Disable (pcirev >= 3 only) */
+#define  SSB_GPIO_SCS           0x10    /* PCI config space bit 4 for 4306c0 slow clock source */
+#define  SSB_GPIO_HWRAD         0x20    /* PCI config space GPIO 13 for hw radio disable */
+#define  SSB_GPIO_XTAL          0x40    /* PCI config space GPIO 14 for Xtal powerup */
+#define  SSB_GPIO_PLL           0x80    /* PCI config space GPIO 15 for PLL powerdown */
+
+
+#define SSB_BAR0_MAX_RETRIES    50
+
+/* Silicon backplane configuration register definitions */
+#define SSB_IPSFLAG             0x0F08
+#define  SSB_IPSFLAG_IRQ1       0x0000003F /* which sbflags get routed to mips interrupt 1 */
+#define  SSB_IPSFLAG_IRQ1_SHIFT 0
+#define  SSB_IPSFLAG_IRQ2       0x00003F00 /* which sbflags get routed to mips interrupt 2 */
+#define  SSB_IPSFLAG_IRQ2_SHIFT 8
+#define  SSB_IPSFLAG_IRQ3       0x003F0000 /* which sbflags get routed to mips interrupt 3 */
+#define  SSB_IPSFLAG_IRQ3_SHIFT 16
+#define  SSB_IPSFLAG_IRQ4       0x3F000000 /* which sbflags get routed to mips interrupt 4 */
+#define  SSB_IPSFLAG_IRQ4_SHIFT 24
+#define SSB_TPSFLAG             0x0F18
+#define  SSB_TPSFLAG_BPFLAG     0x0000003F /* Backplane flag # */
+#define  SSB_TPSFLAG_ALWAYSIRQ  0x00000040 /* IRQ is always sent on the Backplane */
+#define SSB_TMERRLOGA           0x0F48
+#define SSB_TMERRLOG            0x0F50
+#define SSB_ADMATCH3            0x0F60
+#define SSB_ADMATCH2            0x0F68
+#define SSB_ADMATCH1            0x0F70
+#define SSB_IMSTATE             0x0F90     /* SB Initiator Agent State */
+#define  SSB_IMSTATE_PC         0x0000000f /* Pipe Count */
+#define  SSB_IMSTATE_AP_MASK    0x00000030 /* Arbitration Priority */
+#define  SSB_IMSTATE_AP_BOTH    0x00000000 /* Use both timeslices and token */
+#define  SSB_IMSTATE_AP_TS      0x00000010 /* Use timeslices only */
+#define  SSB_IMSTATE_AP_TK      0x00000020 /* Use token only */
+#define  SSB_IMSTATE_AP_RSV     0x00000030 /* Reserved */
+#define  SSB_IMSTATE_IBE        0x00020000 /* In Band Error */
+#define  SSB_IMSTATE_TO         0x00040000 /* Timeout */
+#define SSB_INTVEC              0x0F94     /* SB Interrupt Mask */
+#define  SSB_INTVEC_PCI         0x00000001 /* Enable interrupts for PCI */
+#define  SSB_INTVEC_ENET0       0x00000002 /* Enable interrupts for enet 0 */
+#define  SSB_INTVEC_ILINE20     0x00000004 /* Enable interrupts for iline20 */
+#define  SSB_INTVEC_CODEC       0x00000008 /* Enable interrupts for v90 codec */
+#define  SSB_INTVEC_USB         0x00000010 /* Enable interrupts for usb */
+#define  SSB_INTVEC_EXTIF       0x00000020 /* Enable interrupts for external i/f */
+#define  SSB_INTVEC_ENET1       0x00000040 /* Enable interrupts for enet 1 */
+#define SSB_TMSLOW              0x0F98     /* SB Target State Low */
+#define  SSB_TMSLOW_RESET       0x00000001 /* Reset */
+#define  SSB_TMSLOW_REJECT_22   0x00000002 /* Reject (Backplane rev 2.2) */
+#define  SSB_TMSLOW_REJECT_23   0x00000004 /* Reject (Backplane rev 2.3) */
+#define  SSB_TMSLOW_CLOCK       0x00010000 /* Clock Enable */
+#define  SSB_TMSLOW_FGC         0x00020000 /* Force Gated Clocks On */
+#define  SSB_TMSLOW_PE          0x40000000 /* Power Management Enable */
+#define  SSB_TMSLOW_BE          0x80000000 /* BIST Enable */
+#define SSB_TMSHIGH             0x0F9C     /* SB Target State High */
+#define  SSB_TMSHIGH_SERR       0x00000001 /* S-error */
+#define  SSB_TMSHIGH_INT        0x00000002 /* Interrupt */
+#define  SSB_TMSHIGH_BUSY       0x00000004 /* Busy */
+#define  SSB_TMSHIGH_TO         0x00000020 /* Timeout. Backplane rev >= 2.3 only */
+#define  SSB_TMSHIGH_COREFL     0x1FFF0000 /* Core specific flags */
+#define  SSB_TMSHIGH_COREFL_SHIFT       16
+#define  SSB_TMSHIGH_DMA64      0x10000000 /* 64bit DMA supported */
+#define  SSB_TMSHIGH_GCR        0x20000000 /* Gated Clock Request */
+#define  SSB_TMSHIGH_BISTF      0x40000000 /* BIST Failed */
+#define  SSB_TMSHIGH_BISTD      0x80000000 /* BIST Done */
+#define SSB_BWA0                0x0FA0
+#define SSB_IMCFGLO             0x0FA8
+#define  SSB_IMCFGLO_SERTO      0x00000007 /* Service timeout */
+#define  SSB_IMCFGLO_REQTO      0x00000070 /* Request timeout */
+#define  SSB_IMCFGLO_REQTO_SHIFT        4
+#define  SSB_IMCFGLO_CONNID     0x00FF0000 /* Connection ID */
+#define  SSB_IMCFGLO_CONNID_SHIFT       16
+#define SSB_IMCFGHI             0x0FAC
+#define SSB_ADMATCH0            0x0FB0
+#define SSB_TMCFGLO             0x0FB8
+#define SSB_TMCFGHI             0x0FBC
+#define SSB_BCONFIG             0x0FC0
+#define SSB_BSTATE              0x0FC8
+#define SSB_ACTCFG              0x0FD8
+#define SSB_FLAGST              0x0FE8
+#define SSB_IDLOW               0x0FF8
+#define  SSB_IDLOW_CFGSP        0x00000003 /* Config Space */
+#define  SSB_IDLOW_ADDRNGE      0x00000038 /* Address Ranges supported */
+#define  SSB_IDLOW_ADDRNGE_SHIFT        3
+#define  SSB_IDLOW_SYNC         0x00000040
+#define  SSB_IDLOW_INITIATOR    0x00000080
+#define  SSB_IDLOW_MIBL         0x00000F00 /* Minimum Backplane latency */
+#define  SSB_IDLOW_MIBL_SHIFT   8
+#define  SSB_IDLOW_MABL         0x0000F000 /* Maximum Backplane latency */
+#define  SSB_IDLOW_MABL_SHIFT   12
+#define  SSB_IDLOW_TIF          0x00010000 /* This Initiator is first */
+#define  SSB_IDLOW_CCW          0x000C0000 /* Cycle counter width */
+#define  SSB_IDLOW_CCW_SHIFT    18
+#define  SSB_IDLOW_TPT          0x00F00000 /* Target ports */
+#define  SSB_IDLOW_TPT_SHIFT    20
+#define  SSB_IDLOW_INITP        0x0F000000 /* Initiator ports */
+#define  SSB_IDLOW_INITP_SHIFT  24
+#define  SSB_IDLOW_SSBREV       0xF0000000 /* Sonics Backplane Revision code */
+#define  SSB_IDLOW_SSBREV_22    0x00000000 /* <= 2.2 */
+#define  SSB_IDLOW_SSBREV_23    0x10000000 /* 2.3 */
+#define SSB_IDHIGH              0x0FFC     /* SB Identification High */
+#define  SSB_IDHIGH_RCLO        0x0000000F /* Revision Code (low part) */
+#define  SSB_IDHIGH_CC          0x00008FF0 /* Core Code */
+#define  SSB_IDHIGH_CC_SHIFT    4
+#define  SSB_IDHIGH_RCHI        0x00007000 /* Revision Code (high part) */
+#define  SSB_IDHIGH_RCHI_SHIFT  8          /* yes, shift 8 is right */
+#define  SSB_IDHIGH_VC          0xFFFF0000 /* Vendor Code */
+#define  SSB_IDHIGH_VC_SHIFT    16
+
+/* SPROM shadow area. If not otherwise noted, fields are
+ * two bytes wide. Note that the SPROM can _only_ be read
+ * in two-byte quantinies.
+ */
+#define SSB_SPROMSIZE_WORDS             64
+#define SSB_SPROMSIZE_BYTES             (SSB_SPROMSIZE_WORDS * sizeof(u16))
+#define SSB_SPROM_BASE                  0x1000
+#define SSB_SPROM_REVISION              0x107E
+#define  SSB_SPROM_REVISION_REV         0x00FF  /* SPROM Revision number */
+#define  SSB_SPROM_REVISION_CRC         0xFF00  /* SPROM CRC8 value */
+#define  SSB_SPROM_REVISION_CRC_SHIFT   8
+/* SPROM Revision 1 */
+#define SSB_SPROM1_SPID                 0x1004  /* Subsystem Product ID for PCI */
+#define SSB_SPROM1_SVID                 0x1006  /* Subsystem Vendor ID for PCI */
+#define SSB_SPROM1_PID                  0x1008  /* Product ID for PCI */
+#define SSB_SPROM1_IL0MAC               0x1048  /* 6 bytes MAC address for 802.11b/g */
+#define SSB_SPROM1_ET0MAC               0x104E  /* 6 bytes MAC address for Ethernet */
+#define SSB_SPROM1_ET1MAC               0x1054  /* 6 bytes MAC address for 802.11a */
+#define SSB_SPROM1_ETHPHY               0x105A  /* Ethernet PHY settings */
+#define  SSB_SPROM1_ETHPHY_ET0A         0x001F  /* MII Address for enet0 */
+#define  SSB_SPROM1_ETHPHY_ET1A         0x03E0  /* MII Address for enet1 */
+#define  SSB_SPROM1_ETHPHY_ET1A_SHIFT   5
+#define  SSB_SPROM1_ETHPHY_ET0M         (1<<14) /* MDIO for enet0 */
+#define  SSB_SPROM1_ETHPHY_ET1M         (1<<15) /* MDIO for enet1 */
+#define SSB_SPROM1_BINF                 0x105C  /* Board info */
+#define  SSB_SPROM1_BINF_BREV           0x00FF  /* Board Revision */
+#define  SSB_SPROM1_BINF_CCODE          0x0F00  /* Country Code */
+#define  SSB_SPROM1_BINF_CCODE_SHIFT    8
+#define  SSB_SPROM1_BINF_ANTA           0x3000  /* Available A-PHY antennas */
+#define  SSB_SPROM1_BINF_ANTA_SHIFT     12
+#define  SSB_SPROM1_BINF_ANTBG          0xC000  /* Available B-PHY antennas */
+#define  SSB_SPROM1_BINF_ANTBG_SHIFT    14
+#define SSB_SPROM1_PA0B0                0x105E
+#define SSB_SPROM1_PA0B1                0x1060
+#define SSB_SPROM1_PA0B2                0x1062
+#define SSB_SPROM1_GPIOA                0x1064  /* General Purpose IO pins 0 and 1 */
+#define  SSB_SPROM1_GPIOA_P0            0x00FF  /* Pin 0 */
+#define  SSB_SPROM1_GPIOA_P1            0xFF00  /* Pin 1 */
+#define  SSB_SPROM1_GPIOA_P1_SHIFT      8
+#define SSB_SPROM1_GPIOB                0x1066  /* General Purpuse IO pins 2 and 3 */
+#define  SSB_SPROM1_GPIOB_P2            0x00FF  /* Pin 2 */
+#define  SSB_SPROM1_GPIOB_P3            0xFF00  /* Pin 3 */
+#define  SSB_SPROM1_GPIOB_P3_SHIFT      8
+#define SSB_SPROM1_MAXPWR               0x1068  /* Power Amplifier Max Power */
+#define  SSB_SPROM1_MAXPWR_BG           0x00FF  /* B-PHY and G-PHY (in dBm Q5.2) */
+#define  SSB_SPROM1_MAXPWR_A            0xFF00  /* A-PHY (in dBm Q5.2) */
+#define  SSB_SPROM1_MAXPWR_A_SHIFT      8
+#define SSB_SPROM1_PA1B0                0x106A
+#define SSB_SPROM1_PA1B1                0x106C
+#define SSB_SPROM1_PA1B2                0x106E
+#define SSB_SPROM1_ITSSI                0x1070  /* Idle TSSI Target */
+#define  SSB_SPROM1_ITSSI_BG            0x00FF  /* B-PHY and G-PHY*/
+#define  SSB_SPROM1_ITSSI_A             0xFF00  /* A-PHY */
+#define  SSB_SPROM1_ITSSI_A_SHIFT       8
+#define SSB_SPROM1_BFLLO                0x1072  /* Boardflags (low 16 bits) */
+#define SSB_SPROM1_AGAIN                0x1074  /* Antenna Gain (in dBm Q5.2) */
+#define  SSB_SPROM1_AGAIN_A             0x00FF  /* A-PHY */
+#define  SSB_SPROM1_AGAIN_BG            0xFF00  /* B-PHY and G-PHY */
+#define  SSB_SPROM1_AGAIN_BG_SHIFT      8
+#define SSB_SPROM1_OEM                  0x1076  /* 8 bytes OEM string (rev 1 only) */
+/* SPROM Revision 2 (inherits from rev 1) */
+#define SSB_SPROM2_BFLHI                0x1038  /* Boardflags (high 16 bits) */
+#define SSB_SPROM2_MAXP_A               0x103A  /* A-PHY Max Power */
+#define  SSB_SPROM2_MAXP_A_HI           0x00FF  /* Max Power High */
+#define  SSB_SPROM2_MAXP_A_LO           0xFF00  /* Max Power Low */
+#define  SSB_SPROM2_MAXP_A_LO_SHIFT     8
+#define SSB_SPROM2_PA1LOB0              0x103C  /* A-PHY PowerAmplifier Low Settings */
+#define SSB_SPROM2_PA1LOB1              0x103E  /* A-PHY PowerAmplifier Low Settings */
+#define SSB_SPROM2_PA1LOB2              0x1040  /* A-PHY PowerAmplifier Low Settings */
+#define SSB_SPROM2_PA1HIB0              0x1042  /* A-PHY PowerAmplifier High Settings */
+#define SSB_SPROM2_PA1HIB1              0x1044  /* A-PHY PowerAmplifier High Settings */
+#define SSB_SPROM2_PA1HIB2              0x1046  /* A-PHY PowerAmplifier High Settings */
+#define SSB_SPROM2_OPO                  0x1078  /* OFDM Power Offset from CCK Level */
+#define  SSB_SPROM2_OPO_VALUE           0x00FF
+#define  SSB_SPROM2_OPO_UNUSED          0xFF00
+#define SSB_SPROM2_CCODE                0x107C  /* Two char Country Code */
+/* SPROM Revision 3 (inherits from rev 2) */
+#define SSB_SPROM3_OFDMAPO              0x102C  /* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
+#define SSB_SPROM3_OFDMALPO             0x1030  /* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
+#define SSB_SPROM3_OFDMAHPO             0x1034  /* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
+#define SSB_SPROM3_GPIOLDC              0x1042  /* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
+#define  SSB_SPROM3_GPIOLDC_OFF         0x0000FF00      /* Off Count */
+#define  SSB_SPROM3_GPIOLDC_OFF_SHIFT   8
+#define  SSB_SPROM3_GPIOLDC_ON          0x00FF0000      /* On Count */
+#define  SSB_SPROM3_GPIOLDC_ON_SHIFT    16
+#define SSB_SPROM3_CCKPO                0x1078  /* CCK Power Offset */
+#define  SSB_SPROM3_CCKPO_1M            0x000F  /* 1M Rate PO */
+#define  SSB_SPROM3_CCKPO_2M            0x00F0  /* 2M Rate PO */
+#define  SSB_SPROM3_CCKPO_2M_SHIFT      4
+#define  SSB_SPROM3_CCKPO_55M           0x0F00  /* 5.5M Rate PO */
+#define  SSB_SPROM3_CCKPO_55M_SHIFT     8
+#define  SSB_SPROM3_CCKPO_11M           0xF000  /* 11M Rate PO */
+#define  SSB_SPROM3_CCKPO_11M_SHIFT     12
+#define  SSB_SPROM3_OFDMGPO             0x107A  /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
+
+/* Values for SSB_SPROM1_BINF_CCODE */
+enum {
+        SSB_SPROM1CCODE_WORLD = 0,
+        SSB_SPROM1CCODE_THAILAND,
+        SSB_SPROM1CCODE_ISRAEL,
+        SSB_SPROM1CCODE_JORDAN,
+        SSB_SPROM1CCODE_CHINA,
+        SSB_SPROM1CCODE_JAPAN,
+        SSB_SPROM1CCODE_USA_CANADA_ANZ,
+        SSB_SPROM1CCODE_EUROPE,
+        SSB_SPROM1CCODE_USA_LOW,
+        SSB_SPROM1CCODE_JAPAN_HIGH,
+        SSB_SPROM1CCODE_ALL,
+        SSB_SPROM1CCODE_NONE,
+};
+
+/* Address-Match values and masks (SSB_ADMATCHxxx) */
+#define SSB_ADM_TYPE                    0x00000003      /* Address type */
+#define  SSB_ADM_TYPE0                  0
+#define  SSB_ADM_TYPE1                  1
+#define  SSB_ADM_TYPE2                  2
+#define SSB_ADM_AD64                    0x00000004
+#define SSB_ADM_SZ0                     0x000000F8      /* Type0 size */
+#define SSB_ADM_SZ0_SHIFT               3
+#define SSB_ADM_SZ1                     0x000001F8      /* Type1 size */
+#define SSB_ADM_SZ1_SHIFT               3
+#define SSB_ADM_SZ2                     0x000001F8      /* Type2 size */
+#define SSB_ADM_SZ2_SHIFT               3
+#define SSB_ADM_EN                      0x00000400      /* Enable */
+#define SSB_ADM_NEG                     0x00000800      /* Negative decode */
+#define SSB_ADM_BASE0                   0xFFFFFF00      /* Type0 base address */
+#define SSB_ADM_BASE0_SHIFT             8
+#define SSB_ADM_BASE1                   0xFFFFF000      /* Type1 base address for the core */
+#define SSB_ADM_BASE1_SHIFT             12
+#define SSB_ADM_BASE2                   0xFFFF0000      /* Type2 base address for the core */
+#define SSB_ADM_BASE2_SHIFT             16
+
+
+#endif /* LINUX_SSB_REGS_H_ */
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index 1d2b084c0185..e7fa657d0c49 100644
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -13,7 +13,7 @@ extern void save_stack_trace(struct stack_trace *trace);
 extern void print_stack_trace(struct stack_trace *trace, int spaces);
 #else
 # define save_stack_trace(trace)                        do { } while (0)
-# define print_stack_trace(trace)                       do { } while (0)
+# define print_stack_trace(trace, spaces)               do { } while (0)
 #endif
 
 #endif
diff --git a/include/linux/string.h b/include/linux/string.h
index 7f2eb6a477f9..836062b7582a 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -105,8 +105,12 @@ extern void * memchr(const void *,int,__kernel_size_t);
 #endif
 
 extern char *kstrdup(const char *s, gfp_t gfp);
+extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
 extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
 
+extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
+extern void argv_free(char **argv);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 9e340fa23c06..c6b53d181bfa 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -12,6 +12,7 @@
 #include <linux/uio.h>
 #include <asm/byteorder.h>
 #include <linux/scatterlist.h>
+#include <linux/smp_lock.h>
 
 /*
  * Buffer adjustment
@@ -36,6 +37,21 @@ struct xdr_netobj {
 typedef int     (*kxdrproc_t)(void *rqstp, __be32 *data, void *obj);
 
 /*
+ * We're still requiring the BKL in the xdr code until it's been
+ * more carefully audited, at which point this wrapper will become
+ * unnecessary.
+ */
+static inline int rpc_call_xdrproc(kxdrproc_t xdrproc, void *rqstp, __be32 *data, void *obj)
+{
+        int ret;
+
+        lock_kernel();
+        ret = xdrproc(rqstp, data, obj);
+        unlock_kernel();
+        return ret;
+}
+
+/*
  * Basic structure for transmission/reception of a client XDR message.
  * Features a header (for a linear buffer containing RPC headers
  * and the data payload for short messages), and then an array of
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 9c7cb6430666..388cace9751f 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -24,7 +24,7 @@ struct pbe {
 extern void drain_local_pages(void);
 extern void mark_free_pages(struct zone *zone);
 
-#if defined(CONFIG_PM) && defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
 extern int pm_prepare_console(void);
 extern void pm_restore_console(void);
 #else
@@ -43,14 +43,18 @@ static inline void pm_restore_console(void) {}
  * @prepare: prepare system for hibernation
  * @enter: shut down system after state has been saved to disk
  * @finish: finish/clean up after state has been reloaded
+ * @pre_restore: prepare system for the restoration from a hibernation image
+ * @restore_cleanup: clean up after a failing image restoration
  */
 struct hibernation_ops {
         int (*prepare)(void);
         int (*enter)(void);
         void (*finish)(void);
+        int (*pre_restore)(void);
+        void (*restore_cleanup)(void);
 };
 
-#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
+#ifdef CONFIG_HIBERNATION
 /* kernel/power/snapshot.c */
 extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
 static inline void register_nosave_region(unsigned long b, unsigned long e)
@@ -68,21 +72,62 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
 
 extern void hibernation_set_ops(struct hibernation_ops *ops);
 extern int hibernate(void);
-#else
-static inline void register_nosave_region(unsigned long b, unsigned long e) {}
-static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
+#else /* CONFIG_HIBERNATION */
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
 static inline void swsusp_unset_page_free(struct page *p) {}
 
 static inline void hibernation_set_ops(struct hibernation_ops *ops) {}
 static inline int hibernate(void) { return -ENOSYS; }
-#endif /* defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) */
+#endif /* CONFIG_HIBERNATION */
 
+#ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);
 void restore_processor_state(void);
 struct saved_context;
 void __save_processor_state(struct saved_context *ctxt);
 void __restore_processor_state(struct saved_context *ctxt);
 
+/* kernel/power/main.c */
+extern struct blocking_notifier_head pm_chain_head;
+
+static inline int register_pm_notifier(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&pm_chain_head, nb);
+}
+
+static inline int unregister_pm_notifier(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&pm_chain_head, nb);
+}
+
+#define pm_notifier(fn, pri) {                          \
+        static struct notifier_block fn##_nb =                  \
+                { .notifier_call = fn, .priority = pri };       \
+        register_pm_notifier(&fn##_nb);                 \
+}
+#else /* !CONFIG_PM_SLEEP */
+
+static inline int register_pm_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
+
+static inline int unregister_pm_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
+
+#define pm_notifier(fn, pri)    do { (void)(fn); } while (0)
+#endif /* !CONFIG_PM_SLEEP */
+
+#ifndef CONFIG_HIBERNATION
+static inline void register_nosave_region(unsigned long b, unsigned long e)
+{
+}
+static inline void register_nosave_region_late(unsigned long b, unsigned long e)
+{
+}
+#endif
+
 #endif /* _LINUX_SWSUSP_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 665f85f2a3af..edf681a7fd8f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -221,7 +221,7 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
+extern void end_swap_bio_read(struct bio *bio, int err);
 
 /* linux/mm/swap_state.c */
 extern struct address_space swapper_space;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 83d0ec11235e..61def7c8fbb3 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -549,7 +549,7 @@ asmlinkage long sys_inotify_rm_watch(int fd, u32 wd);
 asmlinkage long sys_spu_run(int fd, __u32 __user *unpc,
                                  __u32 __user *ustatus);
 asmlinkage long sys_spu_create(const char __user *name,
-                unsigned int flags, mode_t mode);
+                unsigned int flags, mode_t mode, int fd);
 
 asmlinkage long sys_mknodat(int dfd, const char __user * filename, int mode,
                             unsigned dev);
@@ -610,6 +610,7 @@ asmlinkage long sys_signalfd(int ufd, sigset_t __user *user_mask, size_t sizemas
 asmlinkage long sys_timerfd(int ufd, int clockid, int flags,
                             const struct itimerspec __user *utmr);
 asmlinkage long sys_eventfd(unsigned int count);
+asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);
 
 int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 47f1c53332ce..483050c924c3 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -62,7 +62,7 @@ enum
         CTL_KERN=1,             /* General kernel info and control */
         CTL_VM=2,               /* VM management */
         CTL_NET=3,              /* Networking */
-        /* was CTL_PROC */
+        CTL_PROC=4,             /* removal breaks strace(1) compilation */
         CTL_FS=5,               /* Filesystems */
         CTL_DEBUG=6,            /* Debugging */
         CTL_DEV=7,              /* Devices */
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index be8228e50a27..149ab62329e2 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -3,6 +3,8 @@
  *
  * Copyright (c) 2001,2002 Patrick Mochel
  * Copyright (c) 2004 Silicon Graphics, Inc.
+ * Copyright (c) 2007 SUSE Linux Products GmbH
+ * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
  *
  * Please see Documentation/filesystems/sysfs.txt for more information.
  */
@@ -17,23 +19,20 @@
 
 struct kobject;
 struct module;
-struct nameidata;
-struct dentry;
-struct sysfs_dirent;
 
 /* FIXME
  * The *owner field is no longer used, but leave around
  * until the tree gets cleaned up fully.
  */
 struct attribute {
-        const char              * name;
-        struct module           * owner;
+        const char              *name;
+        struct module           *owner;
         mode_t                  mode;
 };
 
 struct attribute_group {
-        const char              * name;
-        struct attribute        ** attrs;
+        const char              *name;
+        struct attribute        **attrs;
 };
 
 
@@ -77,72 +76,41 @@ struct sysfs_ops {
         ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
 };
 
-#define SYSFS_TYPE_MASK         0x00ff
-#define SYSFS_ROOT              0x0001
-#define SYSFS_DIR               0x0002
-#define SYSFS_KOBJ_ATTR         0x0004
-#define SYSFS_KOBJ_BIN_ATTR     0x0008
-#define SYSFS_KOBJ_LINK         0x0020
-#define SYSFS_COPY_NAME         (SYSFS_DIR | SYSFS_KOBJ_LINK)
-
-#define SYSFS_FLAG_MASK         ~SYSFS_TYPE_MASK
-#define SYSFS_FLAG_REMOVED      0x0100
-
 #ifdef CONFIG_SYSFS
 
-extern int sysfs_schedule_callback(struct kobject *kobj,
-                void (*func)(void *), void *data, struct module *owner);
-
-extern int __must_check
-sysfs_create_dir(struct kobject *kobj, struct sysfs_dirent *shadow_parent_sd);
-
-extern void
-sysfs_remove_dir(struct kobject *);
-
-extern int __must_check
-sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
-                 const char *new_name);
-
-extern int __must_check
-sysfs_move_dir(struct kobject *, struct kobject *);
-
-extern int __must_check
-sysfs_create_file(struct kobject *, const struct attribute *);
+int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
+                            void *data, struct module *owner);
 
-extern int __must_check
-sysfs_update_file(struct kobject *, const struct attribute *);
+int __must_check sysfs_create_dir(struct kobject *kobj);
+void sysfs_remove_dir(struct kobject *kobj);
+int __must_check sysfs_rename_dir(struct kobject *kobj, const char *new_name);
+int __must_check sysfs_move_dir(struct kobject *kobj,
+                                struct kobject *new_parent_kobj);
 
-extern int __must_check
-sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode);
-
-extern void
-sysfs_remove_file(struct kobject *, const struct attribute *);
-
-extern int __must_check
-sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name);
-
-extern void
-sysfs_remove_link(struct kobject *, const char * name);
+int __must_check sysfs_create_file(struct kobject *kobj,
+                                   const struct attribute *attr);
+int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
+                                  mode_t mode);
+void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
 
 int __must_check sysfs_create_bin_file(struct kobject *kobj,
-                                        struct bin_attribute *attr);
+                                       struct bin_attribute *attr);
 void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr);
 
-int __must_check sysfs_create_group(struct kobject *,
-                                        const struct attribute_group *);
-void sysfs_remove_group(struct kobject *, const struct attribute_group *);
+int __must_check sysfs_create_link(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,
+                                    const struct attribute_group *grp);
+void sysfs_remove_group(struct kobject *kobj,
+                        const struct attribute_group *grp);
 int sysfs_add_file_to_group(struct kobject *kobj,
-                const struct attribute *attr, const char *group);
+                        const struct attribute *attr, const char *group);
 void sysfs_remove_file_from_group(struct kobject *kobj,
-                const struct attribute *attr, const char *group);
-
-void sysfs_notify(struct kobject * k, char *dir, char *attr);
-
+                        const struct attribute *attr, const char *group);
 
-extern int sysfs_make_shadowed_dir(struct kobject *kobj,
-        void * (*follow_link)(struct dentry *, struct nameidata *));
-extern struct sysfs_dirent *sysfs_create_shadow_dir(struct kobject *kobj);
-extern void sysfs_remove_shadow_dir(struct sysfs_dirent *shadow_sd);
+void sysfs_notify(struct kobject *kobj, char *dir, char *attr);
 
 extern int __must_check sysfs_init(void);
 
@@ -154,75 +122,76 @@ static inline int sysfs_schedule_callback(struct kobject *kobj,
         return -ENOSYS;
 }
 
-static inline int sysfs_create_dir(struct kobject *kobj,
-                                   struct sysfs_dirent *shadow_parent_sd)
+static inline int sysfs_create_dir(struct kobject *kobj)
 {
         return 0;
 }
 
-static inline void sysfs_remove_dir(struct kobject * k)
+static inline void sysfs_remove_dir(struct kobject *kobj)
 {
         ;
 }
 
-static inline int sysfs_rename_dir(struct kobject *kobj,
-                                   struct sysfs_dirent *new_parent_sd,
-                                   const char *new_name)
+static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
 {
         return 0;
 }
 
-static inline int sysfs_move_dir(struct kobject * k, struct kobject * new_parent)
+static inline int sysfs_move_dir(struct kobject *kobj,
+                                 struct kobject *new_parent_kobj)
 {
         return 0;
 }
 
-static inline int sysfs_create_file(struct kobject * k, const struct attribute * a)
+static inline int sysfs_create_file(struct kobject *kobj,
+                                    const struct attribute *attr)
 {
         return 0;
 }
 
-static inline int sysfs_update_file(struct kobject * k, const struct attribute * a)
-{
-        return 0;
-}
-static inline int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode)
+static inline int sysfs_chmod_file(struct kobject *kobj,
+                                   struct attribute *attr, mode_t mode)
 {
         return 0;
 }
 
-static inline void sysfs_remove_file(struct kobject * k, const struct attribute * a)
+static inline void sysfs_remove_file(struct kobject *kobj,
+                                     const struct attribute *attr)
 {
         ;
 }
 
-static inline int sysfs_create_link(struct kobject * k, struct kobject * t, const char * n)
+static inline int sysfs_create_bin_file(struct kobject *kobj,
+                                        struct bin_attribute *attr)
 {
         return 0;
 }
 
-static inline void sysfs_remove_link(struct kobject * k, const char * name)
+static inline int sysfs_remove_bin_file(struct kobject *kobj,
+                                        struct bin_attribute *attr)
 {
-        ;
+        return 0;
 }
 
-
-static inline int sysfs_create_bin_file(struct kobject * k, struct bin_attribute * a)
+static inline int sysfs_create_link(struct kobject *kobj,
+                                    struct kobject *target, const char *name)
 {
         return 0;
 }
 
-static inline int sysfs_remove_bin_file(struct kobject * k, struct bin_attribute * a)
+static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
 {
-        return 0;
+        ;
 }
 
-static inline int sysfs_create_group(struct kobject * k, const struct attribute_group *g)
+static inline int sysfs_create_group(struct kobject *kobj,
+                                     const struct attribute_group *grp)
 {
         return 0;
 }
 
-static inline void sysfs_remove_group(struct kobject * k, const struct attribute_group * g)
+static inline void sysfs_remove_group(struct kobject *kobj,
+                                      const struct attribute_group *grp)
 {
         ;
 }
@@ -238,14 +207,8 @@ static inline void sysfs_remove_file_from_group(struct kobject *kobj,
 {
 }
 
-static inline void sysfs_notify(struct kobject * k, char *dir, char *attr)
-{
-}
-
-static inline int sysfs_make_shadowed_dir(struct kobject *kobj,
-        void * (*follow_link)(struct dentry *, struct nameidata *))
+static inline void sysfs_notify(struct kobject *kobj, char *dir, char *attr)
 {
-        return 0;
 }
 
 static inline int __must_check sysfs_init(void)
diff --git a/include/linux/tc_act/tc_nat.h b/include/linux/tc_act/tc_nat.h
new file mode 100644
index 000000000000..e7cf31e8ba79
--- /dev/null
+++ b/include/linux/tc_act/tc_nat.h
@@ -0,0 +1,29 @@
+#ifndef __LINUX_TC_NAT_H
+#define __LINUX_TC_NAT_H
+
+#include <linux/pkt_cls.h>
+#include <linux/types.h>
+
+#define TCA_ACT_NAT 9
+
+enum
+{
+        TCA_NAT_UNSPEC,
+        TCA_NAT_PARMS,
+        TCA_NAT_TM,
+        __TCA_NAT_MAX
+};
+#define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
+
+#define TCA_NAT_FLAG_EGRESS 1
+
+struct tc_nat
+{
+        tc_gen;
+        __be32 old_addr;
+        __be32 new_addr;
+        __be32 mask;
+        __u32 flags;
+};
+
+#endif
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index c6b9f92e8289..c5b94c1a5ee2 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -304,7 +304,6 @@ struct tcp_sock {
         u32     rtt_seq;        /* sequence number to update rttvar     */
 
         u32     packets_out;    /* Packets which are "in flight"        */
-        u32     left_out;       /* Packets which leaved network */
         u32     retrans_out;    /* Retransmitted packets out            */
 /*
  *      Options received (usually on last packet, some only on SYN packets).
@@ -333,6 +332,9 @@ struct tcp_sock {
 
         struct tcp_sack_block_wire recv_sack_cache[4];
 
+        u32     highest_sack;   /* Start seq of globally highest revd SACK
+                                 * (validity guaranteed only if sacked_out > 0) */
+
         /* from STCP, retrans queue hinting */
         struct sk_buff* lost_skb_hint;
 
@@ -341,10 +343,12 @@ struct tcp_sock {
         struct sk_buff *forward_skb_hint;
         struct sk_buff *fastpath_skb_hint;
 
-        int     fastpath_cnt_hint;
+        int     fastpath_cnt_hint;      /* Lags behind by current skb's pcount
+                                         * compared to respective fackets_out */
         int     lost_cnt_hint;
         int     retransmit_cnt_hint;
-        int     forward_cnt_hint;
+
+        u32     lost_retrans_low;       /* Sent seq after any rxmit (lowest) */
 
         u16     advmss;         /* Advertised MSS                       */
         u16     prior_ssthresh; /* ssthresh saved at recovery start     */
diff --git a/include/linux/time.h b/include/linux/time.h
index ec3b0ced0afe..6a5f503b4f1d 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -4,6 +4,7 @@
 #include <linux/types.h>
 
 #ifdef __KERNEL__
+# include <linux/cache.h>
 # include <linux/seqlock.h>
 #endif
 
@@ -94,17 +95,15 @@ extern struct timespec wall_to_monotonic;
 extern seqlock_t xtime_lock __attribute__((weak));
 
 extern unsigned long read_persistent_clock(void);
+extern int update_persistent_clock(struct timespec now);
+extern int no_sync_cmos_clock __read_mostly;
 void timekeeping_init(void);
 
-static inline unsigned long get_seconds(void)
-{
-        return xtime.tv_sec;
-}
-
+unsigned long get_seconds(void);
 struct timespec current_kernel_time(void);
 
 #define CURRENT_TIME            (current_kernel_time())
-#define CURRENT_TIME_SEC        ((struct timespec) { xtime.tv_sec, 0 })
+#define CURRENT_TIME_SEC        ((struct timespec) { get_seconds(), 0 })
 
 extern void do_gettimeofday(struct timeval *tv);
 extern int do_settimeofday(struct timespec *tv);
diff --git a/include/linux/timex.h b/include/linux/timex.h
index da929dbbea2a..37ac3ff90faf 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -224,66 +224,6 @@ static inline int ntp_synced(void)
         __x < 0 ? -(-__x >> __s) : __x >> __s;  \
 })
 
-
-#ifdef CONFIG_TIME_INTERPOLATION
-
-#define TIME_SOURCE_CPU 0
-#define TIME_SOURCE_MMIO64 1
-#define TIME_SOURCE_MMIO32 2
-#define TIME_SOURCE_FUNCTION 3
-
-/* For proper operations time_interpolator clocks must run slightly slower
- * than the standard clock since the interpolator may only correct by having
- * time jump forward during a tick. A slower clock is usually a side effect
- * of the integer divide of the nanoseconds in a second by the frequency.
- * The accuracy of the division can be increased by specifying a shift.
- * However, this may cause the clock not to be slow enough.
- * The interpolator will self-tune the clock by slowing down if no
- * resets occur or speeding up if the time jumps per analysis cycle
- * become too high.
- *
- * Setting jitter compensates for a fluctuating timesource by comparing
- * to the last value read from the timesource to insure that an earlier value
- * is not returned by a later call. The price to pay
- * for the compensation is that the timer routines are not as scalable anymore.
- */
-
-struct time_interpolator {
-        u16 source;                     /* time source flags */
-        u8 shift;                       /* increases accuracy of multiply by shifting. */
-                                /* Note that bits may be lost if shift is set too high */
-        u8 jitter;                      /* if set compensate for fluctuations */
-        u32 nsec_per_cyc;               /* set by register_time_interpolator() */
-        void *addr;                     /* address of counter or function */
-        cycles_t mask;                  /* mask the valid bits of the counter */
-        unsigned long offset;           /* nsec offset at last update of interpolator */
-        u64 last_counter;               /* counter value in units of the counter at last update */
-        cycles_t last_cycle;            /* Last timer value if TIME_SOURCE_JITTER is set */
-        u64 frequency;                  /* frequency in counts/second */
-        long drift;                     /* drift in parts-per-million (or -1) */
-        unsigned long skips;            /* skips forward */
-        unsigned long ns_skipped;       /* nanoseconds skipped */
-        struct time_interpolator *next;
-};
-
-extern void register_time_interpolator(struct time_interpolator *);
-extern void unregister_time_interpolator(struct time_interpolator *);
-extern void time_interpolator_reset(void);
-extern unsigned long time_interpolator_get_offset(void);
-extern void time_interpolator_update(long delta_nsec);
-
-#else /* !CONFIG_TIME_INTERPOLATION */
-
-static inline void time_interpolator_reset(void)
-{
-}
-
-static inline void time_interpolator_update(long delta_nsec)
-{
-}
-
-#endif /* !CONFIG_TIME_INTERPOLATION */
-
 #define TICK_LENGTH_SHIFT       32
 
 #ifdef CONFIG_NO_HZ
diff --git a/include/linux/topology.h b/include/linux/topology.h
index d0890a7e5bab..525d437b1253 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -185,7 +185,6 @@
         .max_interval           = 64*num_online_cpus(), \
         .busy_factor            = 128,                  \
         .imbalance_pct          = 133,                  \
-        .cache_hot_time         = (10*1000000),         \
         .cache_nice_tries       = 1,                    \
         .busy_idx               = 3,                    \
         .idle_idx               = 3,                    \
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 691a1748d9d2..60478f6e5dc6 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -21,7 +21,6 @@
  * (Note: the *_driver.minor_start values 1, 64, 128, 192 are
  * hardcoded at present.)
  */
-#define NR_PTYS CONFIG_LEGACY_PTY_COUNT   /* Number of legacy ptys */
 #define NR_UNIX98_PTY_DEFAULT   4096      /* Default maximum for Unix98 ptys */
 #define NR_UNIX98_PTY_MAX       (1 << MINORBITS) /* Absolute limit */
 #define NR_LDISCS               17
@@ -274,6 +273,8 @@ struct tty_struct {
 #define TTY_PTY_LOCK            16      /* pty private */
 #define TTY_NO_WRITE_SPLIT      17      /* Preserve write boundaries to driver */
 #define TTY_HUPPED              18      /* Post driver->hangup() */
+#define TTY_FLUSHING            19      /* Flushing to ldisc in progress */
+#define TTY_FLUSHPENDING        20      /* Queued buffer flush pending */
 
 #define TTY_WRITE_FLUSH(tty) tty_write_flush((tty))
 
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
new file mode 100644
index 000000000000..44c28e94df50
--- /dev/null
+++ b/include/linux/uio_driver.h
@@ -0,0 +1,91 @@
+/*
+ * include/linux/uio_driver.h
+ *
+ * Copyright(C) 2005, Benedikt Spranger <b.spranger@linutronix.de>
+ * Copyright(C) 2005, Thomas Gleixner <tglx@linutronix.de>
+ * Copyright(C) 2006, Hans J. Koch <hjk@linutronix.de>
+ * Copyright(C) 2006, Greg Kroah-Hartman <greg@kroah.com>
+ *
+ * Userspace IO driver.
+ *
+ * Licensed under the GPLv2 only.
+ */
+
+#ifndef _UIO_DRIVER_H_
+#define _UIO_DRIVER_H_
+
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/interrupt.h>
+
+/**
+ * struct uio_mem - description of a UIO memory region
+ * @kobj:               kobject for this mapping
+ * @addr:               address of the device's memory
+ * @size:               size of IO
+ * @memtype:            type of memory addr points to
+ * @internal_addr:      ioremap-ped version of addr, for driver internal use
+ */
+struct uio_mem {
+        struct kobject          kobj;
+        unsigned long           addr;
+        unsigned long           size;
+        int                     memtype;
+        void __iomem            *internal_addr;
+};
+
+#define MAX_UIO_MAPS    5
+
+struct uio_device;
+
+/**
+ * struct uio_info - UIO device capabilities
+ * @uio_dev:            the UIO device this info belongs to
+ * @name:               device name
+ * @version:            device driver version
+ * @mem:                list of mappable memory regions, size==0 for end of list
+ * @irq:                interrupt number or UIO_IRQ_CUSTOM
+ * @irq_flags:          flags for request_irq()
+ * @priv:               optional private data
+ * @handler:            the device's irq handler
+ * @mmap:               mmap operation for this uio device
+ * @open:               open operation for this uio device
+ * @release:            release operation for this uio device
+ */
+struct uio_info {
+        struct uio_device       *uio_dev;
+        char                    *name;
+        char                    *version;
+        struct uio_mem          mem[MAX_UIO_MAPS];
+        long                    irq;
+        unsigned long           irq_flags;
+        void                    *priv;
+        irqreturn_t (*handler)(int irq, struct uio_info *dev_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);
+};
+
+extern int __must_check
+        __uio_register_device(struct module *owner,
+                              struct device *parent,
+                              struct uio_info *info);
+static inline int __must_check
+        uio_register_device(struct device *parent, struct uio_info *info)
+{
+        return __uio_register_device(THIS_MODULE, parent, info);
+}
+extern void uio_unregister_device(struct uio_info *info);
+extern void uio_event_notify(struct uio_info *info);
+
+/* defines for uio_device->irq */
+#define UIO_IRQ_CUSTOM  -1
+#define UIO_IRQ_NONE    -2
+
+/* defines for uio_device->memtype */
+#define UIO_MEM_NONE    0
+#define UIO_MEM_PHYS    1
+#define UIO_MEM_LOGICAL 2
+#define UIO_MEM_VIRTUAL 3
+
+#endif /* _LINUX_UIO_DRIVER_H_ */
diff --git a/include/linux/umem.h b/include/linux/umem.h
deleted file mode 100644
index f36ebfc32bf6..000000000000
--- a/include/linux/umem.h
+++ /dev/null
@@ -1,138 +0,0 @@
-
-/*
- * This file contains defines for the
- *   Micro Memory MM5415
- * family PCI Memory Module with Battery Backup.
- *
- * Copyright Micro Memory INC 2001.  All rights reserved.
- * Release under the terms of the GNU GENERAL PUBLIC LICENSE version 2.
- * See the file COPYING.
- */
-
-#ifndef _DRIVERS_BLOCK_MM_H
-#define _DRIVERS_BLOCK_MM_H
-
-
-#define IRQ_TIMEOUT (1 * HZ)
-
-/* CSR register definition */
-#define MEMCTRLSTATUS_MAGIC     0x00
-#define  MM_MAGIC_VALUE         (unsigned char)0x59
-
-#define MEMCTRLSTATUS_BATTERY   0x04
-#define  BATTERY_1_DISABLED     0x01
-#define  BATTERY_1_FAILURE      0x02
-#define  BATTERY_2_DISABLED     0x04
-#define  BATTERY_2_FAILURE      0x08
-
-#define MEMCTRLSTATUS_MEMORY    0x07
-#define  MEM_128_MB             0xfe
-#define  MEM_256_MB             0xfc
-#define  MEM_512_MB             0xf8
-#define  MEM_1_GB               0xf0
-#define  MEM_2_GB               0xe0
-
-#define MEMCTRLCMD_LEDCTRL      0x08
-#define  LED_REMOVE             2
-#define  LED_FAULT              4
-#define  LED_POWER              6
-#define  LED_FLIP               255
-#define  LED_OFF                0x00
-#define  LED_ON                 0x01
-#define  LED_FLASH_3_5          0x02
-#define  LED_FLASH_7_0          0x03
-#define  LED_POWER_ON           0x00
-#define  LED_POWER_OFF          0x01
-#define  USER_BIT1              0x01
-#define  USER_BIT2              0x02
-
-#define MEMORY_INITIALIZED      USER_BIT1
-
-#define MEMCTRLCMD_ERRCTRL      0x0C
-#define  EDC_NONE_DEFAULT       0x00
-#define  EDC_NONE               0x01
-#define  EDC_STORE_READ         0x02
-#define  EDC_STORE_CORRECT      0x03
-
-#define MEMCTRLCMD_ERRCNT       0x0D
-#define MEMCTRLCMD_ERRSTATUS    0x0E
-
-#define ERROR_DATA_LOG          0x20
-#define ERROR_ADDR_LOG          0x28
-#define ERROR_COUNT             0x3D
-#define ERROR_SYNDROME          0x3E
-#define ERROR_CHECK             0x3F
-
-#define DMA_PCI_ADDR            0x40
-#define DMA_LOCAL_ADDR          0x48
-#define DMA_TRANSFER_SIZE       0x50
-#define DMA_DESCRIPTOR_ADDR     0x58
-#define DMA_SEMAPHORE_ADDR      0x60
-#define DMA_STATUS_CTRL         0x68
-#define  DMASCR_GO              0x00001
-#define  DMASCR_TRANSFER_READ   0x00002
-#define  DMASCR_CHAIN_EN        0x00004
-#define  DMASCR_SEM_EN          0x00010
-#define  DMASCR_DMA_COMP_EN     0x00020
-#define  DMASCR_CHAIN_COMP_EN   0x00040
-#define  DMASCR_ERR_INT_EN      0x00080
-#define  DMASCR_PARITY_INT_EN   0x00100
-#define  DMASCR_ANY_ERR         0x00800
-#define  DMASCR_MBE_ERR         0x01000
-#define  DMASCR_PARITY_ERR_REP  0x02000
-#define  DMASCR_PARITY_ERR_DET  0x04000
-#define  DMASCR_SYSTEM_ERR_SIG  0x08000
-#define  DMASCR_TARGET_ABT      0x10000
-#define  DMASCR_MASTER_ABT      0x20000
-#define  DMASCR_DMA_COMPLETE    0x40000
-#define  DMASCR_CHAIN_COMPLETE  0x80000
-
-/* 
-3.SOME PCs HAVE HOST BRIDGES WHICH APPARENTLY DO NOT CORRECTLY HANDLE 
-READ-LINE (0xE) OR READ-MULTIPLE (0xC) PCI COMMAND CODES DURING DMA 
-TRANSFERS. IN OTHER SYSTEMS THESE COMMAND CODES WILL CAUSE THE HOST BRIDGE 
-TO ALLOW LONGER BURSTS DURING DMA READ OPERATIONS. THE UPPER FOUR BITS 
-(31..28) OF THE DMA CSR HAVE BEEN MADE PROGRAMMABLE, SO THAT EITHER A 0x6, 
-AN 0xE OR A 0xC CAN BE WRITTEN TO THEM TO SET THE COMMAND CODE USED DURING 
-DMA READ OPERATIONS.
-*/
-#define        DMASCR_READ   0x60000000
-#define        DMASCR_READLINE   0xE0000000
-#define        DMASCR_READMULTI   0xC0000000
-
-
-#define DMASCR_ERROR_MASK       (DMASCR_MASTER_ABT | DMASCR_TARGET_ABT | DMASCR_SYSTEM_ERR_SIG | DMASCR_PARITY_ERR_DET | DMASCR_MBE_ERR | DMASCR_ANY_ERR)
-#define DMASCR_HARD_ERROR       (DMASCR_MASTER_ABT | DMASCR_TARGET_ABT | DMASCR_SYSTEM_ERR_SIG | DMASCR_PARITY_ERR_DET | DMASCR_MBE_ERR)
-
-#define WINDOWMAP_WINNUM        0x7B
-
-#define DMA_READ_FROM_HOST 0
-#define DMA_WRITE_TO_HOST 1
-
-struct mm_dma_desc {
-        __le64  pci_addr;
-        __le64  local_addr;
-        __le32  transfer_size;
-        u32     zero1;
-        __le64  next_desc_addr;
-        __le64  sem_addr;
-        __le32  control_bits;
-        u32     zero2;
-
-        dma_addr_t data_dma_handle;
-
-        /* Copy of the bits */
-        __le64  sem_control_bits;
-} __attribute__((aligned(8)));
-
-#define PCI_VENDOR_ID_MICRO_MEMORY              0x1332
-#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN       0x5415
-#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN       0x5425
-#define PCI_DEVICE_ID_MICRO_MEMORY_6155         0x6155
-
-/* bits for card->flags */
-#define UM_FLAG_DMA_IN_REGS             1
-#define UM_FLAG_NO_BYTE_STATUS          2
-#define UM_FLAG_NO_BATTREG              4
-#define UM_FLAG_NO_BATT                 8
-#endif
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 7a60946df3b6..c5c8f169d3cf 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -52,6 +52,7 @@ struct ep_device;
  * @ep_dev: ep_device for sysfs info
  * @extra: descriptors following this endpoint in the configuration
  * @extralen: how many bytes of "extra" are valid
+ * @enabled: URBs may be submitted to this endpoint
  *
  * USB requests are always queued to a given endpoint, identified by a
  * descriptor within an active interface in a given USB configuration.
@@ -64,6 +65,7 @@ struct usb_host_endpoint {
 
         unsigned char *extra;   /* Extra descriptors */
         int extralen;
+        int enabled;
 };
 
 /* host-side wrapper for one interface setting's parsed descriptors */
@@ -94,6 +96,7 @@ enum usb_interface_condition {
  *      endpoint configurations.  They will be in no particular order.
  * @num_altsetting: number of altsettings defined.
  * @cur_altsetting: the current altsetting.
+ * @intf_assoc: interface association descriptor
  * @driver: the USB driver that is bound to this interface.
  * @minor: the minor number assigned to this interface, if this
  *      interface is bound to a driver that uses the USB major number.
@@ -213,6 +216,7 @@ struct usb_interface_cache {
  * @desc: the device's configuration descriptor.
  * @string: pointer to the cached version of the iConfiguration string, if
  *      present for this configuration.
+ * @intf_assoc: list of any interface association descriptors in this config
  * @interface: array of pointers to usb_interface structures, one for each
  *      interface in the configuration.  The number of interfaces is stored
  *      in desc.bNumInterfaces.  These pointers are valid only while the
@@ -342,6 +346,11 @@ struct usb_tt;
  *
  * Usbcore drivers should not set usbdev->state directly.  Instead use
  * usb_set_device_state().
+ *
+ * @authorized: (user space) policy determines if we authorize this
+ *              device to be used or not. By default, wired USB
+ *              devices are authorized. WUSB devices are not, until we
+ *              authorize them from user space. FIXME -- complete doc
  */
 struct usb_device {
         int             devnum;         /* Address on USB bus */
@@ -374,8 +383,11 @@ struct usb_device {
         u8 portnum;                     /* Parent port number (origin 1) */
         u8 level;                       /* Number of USB hub ancestors */
 
+        unsigned can_submit:1;          /* URBs may be submitted */
         unsigned discon_suspended:1;    /* Disconnected while suspended */
         unsigned have_langid:1;         /* whether string_langid is valid */
+        unsigned authorized:1;          /* Policy has determined we can use it */
+        unsigned wusb:1;                /* Device is Wireless USB */
         int string_langid;              /* language ID for strings */
 
         /* static strings from the device */
@@ -403,6 +415,7 @@ struct usb_device {
 
         int pm_usage_cnt;               /* usage counter for autosuspend */
         u32 quirks;                     /* quirks of the whole device */
+        atomic_t urbnum;                /* number of URBs submitted for the whole device */
 
 #ifdef CONFIG_PM
         struct delayed_work autosuspend; /* for delayed autosuspends */
@@ -417,6 +430,7 @@ struct usb_device {
         unsigned persist_enabled:1;     /* USB_PERSIST enabled for this dev */
         unsigned autosuspend_disabled:1; /* autosuspend and autoresume */
         unsigned autoresume_disabled:1;  /*  disabled by the user */
+        unsigned skip_sys_resume:1;     /* skip the next system resume */
 #endif
 };
 #define to_usb_device(d) container_of(d, struct usb_device, dev)
@@ -553,6 +567,29 @@ static inline int usb_make_path (struct usb_device *dev, char *buf,
 /*-------------------------------------------------------------------------*/
 
 /**
+ * usb_endpoint_num - get the endpoint's number
+ * @epd: endpoint to be checked
+ *
+ * Returns @epd's number: 0 to 15.
+ */
+static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+}
+
+/**
+ * usb_endpoint_type - get the endpoint's transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
+ * to @epd's transfer type.
+ */
+static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
+{
+        return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
+}
+
+/**
  * usb_endpoint_dir_in - check if the endpoint has IN direction
  * @epd: endpoint to be checked
  *
@@ -994,6 +1031,8 @@ extern int usb_disabled(void);
 
 /*
  * urb->transfer_flags:
+ *
+ * Note: URB_DIR_IN/OUT is automatically set in usb_submit_urb().
  */
 #define URB_SHORT_NOT_OK        0x0001  /* report short reads as errors */
 #define URB_ISO_ASAP            0x0002  /* iso-only, urb->start_frame
@@ -1006,6 +1045,10 @@ extern int usb_disabled(void);
                                          * needed */
 #define URB_FREE_BUFFER         0x0100  /* Free transfer buffer with the URB */
 
+#define URB_DIR_IN              0x0200  /* Transfer from device to host */
+#define URB_DIR_OUT             0
+#define URB_DIR_MASK            URB_DIR_IN
+
 struct usb_iso_packet_descriptor {
         unsigned int offset;
         unsigned int length;            /* expected length */
@@ -1035,6 +1078,8 @@ typedef void (*usb_complete_t)(struct urb *);
  * @urb_list: For use by current owner of the URB.
  * @anchor_list: membership in the list of an anchor
  * @anchor: to anchor URBs to a common mooring
+ * @ep: Points to the endpoint's data structure.  Will eventually
+ *      replace @pipe.
  * @pipe: Holds endpoint number, direction, type, and more.
  *      Create these values with the eight macros available;
  *      usb_{snd,rcv}TYPEpipe(dev,endpoint), where the TYPE is "ctrl"
@@ -1199,10 +1244,10 @@ struct urb
 {
         /* private: usb core and host controller only fields in the urb */
         struct kref kref;               /* reference count of the URB */
-        spinlock_t lock;                /* lock for the URB */
         void *hcpriv;                   /* private data for host controller */
         atomic_t use_count;             /* concurrent submissions counter */
         u8 reject;                      /* submissions will fail */
+        int unlinked;                   /* unlink error code */
 
         /* public: documented fields in the urb that can be used by drivers */
         struct list_head urb_list;      /* list head for use by the urb's
@@ -1210,6 +1255,7 @@ struct urb
         struct list_head anchor_list;   /* the URB may be anchored by the driver */
         struct usb_anchor *anchor;
         struct usb_device *dev;         /* (in) pointer to associated device */
+        struct usb_host_endpoint *ep;   /* (internal) pointer to endpoint struct */
         unsigned int pipe;              /* (in) pipe information */
         int status;                     /* (return) non-ISO status */
         unsigned int transfer_flags;    /* (in) URB_SHORT_NOT_OK | ...*/
@@ -1255,7 +1301,6 @@ static inline void usb_fill_control_urb (struct urb *urb,
                                          usb_complete_t complete_fn,
                                          void *context)
 {
-        spin_lock_init(&urb->lock);
         urb->dev = dev;
         urb->pipe = pipe;
         urb->setup_packet = setup_packet;
@@ -1286,7 +1331,6 @@ static inline void usb_fill_bulk_urb (struct urb *urb,
                                       usb_complete_t complete_fn,
                                       void *context)
 {
-        spin_lock_init(&urb->lock);
         urb->dev = dev;
         urb->pipe = pipe;
         urb->transfer_buffer = transfer_buffer;
@@ -1322,7 +1366,6 @@ static inline void usb_fill_int_urb (struct urb *urb,
                                      void *context,
                                      int interval)
 {
-        spin_lock_init(&urb->lock);
         urb->dev = dev;
         urb->pipe = pipe;
         urb->transfer_buffer = transfer_buffer;
@@ -1350,6 +1393,30 @@ extern void usb_unanchor_urb(struct urb *urb);
 extern int usb_wait_anchor_empty_timeout(struct usb_anchor *anchor,
                                          unsigned int timeout);
 
+/**
+ * usb_urb_dir_in - check if an URB describes an IN transfer
+ * @urb: URB to be checked
+ *
+ * Returns 1 if @urb describes an IN transfer (device-to-host),
+ * otherwise 0.
+ */
+static inline int usb_urb_dir_in(struct urb *urb)
+{
+        return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_IN;
+}
+
+/**
+ * usb_urb_dir_out - check if an URB describes an OUT transfer
+ * @urb: URB to be checked
+ *
+ * Returns 1 if @urb describes an OUT transfer (host-to-device),
+ * otherwise 0.
+ */
+static inline int usb_urb_dir_out(struct urb *urb)
+{
+        return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_OUT;
+}
+
 void *usb_buffer_alloc (struct usb_device *dev, size_t size,
         gfp_t mem_flags, dma_addr_t *dma);
 void usb_buffer_free (struct usb_device *dev, size_t size,
@@ -1362,13 +1429,13 @@ void usb_buffer_unmap (struct urb *urb);
 #endif
 
 struct scatterlist;
-int usb_buffer_map_sg(const struct usb_device *dev, unsigned pipe,
+int usb_buffer_map_sg(const struct usb_device *dev, int is_in,
                       struct scatterlist *sg, int nents);
 #if 0
-void usb_buffer_dmasync_sg(const struct usb_device *dev, unsigned pipe,
+void usb_buffer_dmasync_sg(const struct usb_device *dev, int is_in,
                            struct scatterlist *sg, int n_hw_ents);
 #endif
-void usb_buffer_unmap_sg(const struct usb_device *dev, unsigned pipe,
+void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
                          struct scatterlist *sg, int n_hw_ents);
 
 /*-------------------------------------------------------------------*
diff --git a/include/linux/usb_gadget.h b/include/linux/usb/gadget.h
index 4f59b2aa8a9e..46705e91573d 100644
--- a/include/linux/usb_gadget.h
+++ b/include/linux/usb/gadget.h
@@ -1,5 +1,5 @@
 /*
- * <linux/usb_gadget.h>
+ * <linux/usb/gadget.h>
  *
  * We call the USB code inside a Linux-based peripheral device a "gadget"
  * driver, except for the hardware-specific bus glue.  One USB host can
@@ -22,10 +22,10 @@ struct usb_ep;
 /**
  * struct usb_request - describes one i/o request
  * @buf: Buffer used for data.  Always provide this; some controllers
- *      only use PIO, or don't use DMA for some endpoints.
+ *      only use PIO, or don't use DMA for some endpoints.
  * @dma: DMA address corresponding to 'buf'.  If you don't set this
- *      field, and the usb controller needs one, it is responsible
- *      for mapping and unmapping the buffer.
+ *      field, and the usb controller needs one, it is responsible
+ *      for mapping and unmapping the buffer.
  * @length: Length of that data
  * @no_interrupt: If true, hints that no completion irq is needed.
  *      Helpful sometimes with deep request queues that are handled
@@ -45,16 +45,16 @@ struct usb_ep;
  * @context: For use by the completion callback
  * @list: For use by the gadget driver.
  * @status: Reports completion code, zero or a negative errno.
- *      Normally, faults block the transfer queue from advancing until
- *      the completion callback returns.
- *      Code "-ESHUTDOWN" indicates completion caused by device disconnect,
- *      or when the driver disabled the endpoint.
+ *      Normally, faults block the transfer queue from advancing until
+ *      the completion callback returns.
+ *      Code "-ESHUTDOWN" indicates completion caused by device disconnect,
+ *      or when the driver disabled the endpoint.
  * @actual: Reports bytes transferred to/from the buffer.  For reads (OUT
- *      transfers) this may be less than the requested length.  If the
- *      short_not_ok flag is set, short reads are treated as errors
- *      even when status otherwise indicates successful completion.
- *      Note that for writes (IN transfers) some data bytes may still
- *      reside in a device-side FIFO when the request is reported as
+ *      transfers) this may be less than the requested length.  If the
+ *      short_not_ok flag is set, short reads are treated as errors
+ *      even when status otherwise indicates successful completion.
+ *      Note that for writes (IN transfers) some data bytes may still
+ *      reside in a device-side FIFO when the request is reported as
  *      complete.
  *
  * These are allocated/freed through the endpoint they're used with.  The
@@ -128,7 +128,7 @@ struct usb_ep_ops {
  *      value can sometimes be reduced (hardware allowing), according to
  *      the endpoint descriptor used to configure the endpoint.
  * @driver_data:for use by the gadget driver.  all other fields are
- *      read-only to gadget drivers.
+ *      read-only to gadget drivers.
  *
  * the bus controller driver lists all the general purpose endpoints in
  * gadget->ep_list.  the control endpoint (gadget->ep0) is not in that list,
@@ -148,10 +148,10 @@ struct usb_ep {
 /**
  * usb_ep_enable - configure endpoint, making it usable
  * @ep:the endpoint being configured.  may not be the endpoint named "ep0".
- *      drivers discover endpoints through the ep_list of a usb_gadget.
+ *      drivers discover endpoints through the ep_list of a usb_gadget.
  * @desc:descriptor for desired behavior.  caller guarantees this pointer
- *      remains valid until the endpoint is disabled; the data byte order
- *      is little-endian (usb-standard).
+ *      remains valid until the endpoint is disabled; the data byte order
+ *      is little-endian (usb-standard).
  *
  * when configurations are set, or when interface settings change, the driver
  * will enable or disable the relevant endpoints.  while it is enabled, an
@@ -232,7 +232,7 @@ usb_ep_free_request (struct usb_ep *ep, struct usb_request *req)
  * @ep:the endpoint associated with the request
  * @req:the request being submitted
  * @gfp_flags: GFP_* flags to use in case the lower level driver couldn't
- *      pre-allocate all necessary memory with the request.
+ *      pre-allocate all necessary memory with the request.
  *
  * This tells the device controller to perform the specified request through
  * that endpoint (reading or writing a buffer).  When the request completes,
@@ -415,7 +415,7 @@ struct usb_gadget_ops {
  * struct usb_gadget - represents a usb slave device
  * @ops: Function pointers used to access hardware-specific operations.
  * @ep0: Endpoint zero, used when reading or writing responses to
- *      driver setup() requests
+ *      driver setup() requests
  * @ep_list: List of other endpoints supported by the device.
  * @speed: Speed of current connection to USB host.
  * @is_dualspeed: True if the controller supports both high and full speed
@@ -432,7 +432,7 @@ struct usb_gadget_ops {
  * @b_hnp_enable: OTG device feature flag, indicating that the A-Host
  *      enabled HNP support.
  * @name: Identifies the controller hardware type.  Used in diagnostics
- *      and sometimes configuration.
+ *      and sometimes configuration.
  * @dev: Driver model state for this abstract device.
  *
  * Gadgets have a mostly-portable "gadget driver" implementing device
@@ -480,6 +480,39 @@ static inline void *get_gadget_data (struct usb_gadget *gadget)
 
 
 /**
+ * gadget_is_dualspeed - return true iff the hardware handles high speed
+ * @gadget: controller that might support both high and full speeds
+ */
+static inline int gadget_is_dualspeed(struct usb_gadget *g)
+{
+#ifdef CONFIG_USB_GADGET_DUALSPEED
+        /* runtime test would check "g->is_dualspeed" ... that might be
+         * useful to work around hardware bugs, but is mostly pointless
+         */
+        return 1;
+#else
+        return 0;
+#endif
+}
+
+/**
+ * gadget_is_otg - return true iff the hardware is OTG-ready
+ * @gadget: controller that might have a Mini-AB connector
+ *
+ * This is a runtime test, since kernels with a USB-OTG stack sometimes
+ * run on boards which only have a Mini-B (or Mini-A) connector.
+ */
+static inline int gadget_is_otg(struct usb_gadget *g)
+{
+#ifdef CONFIG_USB_OTG
+        return g->is_otg;
+#else
+        return 0;
+#endif
+}
+
+
+/**
  * usb_gadget_frame_number - returns the current frame number
  * @gadget: controller that reports the frame number
  *
@@ -655,23 +688,23 @@ usb_gadget_disconnect (struct usb_gadget *gadget)
  * @function: String describing the gadget's function
  * @speed: Highest speed the driver handles.
  * @bind: Invoked when the driver is bound to a gadget, usually
- *      after registering the driver.
- *      At that point, ep0 is fully initialized, and ep_list holds
- *      the currently-available endpoints.
- *      Called in a context that permits sleeping.
+ *      after registering the driver.
+ *      At that point, ep0 is fully initialized, and ep_list holds
+ *      the currently-available endpoints.
+ *      Called in a context that permits sleeping.
  * @setup: Invoked for ep0 control requests that aren't handled by
- *      the hardware level driver. Most calls must be handled by
- *      the gadget driver, including descriptor and configuration
- *      management.  The 16 bit members of the setup data are in
- *      USB byte order. Called in_interrupt; this may not sleep.  Driver
+ *      the hardware level driver. Most calls must be handled by
+ *      the gadget driver, including descriptor and configuration
+ *      management.  The 16 bit members of the setup data are in
+ *      USB byte order. Called in_interrupt; this may not sleep.  Driver
  *      queues a response to ep0, or returns negative to stall.
  * @disconnect: Invoked after all transfers have been stopped,
- *      when the host is disconnected.  May be called in_interrupt; this
- *      may not sleep.  Some devices can't detect disconnect, so this might
+ *      when the host is disconnected.  May be called in_interrupt; this
+ *      may not sleep.  Some devices can't detect disconnect, so this might
  *      not be called except as part of controller shutdown.
  * @unbind: Invoked when the driver is unbound from a gadget,
- *      usually from rmmod (after a disconnect is reported).
- *      Called in a context that permits sleeping.
+ *      usually from rmmod (after a disconnect is reported).
+ *      Called in a context that permits sleeping.
  * @suspend: Invoked on USB suspend.  May be called in_interrupt.
  * @resume: Invoked on USB resume.  May be called in_interrupt.
  * @driver: Driver model state for this driver.
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 8da374caf582..2692ec9389ca 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -4,11 +4,8 @@
  * belong here.
  */
 
-/* device must not be autosuspended */
-#define USB_QUIRK_NO_AUTOSUSPEND        0x00000001
-
 /* string descriptors must not be fetched using a 255-byte read */
-#define USB_QUIRK_STRING_FETCH_255      0x00000002
+#define USB_QUIRK_STRING_FETCH_255      0x00000001
 
 /* device can't resume correctly so reset it instead */
-#define USB_QUIRK_RESET_RESUME          0x00000004
+#define USB_QUIRK_RESET_RESUME          0x00000002
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index e8b8928232c8..488ce128885c 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -141,7 +141,7 @@ struct usb_serial {
 };
 #define to_usb_serial(d) container_of(d, struct usb_serial, kref)
 
-#define NUM_DONT_CARE   (-1)
+#define NUM_DONT_CARE   99
 
 /* get and set the serial private data pointer helper functions */
 static inline void *usb_get_serial_data (struct usb_serial *serial)
@@ -160,12 +160,18 @@ static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
  *      in the syslog messages when a device is inserted or removed.
  * @id_table: pointer to a list of usb_device_id structures that define all
  *      of the devices this structure can support.
- * @num_interrupt_in: the number of interrupt in endpoints this device will
- *      have.
- * @num_interrupt_out: the number of interrupt out endpoints this device will
- *      have.
- * @num_bulk_in: the number of bulk in endpoints this device will have.
- * @num_bulk_out: the number of bulk out endpoints this device will have.
+ * @num_interrupt_in: If a device doesn't have this many interrupt-in
+ *      endpoints, it won't be sent to the driver's attach() method.
+ *      (But it might still be sent to the probe() method.)
+ * @num_interrupt_out: If a device doesn't have this many interrupt-out
+ *      endpoints, it won't be sent to the driver's attach() method.
+ *      (But it might still be sent to the probe() method.)
+ * @num_bulk_in: If a device doesn't have this many bulk-in
+ *      endpoints, it won't be sent to the driver's attach() method.
+ *      (But it might still be sent to the probe() method.)
+ * @num_bulk_out: If a device doesn't have this many bulk-out
+ *      endpoints, it won't be sent to the driver's attach() method.
+ *      (But it might still be sent to the probe() method.)
  * @num_ports: the number of different ports this device will have.
  * @calc_num_ports: pointer to a function to determine how many ports this
  *      device has dynamically.  It will be called after the probe()
diff --git a/include/linux/usb_sl811.h b/include/linux/usb_sl811.h
deleted file mode 100644
index 4f2d012d7309..000000000000
--- a/include/linux/usb_sl811.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * board initialization should put one of these into dev->platform_data
- * and place the sl811hs onto platform_bus named "sl811-hcd".
- */
-
-struct sl811_platform_data {
-        unsigned        can_wakeup:1;
-
-        /* given port_power, msec/2 after power on till power good */
-        u8              potpg;
-
-        /* mA/2 power supplied on this port (max = default = 250) */
-        u8              power;
-
-        /* sl811 relies on an external source of VBUS current */
-        void            (*port_power)(struct device *dev, int is_on);
-
-        /* pulse sl811 nRST (probably with a GPIO) */
-        void            (*reset)(struct device *dev);
-
-        // some boards need something like these:
-        // int          (*check_overcurrent)(struct device *dev);
-        // void         (*clock_enable)(struct device *dev, int is_on);
-};
-
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index bb320573bb9e..b5f41d4c2eec 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -11,7 +11,7 @@
 
 struct user_namespace {
         struct kref             kref;
-        struct list_head        uidhash_table[UIDHASH_SZ];
+        struct hlist_head       uidhash_table[UIDHASH_SZ];
         struct user_struct      *root_user;
 };
 
@@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags,
         if (flags & CLONE_NEWUSER)
                 return ERR_PTR(-EINVAL);
 
-        return NULL;
+        return old_ns;
 }
 
 static inline void put_user_ns(struct user_namespace *ns)
diff --git a/include/linux/video_output.h b/include/linux/video_output.h
index e63e0c03ee0d..2fb46bc9340d 100644
--- a/include/linux/video_output.h
+++ b/include/linux/video_output.h
@@ -31,9 +31,9 @@ struct output_properties {
 struct output_device {
         int request_state;
         struct output_properties *props;
-        struct class_device class_dev;
+        struct device dev;
 };
-#define to_output_device(obj) container_of(obj, struct output_device, class_dev)
+#define to_output_device(obj) container_of(obj, struct output_device, dev)
 struct output_device *video_output_register(const char *name,
         struct device *dev,
         void *devdata,
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index d16a2b57dc81..1f503e94eff1 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -60,6 +60,7 @@
 #include <linux/compiler.h> /* need __user */
 #else
 #define __user
+#include <sys/time.h>
 #endif
 #include <linux/types.h>
 
@@ -270,6 +271,7 @@ struct v4l2_pix_format
 
 /*      Pixel format         FOURCC                        depth  Description  */
 #define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R','G','B','1') /*  8  RGB-3-3-2     */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R','4','4','4') /* 16  xxxxrrrr ggggbbbb */
 #define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R','G','B','O') /* 16  RGB-5-5-5     */
 #define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R','G','B','P') /* 16  RGB-5-6-5     */
 #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') /* 16  RGB-5-5-5 BE  */
@@ -279,6 +281,7 @@ struct v4l2_pix_format
 #define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4') /* 32  BGR-8-8-8-8   */
 #define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4') /* 32  RGB-8-8-8-8   */
 #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y') /*  8  Greyscale     */
+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P','A','L','8') /*  8  8-bit palette */
 #define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9') /*  9  YVU 4:1:0     */
 #define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2') /* 12  YVU 4:2:0     */
 #define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y','U','Y','V') /* 16  YUV 4:2:2     */
@@ -286,6 +289,10 @@ struct v4l2_pix_format
 #define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') /* 16  YVU422 planar */
 #define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') /* 16  YVU411 planar */
 #define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y','4','1','P') /* 12  YUV 4:1:1     */
+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y','4','4','4') /* 16  xxxxyyyy uuuuvvvv */
+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y','U','V','O') /* 16  YUV-5-5-5     */
+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y','U','V','P') /* 16  YUV-5-6-5     */
+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y','U','V','4') /* 32  YUV-8-8-8-8   */
 
 /* two planes -- one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12    v4l2_fourcc('N','V','1','2') /* 12  Y/CbCr 4:2:0  */
@@ -297,7 +304,6 @@ struct v4l2_pix_format
 #define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y','Y','U','V') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_HI240   v4l2_fourcc('H','I','2','4') /*  8  8-bit color   */
 #define V4L2_PIX_FMT_HM12    v4l2_fourcc('H','M','1','2') /*  8  YUV 4:2:0 16x16 macroblocks */
-#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R','4','4','4') /* 16  xxxxrrrr ggggbbbb */
 
 /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /*  8  BGBG.. GRGR.. */
@@ -616,7 +622,6 @@ struct v4l2_framebuffer
 #define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
 #define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
 #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
-#define V4L2_FBUF_CAP_GLOBAL_INV_ALPHA  0x0080
 /*  Flags for the 'flags' field. */
 #define V4L2_FBUF_FLAG_PRIMARY          0x0001
 #define V4L2_FBUF_FLAG_OVERLAY          0x0002
@@ -624,7 +629,6 @@ struct v4l2_framebuffer
 #define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
-#define V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA 0x0040
 
 struct v4l2_clip
 {
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 132b260aef1e..89338b468d0d 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -58,6 +58,13 @@ void vmalloc_sync_all(void);
 /*
  *      Lowlevel-APIs (not for driver use!)
  */
+
+static inline size_t get_vm_area_size(const struct vm_struct *area)
+{
+        /* return actual size without guard page */
+        return area->size - PAGE_SIZE;
+}
+
 extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);
 extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
                                         unsigned long start, unsigned long end);
@@ -70,6 +77,10 @@ extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
                         struct page ***pages);
 extern void unmap_kernel_range(unsigned long addr, unsigned long size);
 
+/* Allocate/destroy a 'vmalloc' VM area. */
+extern struct vm_struct *alloc_vm_area(size_t size);
+extern void free_vm_area(struct vm_struct *area);
+
 /*
  *      Internals.  Dont't use..
  */
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 4ef4d22e5e43..c7c3337c3a88 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -5,6 +5,7 @@
 #define WRITEBACK_H
 
 #include <linux/sched.h>
+#include <linux/fs.h>
 
 struct backing_dev_info;
 
@@ -127,7 +128,7 @@ int sync_page_range(struct inode *inode, struct address_space *mapping,
                         loff_t pos, loff_t count);
 int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
                            loff_t pos, loff_t count);
-void set_page_dirty_balance(struct page *page);
+void set_page_dirty_balance(struct page *page, int page_mkwrite);
 void writeback_set_ratelimit(void);
 
 /* pdflush.c */
diff --git a/include/linux/xilinxfb.h b/include/linux/xilinxfb.h
new file mode 100644
index 000000000000..f2463f559fb9
--- /dev/null
+++ b/include/linux/xilinxfb.h
@@ -0,0 +1,30 @@
+/*
+ * Platform device data for Xilinx Framebuffer device
+ *
+ * Copyright 2007 Secret Lab Technologies Ltd.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#ifndef __XILINXFB_H__
+#define __XILINXFB_H__
+
+#include <linux/types.h>
+
+/* ML300/403 reference design framebuffer driver platform data struct */
+struct xilinxfb_platform_data {
+        u32 rotate_screen;      /* Flag to rotate display 180 degrees */
+        u32 screen_height_mm;   /* Physical dimentions of screen in mm */
+        u32 screen_width_mm;
+        u32 xres, yres;         /* resolution of screen in pixels */
+        u32 xvirt, yvirt;       /* resolution of memory buffer */
+
+        /* Physical address of framebuffer memory; If non-zero, driver
+         * will use provided memory address instead of allocating one from
+         * the consistent pool. */
+        u32 fb_phys;
+};
+
+#endif  /* __XILINXFB_H__ */
diff --git a/include/linux/zlib.h b/include/linux/zlib.h
index 9e3192a7dc6f..40c49cb3eb51 100644
--- a/include/linux/zlib.h
+++ b/include/linux/zlib.h
@@ -82,7 +82,7 @@
 struct internal_state;
 
 typedef struct z_stream_s {
-    Byte    *next_in;   /* next input byte */
+    const Byte *next_in;   /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total nb of input bytes read so far */
 
@@ -699,4 +699,8 @@ extern int zlib_inflateInit2(z_streamp strm, int  windowBits);
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
+/* Utility function: initialize zlib, unpack binary blob, clean up zlib,
+ * return len or negative error code. */
+extern int zlib_inflate_blob(void *dst, unsigned dst_sz, const void *src, unsigned src_sz);
+
 #endif /* _ZLIB_H */