215 files changed, 5973 insertions, 1478 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 17714beb868e..5b6c391efc8e 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h
index 9cf736ea4691..fc1575fd4596 100644
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index bc4a6deb73b0..ef1cef77d32b 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index a091cabca4b1..de39915f6b7f 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 359ef11725a6..78ca429929f7 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -148,9 +148,7 @@ struct acpi_device_flags {
        u32 suprise_removal_ok:1;
        u32 power_manageable:1;
        u32 performance_manageable:1;
-        u32 wake_capable:1;     /* Wakeup(_PRW) supported? */
+        u32 reserved:24;
-        u32 force_power_state:1;
-        u32 reserved:22;
 };
 /* File System */
@@ -242,20 +240,14 @@ struct acpi_device_perf {
 struct acpi_device_wakeup_flags {
        u8 valid:1;             /* Can successfully enable wakeup? */
        u8 run_wake:1;          /* Run-Wake GPE devices */
-        u8 always_enabled:1;    /* Run-wake devices that are always enabled */
        u8 notifier_present:1;  /* Wake-up notify handler has been installed */
 };
-struct acpi_device_wakeup_state {
-        u8 enabled:1;
-};
 struct acpi_device_wakeup {
        acpi_handle gpe_device;
        u64 gpe_number;
        u64 sleep_state;
        struct acpi_handle_list resources;
-        struct acpi_device_wakeup_state state;
        struct acpi_device_wakeup_flags flags;
        int prepare_count;
        int run_wake_count;
@@ -328,8 +320,8 @@ void acpi_bus_data_handler(acpi_handle handle, void *context);
 acpi_status acpi_bus_get_status_handle(acpi_handle handle,
                                       unsigned long long *sta);
 int acpi_bus_get_status(struct acpi_device *device);
-int acpi_bus_get_power(acpi_handle handle, int *state);
 int acpi_bus_set_power(acpi_handle handle, int state);
+int acpi_bus_update_power(acpi_handle handle, int *state_p);
 bool acpi_bus_power_manageable(acpi_handle handle);
 bool acpi_bus_can_wakeup(acpi_handle handle);
 #ifdef CONFIG_ACPI_PROC_EVENT
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 65b3f5888f42..a3252a5ead66 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -8,7 +8,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 53b7cfd924a3..e46ec95a8ada 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -6,7 +6,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 /* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION                 0x20101013
+#define ACPI_CA_VERSION                 0x20110112
 #include "actypes.h"
 #include "actbl.h"
@@ -229,6 +229,10 @@ acpi_status
 acpi_install_initialization_handler(acpi_init_handler handler, u32 function);
 acpi_status
+acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler,
+                                 void *context);
+acpi_status
 acpi_install_fixed_event_handler(u32 acpi_event,
                                 acpi_event_handler handler, void *context);
@@ -258,11 +262,11 @@ acpi_remove_address_space_handler(acpi_handle device,
 acpi_status
 acpi_install_gpe_handler(acpi_handle gpe_device,
                         u32 gpe_number,
-                         u32 type, acpi_event_handler address, void *context);
+                         u32 type, acpi_gpe_handler address, void *context);
 acpi_status
 acpi_remove_gpe_handler(acpi_handle gpe_device,
-                        u32 gpe_number, acpi_event_handler address);
+                        u32 gpe_number, acpi_gpe_handler address);
 #ifdef ACPI_FUTURE_USAGE
 acpi_status acpi_install_exception_handler(acpi_exception_handler handler);
@@ -292,11 +296,13 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number);
 acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number);
-acpi_status acpi_gpe_can_wake(acpi_handle gpe_device, u32 gpe_number);
 acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number);
-acpi_status acpi_gpe_wakeup(acpi_handle gpe_device, u32 gpe_number, u8 action);
+acpi_status
+acpi_setup_gpe_for_wake(acpi_handle parent_device,
+                        acpi_handle gpe_device, u32 gpe_number);
+acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action);
 acpi_status
 acpi_get_gpe_status(acpi_handle gpe_device,
@@ -315,7 +321,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
 acpi_status acpi_remove_gpe_block(acpi_handle gpe_device);
-acpi_status acpi_update_gpes(void);
+acpi_status acpi_update_all_gpes(void);
 /*
 * Resource interfaces
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index e5526354ba5e..0a66cc45dd6b 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index ad2001683ba7..7e42bfee0e29 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index c637b75b9f3f..7504bc99b29b 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,7 @@ struct acpi_whea_header {
 struct acpi_table_bert {
        struct acpi_table_header header;        /* Common ACPI table header */
        u32 region_length;      /* Length of the boot error region */
-        u64 address;            /* Physical addresss of the error region */
+        u64 address;            /* Physical address of the error region */
 };
 /* Boot Error Region (not a subtable, pointed to by Address field above) */
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index d4136b28011f..0fc15dfb2e22 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 2b134b691e34..64f838beaabf 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -656,33 +656,34 @@ typedef u32 acpi_event_status;
 #define ACPI_GPE_MAX                    0xFF
 #define ACPI_NUM_GPE                    256
-/* Actions for acpi_gpe_wakeup, acpi_hw_low_set_gpe */
+/* Actions for acpi_set_gpe_wake_mask, acpi_hw_low_set_gpe */
 #define ACPI_GPE_ENABLE                 0
 #define ACPI_GPE_DISABLE                1
-#define ACPI_GPE_COND_ENABLE            2
+#define ACPI_GPE_CONDITIONAL_ENABLE     2
 /*
 * GPE info flags - Per GPE
- * +-------+---+-+-+
+ * +-------+-+-+---+
- * |  7:4  |3:2|1|0|
+ * |  7:4  |3|2|1:0|
- * +-------+---+-+-+
+ * +-------+-+-+---+
- *     |     |  | |
+ *     |    | |  |
- *     |     |  | +--- Interrupt type: edge or level triggered
+ *     |    | |  +-- Type of dispatch:to method, handler, notify, or none
- *     |     |  +----- GPE can wake the system
+ *     |    | +----- Interrupt type: edge or level triggered
- *     |     +-------- Type of dispatch:to method, handler, or none
+ *     |    +------- Is a Wake GPE
- *     +-------------- <Reserved>
+ *     +------------ <Reserved>
 */
-#define ACPI_GPE_XRUPT_TYPE_MASK        (u8) 0x01
+#define ACPI_GPE_DISPATCH_NONE          (u8) 0x00
-#define ACPI_GPE_LEVEL_TRIGGERED        (u8) 0x01
+#define ACPI_GPE_DISPATCH_METHOD        (u8) 0x01
-#define ACPI_GPE_EDGE_TRIGGERED         (u8) 0x00
+#define ACPI_GPE_DISPATCH_HANDLER       (u8) 0x02
+#define ACPI_GPE_DISPATCH_NOTIFY        (u8) 0x03
+#define ACPI_GPE_DISPATCH_MASK          (u8) 0x03
-#define ACPI_GPE_CAN_WAKE               (u8) 0x02
+#define ACPI_GPE_LEVEL_TRIGGERED        (u8) 0x04
+#define ACPI_GPE_EDGE_TRIGGERED         (u8) 0x00
+#define ACPI_GPE_XRUPT_TYPE_MASK        (u8) 0x04
-#define ACPI_GPE_DISPATCH_MASK          (u8) 0x0C
+#define ACPI_GPE_CAN_WAKE               (u8) 0x08
-#define ACPI_GPE_DISPATCH_HANDLER       (u8) 0x04
-#define ACPI_GPE_DISPATCH_METHOD        (u8) 0x08
-#define ACPI_GPE_DISPATCH_NOT_USED      (u8) 0x00
 /*
 * Flags for GPE and Lock interfaces
@@ -894,9 +895,20 @@ typedef void
 /*
 * Various handlers and callback procedures
 */
+typedef
+void (*ACPI_GBL_EVENT_HANDLER) (u32 event_type,
+                               acpi_handle device,
+                               u32 event_number, void *context);
+#define ACPI_EVENT_TYPE_GPE         0
+#define ACPI_EVENT_TYPE_FIXED       1
 typedef u32(*acpi_event_handler) (void *context);
 typedef
+u32 (*acpi_gpe_handler) (acpi_handle gpe_device, u32 gpe_number, void *context);
+typedef
 void (*acpi_notify_handler) (acpi_handle device, u32 value, void *context);
 typedef
@@ -951,6 +963,10 @@ u32 (*acpi_interface_handler) (acpi_string interface_name, u32 supported);
 #define ACPI_INTERRUPT_NOT_HANDLED      0x00
 #define ACPI_INTERRUPT_HANDLED          0x01
+/* GPE handler return values */
+#define ACPI_REENABLE_GPE               0x80
 /* Length of 32-bit EISAID values when converted back to a string */
 #define ACPI_EISAID_STRING_SIZE         8       /* Includes null terminator */
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index b3365025ff8d..c4dbb132d902 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -19,6 +19,12 @@
 extern int hest_disable;
 extern int erst_disable;
+#ifdef CONFIG_ACPI_APEI
+void __init acpi_hest_init(void);
+#else
+static inline void acpi_hest_init(void) { return; }
+#endif
 typedef int (*apei_hest_func_t)(struct acpi_hest_header *hest_hdr, void *data);
 int apei_hest_parse(apei_hest_func_t func, void *data);
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index a3e334ab1119..5af3ed52ef98 100644
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index 5dcb9537343c..e228893591a9 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 572189e37133..5d2a5e9544d9 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 1b62102fbb67..55192ac0cede 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -324,6 +324,12 @@ int acpi_processor_tstate_has_changed(struct acpi_processor *pr);
 int acpi_processor_get_throttling_info(struct acpi_processor *pr);
 extern int acpi_processor_set_throttling(struct acpi_processor *pr,
                                         int state, bool force);
+/*
+ * Reevaluate whether the T-state is invalid after one cpu is
+ * onlined/offlined. In such case the flags.throttling will be updated.
+ */
+extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
+                        unsigned long action);
 extern const struct file_operations acpi_processor_throttling_fops;
 extern void acpi_processor_throttling_init(void);
 /* in processor_idle.c */
diff --git a/include/asm-generic/mman-common.h b/include/asm-generic/mman-common.h
index 3da9e2742fa0..787abbb6d867 100644
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@ -45,6 +45,9 @@
 #define MADV_MERGEABLE   12             /* KSM may merge identical pages */
 #define MADV_UNMERGEABLE 13             /* KSM may not merge identical pages */
+#define MADV_HUGEPAGE   14              /* Worth backing with hugepages */
+#define MADV_NOHUGEPAGE 15              /* Not worth backing with hugepages */
 /* compatibility flags */
 #define MAP_FILE        0
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 6f3c6ae4fe03..31b6188df221 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -5,67 +5,100 @@
 #ifdef CONFIG_MMU
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-/*
+extern int ptep_set_access_flags(struct vm_area_struct *vma,
- * Largely same as above, but only sets the access flags (dirty,
+                                 unsigned long address, pte_t *ptep,
- * accessed, and writable). Furthermore, we know it always gets set
+                                 pte_t entry, int dirty);
- * to a "more permissive" setting, which allows most architectures
+#endif
- * to optimize this. We return whether the PTE actually changed, which
- * in turn instructs the caller to do things like update__mmu_cache.
+#ifndef __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS
- * This used to be done in the caller, but sparc needs minor faults to
+extern int pmdp_set_access_flags(struct vm_area_struct *vma,
- * force that call on sun4c so we changed this macro slightly
+                                 unsigned long address, pmd_t *pmdp,
- */
+                                 pmd_t entry, int dirty);
-#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
-({                                                                        \
-        int __changed = !pte_same(*(__ptep), __entry);                    \
-        if (__changed) {                                                  \
-                set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); \
-                flush_tlb_page(__vma, __address);                         \
-        }                                                                 \
-        __changed;                                                        \
-})
 #endif
 #ifndef __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define ptep_test_and_clear_young(__vma, __address, __ptep)             \
+static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
-({                                                                      \
+                                            unsigned long address,
-        pte_t __pte = *(__ptep);                                        \
+                                            pte_t *ptep)
-        int r = 1;                                                      \
+{
-        if (!pte_young(__pte))                                          \
+        pte_t pte = *ptep;
-                r = 0;                                                  \
+        int r = 1;
-        else                                                            \
+        if (!pte_young(pte))
-                set_pte_at((__vma)->vm_mm, (__address),                 \
+                r = 0;
-                           (__ptep), pte_mkold(__pte));                 \
+        else
-        r;                                                              \
+                set_pte_at(vma->vm_mm, address, ptep, pte_mkold(pte));
-})
+        return r;
+}
+#endif
+#ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+                                            unsigned long address,
+                                            pmd_t *pmdp)
+{
+        pmd_t pmd = *pmdp;
+        int r = 1;
+        if (!pmd_young(pmd))
+                r = 0;
+        else
+                set_pmd_at(vma->vm_mm, address, pmdp, pmd_mkold(pmd));
+        return r;
+}
+#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+                                            unsigned long address,
+                                            pmd_t *pmdp)
+{
+        BUG();
+        return 0;
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 #endif
 #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
-#define ptep_clear_flush_young(__vma, __address, __ptep)                \
+int ptep_clear_flush_young(struct vm_area_struct *vma,
-({                                                                      \
+                           unsigned long address, pte_t *ptep);
-        int __young;                                                    \
+#endif
-        __young = ptep_test_and_clear_young(__vma, __address, __ptep);  \
-        if (__young)                                                    \
+#ifndef __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH
-                flush_tlb_page(__vma, __address);                       \
+int pmdp_clear_flush_young(struct vm_area_struct *vma,
-        __young;                                                        \
+                           unsigned long address, pmd_t *pmdp);
-})
 #endif
 #ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define ptep_get_and_clear(__mm, __address, __ptep)                     \
+static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
-({                                                                      \
+                                       unsigned long address,
-        pte_t __pte = *(__ptep);                                        \
+                                       pte_t *ptep)
-        pte_clear((__mm), (__address), (__ptep));                       \
+{
-        __pte;                                                          \
+        pte_t pte = *ptep;
+        pte_clear(mm, address, ptep);
+        return pte;
+}
+#endif
+#ifndef __HAVE_ARCH_PMDP_GET_AND_CLEAR
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,
+                                       unsigned long address,
+                                       pmd_t *pmdp)
+{
+        pmd_t pmd = *pmdp;
+        pmd_clear(mm, address, pmdp);
+        return pmd;
 })
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 #endif
 #ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
-#define ptep_get_and_clear_full(__mm, __address, __ptep, __full)        \
+static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
-({                                                                      \
+                                            unsigned long address, pte_t *ptep,
-        pte_t __pte;                                                    \
+                                            int full)
-        __pte = ptep_get_and_clear((__mm), (__address), (__ptep));      \
+{
-        __pte;                                                          \
+        pte_t pte;
-})
+        pte = ptep_get_and_clear(mm, address, ptep);
+        return pte;
+}
 #endif
 /*
@@ -74,20 +107,25 @@
 * not present, or in the process of an address space destruction.
 */
 #ifndef __HAVE_ARCH_PTE_CLEAR_NOT_PRESENT_FULL
-#define pte_clear_not_present_full(__mm, __address, __ptep, __full)     \
+static inline void pte_clear_not_present_full(struct mm_struct *mm,
-do {                                                                    \
+                                              unsigned long address,
-        pte_clear((__mm), (__address), (__ptep));                       \
+                                              pte_t *ptep,
-} while (0)
+                                              int full)
+{
+        pte_clear(mm, address, ptep);
+}
 #endif
 #ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH
-#define ptep_clear_flush(__vma, __address, __ptep)                      \
+extern pte_t ptep_clear_flush(struct vm_area_struct *vma,
-({                                                                      \
+                              unsigned long address,
-        pte_t __pte;                                                    \
+                              pte_t *ptep);
-        __pte = ptep_get_and_clear((__vma)->vm_mm, __address, __ptep);  \
+#endif
-        flush_tlb_page(__vma, __address);                               \
-        __pte;                                                          \
+#ifndef __HAVE_ARCH_PMDP_CLEAR_FLUSH
-})
+extern pmd_t pmdp_clear_flush(struct vm_area_struct *vma,
+                              unsigned long address,
+                              pmd_t *pmdp);
 #endif
 #ifndef __HAVE_ARCH_PTEP_SET_WRPROTECT
@@ -99,8 +137,49 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 }
 #endif
+#ifndef __HAVE_ARCH_PMDP_SET_WRPROTECT
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+                                      unsigned long address, pmd_t *pmdp)
+{
+        pmd_t old_pmd = *pmdp;
+        set_pmd_at(mm, address, pmdp, pmd_wrprotect(old_pmd));
+}
+#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+                                      unsigned long address, pmd_t *pmdp)
+{
+        BUG();
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+#endif
+#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
+extern pmd_t pmdp_splitting_flush(struct vm_area_struct *vma,
+                                  unsigned long address,
+                                  pmd_t *pmdp);
+#endif
 #ifndef __HAVE_ARCH_PTE_SAME
-#define pte_same(A,B)   (pte_val(A) == pte_val(B))
+static inline int pte_same(pte_t pte_a, pte_t pte_b)
+{
+        return pte_val(pte_a) == pte_val(pte_b);
+}
+#endif
+#ifndef __HAVE_ARCH_PMD_SAME
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
+{
+        return pmd_val(pmd_a) == pmd_val(pmd_b);
+}
+#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
+{
+        BUG();
+        return 0;
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 #endif
 #ifndef __HAVE_ARCH_PAGE_TEST_DIRTY
@@ -348,6 +427,24 @@ extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
                                unsigned long size);
 #endif
+#ifndef CONFIG_TRANSPARENT_HUGEPAGE
+static inline int pmd_trans_huge(pmd_t pmd)
+{
+        return 0;
+}
+static inline int pmd_trans_splitting(pmd_t pmd)
+{
+        return 0;
+}
+#ifndef __HAVE_ARCH_PMD_WRITE
+static inline int pmd_write(pmd_t pmd)
+{
+        BUG();
+        return 0;
+}
+#endif /* __HAVE_ARCH_PMD_WRITE */
+#endif
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_GENERIC_PGTABLE_H */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 05cbad03c5ab..68649336c4ad 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -200,7 +200,8 @@
 #define READ_MOSTLY_DATA(align)                                         \
        . = ALIGN(align);                                               \
-        *(.data..read_mostly)
+        *(.data..read_mostly)                                           \
+        . = ALIGN(align);
 #define CACHELINE_ALIGNED_DATA(align)                                   \
        . = ALIGN(align);                                               \
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
new file mode 100644
index 000000000000..c5813c87de06
--- /dev/null
+++ b/include/crypto/if_alg.h
@@ -0,0 +1,92 @@
+/*
+ * if_alg: User-space algorithm interface
+ *
+ * Copyright (c) 2010 Herbert Xu <herbert@gondor.apana.org.au>
+ *
+ * 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 _CRYPTO_IF_ALG_H
+#define _CRYPTO_IF_ALG_H
+#include <linux/compiler.h>
+#include <linux/completion.h>
+#include <linux/if_alg.h>
+#include <linux/types.h>
+#include <net/sock.h>
+#define ALG_MAX_PAGES                   16
+struct crypto_async_request;
+struct alg_sock {
+        /* struct sock must be the first member of struct alg_sock */
+        struct sock sk;
+        struct sock *parent;
+        const struct af_alg_type *type;
+        void *private;
+};
+struct af_alg_completion {
+        struct completion completion;
+        int err;
+};
+struct af_alg_control {
+        struct af_alg_iv *iv;
+        int op;
+};
+struct af_alg_type {
+        void *(*bind)(const char *name, u32 type, u32 mask);
+        void (*release)(void *private);
+        int (*setkey)(void *private, const u8 *key, unsigned int keylen);
+        int (*accept)(void *private, struct sock *sk);
+        struct proto_ops *ops;
+        struct module *owner;
+        char name[14];
+};
+struct af_alg_sgl {
+        struct scatterlist sg[ALG_MAX_PAGES];
+        struct page *pages[ALG_MAX_PAGES];
+};
+int af_alg_register_type(const struct af_alg_type *type);
+int af_alg_unregister_type(const struct af_alg_type *type);
+int af_alg_release(struct socket *sock);
+int af_alg_accept(struct sock *sk, struct socket *newsock);
+int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len,
+                   int write);
+void af_alg_free_sg(struct af_alg_sgl *sgl);
+int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con);
+int af_alg_wait_for_completion(int err, struct af_alg_completion *completion);
+void af_alg_complete(struct crypto_async_request *req, int err);
+static inline struct alg_sock *alg_sk(struct sock *sk)
+{
+        return (struct alg_sock *)sk;
+}
+static inline void af_alg_release_parent(struct sock *sk)
+{
+        sock_put(alg_sk(sk)->parent);
+}
+static inline void af_alg_init_completion(struct af_alg_completion *completion)
+{
+        init_completion(&completion->completion);
+}
+#endif  /* _CRYPTO_IF_ALG_H */
diff --git a/include/crypto/padlock.h b/include/crypto/padlock.h
new file mode 100644
index 000000000000..d2cfa2ef49e8
--- /dev/null
+++ b/include/crypto/padlock.h
@@ -0,0 +1,29 @@
+/*
+ * Driver for VIA PadLock
+ *
+ * Copyright (c) 2004 Michal Ludvig <michal@logix.cz>
+ *
+ * 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 _CRYPTO_PADLOCK_H
+#define _CRYPTO_PADLOCK_H
+#define PADLOCK_ALIGNMENT 16
+#define PFX     KBUILD_MODNAME ": "
+#define PADLOCK_CRA_PRIORITY    300
+#define PADLOCK_COMPOSITE_PRIORITY 400
+#ifdef CONFIG_64BIT
+#define STACK_ALIGN 16
+#else
+#define STACK_ALIGN 4
+#endif
+#endif  /* _CRYPTO_PADLOCK_H */
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 833d208c25d6..4fd95a323beb 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -68,6 +68,21 @@ static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)
        return (++sg)->length ? sg : (void *)sg_page(sg);
 }
+static inline void scatterwalk_crypto_chain(struct scatterlist *head,
+                                            struct scatterlist *sg,
+                                            int chain, int num)
+{
+        if (chain) {
+                head->length += sg->length;
+                sg = scatterwalk_sg_next(sg);
+        }
+        if (sg)
+                scatterwalk_sg_chain(head, num, sg);
+        else
+                sg_mark_end(head);
+}
 static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in,
                                                struct scatter_walk *walk_out)
 {
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index aac27bd56e89..f22e7fe4b6db 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -121,6 +121,9 @@ int drm_fb_helper_setcolreg(unsigned regno,
 void drm_fb_helper_restore(void);
 void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
                            uint32_t fb_width, uint32_t fb_height);
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
+                            uint32_t depth);
 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info);
 bool drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index d1580c17cab3..2296d8b1931f 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -158,6 +158,7 @@ header-y += icmpv6.h
 header-y += if.h
 header-y += if_addr.h
 header-y += if_addrlabel.h
+header-y += if_alg.h
 header-y += if_arcnet.h
 header-y += if_arp.h
 header-y += if_bonding.h
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 67c91b4418b0..a2e910e01293 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -306,9 +306,6 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
                                             u32 *mask, u32 req);
 extern void acpi_early_init(void);
-int acpi_os_map_generic_address(struct acpi_generic_address *addr);
-void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
 #else   /* !CONFIG_ACPI */
 #define acpi_disabled 1
@@ -352,4 +349,14 @@ static inline int acpi_table_parse(char *id,
        return -1;
 }
 #endif  /* !CONFIG_ACPI */
+#ifdef CONFIG_ACPI_SLEEP
+int suspend_nvs_register(unsigned long start, unsigned long size);
+#else
+static inline int suspend_nvs_register(unsigned long a, unsigned long b)
+{
+        return 0;
+}
+#endif
 #endif  /*_LINUX_ACPI_H*/
diff --git a/include/linux/acpi_io.h b/include/linux/acpi_io.h
new file mode 100644
index 000000000000..7180013a4a3a
--- /dev/null
+++ b/include/linux/acpi_io.h
@@ -0,0 +1,16 @@
+#ifndef _ACPI_IO_H_
+#define _ACPI_IO_H_
+#include <linux/io.h>
+#include <acpi/acpi.h>
+static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
+                                            acpi_size size)
+{
+       return ioremap_cache(phys, size);
+}
+int acpi_os_map_generic_address(struct acpi_generic_address *addr);
+void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
+#endif
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h
index 521a0f8974ac..3111385b8ca7 100644
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
@@ -12,7 +12,6 @@
 *
 * Please credit ARM.com
 * Documentation: ARM DDI 0196D
- *
 */
 #ifndef AMBA_PL08X_H
@@ -22,6 +21,15 @@
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
+struct pl08x_lli;
+struct pl08x_driver_data;
+/* Bitmasks for selecting AHB ports for DMA transfers */
+enum {
+        PL08X_AHB1 = (1 << 0),
+        PL08X_AHB2 = (1 << 1)
+};
 /**
 * struct pl08x_channel_data - data structure to pass info between
 * platform and PL08x driver regarding channel configuration
@@ -46,8 +54,10 @@
 * @circular_buffer: whether the buffer passed in is circular and
 * shall simply be looped round round (like a record baby round
 * round round round)
- * @single: the device connected to this channel will request single
+ * @single: the device connected to this channel will request single DMA
- * DMA transfers, not bursts. (Bursts are default.)
+ * transfers, not bursts. (Bursts are default.)
+ * @periph_buses: the device connected to this channel is accessible via
+ * these buses (use PL08X_AHB1 | PL08X_AHB2).
 */
 struct pl08x_channel_data {
        char *bus_id;
@@ -55,10 +65,10 @@ struct pl08x_channel_data {
        int max_signal;
        u32 muxval;
        u32 cctl;
-        u32 ccfg;
        dma_addr_t addr;
        bool circular_buffer;
        bool single;
+        u8 periph_buses;
 };
 /**
@@ -67,24 +77,23 @@ struct pl08x_channel_data {
 * @addr: current address
 * @maxwidth: the maximum width of a transfer on this bus
 * @buswidth: the width of this bus in bytes: 1, 2 or 4
- * @fill_bytes: bytes required to fill to the next bus memory
+ * @fill_bytes: bytes required to fill to the next bus memory boundary
- * boundary
 */
 struct pl08x_bus_data {
        dma_addr_t addr;
        u8 maxwidth;
        u8 buswidth;
-        u32 fill_bytes;
+        size_t fill_bytes;
 };
 /**
 * struct pl08x_phy_chan - holder for the physical channels
 * @id: physical index to this channel
 * @lock: a lock to use when altering an instance of this struct
- * @signal: the physical signal (aka channel) serving this
+ * @signal: the physical signal (aka channel) serving this physical channel
- * physical channel right now
+ * right now
- * @serving: the virtual channel currently being served by this
+ * @serving: the virtual channel currently being served by this physical
- * physical channel
+ * channel
 */
 struct pl08x_phy_chan {
        unsigned int id;
@@ -92,11 +101,6 @@ struct pl08x_phy_chan {
        spinlock_t lock;
        int signal;
        struct pl08x_dma_chan *serving;
-        u32 csrc;
-        u32 cdst;
-        u32 clli;
-        u32 cctl;
-        u32 ccfg;
 };
 /**
@@ -108,26 +112,23 @@ struct pl08x_txd {
        struct dma_async_tx_descriptor tx;
        struct list_head node;
        enum dma_data_direction direction;
-        struct pl08x_bus_data srcbus;
+        dma_addr_t src_addr;
-        struct pl08x_bus_data dstbus;
+        dma_addr_t dst_addr;
-        int len;
+        size_t len;
        dma_addr_t llis_bus;
-        void *llis_va;
+        struct pl08x_lli *llis_va;
-        struct pl08x_channel_data *cd;
+        /* Default cctl value for LLIs */
-        bool active;
+        u32 cctl;
        /*
         * Settings to be put into the physical channel when we
-         * trigger this txd
+         * trigger this txd.  Other registers are in llis_va[0].
         */
-        u32 csrc;
+        u32 ccfg;
-        u32 cdst;
-        u32 clli;
-        u32 cctl;
 };
 /**
- * struct pl08x_dma_chan_state - holds the PL08x specific virtual
+ * struct pl08x_dma_chan_state - holds the PL08x specific virtual channel
- * channel states
+ * states
 * @PL08X_CHAN_IDLE: the channel is idle
 * @PL08X_CHAN_RUNNING: the channel has allocated a physical transport
 * channel and is running a transfer on it
@@ -147,6 +148,8 @@ enum pl08x_dma_chan_state {
 * struct pl08x_dma_chan - this structure wraps a DMA ENGINE channel
 * @chan: wrappped abstract channel
 * @phychan: the physical channel utilized by this channel, if there is one
+ * @phychan_hold: if non-zero, hold on to the physical channel even if we
+ * have no pending entries
 * @tasklet: tasklet scheduled by the IRQ to handle actual work etc
 * @name: name of channel
 * @cd: channel platform data
@@ -154,53 +157,49 @@ enum pl08x_dma_chan_state {
 * @runtime_direction: current direction of this channel according to
 * runtime config
 * @lc: last completed transaction on this channel
- * @desc_list: queued transactions pending on this channel
+ * @pend_list: queued transactions pending on this channel
 * @at: active transaction on this channel
- * @lockflags: sometimes we let a lock last between two function calls,
- * especially prep/submit, and then we need to store the IRQ flags
- * in the channel state, here
 * @lock: a lock for this channel data
 * @host: a pointer to the host (internal use)
 * @state: whether the channel is idle, paused, running etc
 * @slave: whether this channel is a device (slave) or for memcpy
- * @waiting: a TX descriptor on this channel which is waiting for
+ * @waiting: a TX descriptor on this channel which is waiting for a physical
- * a physical channel to become available
+ * channel to become available
 */
 struct pl08x_dma_chan {
        struct dma_chan chan;
        struct pl08x_phy_chan *phychan;
+        int phychan_hold;
        struct tasklet_struct tasklet;
        char *name;
        struct pl08x_channel_data *cd;
        dma_addr_t runtime_addr;
        enum dma_data_direction runtime_direction;
-        atomic_t last_issued;
        dma_cookie_t lc;
-        struct list_head desc_list;
+        struct list_head pend_list;
        struct pl08x_txd *at;
-        unsigned long lockflags;
        spinlock_t lock;
-        void *host;
+        struct pl08x_driver_data *host;
        enum pl08x_dma_chan_state state;
        bool slave;
        struct pl08x_txd *waiting;
 };
 /**
- * struct pl08x_platform_data - the platform configuration for the
+ * struct pl08x_platform_data - the platform configuration for the PL08x
- * PL08x PrimeCells.
+ * PrimeCells.
 * @slave_channels: the channels defined for the different devices on the
 * platform, all inclusive, including multiplexed channels. The available
- * physical channels will be multiplexed around these signals as they
+ * physical channels will be multiplexed around these signals as they are
- * are requested, just enumerate all possible channels.
+ * requested, just enumerate all possible channels.
- * @get_signal: request a physical signal to be used for a DMA
+ * @get_signal: request a physical signal to be used for a DMA transfer
- * transfer immediately: if there is some multiplexing or similar blocking
+ * immediately: if there is some multiplexing or similar blocking the use
- * the use of the channel the transfer can be denied by returning
+ * of the channel the transfer can be denied by returning less than zero,
- * less than zero, else it returns the allocated signal number
+ * else it returns the allocated signal number
 * @put_signal: indicate to the platform that this physical signal is not
 * running any DMA transfer and multiplexing can be recycled
- * @bus_bit_lli: Bit[0] of the address indicated which AHB bus master the
+ * @lli_buses: buses which LLIs can be fetched from: PL08X_AHB1 | PL08X_AHB2
- * LLI addresses are on 0/1 Master 1/2.
+ * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2
 */
 struct pl08x_platform_data {
        struct pl08x_channel_data *slave_channels;
@@ -208,6 +207,8 @@ struct pl08x_platform_data {
        struct pl08x_channel_data memcpy_channel;
        int (*get_signal)(struct pl08x_dma_chan *);
        void (*put_signal)(struct pl08x_dma_chan *);
+        u8 lli_buses;
+        u8 mem_buses;
 };
 #ifdef CONFIG_AMBA_PL08X
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
index 8b49ac48a5b7..e02982fa2953 100644
--- a/include/linux/auto_fs4.h
+++ b/include/linux/auto_fs4.h
@@ -24,7 +24,7 @@
 #define AUTOFS_MIN_PROTO_VERSION        3
 #define AUTOFS_MAX_PROTO_VERSION        5
-#define AUTOFS_PROTO_SUBVERSION         1
+#define AUTOFS_PROTO_SUBVERSION         2
 /* Mask for expire behaviour */
 #define AUTOFS_EXP_IMMEDIATE            1
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 64a7114a9394..c3d6512eded1 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -25,7 +25,7 @@ struct pt_regs;
 /*
 * This structure is used to hold the arguments that are used when loading binaries.
 */
-struct linux_binprm{
+struct linux_binprm {
        char buf[BINPRM_BUF_SIZE];
 #ifdef CONFIG_MMU
        struct vm_area_struct *vma;
@@ -93,7 +93,6 @@ struct linux_binfmt {
        int (*load_shlib)(struct file *);
        int (*core_dump)(struct coredump_params *cprm);
        unsigned long min_coredump;     /* minimal dump size */
-        int hasvdso;
 };
 extern int __register_binfmt(struct linux_binfmt *fmt, int insert);
@@ -113,7 +112,7 @@ extern void unregister_binfmt(struct linux_binfmt *);
 extern int prepare_binprm(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 search_binary_handler(struct linux_binprm *, struct pt_regs *);
 extern int flush_old_exec(struct linux_binprm * bprm);
 extern void setup_new_exec(struct linux_binprm * bprm);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 36ab42c9bb99..4d18ff34670a 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -115,6 +115,7 @@ struct request {
        void *elevator_private3;
        struct gendisk *rq_disk;
+        struct hd_struct *part;
        unsigned long start_time;
 #ifdef CONFIG_BLK_CGROUP
        unsigned long long start_time_ns;
@@ -646,7 +647,6 @@ static inline void rq_flush_dcache_pages(struct request *rq)
 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_rq_init(struct request_queue *q, struct request *rq);
 extern void blk_put_request(struct request *);
@@ -1256,6 +1256,9 @@ struct block_device_operations {
        int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
        int (*direct_access) (struct block_device *, sector_t,
                                                void **, unsigned long *);
+        unsigned int (*check_events) (struct gendisk *disk,
+                                      unsigned int clearing);
+        /* ->media_changed() is DEPRECATED, use ->check_events() instead */
        int (*media_changed) (struct gendisk *);
        void (*unlock_native_capacity) (struct gendisk *);
        int (*revalidate_disk) (struct gendisk *);
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index f389e319a454..fb4591977b03 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -28,8 +28,6 @@ int cdev_add(struct cdev *, dev_t, unsigned);
 void cdev_del(struct cdev *);
-int cdev_index(struct inode *inode);
 void cd_forget(struct inode *);
 extern struct backing_dev_info directly_mappable_cdev_bdi;
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 78e904796622..35eae4b67503 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -946,6 +946,8 @@ struct cdrom_device_info {
 /* device-related storage */
        unsigned int options    : 30;   /* options flags */
        unsigned mc_flags       : 2;    /* media change buffer flags */
+        unsigned int vfs_events;        /* cached events for vfs path */
+        unsigned int ioctl_events;      /* cached events for ioctl path */
        int use_count;                  /* number of times device opened */
        char name[20];                  /* name of the device type */
 /* per-device flags */
@@ -965,6 +967,8 @@ struct cdrom_device_ops {
        int (*open) (struct cdrom_device_info *, int);
        void (*release) (struct cdrom_device_info *);
        int (*drive_status) (struct cdrom_device_info *, int);
+        unsigned int (*check_events) (struct cdrom_device_info *cdi,
+                                      unsigned int clearing, int slot);
        int (*media_changed) (struct cdrom_device_info *, int);
        int (*tray_move) (struct cdrom_device_info *, int);
        int (*lock_door) (struct cdrom_device_info *, int);
@@ -993,6 +997,8 @@ extern int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev,
 extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode);
 extern int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
                       fmode_t mode, unsigned int cmd, unsigned long arg);
+extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,
+                                       unsigned int clearing);
 extern int cdrom_media_changed(struct cdrom_device_info *);
 extern int register_cdrom(struct cdrom_device_info *cdi);
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index c3c74aef289d..09dcc0c2ffd5 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -43,6 +43,10 @@
 #define CEPH_FEATURE_NOSRCADDR      (1<<1)
 #define CEPH_FEATURE_MONCLOCKCHECK  (1<<2)
 #define CEPH_FEATURE_FLOCK          (1<<3)
+#define CEPH_FEATURE_SUBSCRIBE2     (1<<4)
+#define CEPH_FEATURE_MONNAMES       (1<<5)
+#define CEPH_FEATURE_RECONNECT_SEQ  (1<<6)
+#define CEPH_FEATURE_DIRLAYOUTHASH  (1<<7)
 /*
@@ -55,10 +59,10 @@ struct ceph_file_layout {
        __le32 fl_stripe_count;    /* over this many objects */
        __le32 fl_object_size;     /* until objects are this big, then move to
                                      new objects */
-        __le32 fl_cas_hash;        /* 0 = none; 1 = sha256 */
+        __le32 fl_cas_hash;        /* UNUSED.  0 = none; 1 = sha256 */
        /* pg -> disk layout */
-        __le32 fl_object_stripe_unit;  /* for per-object parity, if any */
+        __le32 fl_object_stripe_unit;  /* UNUSED.  for per-object parity, if any */
        /* object -> pg layout */
        __le32 fl_pg_preferred; /* preferred primary for pg (-1 for none) */
@@ -69,6 +73,12 @@ struct ceph_file_layout {
 int ceph_file_layout_is_valid(const struct ceph_file_layout *layout);
+struct ceph_dir_layout {
+        __u8   dl_dir_hash;   /* see ceph_hash.h for ids */
+        __u8   dl_unused1;
+        __u16  dl_unused2;
+        __u32  dl_unused3;
+} __attribute__ ((packed));
 /* crypto algorithms */
 #define CEPH_CRYPTO_NONE 0x0
@@ -457,7 +467,7 @@ struct ceph_mds_reply_inode {
        struct ceph_timespec rctime;
        struct ceph_frag_tree_head fragtree;  /* (must be at end of struct) */
 } __attribute__ ((packed));
-/* followed by frag array, then symlink string, then xattr blob */
+/* followed by frag array, symlink string, dir layout, xattr blob */
 /* reply_lease follows dname, and reply_inode */
 struct ceph_mds_reply_lease {
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index a108b425fee2..c3011beac30d 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -110,17 +110,12 @@ struct ceph_msg_pos {
 /*
 * ceph_connection state bit flags
- *
- * QUEUED and BUSY are used together to ensure that only a single
- * thread is currently opening, reading or writing data to the socket.
 */
 #define LOSSYTX         0  /* we can close channel or drop messages on errors */
 #define CONNECTING      1
 #define NEGOTIATING     2
 #define KEEPALIVE_PENDING      3
 #define WRITE_PENDING   4  /* we have data ready to send */
-#define QUEUED          5  /* there is work queued on this connection */
-#define BUSY            6  /* work is being done */
 #define STANDBY         8  /* no outgoing messages, socket closed.  we keep
                            * the ceph_connection around to maintain shared
                            * state with the peer. */
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ed4ba111bc8d..ce104e33cd22 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -564,7 +564,7 @@ struct cgroup_iter {
 /*
 * To iterate across the tasks in a cgroup:
 *
- * 1) call cgroup_iter_start to intialize an iterator
+ * 1) call cgroup_iter_start to initialize an iterator
 *
 * 2) call cgroup_iter_next() to retrieve member tasks until it
 *    returns NULL or until you want to end the iteration
diff --git a/include/linux/coda_cache.h b/include/linux/coda_cache.h
deleted file mode 100644
index c910b5eb1ceb..000000000000
--- a/include/linux/coda_cache.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Coda filesystem -- Linux Minicache
- *
- * Copyright (C) 1989 - 1997 Carnegie Mellon University
- *
- * Carnegie Mellon University encourages users of this software to
- * contribute improvements to the Coda project. Contact Peter Braam
- * <coda@cs.cmu.edu>
- */
-#ifndef _CFSNC_HEADER_
-#define _CFSNC_HEADER_
-/* credential cache */
-void coda_cache_enter(struct inode *inode, int mask);
-void coda_cache_clear_inode(struct inode *);
-void coda_cache_clear_all(struct super_block *sb);
-int coda_cache_check(struct inode *inode, int mask);
-/* for downcalls and attributes and lookups */
-void coda_flag_inode_children(struct inode *inode, int flag);
-#endif /* _CFSNC_HEADER_ */
diff --git a/include/linux/coda_fs_i.h b/include/linux/coda_fs_i.h
deleted file mode 100644
index e35071b1de0e..000000000000
--- a/include/linux/coda_fs_i.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  coda_fs_i.h
- *
- *  Copyright (C) 1998 Carnegie Mellon University
- *
- */
-#ifndef _LINUX_CODA_FS_I
-#define _LINUX_CODA_FS_I
-#include <linux/types.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/coda.h>
-/*
- * coda fs inode data
- * c_lock protects accesses to c_flags, c_mapcount, c_cached_epoch, c_uid and
- * c_cached_perm.
- * vfs_inode is set only when the inode is created and never changes.
- * c_fid is set when the inode is created and should be considered immutable.
- */
-struct coda_inode_info {
-        struct CodaFid     c_fid;       /* Coda identifier */
-        u_short            c_flags;     /* flags (see below) */
-        unsigned int       c_mapcount;  /* nr of times this inode is mapped */
-        unsigned int       c_cached_epoch; /* epoch for cached permissions */
-        vuid_t             c_uid;       /* fsuid for cached permissions */
-        unsigned int       c_cached_perm; /* cached access permissions */
-        spinlock_t         c_lock;
-        struct inode       vfs_inode;
-};
-/*
- * coda fs file private data
- */
-#define CODA_MAGIC 0xC0DAC0DA
-struct coda_file_info {
-        int                cfi_magic;     /* magic number */
-        struct file       *cfi_container; /* container file for this cnode */
-        unsigned int       cfi_mapcount;  /* nr of times this file is mapped */
-};
-#define CODA_FTOC(file) ((struct coda_file_info *)((file)->private_data))
-/* flags */
-#define C_VATTR       0x1   /* Validity of vattr in inode */
-#define C_FLUSH       0x2   /* used after a flush */
-#define C_DYING       0x4   /* from venus (which died) */
-#define C_PURGE       0x8
-int coda_cnode_make(struct inode **, struct CodaFid *, struct super_block *);
-struct inode *coda_iget(struct super_block *sb, struct CodaFid *fid, struct coda_vattr *attr);
-int coda_cnode_makectl(struct inode **inode, struct super_block *sb);
-struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb);
-void coda_replace_fid(struct inode *, struct CodaFid *, struct CodaFid *);
-#endif
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
deleted file mode 100644
index 4ccc59c1ea82..000000000000
--- a/include/linux/coda_linux.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* 
- * Coda File System, Linux Kernel module
- * 
- * Original version, adapted from cfs_mach.c, (C) Carnegie Mellon University
- * Linux modifications (C) 1996, Peter J. Braam
- * Rewritten for Linux 2.1 (C) 1997 Carnegie Mellon University
- *
- * Carnegie Mellon University encourages users of this software to
- * contribute improvements to the Coda project.
- */
-#ifndef _LINUX_CODA_FS
-#define _LINUX_CODA_FS
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/slab.h>
-#include <linux/wait.h>         
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/coda_fs_i.h>
-/* operations */
-extern const struct inode_operations coda_dir_inode_operations;
-extern const struct inode_operations coda_file_inode_operations;
-extern const struct inode_operations coda_ioctl_inode_operations;
-extern const struct address_space_operations coda_file_aops;
-extern const struct address_space_operations coda_symlink_aops;
-extern const struct file_operations coda_dir_operations;
-extern const struct file_operations coda_file_operations;
-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_release(struct inode *i, struct file *f);
-int coda_permission(struct inode *inode, int mask, unsigned int flags);
-int coda_revalidate_inode(struct dentry *);
-int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *);
-int coda_setattr(struct dentry *, struct iattr *);
-/* this file:  heloers */
-char *coda_f2s(struct CodaFid *f);
-int coda_isroot(struct inode *i);
-int coda_iscontrol(const char *name, size_t length);
-void coda_vattr_to_iattr(struct inode *, struct coda_vattr *);
-void coda_iattr_to_vattr(struct iattr *, struct coda_vattr *);
-unsigned short coda_flags_to_cflags(unsigned short);
-/* sysctl.h */
-void coda_sysctl_init(void);
-void coda_sysctl_clean(void);
-#define CODA_ALLOC(ptr, cast, size) do { \
-    if (size < PAGE_SIZE) \
-        ptr = kmalloc((unsigned long) size, GFP_KERNEL); \
-    else \
-        ptr = (cast)vmalloc((unsigned long) size); \
-    if (!ptr) \
-        printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \
-    else memset( ptr, 0, size ); \
-} while (0)
-#define CODA_FREE(ptr,size) \
-    do { if (size < PAGE_SIZE) kfree((ptr)); else vfree((ptr)); } while (0)
-/* inode to cnode access functions */
-static inline struct coda_inode_info *ITOC(struct inode *inode)
-{
-        return list_entry(inode, struct coda_inode_info, vfs_inode);
-}
-static __inline__ struct CodaFid *coda_i2f(struct inode *inode)
-{
-        return &(ITOC(inode)->c_fid);
-}
-static __inline__ char *coda_i2s(struct inode *inode)
-{
-        return coda_f2s(&(ITOC(inode)->c_fid));
-}
-/* this will not zap the inode away */
-static __inline__ void coda_flag_inode(struct inode *inode, int flag)
-{
-        struct coda_inode_info *cii = ITOC(inode);
-        spin_lock(&cii->c_lock);
-        cii->c_flags |= flag;
-        spin_unlock(&cii->c_lock);
-}               
-#endif
diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index 5ac51552d908..dfa2ed4c0d26 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -11,6 +11,9 @@
 /* The full zone was compacted */
 #define COMPACT_COMPLETE        3
+#define COMPACT_MODE_DIRECT_RECLAIM     0
+#define COMPACT_MODE_KSWAPD             1
 #ifdef CONFIG_COMPACTION
 extern int sysctl_compact_memory;
 extern int sysctl_compaction_handler(struct ctl_table *table, int write,
@@ -21,7 +24,12 @@ extern int sysctl_extfrag_handler(struct ctl_table *table, int write,
 extern int fragmentation_index(struct zone *zone, unsigned int order);
 extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
-                        int order, gfp_t gfp_mask, nodemask_t *mask);
+                        int order, gfp_t gfp_mask, nodemask_t *mask,
+                        bool sync);
+extern unsigned long compaction_suitable(struct zone *zone, int order);
+extern unsigned long compact_zone_order(struct zone *zone, int order,
+                                        gfp_t gfp_mask, bool sync,
+                                        int compact_mode);
 /* Do not skip compaction more than 64 times */
 #define COMPACT_MAX_DEFER_SHIFT 6
@@ -54,7 +62,20 @@ static inline bool compaction_deferred(struct zone *zone)
 #else
 static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,
-                        int order, gfp_t gfp_mask, nodemask_t *nodemask)
+                        int order, gfp_t gfp_mask, nodemask_t *nodemask,
+                        bool sync)
+{
+        return COMPACT_CONTINUE;
+}
+static inline unsigned long compaction_suitable(struct zone *zone, int order)
+{
+        return COMPACT_SKIPPED;
+}
+static inline unsigned long compact_zone_order(struct zone *zone, int order,
+                                               gfp_t gfp_mask, bool sync,
+                                               int compact_mode)
 {
        return COMPACT_CONTINUE;
 }
diff --git a/include/linux/cper.h b/include/linux/cper.h
index bf972f81e2a7..3104aaff5dd0 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -39,10 +39,12 @@
 * Severity difinition for error_severity in struct cper_record_header
 * and section_severity in struct cper_section_descriptor
 */
-#define CPER_SEV_RECOVERABLE                    0x0
+enum {
-#define CPER_SEV_FATAL                          0x1
+        CPER_SEV_RECOVERABLE,
-#define CPER_SEV_CORRECTED                      0x2
+        CPER_SEV_FATAL,
-#define CPER_SEV_INFORMATIONAL                  0x3
+        CPER_SEV_CORRECTED,
+        CPER_SEV_INFORMATIONAL,
+};
 /*
 * Validation bits difinition for validation_bits in struct
@@ -201,6 +203,47 @@
        UUID_LE(0x036F84E1, 0x7F37, 0x428c, 0xA7, 0x9E, 0x57, 0x5F,     \
                0xDF, 0xAA, 0x84, 0xEC)
+#define CPER_PROC_VALID_TYPE                    0x0001
+#define CPER_PROC_VALID_ISA                     0x0002
+#define CPER_PROC_VALID_ERROR_TYPE              0x0004
+#define CPER_PROC_VALID_OPERATION               0x0008
+#define CPER_PROC_VALID_FLAGS                   0x0010
+#define CPER_PROC_VALID_LEVEL                   0x0020
+#define CPER_PROC_VALID_VERSION                 0x0040
+#define CPER_PROC_VALID_BRAND_INFO              0x0080
+#define CPER_PROC_VALID_ID                      0x0100
+#define CPER_PROC_VALID_TARGET_ADDRESS          0x0200
+#define CPER_PROC_VALID_REQUESTOR_ID            0x0400
+#define CPER_PROC_VALID_RESPONDER_ID            0x0800
+#define CPER_PROC_VALID_IP                      0x1000
+#define CPER_MEM_VALID_ERROR_STATUS             0x0001
+#define CPER_MEM_VALID_PHYSICAL_ADDRESS         0x0002
+#define CPER_MEM_VALID_PHYSICAL_ADDRESS_MASK    0x0004
+#define CPER_MEM_VALID_NODE                     0x0008
+#define CPER_MEM_VALID_CARD                     0x0010
+#define CPER_MEM_VALID_MODULE                   0x0020
+#define CPER_MEM_VALID_BANK                     0x0040
+#define CPER_MEM_VALID_DEVICE                   0x0080
+#define CPER_MEM_VALID_ROW                      0x0100
+#define CPER_MEM_VALID_COLUMN                   0x0200
+#define CPER_MEM_VALID_BIT_POSITION             0x0400
+#define CPER_MEM_VALID_REQUESTOR_ID             0x0800
+#define CPER_MEM_VALID_RESPONDER_ID             0x1000
+#define CPER_MEM_VALID_TARGET_ID                0x2000
+#define CPER_MEM_VALID_ERROR_TYPE               0x4000
+#define CPER_PCIE_VALID_PORT_TYPE               0x0001
+#define CPER_PCIE_VALID_VERSION                 0x0002
+#define CPER_PCIE_VALID_COMMAND_STATUS          0x0004
+#define CPER_PCIE_VALID_DEVICE_ID               0x0008
+#define CPER_PCIE_VALID_SERIAL_NUMBER           0x0010
+#define CPER_PCIE_VALID_BRIDGE_CONTROL_STATUS   0x0020
+#define CPER_PCIE_VALID_CAPABILITY              0x0040
+#define CPER_PCIE_VALID_AER_INFO                0x0080
+#define CPER_PCIE_SLOT_SHIFT                    3
 /*
 * All tables and structs must be byte-packed to match CPER
 * specification, since the tables are provided by the system BIOS
@@ -306,6 +349,41 @@ struct cper_sec_mem_err {
        __u8    error_type;
 };
+struct cper_sec_pcie {
+        __u64           validation_bits;
+        __u32           port_type;
+        struct {
+                __u8    minor;
+                __u8    major;
+                __u8    reserved[2];
+        }               version;
+        __u16           command;
+        __u16           status;
+        __u32           reserved;
+        struct {
+                __u16   vendor_id;
+                __u16   device_id;
+                __u8    class_code[3];
+                __u8    function;
+                __u8    device;
+                __u16   segment;
+                __u8    bus;
+                __u8    secondary_bus;
+                __u16   slot;
+                __u8    reserved;
+        }               device_id;
+        struct {
+                __u32   lower;
+                __u32   upper;
+        }               serial_number;
+        struct {
+                __u16   secondary_status;
+                __u16   control;
+        }               bridge;
+        __u8    capability[60];
+        __u8    aer_info[96];
+};
 /* Reset to default packing */
 #pragma pack()
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 1be416bbbb82..36719ead50e8 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -47,13 +47,7 @@ struct cpuidle_state {
 /* Idle State Flags */
 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
-#define CPUIDLE_FLAG_CHECK_BM   (0x02) /* BM activity will exit state */
-#define CPUIDLE_FLAG_POLL       (0x10) /* no latency, no savings */
-#define CPUIDLE_FLAG_SHALLOW    (0x20) /* low latency, minimal savings */
-#define CPUIDLE_FLAG_BALANCED   (0x40) /* medium latency, moderate savings */
-#define CPUIDLE_FLAG_DEEP       (0x80) /* high latency, large savings */
 #define CPUIDLE_FLAG_IGNORE     (0x100) /* ignore during this idle period */
-#define CPUIDLE_FLAG_TLB_FLUSHED (0x200) /* tlb will be flushed */
 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
diff --git a/include/linux/cramfs_fs.h b/include/linux/cramfs_fs.h
index 6fc2bed368b8..0e7bf272ec2f 100644
--- a/include/linux/cramfs_fs.h
+++ b/include/linux/cramfs_fs.h
@@ -84,9 +84,11 @@ struct cramfs_super {
                                | CRAMFS_FLAG_WRONG_SIGNATURE \
                                | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET )
+#ifdef __KERNEL__
 /* Uncompression interfaces to the underlying zlib */
 int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen);
 int cramfs_uncompress_init(void);
 void cramfs_uncompress_exit(void);
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index d5a1d4810b80..6fe2114f8ad2 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -103,14 +103,20 @@ static inline int cs5535_has_vsa2(void)
 #define GPIO_POSITIVE_EDGE_STS  0x48
 #define GPIO_NEGATIVE_EDGE_STS  0x4C
+#define GPIO_FLTR7_AMOUNT       0xD8
 #define GPIO_MAP_X              0xE0
 #define GPIO_MAP_Y              0xE4
 #define GPIO_MAP_Z              0xE8
 #define GPIO_MAP_W              0xEC
+#define GPIO_FE7_SEL            0xF7
 void cs5535_gpio_set(unsigned offset, unsigned int reg);
 void cs5535_gpio_clear(unsigned offset, unsigned int reg);
 int cs5535_gpio_isset(unsigned offset, unsigned int reg);
+int cs5535_gpio_set_irq(unsigned group, unsigned irq);
+void cs5535_gpio_setup_event(unsigned offset, int pair, int pme);
 /* MFGPTs */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 59fcd24b1468..f958c19e3ca5 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -167,6 +167,8 @@ struct dentry_operations {
        void (*d_release)(struct dentry *);
        void (*d_iput)(struct dentry *, struct inode *);
        char *(*d_dname)(struct dentry *, char *, int);
+        struct vfsmount *(*d_automount)(struct path *);
+        int (*d_manage)(struct dentry *, bool, bool);
 } ____cacheline_aligned;
 /*
@@ -205,13 +207,18 @@ struct dentry_operations {
 #define DCACHE_CANT_MOUNT       0x0100
 #define DCACHE_GENOCIDE         0x0200
-#define DCACHE_MOUNTED          0x0400  /* is a mountpoint */
 #define DCACHE_OP_HASH          0x1000
 #define DCACHE_OP_COMPARE       0x2000
 #define DCACHE_OP_REVALIDATE    0x4000
 #define DCACHE_OP_DELETE        0x8000
+#define DCACHE_MOUNTED          0x10000 /* is a mountpoint */
+#define DCACHE_NEED_AUTOMOUNT   0x20000 /* handle automount on this dir */
+#define DCACHE_MANAGE_TRANSIT   0x40000 /* manage transit from this dirent */
+#define DCACHE_MANAGED_DENTRY \
+        (DCACHE_MOUNTED|DCACHE_NEED_AUTOMOUNT|DCACHE_MANAGE_TRANSIT)
 extern seqlock_t rename_lock;
 static inline int dname_external(struct dentry *dentry)
@@ -399,7 +406,12 @@ static inline void dont_mount(struct dentry *dentry)
 extern void dput(struct dentry *);
-static inline int d_mountpoint(struct dentry *dentry)
+static inline bool d_managed(struct dentry *dentry)
+{
+        return dentry->d_flags & DCACHE_MANAGED_DENTRY;
+}
+static inline bool d_mountpoint(struct dentry *dentry)
 {
        return dentry->d_flags & DCACHE_MOUNTED;
 }
diff --git a/include/linux/decompress/inflate.h b/include/linux/decompress/inflate.h
index f9b06ccc3e5c..8c0aef1ba5f5 100644
--- a/include/linux/decompress/inflate.h
+++ b/include/linux/decompress/inflate.h
@@ -1,9 +1,6 @@
 #ifndef INFLATE_H
 #define INFLATE_H
-/* Other housekeeping constants */
-#define INBUFSIZ 4096
 int gunzip(unsigned char *inbuf, int len,
           int(*fill)(void*, unsigned int),
           int(*flush)(void*, unsigned int),
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index ad5ec1d0475e..4cb72b920c74 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -61,8 +61,6 @@ static void free(void *where)
 #define large_malloc(a) malloc(a)
 #define large_free(a) free(a)
-#define set_error_fn(x)
 #define INIT
 #else /* STATIC */
@@ -72,6 +70,7 @@ static void free(void *where)
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 /* Use defines rather than static inline in order to avoid spurious
@@ -84,9 +83,6 @@ static void free(void *where)
 #define large_malloc(a) vmalloc(a)
 #define large_free(a) vfree(a)
-static void(*error)(char *m);
-#define set_error_fn(x) error = x;
 #define INIT __init
 #define STATIC
diff --git a/include/linux/decompress/unxz.h b/include/linux/decompress/unxz.h
new file mode 100644
index 000000000000..41728fc6c8a1
--- /dev/null
+++ b/include/linux/decompress/unxz.h
@@ -0,0 +1,19 @@
+/*
+ * Wrapper for decompressing XZ-compressed kernel, initramfs, and initrd
+ *
+ * Author: Lasse Collin <lasse.collin@tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+#ifndef DECOMPRESS_UNXZ_H
+#define DECOMPRESS_UNXZ_H
+int unxz(unsigned char *in, int in_size,
+         int (*fill)(void *dest, unsigned int size),
+         int (*flush)(void *src, unsigned int size),
+         unsigned char *out, int *in_used,
+         void (*error)(char *x));
+#endif
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 2970022faa63..272496d1fae4 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -193,6 +193,13 @@ struct dm_target {
        char *error;
 };
+/* Each target can link one of these into the table */
+struct dm_target_callbacks {
+        struct list_head list;
+        int (*congested_fn) (struct dm_target_callbacks *, int);
+        void (*unplug_fn)(struct dm_target_callbacks *);
+};
 int dm_register_target(struct target_type *t);
 void dm_unregister_target(struct target_type *t);
@@ -269,6 +276,11 @@ int dm_table_add_target(struct dm_table *t, const char *type,
                        sector_t start, sector_t len, char *params);
 /*
+ * Target_ctr should call this if it needs to add any callbacks.
+ */
+void dm_table_add_target_callbacks(struct dm_table *t, struct dm_target_callbacks *cb);
+/*
 * Finally call this to make the table ready for use.
 */
 int dm_table_complete(struct dm_table *t);
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 49eab360d5d4..78bbf47bbb96 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -44,7 +44,7 @@
 * Remove a device, destroy any tables.
 *
 * DM_DEV_RENAME:
- * Rename a device.
+ * Rename a device or set its uuid if none was previously supplied.
 *
 * DM_SUSPEND:
 * This performs both suspend and resume, depending which flag is
@@ -267,9 +267,9 @@ enum {
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        18
+#define DM_VERSION_MINOR        19
-#define DM_VERSION_PATCHLEVEL   0
+#define DM_VERSION_PATCHLEVEL   1
-#define DM_VERSION_EXTRA        "-ioctl (2010-06-29)"
+#define DM_VERSION_EXTRA        "-ioctl (2011-01-07)"
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
@@ -322,4 +322,10 @@ enum {
 */
 #define DM_UEVENT_GENERATED_FLAG        (1 << 13) /* Out */
+/*
+ * If set, rename changes the uuid not the name.  Only permitted
+ * if no uuid was previously supplied: an existing uuid cannot be changed.
+ */
+#define DM_UUID_FLAG                    (1 << 14) /* In */
 #endif                          /* _LINUX_DM_IOCTL_H */
diff --git a/include/linux/dm-log-userspace.h b/include/linux/dm-log-userspace.h
index 0c3c3a2110c4..eeace7d3ff15 100644
--- a/include/linux/dm-log-userspace.h
+++ b/include/linux/dm-log-userspace.h
@@ -370,6 +370,16 @@
 #define DM_ULOG_REQUEST_TYPE(request_type) \
        (DM_ULOG_REQUEST_MASK & (request_type))
+/*
+ * DM_ULOG_REQUEST_VERSION is incremented when there is a
+ * change to the way information is passed between kernel
+ * and userspace.  This could be a structure change of
+ * dm_ulog_request or a change in the way requests are
+ * issued/handled.  Changes are outlined here:
+ *      version 1:  Initial implementation
+ */
+#define DM_ULOG_REQUEST_VERSION 1
 struct dm_ulog_request {
        /*
         * The local unique identifier (luid) and the universally unique
@@ -383,8 +393,9 @@ struct dm_ulog_request {
         */
        uint64_t luid;
        char uuid[DM_UUID_LEN];
-        char padding[7];        /* Padding because DM_UUID_LEN = 129 */
+        char padding[3];        /* Padding because DM_UUID_LEN = 129 */
+        uint32_t version;       /* See DM_ULOG_REQUEST_VERSION */
        int32_t error;          /* Used to report back processing errors */
        uint32_t seq;           /* Sequence number for request */
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 8cd00ad98d37..9bebd7f16ef1 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -532,7 +532,7 @@ static inline int dmaengine_resume(struct dma_chan *chan)
        return dmaengine_device_control(chan, DMA_RESUME, 0);
 }
-static inline int dmaengine_submit(struct dma_async_tx_descriptor *desc)
+static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)
 {
        return desc->tx_submit(desc);
 }
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index bec8b82889bf..ab68f785fd19 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -99,6 +99,17 @@ static inline int is_broadcast_ether_addr(const u8 *addr)
 }
 /**
+ * is_unicast_ether_addr - Determine if the Ethernet address is unicast
+ * @addr: Pointer to a six-byte array containing the Ethernet address
+ *
+ * Return true if the address is a unicast address.
+ */
+static inline int is_unicast_ether_addr(const u8 *addr)
+{
+        return !is_multicast_ether_addr(addr);
+}
+/**
 * is_valid_ether_addr - Determine if the given Ethernet address is valid
 * @addr: Pointer to a six-byte array containing the Ethernet address
 *
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 3c155107d61f..73e0b628e058 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -2,6 +2,7 @@
 #define _FALLOC_H_
 #define FALLOC_FL_KEEP_SIZE     0x01 /* default is extend size */
+#define FALLOC_FL_PUNCH_HOLE    0x02 /* de-allocates range */
 #ifdef __KERNEL__
diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index afc00af3229b..a562fa5fb4e3 100644
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -45,6 +45,7 @@
 #define AT_REMOVEDIR            0x200   /* Remove directory instead of
                                           unlinking file.  */
 #define AT_SYMLINK_FOLLOW       0x400   /* Follow symbolic links.  */
+#define AT_NO_AUTOMOUNT         0x800   /* Suppress terminal automount traversal */
 #ifdef __KERNEL__
diff --git a/include/linux/file.h b/include/linux/file.h
index b1e12970f617..e85baebf6279 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -23,7 +23,7 @@ extern struct file *alloc_file(struct path *, fmode_t mode,
 static inline void fput_light(struct file *file, int fput_needed)
 {
-        if (unlikely(fput_needed))
+        if (fput_needed)
                fput(file);
 }
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
index 68c642d8843d..59ea406be7f6 100644
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
@@ -273,7 +273,7 @@ struct fw_cdev_event_iso_interrupt {
 * @closure:    See &fw_cdev_event_common;
 *              set by %FW_CDEV_CREATE_ISO_CONTEXT ioctl
 * @type:       %FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL
- * @completed:  Offset into the receive buffer; data before this offest is valid
+ * @completed:  Offset into the receive buffer; data before this offset is valid
 *
 * This event is sent in multichannel contexts (context type
 * %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL) for &fw_cdev_iso_packet buffer
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f84d9928bdb1..32b38cd829d3 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -242,6 +242,7 @@ struct inodes_stat_t {
 #define S_SWAPFILE      256     /* Do not truncate: swapon got its bmaps */
 #define S_PRIVATE       512     /* Inode is fs-internal */
 #define S_IMA           1024    /* Inode has an associated IMA struct */
+#define S_AUTOMOUNT     2048    /* Automount/referral quasi-directory */
 /*
 * Note that nosuid etc flags are inode-specific: setting some file-system
@@ -277,6 +278,7 @@ struct inodes_stat_t {
 #define IS_SWAPFILE(inode)      ((inode)->i_flags & S_SWAPFILE)
 #define IS_PRIVATE(inode)       ((inode)->i_flags & S_PRIVATE)
 #define IS_IMA(inode)           ((inode)->i_flags & S_IMA)
+#define IS_AUTOMOUNT(inode)     ((inode)->i_flags & S_AUTOMOUNT)
 /* the read-only stuff doesn't really belong here, but any other place is
   probably as bad and I don't want to create yet another include file. */
@@ -664,8 +666,9 @@ struct block_device {
        void *                  bd_claiming;
        void *                  bd_holder;
        int                     bd_holders;
+        bool                    bd_write_holder;
 #ifdef CONFIG_SYSFS
-        struct list_head        bd_holder_list;
+        struct list_head        bd_holder_disks;
 #endif
        struct block_device *   bd_contains;
        unsigned                bd_block_size;
@@ -1065,7 +1068,6 @@ struct lock_manager_operations {
        int (*fl_grant)(struct file_lock *, struct file_lock *, int);
        void (*fl_release_private)(struct file_lock *);
        void (*fl_break)(struct file_lock *);
-        int (*fl_mylease)(struct file_lock *, struct file_lock *);
        int (*fl_change)(struct file_lock **, int);
 };
@@ -1423,6 +1425,7 @@ struct super_block {
         * generic_show_options()
         */
        char __rcu *s_options;
+        const struct dentry_operations *s_d_op; /* default d_op for dentries */
 };
 extern struct timespec current_fs_time(struct super_block *sb);
@@ -1480,8 +1483,8 @@ struct fiemap_extent_info {
        unsigned int fi_flags;          /* Flags as passed from user */
        unsigned int fi_extents_mapped; /* Number of mapped extents */
        unsigned int fi_extents_max;    /* Size of fiemap_extent array */
-        struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
+        struct fiemap_extent __user *fi_extents_start; /* Start of
-                                                 * array */
+                                                        fiemap_extent array */
 };
 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
                            u64 phys, u64 len, u32 flags);
@@ -1549,6 +1552,8 @@ struct file_operations {
        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 **);
+        long (*fallocate)(struct file *file, int mode, loff_t offset,
+                          loff_t len);
 };
 #define IPERM_FLAG_RCU  0x0001
@@ -1579,8 +1584,6 @@ 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);
        int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
                      u64 len);
 } ____cacheline_aligned;
@@ -1834,7 +1837,9 @@ struct super_block *sget(struct file_system_type *type,
                        int (*set)(struct super_block *,void *),
                        void *data);
 extern struct dentry *mount_pseudo(struct file_system_type *, char *,
-        const struct super_operations *ops, unsigned long);
+        const struct super_operations *ops,
+        const struct dentry_operations *dops,
+        unsigned long);
 extern void simple_set_mnt(struct vfsmount *mnt, struct super_block *sb);
 static inline void sb_mark_dirty(struct super_block *sb)
@@ -2016,7 +2021,6 @@ extern struct block_device *bdgrab(struct block_device *bdev);
 extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
-extern struct block_device *open_by_devnum(dev_t, fmode_t);
 extern void invalidate_bdev(struct block_device *);
 extern int sync_blockdev(struct block_device *bdev);
 extern struct super_block *freeze_bdev(struct block_device *);
@@ -2047,16 +2051,26 @@ extern const struct file_operations def_fifo_fops;
 extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
 extern int blkdev_ioctl(struct block_device *, fmode_t, unsigned, unsigned long);
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
-extern int blkdev_get(struct block_device *, fmode_t);
+extern int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder);
-extern int blkdev_put(struct block_device *, fmode_t);
+extern struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
-extern int bd_claim(struct block_device *, void *);
+                                               void *holder);
-extern void bd_release(struct block_device *);
+extern struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode,
+                                              void *holder);
+extern int blkdev_put(struct block_device *bdev, fmode_t mode);
 #ifdef CONFIG_SYSFS
-extern int bd_claim_by_disk(struct block_device *, void *, struct gendisk *);
+extern int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk);
-extern void bd_release_from_disk(struct block_device *, struct gendisk *);
+extern void bd_unlink_disk_holder(struct block_device *bdev,
+                                  struct gendisk *disk);
 #else
-#define bd_claim_by_disk(bdev, holder, disk)    bd_claim(bdev, holder)
+static inline int bd_link_disk_holder(struct block_device *bdev,
-#define bd_release_from_disk(bdev, disk)        bd_release(bdev)
+                                      struct gendisk *disk)
+{
+        return 0;
+}
+static inline void bd_unlink_disk_holder(struct block_device *bdev,
+                                         struct gendisk *disk)
+{
+}
 #endif
 #endif
@@ -2092,8 +2106,6 @@ static inline void unregister_chrdev(unsigned int major, const char *name)
 extern const char *__bdevname(dev_t, char *buffer);
 extern const char *bdevname(struct block_device *bdev, char *buffer);
 extern struct block_device *lookup_bdev(const char *);
-extern struct block_device *open_bdev_exclusive(const char *, fmode_t, void *);
-extern void close_bdev_exclusive(struct block_device *, fmode_t);
 extern void blkdev_show(struct seq_file *,off_t);
 #else
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 7a7b9c1644e4..c0d5f6945c1e 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -115,6 +115,7 @@ struct hd_struct {
 #else
        struct disk_stats dkstats;
 #endif
+        atomic_t ref;
        struct rcu_head rcu_head;
 };
@@ -127,6 +128,11 @@ struct hd_struct {
 #define GENHD_FL_EXT_DEVT                       64 /* allow extended devt */
 #define GENHD_FL_NATIVE_CAPACITY                128
+enum {
+        DISK_EVENT_MEDIA_CHANGE                 = 1 << 0, /* media changed */
+        DISK_EVENT_EJECT_REQUEST                = 1 << 1, /* eject requested */
+};
 #define BLK_SCSI_MAX_CMDS       (256)
 #define BLK_SCSI_CMD_PER_LONG   (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
@@ -143,6 +149,8 @@ struct disk_part_tbl {
        struct hd_struct __rcu *part[];
 };
+struct disk_events;
 struct gendisk {
        /* major, first_minor and minors are input parameters only,
         * don't use directly.  Use disk_devt() and disk_max_parts().
@@ -154,6 +162,10 @@ struct gendisk {
        char disk_name[DISK_NAME_LEN];  /* name of major driver */
        char *(*devnode)(struct gendisk *gd, mode_t *mode);
+        unsigned int events;            /* supported events */
+        unsigned int async_events;      /* async events, subset of all */
        /* Array of pointers to partitions indexed by partno.
         * Protected with matching bdev lock but stat and other
         * non-critical accesses use RCU.  Always access through
@@ -171,9 +183,8 @@ struct gendisk {
        struct kobject *slave_dir;
        struct timer_rand_state *random;
        atomic_t sync_io;               /* RAID */
-        struct work_struct async_notify;
+        struct disk_events *ev;
 #ifdef  CONFIG_BLK_DEV_INTEGRITY
        struct blk_integrity *integrity;
 #endif
@@ -395,7 +406,6 @@ extern void part_round_stats(int cpu, struct hd_struct *part);
 /* block/genhd.c */
 extern void add_disk(struct gendisk *disk);
 extern void del_gendisk(struct gendisk *gp);
-extern void unlink_gendisk(struct gendisk *gp);
 extern struct gendisk *get_gendisk(dev_t dev, int *partno);
 extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
@@ -407,6 +417,11 @@ static inline int get_disk_ro(struct gendisk *disk)
        return disk->part0.policy;
 }
+extern void disk_block_events(struct gendisk *disk);
+extern void disk_unblock_events(struct gendisk *disk);
+extern void disk_check_events(struct gendisk *disk);
+extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
 /* drivers/char/random.c */
 extern void add_disk_randomness(struct gendisk *disk);
 extern void rand_initialize_disk(struct gendisk *disk);
@@ -583,6 +598,7 @@ extern struct hd_struct * __must_check add_partition(struct gendisk *disk,
                                                     sector_t len, int flags,
                                                     struct partition_meta_info
                                                       *info);
+extern void __delete_partition(struct hd_struct *);
 extern void delete_partition(struct gendisk *, int);
 extern void printk_all_partitions(void);
@@ -611,6 +627,29 @@ extern ssize_t part_fail_store(struct device *dev,
                               const char *buf, size_t count);
 #endif /* CONFIG_FAIL_MAKE_REQUEST */
+static inline void hd_ref_init(struct hd_struct *part)
+{
+        atomic_set(&part->ref, 1);
+        smp_mb();
+}
+static inline void hd_struct_get(struct hd_struct *part)
+{
+        atomic_inc(&part->ref);
+        smp_mb__after_atomic_inc();
+}
+static inline int hd_struct_try_get(struct hd_struct *part)
+{
+        return atomic_inc_not_zero(&part->ref);
+}
+static inline void hd_struct_put(struct hd_struct *part)
+{
+        if (atomic_dec_and_test(&part->ref))
+                __delete_partition(part);
+}
 #else /* CONFIG_BLOCK */
 static inline void printk_all_partitions(void) { }
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index f54adfcbec9c..a3b148a91874 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -34,6 +34,7 @@ struct vm_area_struct;
 #else
 #define ___GFP_NOTRACK          0
 #endif
+#define ___GFP_NO_KSWAPD        0x400000u
 /*
 * GFP bitmasks..
@@ -81,13 +82,15 @@ struct vm_area_struct;
 #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */
 #define __GFP_NOTRACK   ((__force gfp_t)___GFP_NOTRACK)  /* Don't track with kmemcheck */
+#define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
 /*
 * This may seem redundant, but it's a way of annotating false positives vs.
 * allocations that simply cannot be supported (e.g. page tables).
 */
 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
-#define __GFP_BITS_SHIFT 22     /* Room for 22 __GFP_FOO bits */
+#define __GFP_BITS_SHIFT 23     /* Room for 23 __GFP_FOO bits */
 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
 /* This equals 0, but use constants in case they ever change */
@@ -106,6 +109,9 @@ struct vm_area_struct;
                                 __GFP_HARDWALL | __GFP_HIGHMEM | \
                                 __GFP_MOVABLE)
 #define GFP_IOFS        (__GFP_IO | __GFP_FS)
+#define GFP_TRANSHUGE   (GFP_HIGHUSER_MOVABLE | __GFP_COMP | \
+                         __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN | \
+                         __GFP_NO_KSWAPD)
 #ifdef CONFIG_NUMA
 #define GFP_THISNODE    (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
@@ -325,14 +331,17 @@ alloc_pages(gfp_t gfp_mask, unsigned int order)
 {
        return alloc_pages_current(gfp_mask, order);
 }
-extern struct page *alloc_page_vma(gfp_t gfp_mask,
+extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
                        struct vm_area_struct *vma, unsigned long addr);
 #else
 #define alloc_pages(gfp_mask, order) \
                alloc_pages_node(numa_node_id(), gfp_mask, order)
-#define alloc_page_vma(gfp_mask, vma, addr) alloc_pages(gfp_mask, 0)
+#define alloc_pages_vma(gfp_mask, order, vma, addr)     \
+        alloc_pages(gfp_mask, order)
 #endif
 #define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)
+#define alloc_page_vma(gfp_mask, vma, addr)     \
+        alloc_pages_vma(gfp_mask, 0, vma, addr)
 extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
 extern unsigned long get_zeroed_page(gfp_t gfp_mask);
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index e41f7dd1ae67..32720baf70f1 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 struct device;
+struct gpio;
 struct gpio_chip;
 /*
@@ -34,6 +35,17 @@ static inline int gpio_request(unsigned gpio, const char *label)
        return -ENOSYS;
 }
+static inline int gpio_request_one(unsigned gpio,
+                                        unsigned long flags, const char *label)
+{
+        return -ENOSYS;
+}
+static inline int gpio_request_array(struct gpio *array, size_t num)
+{
+        return -ENOSYS;
+}
 static inline void gpio_free(unsigned gpio)
 {
        might_sleep();
@@ -42,6 +54,14 @@ static inline void gpio_free(unsigned gpio)
        WARN_ON(1);
 }
+static inline void gpio_free_array(struct gpio *array, size_t num)
+{
+        might_sleep();
+        /* GPIO can never have been requested */
+        WARN_ON(1);
+}
 static inline int gpio_direction_input(unsigned gpio)
 {
        return -ENOSYS;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 20b9801f669b..d91c25e253c8 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -402,7 +402,7 @@ struct hid_field {
        __u16 dpad;                     /* dpad input code */
 };
-#define HID_MAX_FIELDS 64
+#define HID_MAX_FIELDS 128
 struct hid_report {
        struct list_head list;
@@ -593,6 +593,7 @@ struct hid_usage_id {
 * @report_fixup: called before report descriptor parsing (NULL means nop)
 * @input_mapping: invoked on input registering before mapping an usage
 * @input_mapped: invoked on input registering after mapping an usage
+ * @feature_mapping: invoked on feature registering
 * @suspend: invoked on suspend (NULL means nop)
 * @resume: invoked on resume if device was not reset (NULL means nop)
 * @reset_resume: invoked on resume if device was reset (NULL means nop)
@@ -636,6 +637,9 @@ struct hid_driver {
        int (*input_mapped)(struct hid_device *hdev,
                        struct hid_input *hidinput, struct hid_field *field,
                        struct hid_usage *usage, unsigned long **bit, int *max);
+        void (*feature_mapping)(struct hid_device *hdev,
+                        struct hid_input *hidinput, struct hid_field *field,
+                        struct hid_usage *usage);
 #ifdef CONFIG_PM
        int (*suspend)(struct hid_device *hdev, pm_message_t message);
        int (*resume)(struct hid_device *hdev);
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
new file mode 100644
index 000000000000..8e6c8c42bc3c
--- /dev/null
+++ b/include/linux/huge_mm.h
@@ -0,0 +1,179 @@
+#ifndef _LINUX_HUGE_MM_H
+#define _LINUX_HUGE_MM_H
+extern int do_huge_pmd_anonymous_page(struct mm_struct *mm,
+                                      struct vm_area_struct *vma,
+                                      unsigned long address, pmd_t *pmd,
+                                      unsigned int flags);
+extern int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
+                         pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr,
+                         struct vm_area_struct *vma);
+extern int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
+                               unsigned long address, pmd_t *pmd,
+                               pmd_t orig_pmd);
+extern pgtable_t get_pmd_huge_pte(struct mm_struct *mm);
+extern struct page *follow_trans_huge_pmd(struct mm_struct *mm,
+                                          unsigned long addr,
+                                          pmd_t *pmd,
+                                          unsigned int flags);
+extern int zap_huge_pmd(struct mmu_gather *tlb,
+                        struct vm_area_struct *vma,
+                        pmd_t *pmd);
+extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
+                        unsigned long addr, unsigned long end,
+                        unsigned char *vec);
+extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
+                        unsigned long addr, pgprot_t newprot);
+enum transparent_hugepage_flag {
+        TRANSPARENT_HUGEPAGE_FLAG,
+        TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,
+        TRANSPARENT_HUGEPAGE_DEFRAG_FLAG,
+        TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG,
+        TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG,
+#ifdef CONFIG_DEBUG_VM
+        TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG,
+#endif
+};
+enum page_check_address_pmd_flag {
+        PAGE_CHECK_ADDRESS_PMD_FLAG,
+        PAGE_CHECK_ADDRESS_PMD_NOTSPLITTING_FLAG,
+        PAGE_CHECK_ADDRESS_PMD_SPLITTING_FLAG,
+};
+extern pmd_t *page_check_address_pmd(struct page *page,
+                                     struct mm_struct *mm,
+                                     unsigned long address,
+                                     enum page_check_address_pmd_flag flag);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+#define HPAGE_PMD_SHIFT HPAGE_SHIFT
+#define HPAGE_PMD_MASK HPAGE_MASK
+#define HPAGE_PMD_SIZE HPAGE_SIZE
+#define transparent_hugepage_enabled(__vma)                             \
+        ((transparent_hugepage_flags &                                  \
+          (1<<TRANSPARENT_HUGEPAGE_FLAG) ||                             \
+          (transparent_hugepage_flags &                                 \
+           (1<<TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG) &&                   \
+           ((__vma)->vm_flags & VM_HUGEPAGE))) &&                       \
+         !((__vma)->vm_flags & VM_NOHUGEPAGE))
+#define transparent_hugepage_defrag(__vma)                              \
+        ((transparent_hugepage_flags &                                  \
+          (1<<TRANSPARENT_HUGEPAGE_DEFRAG_FLAG)) ||                     \
+         (transparent_hugepage_flags &                                  \
+          (1<<TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG) &&             \
+          (__vma)->vm_flags & VM_HUGEPAGE))
+#ifdef CONFIG_DEBUG_VM
+#define transparent_hugepage_debug_cow()                                \
+        (transparent_hugepage_flags &                                   \
+         (1<<TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG))
+#else /* CONFIG_DEBUG_VM */
+#define transparent_hugepage_debug_cow() 0
+#endif /* CONFIG_DEBUG_VM */
+extern unsigned long transparent_hugepage_flags;
+extern int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
+                          pmd_t *dst_pmd, pmd_t *src_pmd,
+                          struct vm_area_struct *vma,
+                          unsigned long addr, unsigned long end);
+extern int handle_pte_fault(struct mm_struct *mm,
+                            struct vm_area_struct *vma, unsigned long address,
+                            pte_t *pte, pmd_t *pmd, unsigned int flags);
+extern int split_huge_page(struct page *page);
+extern void __split_huge_page_pmd(struct mm_struct *mm, pmd_t *pmd);
+#define split_huge_page_pmd(__mm, __pmd)                                \
+        do {                                                            \
+                pmd_t *____pmd = (__pmd);                               \
+                if (unlikely(pmd_trans_huge(*____pmd)))                 \
+                        __split_huge_page_pmd(__mm, ____pmd);           \
+        }  while (0)
+#define wait_split_huge_page(__anon_vma, __pmd)                         \
+        do {                                                            \
+                pmd_t *____pmd = (__pmd);                               \
+                spin_unlock_wait(&(__anon_vma)->root->lock);            \
+                /*                                                      \
+                 * spin_unlock_wait() is just a loop in C and so the    \
+                 * CPU can reorder anything around it.                  \
+                 */                                                     \
+                smp_mb();                                               \
+                BUG_ON(pmd_trans_splitting(*____pmd) ||                 \
+                       pmd_trans_huge(*____pmd));                       \
+        } while (0)
+#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
+#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
+#if HPAGE_PMD_ORDER > MAX_ORDER
+#error "hugepages can't be allocated by the buddy allocator"
+#endif
+extern int hugepage_madvise(struct vm_area_struct *vma,
+                            unsigned long *vm_flags, int advice);
+extern void __vma_adjust_trans_huge(struct vm_area_struct *vma,
+                                    unsigned long start,
+                                    unsigned long end,
+                                    long adjust_next);
+static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,
+                                         unsigned long start,
+                                         unsigned long end,
+                                         long adjust_next)
+{
+        if (!vma->anon_vma || vma->vm_ops || vma->vm_file)
+                return;
+        __vma_adjust_trans_huge(vma, start, end, adjust_next);
+}
+static inline int hpage_nr_pages(struct page *page)
+{
+        if (unlikely(PageTransHuge(page)))
+                return HPAGE_PMD_NR;
+        return 1;
+}
+static inline struct page *compound_trans_head(struct page *page)
+{
+        if (PageTail(page)) {
+                struct page *head;
+                head = page->first_page;
+                smp_rmb();
+                /*
+                 * head may be a dangling pointer.
+                 * __split_huge_page_refcount clears PageTail before
+                 * overwriting first_page, so if PageTail is still
+                 * there it means the head pointer isn't dangling.
+                 */
+                if (PageTail(page))
+                        return head;
+        }
+        return page;
+}
+#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+#define HPAGE_PMD_SHIFT ({ BUG(); 0; })
+#define HPAGE_PMD_MASK ({ BUG(); 0; })
+#define HPAGE_PMD_SIZE ({ BUG(); 0; })
+#define hpage_nr_pages(x) 1
+#define transparent_hugepage_enabled(__vma) 0
+#define transparent_hugepage_flags 0UL
+static inline int split_huge_page(struct page *page)
+{
+        return 0;
+}
+#define split_huge_page_pmd(__mm, __pmd)        \
+        do { } while (0)
+#define wait_split_huge_page(__anon_vma, __pmd) \
+        do { } while (0)
+#define compound_trans_head(page) compound_head(page)
+static inline int hugepage_madvise(struct vm_area_struct *vma,
+                                   unsigned long *vm_flags, int advice)
+{
+        BUG();
+        return 0;
+}
+static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,
+                                         unsigned long start,
+                                         unsigned long end,
+                                         long adjust_next)
+{
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+#endif /* _LINUX_HUGE_MM_H */
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 6042228954a7..294169e31364 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -959,7 +959,7 @@ struct ieee80211_ht_info {
 /* block-ack parameters */
 #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
 #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C
-#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0
+#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0
 #define IEEE80211_DELBA_PARAM_TID_MASK 0xF000
 #define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800
diff --git a/include/linux/if_alg.h b/include/linux/if_alg.h
new file mode 100644
index 000000000000..0f9acce5b1ff
--- /dev/null
+++ b/include/linux/if_alg.h
@@ -0,0 +1,40 @@
+/*
+ * if_alg: User-space algorithm interface
+ *
+ * Copyright (c) 2010 Herbert Xu <herbert@gondor.apana.org.au>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ */
+#ifndef _LINUX_IF_ALG_H
+#define _LINUX_IF_ALG_H
+#include <linux/types.h>
+struct sockaddr_alg {
+        __u16   salg_family;
+        __u8    salg_type[14];
+        __u32   salg_feat;
+        __u32   salg_mask;
+        __u8    salg_name[64];
+};
+struct af_alg_iv {
+        __u32   ivlen;
+        __u8    iv[0];
+};
+/* Socket options */
+#define ALG_SET_KEY                     1
+#define ALG_SET_IV                      2
+#define ALG_SET_OP                      3
+/* Operations */
+#define ALG_OP_DECRYPT                  0
+#define ALG_OP_ENCRYPT                  1
+#endif  /* _LINUX_IF_ALG_H */
diff --git a/include/linux/input.h b/include/linux/input.h
index c4e9d91ec979..e428382ca28a 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -802,6 +802,7 @@ struct input_keymap_entry {
 #define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
 #define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
 #define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
+#define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
 #define SW_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)
diff --git a/include/linux/input/as5011.h b/include/linux/input/as5011.h
new file mode 100644
index 000000000000..1affd0ddfa9d
--- /dev/null
+++ b/include/linux/input/as5011.h
@@ -0,0 +1,20 @@
+#ifndef _AS5011_H
+#define _AS5011_H
+/*
+ * Copyright (c) 2010, 2011 Fabien Marteau <fabien.marteau@armadeus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+struct as5011_platform_data {
+        unsigned int button_gpio;
+        unsigned int axis_irq; /* irq number */
+        unsigned long axis_irqflags;
+        char xp, xn; /* threshold for x axis */
+        char yp, yn; /* threshold for y axis */
+};
+#endif /* _AS5011_H */
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 65aae34759de..045f2f275cd0 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -454,6 +454,44 @@ unsigned int ipmi_addr_length(int addr_type);
 /* Validate that the given IPMI address is valid. */
 int ipmi_validate_addr(struct ipmi_addr *addr, int len);
+/*
+ * How did the IPMI driver find out about the device?
+ */
+enum ipmi_addr_src {
+        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
+        SI_PCI, SI_DEVICETREE, SI_DEFAULT
+};
+union ipmi_smi_info_union {
+        /*
+         * the acpi_info element is defined for the SI_ACPI
+         * address type
+         */
+        struct {
+                void *acpi_handle;
+        } acpi_info;
+};
+struct ipmi_smi_info {
+        enum ipmi_addr_src addr_src;
+        /*
+         * Base device for the interface.  Don't forget to put this when
+         * you are done.
+         */
+        struct device *dev;
+        /*
+         * The addr_info provides more detailed info for some IPMI
+         * devices, depending on the addr_src.  Currently only SI_ACPI
+         * info is provided.
+         */
+        union ipmi_smi_info_union addr_info;
+};
+/* This is to get the private info of ipmi_smi_t */
+extern int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data);
 #endif /* __KERNEL__ */
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 4b48318ac542..906590aa6907 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -39,6 +39,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/ipmi.h>
 /* This files describes the interface for IPMI system management interface
   drivers to bind into the IPMI message handler. */
@@ -86,6 +87,13 @@ struct ipmi_smi_handlers {
        int (*start_processing)(void       *send_info,
                                ipmi_smi_t new_intf);
+        /*
+         * Get the detailed private info of the low level interface and store
+         * it into the structure of ipmi_smi_data. For example: the
+         * ACPI device handle will be returned for the pnp_acpi IPMI device.
+         */
+        int (*get_smi_info)(void *send_info, struct ipmi_smi_info *data);
        /* Called to enqueue an SMI message to be sent.  This
           operation is not allowed to fail.  If an error occurs, it
           should report back the error in a received message.  It may
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index 979c68cc7458..6a64c6fa81af 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -57,7 +57,7 @@ struct irq_desc {
 #endif
        struct timer_rand_state *timer_rand_state;
-        unsigned int            *kstat_irqs;
+        unsigned int __percpu   *kstat_irqs;
        irq_flow_handler_t      handle_irq;
        struct irqaction        *action;        /* IRQ action list */
        unsigned int            status;         /* IRQ status */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index d0fbc043de60..d07d8057e440 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -143,9 +143,22 @@ extern int _cond_resched(void);
 #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)
-#define abs(x) ({                               \
+/*
-                long __x = (x);                 \
+ * abs() handles unsigned and signed longs, ints, shorts and chars.  For all
-                (__x < 0) ? -__x : __x;         \
+ * input types abs() returns a signed long.
+ * abs() should not be used for 64-bit types (s64, u64, long long) - use abs64()
+ * for those.
+ */
+#define abs(x) ({                                               \
+                long ret;                                       \
+                if (sizeof(x) == sizeof(long)) {                \
+                        long __x = (x);                         \
+                        ret = (__x < 0) ? -__x : __x;           \
+                } else {                                        \
+                        int __x = (x);                          \
+                        ret = (__x < 0) ? -__x : __x;           \
+                }                                               \
+                ret;                                            \
        })
 #define abs64(x) ({                             \
@@ -230,6 +243,8 @@ extern int test_taint(unsigned flag);
 extern unsigned long get_taint(void);
 extern int root_mountflags;
+extern bool early_boot_irqs_disabled;
 /* Values used for system_state */
 extern enum system_states {
        SYSTEM_BOOTING,
@@ -587,6 +602,13 @@ struct sysinfo {
 #define NUMA_BUILD 0
 #endif
+/* This helps us avoid #ifdef CONFIG_COMPACTION */
+#ifdef CONFIG_COMPACTION
+#define COMPACTION_BUILD 1
+#else
+#define COMPACTION_BUILD 0
+#endif
 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 44e83ba12b5b..0cce2db580c3 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -46,16 +46,14 @@ DECLARE_PER_CPU(struct kernel_stat, kstat);
 extern unsigned long long nr_context_switches(void);
 #ifndef CONFIG_GENERIC_HARDIRQS
-#define kstat_irqs_this_cpu(irq) \
-        (this_cpu_read(kstat.irqs[irq])
 struct irq_desc;
 static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
                                            struct irq_desc *desc)
 {
-        kstat_this_cpu.irqs[irq]++;
+        __this_cpu_inc(kstat.irqs[irq]);
-        kstat_this_cpu.irqs_sum++;
+        __this_cpu_inc(kstat.irqs_sum);
 }
 static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
@@ -65,17 +63,18 @@ static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
 #else
 #include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
-#define kstat_irqs_this_cpu(DESC) \
-        ((DESC)->kstat_irqs[smp_processor_id()])
+#define kstat_incr_irqs_this_cpu(irqno, DESC)           \
-#define kstat_incr_irqs_this_cpu(irqno, DESC) do {\
+do {                                                    \
-        ((DESC)->kstat_irqs[smp_processor_id()]++);\
+        __this_cpu_inc(*(DESC)->kstat_irqs);            \
-        kstat_this_cpu.irqs_sum++; } while (0)
+        __this_cpu_inc(kstat.irqs_sum);                 \
+} while (0)
 #endif
 static inline void kstat_incr_softirqs_this_cpu(unsigned int irq)
 {
-        kstat_this_cpu.softirqs[irq]++;
+        __this_cpu_inc(kstat.softirqs[irq]);
 }
 static inline unsigned int kstat_softirqs_cpu(unsigned int irq, int cpu)
diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h
new file mode 100644
index 000000000000..6b394f0b5148
--- /dev/null
+++ b/include/linux/khugepaged.h
@@ -0,0 +1,67 @@
+#ifndef _LINUX_KHUGEPAGED_H
+#define _LINUX_KHUGEPAGED_H
+#include <linux/sched.h> /* MMF_VM_HUGEPAGE */
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+extern int __khugepaged_enter(struct mm_struct *mm);
+extern void __khugepaged_exit(struct mm_struct *mm);
+extern int khugepaged_enter_vma_merge(struct vm_area_struct *vma);
+#define khugepaged_enabled()                                           \
+        (transparent_hugepage_flags &                                  \
+         ((1<<TRANSPARENT_HUGEPAGE_FLAG) |                     \
+          (1<<TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG)))
+#define khugepaged_always()                             \
+        (transparent_hugepage_flags &                   \
+         (1<<TRANSPARENT_HUGEPAGE_FLAG))
+#define khugepaged_req_madv()                                   \
+        (transparent_hugepage_flags &                           \
+         (1<<TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG))
+#define khugepaged_defrag()                                     \
+        (transparent_hugepage_flags &                           \
+         (1<<TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG))
+static inline int khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        if (test_bit(MMF_VM_HUGEPAGE, &oldmm->flags))
+                return __khugepaged_enter(mm);
+        return 0;
+}
+static inline void khugepaged_exit(struct mm_struct *mm)
+{
+        if (test_bit(MMF_VM_HUGEPAGE, &mm->flags))
+                __khugepaged_exit(mm);
+}
+static inline int khugepaged_enter(struct vm_area_struct *vma)
+{
+        if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags))
+                if ((khugepaged_always() ||
+                     (khugepaged_req_madv() &&
+                      vma->vm_flags & VM_HUGEPAGE)) &&
+                    !(vma->vm_flags & VM_NOHUGEPAGE))
+                        if (__khugepaged_enter(vma->vm_mm))
+                                return -ENOMEM;
+        return 0;
+}
+#else /* CONFIG_TRANSPARENT_HUGEPAGE */
+static inline int khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        return 0;
+}
+static inline void khugepaged_exit(struct mm_struct *mm)
+{
+}
+static inline int khugepaged_enter(struct vm_area_struct *vma)
+{
+        return 0;
+}
+static inline int khugepaged_enter_vma_merge(struct vm_area_struct *vma)
+{
+        return 0;
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+#endif /* _LINUX_KHUGEPAGED_H */
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h
index 24b44145a886..2a0d7d651dc3 100644
--- a/include/linux/kmsg_dump.h
+++ b/include/linux/kmsg_dump.h
@@ -18,6 +18,10 @@ enum kmsg_dump_reason {
        KMSG_DUMP_OOPS,
        KMSG_DUMP_PANIC,
        KMSG_DUMP_KEXEC,
+        KMSG_DUMP_RESTART,
+        KMSG_DUMP_HALT,
+        KMSG_DUMP_POWEROFF,
+        KMSG_DUMP_EMERG,
 };
 /**
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 919ae53adc5c..ea2dc1a2e13d 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -540,6 +540,7 @@ struct kvm_ppc_pvinfo {
 #endif
 #define KVM_CAP_PPC_GET_PVINFO 57
 #define KVM_CAP_PPC_IRQ_LEVEL 58
+#define KVM_CAP_ASYNC_PF 59
 #ifdef KVM_CAP_IRQ_ROUTING
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index a0557422715e..b5021db21858 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/preempt.h>
 #include <linux/msi.h>
+#include <linux/slab.h>
+#include <linux/rcupdate.h>
 #include <asm/signal.h>
 #include <linux/kvm.h>
@@ -40,6 +42,7 @@
 #define KVM_REQ_KICK               9
 #define KVM_REQ_DEACTIVATE_FPU    10
 #define KVM_REQ_EVENT             11
+#define KVM_REQ_APF_HALT          12
 #define KVM_USERSPACE_IRQ_SOURCE_ID     0
@@ -74,6 +77,27 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx,
 int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
                              struct kvm_io_device *dev);
+#ifdef CONFIG_KVM_ASYNC_PF
+struct kvm_async_pf {
+        struct work_struct work;
+        struct list_head link;
+        struct list_head queue;
+        struct kvm_vcpu *vcpu;
+        struct mm_struct *mm;
+        gva_t gva;
+        unsigned long addr;
+        struct kvm_arch_async_pf arch;
+        struct page *page;
+        bool done;
+};
+void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu);
+void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu);
+int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn,
+                       struct kvm_arch_async_pf *arch);
+int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu);
+#endif
 struct kvm_vcpu {
        struct kvm *kvm;
 #ifdef CONFIG_PREEMPT_NOTIFIERS
@@ -104,6 +128,15 @@ struct kvm_vcpu {
        gpa_t mmio_phys_addr;
 #endif
+#ifdef CONFIG_KVM_ASYNC_PF
+        struct {
+                u32 queued;
+                struct list_head queue;
+                struct list_head done;
+                spinlock_t lock;
+        } async_pf;
+#endif
        struct kvm_vcpu_arch arch;
 };
@@ -113,16 +146,19 @@ struct kvm_vcpu {
 */
 #define KVM_MEM_MAX_NR_PAGES ((1UL << 31) - 1)
+struct kvm_lpage_info {
+        unsigned long rmap_pde;
+        int write_count;
+};
 struct kvm_memory_slot {
        gfn_t base_gfn;
        unsigned long npages;
        unsigned long flags;
        unsigned long *rmap;
        unsigned long *dirty_bitmap;
-        struct {
+        unsigned long *dirty_bitmap_head;
-                unsigned long rmap_pde;
+        struct kvm_lpage_info *lpage_info[KVM_NR_PAGE_SIZES - 1];
-                int write_count;
-        } *lpage_info[KVM_NR_PAGE_SIZES - 1];
        unsigned long userspace_addr;
        int user_alloc;
        int id;
@@ -169,6 +205,7 @@ struct kvm_irq_routing_table {};
 struct kvm_memslots {
        int nmemslots;
+        u64 generation;
        struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
                                        KVM_PRIVATE_MEM_SLOTS];
 };
@@ -206,6 +243,10 @@ struct kvm {
        struct mutex irq_lock;
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
+        /*
+         * Update side is protected by irq_lock and,
+         * if configured, irqfds.lock.
+         */
        struct kvm_irq_routing_table __rcu *irq_routing;
        struct hlist_head mask_notifier_list;
        struct hlist_head irq_ack_notifier_list;
@@ -216,6 +257,7 @@ struct kvm {
        unsigned long mmu_notifier_seq;
        long mmu_notifier_count;
 #endif
+        long tlbs_dirty;
 };
 /* The guest did something we don't support. */
@@ -302,7 +344,11 @@ void kvm_set_page_accessed(struct page *page);
 pfn_t hva_to_pfn_atomic(struct kvm *kvm, unsigned long addr);
 pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn);
+pfn_t gfn_to_pfn_async(struct kvm *kvm, gfn_t gfn, bool *async,
+                       bool write_fault, bool *writable);
 pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn);
+pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,
+                      bool *writable);
 pfn_t gfn_to_pfn_memslot(struct kvm *kvm,
                         struct kvm_memory_slot *slot, gfn_t gfn);
 int memslot_id(struct kvm *kvm, gfn_t gfn);
@@ -321,18 +367,25 @@ int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
                         int offset, int len);
 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
                    unsigned long len);
+int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
+                           void *data, unsigned long len);
+int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
+                              gpa_t gpa);
 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
 int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
 void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
+void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot,
+                             gfn_t gfn);
 void kvm_vcpu_block(struct kvm_vcpu *vcpu);
 void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu);
 void kvm_resched(struct kvm_vcpu *vcpu);
 void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
 void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
 void kvm_flush_remote_tlbs(struct kvm *kvm);
 void kvm_reload_remote_mmus(struct kvm *kvm);
@@ -398,7 +451,19 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
 void kvm_free_physmem(struct kvm *kvm);
-struct  kvm *kvm_arch_create_vm(void);
+#ifndef __KVM_HAVE_ARCH_VM_ALLOC
+static inline struct kvm *kvm_arch_alloc_vm(void)
+{
+        return kzalloc(sizeof(struct kvm), GFP_KERNEL);
+}
+static inline void kvm_arch_free_vm(struct kvm *kvm)
+{
+        kfree(kvm);
+}
+#endif
+int kvm_arch_init_vm(struct kvm *kvm);
 void kvm_arch_destroy_vm(struct kvm *kvm);
 void kvm_free_all_assigned_devices(struct kvm *kvm);
 void kvm_arch_sync_events(struct kvm *kvm);
@@ -414,16 +479,8 @@ struct kvm_irq_ack_notifier {
        void (*irq_acked)(struct kvm_irq_ack_notifier *kian);
 };
-#define KVM_ASSIGNED_MSIX_PENDING               0x1
-struct kvm_guest_msix_entry {
-        u32 vector;
-        u16 entry;
-        u16 flags;
-};
 struct kvm_assigned_dev_kernel {
        struct kvm_irq_ack_notifier ack_notifier;
-        struct work_struct interrupt_work;
        struct list_head list;
        int assigned_dev_id;
        int host_segnr;
@@ -434,13 +491,14 @@ struct kvm_assigned_dev_kernel {
        bool host_irq_disabled;
        struct msix_entry *host_msix_entries;
        int guest_irq;
-        struct kvm_guest_msix_entry *guest_msix_entries;
+        struct msix_entry *guest_msix_entries;
        unsigned long irq_requested_type;
        int irq_source_id;
        int flags;
        struct pci_dev *dev;
        struct kvm *kvm;
-        spinlock_t assigned_dev_lock;
+        spinlock_t intx_lock;
+        char irq_name[32];
 };
 struct kvm_irq_mask_notifier {
@@ -462,6 +520,8 @@ void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
                                   unsigned long *deliver_bitmask);
 #endif
 int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level);
+int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,
+                int irq_source_id, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                   struct kvm_irq_ack_notifier *kian);
@@ -603,17 +663,28 @@ static inline void kvm_free_irq_routing(struct kvm *kvm) {}
 void kvm_eventfd_init(struct kvm *kvm);
 int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags);
 void kvm_irqfd_release(struct kvm *kvm);
+void kvm_irq_routing_update(struct kvm *, struct kvm_irq_routing_table *);
 int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
 #else
 static inline void kvm_eventfd_init(struct kvm *kvm) {}
 static inline int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
 {
        return -EINVAL;
 }
 static inline void kvm_irqfd_release(struct kvm *kvm) {}
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
+static inline void kvm_irq_routing_update(struct kvm *kvm,
+                                          struct kvm_irq_routing_table *irq_rt)
+{
+        rcu_assign_pointer(kvm->irq_routing, irq_rt);
+}
+#endif
 static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args)
 {
        return -ENOSYS;
diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index 7ac0d4eee430..fa7cc7244cbd 100644
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -67,4 +67,11 @@ struct kvm_lapic_irq {
        u32 dest_id;
 };
+struct gfn_to_hva_cache {
+        u64 generation;
+        gpa_t gpa;
+        unsigned long hva;
+        struct kvm_memory_slot *memslot;
+};
 #endif /* __KVM_TYPES_H__ */
diff --git a/include/linux/leds-lp5521.h b/include/linux/leds-lp5521.h
index 38368d785f08..fd548d2a8775 100644
--- a/include/linux/leds-lp5521.h
+++ b/include/linux/leds-lp5521.h
@@ -42,6 +42,7 @@ struct lp5521_platform_data {
        int     (*setup_resources)(void);
        void    (*release_resources)(void);
        void    (*enable)(bool state);
+        const char *label;
 };
 #endif /* __LINUX_LP5521_H */
diff --git a/include/linux/leds-lp5523.h b/include/linux/leds-lp5523.h
index 796747637b80..2694289babd0 100644
--- a/include/linux/leds-lp5523.h
+++ b/include/linux/leds-lp5523.h
@@ -42,6 +42,7 @@ struct lp5523_platform_data {
        int     (*setup_resources)(void);
        void    (*release_resources)(void);
        void    (*enable)(bool state);
+        const   char *label;
 };
 #endif /* __LINUX_LP5523_H */
diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
index 9ee97e7f2be4..5bad17d1acde 100644
--- a/include/linux/list_bl.h
+++ b/include/linux/list_bl.h
@@ -62,7 +62,8 @@ static inline void hlist_bl_set_first(struct hlist_bl_head *h,
                                        struct hlist_bl_node *n)
 {
        LIST_BL_BUG_ON((unsigned long)n & LIST_BL_LOCKMASK);
-        LIST_BL_BUG_ON(!((unsigned long)h->first & LIST_BL_LOCKMASK));
+        LIST_BL_BUG_ON(((unsigned long)h->first & LIST_BL_LOCKMASK) !=
+                                                        LIST_BL_LOCKMASK);
        h->first = (struct hlist_bl_node *)((unsigned long)n | LIST_BL_LOCKMASK);
 }
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 71c09b26c759..f638fd78d106 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -436,16 +436,8 @@ do {								\
 #endif /* CONFIG_LOCKDEP */
 #ifdef CONFIG_TRACE_IRQFLAGS
-extern void early_boot_irqs_off(void);
-extern void early_boot_irqs_on(void);
 extern void print_irqtrace_events(struct task_struct *curr);
 #else
-static inline void early_boot_irqs_off(void)
-{
-}
-static inline void early_boot_irqs_on(void)
-{
-}
 static inline void print_irqtrace_events(struct task_struct *curr)
 {
 }
diff --git a/include/linux/magic.h b/include/linux/magic.h
index ff690d05f129..62730ea2b56e 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -16,6 +16,7 @@
 #define TMPFS_MAGIC             0x01021994
 #define HUGETLBFS_MAGIC         0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC          0x73717368
+#define ECRYPTFS_SUPER_MAGIC    0xf15f
 #define EFS_SUPER_MAGIC         0x414A53
 #define EXT2_SUPER_MAGIC        0xEF53
 #define EXT3_SUPER_MAGIC        0xEF53
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 159a0762aeaf..f512e189be5a 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -25,6 +25,11 @@ struct page_cgroup;
 struct page;
 struct mm_struct;
+/* Stats that can be updated by kernel. */
+enum mem_cgroup_page_stat_item {
+        MEMCG_NR_FILE_MAPPED, /* # of pages charged as file rss */
+};
 extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
                                        struct list_head *dst,
                                        unsigned long *scanned, int order,
@@ -93,7 +98,7 @@ extern int
 mem_cgroup_prepare_migration(struct page *page,
        struct page *newpage, struct mem_cgroup **ptr);
 extern void mem_cgroup_end_migration(struct mem_cgroup *mem,
-        struct page *oldpage, struct page *newpage);
+        struct page *oldpage, struct page *newpage, bool migration_ok);
 /*
 * For memory reclaim.
@@ -121,11 +126,30 @@ static inline bool mem_cgroup_disabled(void)
        return false;
 }
-void mem_cgroup_update_file_mapped(struct page *page, int val);
+void mem_cgroup_update_page_stat(struct page *page,
+                                 enum mem_cgroup_page_stat_item idx,
+                                 int val);
+static inline void mem_cgroup_inc_page_stat(struct page *page,
+                                            enum mem_cgroup_page_stat_item idx)
+{
+        mem_cgroup_update_page_stat(page, idx, 1);
+}
+static inline void mem_cgroup_dec_page_stat(struct page *page,
+                                            enum mem_cgroup_page_stat_item idx)
+{
+        mem_cgroup_update_page_stat(page, idx, -1);
+}
 unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
                                                gfp_t gfp_mask);
 u64 mem_cgroup_get_limit(struct mem_cgroup *mem);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail);
+#endif
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
 struct mem_cgroup;
@@ -231,8 +255,7 @@ mem_cgroup_prepare_migration(struct page *page, struct page *newpage,
 }
 static inline void mem_cgroup_end_migration(struct mem_cgroup *mem,
-                                        struct page *oldpage,
+                struct page *oldpage, struct page *newpage, bool migration_ok)
-                                        struct page *newpage)
 {
 }
@@ -293,8 +316,13 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 {
 }
-static inline void mem_cgroup_update_file_mapped(struct page *page,
+static inline void mem_cgroup_inc_page_stat(struct page *page,
-                                                        int val)
+                                            enum mem_cgroup_page_stat_item idx)
+{
+}
+static inline void mem_cgroup_dec_page_stat(struct page *page,
+                                            enum mem_cgroup_page_stat_item idx)
 {
 }
@@ -311,6 +339,11 @@ u64 mem_cgroup_get_limit(struct mem_cgroup *mem)
        return 0;
 }
+static inline void mem_cgroup_split_huge_fixup(struct page *head,
+                                                struct page *tail)
+{
+}
 #endif /* CONFIG_CGROUP_MEM_CONT */
 #endif /* _LINUX_MEMCONTROL_H */
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 31c237a00c48..8122018d3000 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -13,12 +13,16 @@ struct mem_section;
 #ifdef CONFIG_MEMORY_HOTPLUG
 /*
- * Types for free bootmem.
+ * Types for free bootmem stored in page->lru.next. These have to be in
- * The normal smallest mapcount is -1. Here is smaller value than it.
+ * some random range in unsigned long space for debugging purposes.
 */
-#define SECTION_INFO            (-1 - 1)
+enum {
-#define MIX_SECTION_INFO        (-1 - 2)
+        MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 12,
-#define NODE_INFO               (-1 - 3)
+        SECTION_INFO = MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE,
+        MIX_SECTION_INFO,
+        NODE_INFO,
+        MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO,
+};
 /*
 * pgdat resizing functions
@@ -161,6 +165,12 @@ extern void register_page_bootmem_info_node(struct pglist_data *pgdat);
 extern void put_page_bootmem(struct page *page);
 #endif
+/*
+ * Lock for memory hotplug guarantees 1) all callbacks for memory hotplug
+ * notifier will be called under this. 2) offline/online/add/remove memory
+ * will not run simultaneously.
+ */
 void lock_memory_hotplug(void);
 void unlock_memory_hotplug(void);
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index d63b6050b183..37f56b7c4c15 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -74,32 +74,37 @@
 #define AB8500_INT_ACC_DETECT_21DB_F    37
 #define AB8500_INT_ACC_DETECT_21DB_R    38
 #define AB8500_INT_GP_SW_ADC_CONV_END   39
-#define AB8500_INT_BTEMP_LOW            72
+#define AB8500_INT_ADP_SOURCE_ERROR     72
-#define AB8500_INT_BTEMP_LOW_MEDIUM     73
+#define AB8500_INT_ADP_SINK_ERROR       73
-#define AB8500_INT_BTEMP_MEDIUM_HIGH    74
+#define AB8500_INT_ADP_PROBE_PLUG       74
-#define AB8500_INT_BTEMP_HIGH           75
+#define AB8500_INT_ADP_PROBE_UNPLUG     75
-#define AB8500_INT_USB_CHARGER_NOT_OK   81
+#define AB8500_INT_ADP_SENSE_OFF        76
-#define AB8500_INT_ID_WAKEUP_R          82
+#define AB8500_INT_USB_PHY_POWER_ERR    78
-#define AB8500_INT_ID_DET_R1R           84
+#define AB8500_INT_USB_LINK_STATUS      79
-#define AB8500_INT_ID_DET_R2R           85
+#define AB8500_INT_BTEMP_LOW            80
-#define AB8500_INT_ID_DET_R3R           86
+#define AB8500_INT_BTEMP_LOW_MEDIUM     81
-#define AB8500_INT_ID_DET_R4R           87
+#define AB8500_INT_BTEMP_MEDIUM_HIGH    82
-#define AB8500_INT_ID_WAKEUP_F          88
+#define AB8500_INT_BTEMP_HIGH           83
-#define AB8500_INT_ID_DET_R1F           90
+#define AB8500_INT_USB_CHARGER_NOT_OK   89
-#define AB8500_INT_ID_DET_R2F           91
+#define AB8500_INT_ID_WAKEUP_R          90
-#define AB8500_INT_ID_DET_R3F           92
+#define AB8500_INT_ID_DET_R1R           92
-#define AB8500_INT_ID_DET_R4F           93
+#define AB8500_INT_ID_DET_R2R           93
-#define AB8500_INT_USB_CHG_DET_DONE     94
+#define AB8500_INT_ID_DET_R3R           94
-#define AB8500_INT_USB_CH_TH_PROT_F     96
+#define AB8500_INT_ID_DET_R4R           95
-#define AB8500_INT_USB_CH_TH_PROP_R     97
+#define AB8500_INT_ID_WAKEUP_F          96
-#define AB8500_INT_MAIN_CH_TH_PROP_F    98
+#define AB8500_INT_ID_DET_R1F           98
-#define AB8500_INT_MAIN_CH_TH_PROT_R    99
+#define AB8500_INT_ID_DET_R2F           99
-#define AB8500_INT_USB_CHARGER_NOT_OKF  103
+#define AB8500_INT_ID_DET_R3F           100
+#define AB8500_INT_ID_DET_R4F           101
+#define AB8500_INT_USB_CHG_DET_DONE     102
+#define AB8500_INT_USB_CH_TH_PROT_F     104
+#define AB8500_INT_USB_CH_TH_PROT_R    105
+#define AB8500_INT_MAIN_CH_TH_PROT_F   106
+#define AB8500_INT_MAIN_CH_TH_PROT_R    107
+#define AB8500_INT_USB_CHARGER_NOT_OKF  111
-#define AB8500_NR_IRQS                  104
+#define AB8500_NR_IRQS                  112
-#define AB8500_NUM_IRQ_REGS             13
+#define AB8500_NUM_IRQ_REGS             14
-#define AB8500_NUM_REGULATORS   15
 /**
 * struct ab8500 - ab8500 internal structure
@@ -145,7 +150,8 @@ struct regulator_init_data;
 struct ab8500_platform_data {
        int irq_base;
        void (*init) (struct ab8500 *);
-        struct regulator_init_data *regulator[AB8500_NUM_REGULATORS];
+        int num_regulator;
+        struct regulator_init_data *regulator;
 };
 extern int __devinit ab8500_init(struct ab8500 *ab8500);
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index cb93d80aa642..835996e167e1 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -39,7 +39,7 @@ struct mfd_cell {
        size_t                  data_size;
        /*
-         * This resources can be specified relatievly to the parent device.
+         * This resources can be specified relatively to the parent device.
         * For accessing device you should use resources from device
         */
        int                     num_resources;
@@ -47,6 +47,12 @@ struct mfd_cell {
        /* don't check for resource conflicts */
        bool                    ignore_resource_conflicts;
+        /*
+         * Disable runtime PM callbacks for this subdevice - see
+         * pm_runtime_no_callbacks().
+         */
+        bool                    pm_runtime_no_callbacks;
 };
 extern int mfd_add_devices(struct device *parent, int id,
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h
index 7363dea6bbcd..effa5d3b96ae 100644
--- a/include/linux/mfd/max8998-private.h
+++ b/include/linux/mfd/max8998-private.h
@@ -159,10 +159,12 @@ struct max8998_dev {
        u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS];
        u8 irq_masks_cache[MAX8998_NUM_IRQ_REGS];
        int type;
+        bool wakeup;
 };
 int max8998_irq_init(struct max8998_dev *max8998);
 void max8998_irq_exit(struct max8998_dev *max8998);
+int max8998_irq_resume(struct max8998_dev *max8998);
 extern int max8998_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);
 extern int max8998_bulk_read(struct i2c_client *i2c, u8 reg, int count,
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index f8c9f884aff2..61daa167b576 100644
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -70,24 +70,43 @@ struct max8998_regulator_data {
 * @num_regulators: number of regultors used
 * @irq_base: base IRQ number for max8998, required for IRQs
 * @ono: power onoff IRQ number for max8998
- * @buck1_max_voltage1: BUCK1 maximum alowed voltage register 1
+ * @buck_voltage_lock: Do NOT change the values of the following six
- * @buck1_max_voltage2: BUCK1 maximum alowed voltage register 2
+ *   registers set by buck?_voltage?. The voltage of BUCK1/2 cannot
- * @buck2_max_voltage: BUCK2 maximum alowed voltage
+ *   be other than the preset values.
+ * @buck1_voltage1: BUCK1 DVS mode 1 voltage register
+ * @buck1_voltage2: BUCK1 DVS mode 2 voltage register
+ * @buck1_voltage3: BUCK1 DVS mode 3 voltage register
+ * @buck1_voltage4: BUCK1 DVS mode 4 voltage register
+ * @buck2_voltage1: BUCK2 DVS mode 1 voltage register
+ * @buck2_voltage2: BUCK2 DVS mode 2 voltage register
 * @buck1_set1: BUCK1 gpio pin 1 to set output voltage
 * @buck1_set2: BUCK1 gpio pin 2 to set output voltage
+ * @buck1_default_idx: Default for BUCK1 gpio pin 1, 2
 * @buck2_set3: BUCK2 gpio pin to set output voltage
+ * @buck2_default_idx: Default for BUCK2 gpio pin.
+ * @wakeup: Allow to wake up from suspend
+ * @rtc_delay: LP3974 RTC chip bug that requires delay after a register
+ * write before reading it.
 */
 struct max8998_platform_data {
        struct max8998_regulator_data   *regulators;
        int                             num_regulators;
        int                             irq_base;
        int                             ono;
-        int                             buck1_max_voltage1;
+        bool                            buck_voltage_lock;
-        int                             buck1_max_voltage2;
+        int                             buck1_voltage1;
-        int                             buck2_max_voltage;
+        int                             buck1_voltage2;
+        int                             buck1_voltage3;
+        int                             buck1_voltage4;
+        int                             buck2_voltage1;
+        int                             buck2_voltage2;
        int                             buck1_set1;
        int                             buck1_set2;
+        int                             buck1_default_idx;
        int                             buck2_set3;
+        int                             buck2_default_idx;
+        bool                            wakeup;
+        bool                            rtc_delay;
 };
 #endif /*  __LINUX_MFD_MAX8998_H */
diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h
index b4c741e352c2..7d0f3d6a0002 100644
--- a/include/linux/mfd/mc13783.h
+++ b/include/linux/mfd/mc13783.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2010 Yong Shen <yong.shen@linaro.org>
 * Copyright 2009-2010 Pengutronix
 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
 *
@@ -122,39 +123,39 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
                unsigned int channel, unsigned int *sample);
-#define MC13783_SW_SW1A         0
+#define MC13783_REG_SW1A                0
-#define MC13783_SW_SW1B         1
+#define MC13783_REG_SW1B                1
-#define MC13783_SW_SW2A         2
+#define MC13783_REG_SW2A                2
-#define MC13783_SW_SW2B         3
+#define MC13783_REG_SW2B                3
-#define MC13783_SW_SW3          4
+#define MC13783_REG_SW3         4
-#define MC13783_SW_PLL          5
+#define MC13783_REG_PLL         5
-#define MC13783_REGU_VAUDIO     6
+#define MC13783_REG_VAUDIO      6
-#define MC13783_REGU_VIOHI      7
+#define MC13783_REG_VIOHI       7
-#define MC13783_REGU_VIOLO      8
+#define MC13783_REG_VIOLO       8
-#define MC13783_REGU_VDIG       9
+#define MC13783_REG_VDIG        9
-#define MC13783_REGU_VGEN       10
+#define MC13783_REG_VGEN        10
-#define MC13783_REGU_VRFDIG     11
+#define MC13783_REG_VRFDIG      11
-#define MC13783_REGU_VRFREF     12
+#define MC13783_REG_VRFREF      12
-#define MC13783_REGU_VRFCP      13
+#define MC13783_REG_VRFCP       13
-#define MC13783_REGU_VSIM       14
+#define MC13783_REG_VSIM        14
-#define MC13783_REGU_VESIM      15
+#define MC13783_REG_VESIM       15
-#define MC13783_REGU_VCAM       16
+#define MC13783_REG_VCAM        16
-#define MC13783_REGU_VRFBG      17
+#define MC13783_REG_VRFBG       17
-#define MC13783_REGU_VVIB       18
+#define MC13783_REG_VVIB        18
-#define MC13783_REGU_VRF1       19
+#define MC13783_REG_VRF1        19
-#define MC13783_REGU_VRF2       20
+#define MC13783_REG_VRF2        20
-#define MC13783_REGU_VMMC1      21
+#define MC13783_REG_VMMC1       21
-#define MC13783_REGU_VMMC2      22
+#define MC13783_REG_VMMC2       22
-#define MC13783_REGU_GPO1       23
+#define MC13783_REG_GPO1        23
-#define MC13783_REGU_GPO2       24
+#define MC13783_REG_GPO2        24
-#define MC13783_REGU_GPO3       25
+#define MC13783_REG_GPO3        25
-#define MC13783_REGU_GPO4       26
+#define MC13783_REG_GPO4        26
-#define MC13783_REGU_V1         27
+#define MC13783_REG_V1          27
-#define MC13783_REGU_V2         28
+#define MC13783_REG_V2          28
-#define MC13783_REGU_V3         29
+#define MC13783_REG_V3          29
-#define MC13783_REGU_V4         30
+#define MC13783_REG_V4          30
-#define MC13783_REGU_PWGT1SPI   31
+#define MC13783_REG_PWGT1SPI    31
-#define MC13783_REGU_PWGT2SPI   32
+#define MC13783_REG_PWGT2SPI    32
 #define MC13783_IRQ_ADCDONE     MC13XXX_IRQ_ADCDONE
 #define MC13783_IRQ_ADCBISDONE  MC13XXX_IRQ_ADCBISDONE
diff --git a/include/linux/mfd/mc13892.h b/include/linux/mfd/mc13892.h
new file mode 100644
index 000000000000..a00f2bec178c
--- /dev/null
+++ b/include/linux/mfd/mc13892.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010 Yong Shen <yong.shen@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#ifndef __LINUX_MFD_MC13892_H
+#define __LINUX_MFD_MC13892_H
+#include <linux/mfd/mc13xxx.h>
+#define MC13892_SW1             0
+#define MC13892_SW2             1
+#define MC13892_SW3             2
+#define MC13892_SW4             3
+#define MC13892_SWBST   4
+#define MC13892_VIOHI   5
+#define MC13892_VPLL    6
+#define MC13892_VDIG    7
+#define MC13892_VSD     8
+#define MC13892_VUSB2   9
+#define MC13892_VVIDEO  10
+#define MC13892_VAUDIO  11
+#define MC13892_VCAM    12
+#define MC13892_VGEN1   13
+#define MC13892_VGEN2   14
+#define MC13892_VGEN3   15
+#define MC13892_VUSB    16
+#define MC13892_GPO1    17
+#define MC13892_GPO2    18
+#define MC13892_GPO3    19
+#define MC13892_GPO4    20
+#define MC13892_PWGT1SPI        21
+#define MC13892_PWGT2SPI        22
+#define MC13892_VCOINCELL       23
+#endif
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index a1239c48b41a..903280d21866 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -245,6 +245,7 @@ enum wm831x_parent {
        WM8320 = 0x8320,
        WM8321 = 0x8321,
        WM8325 = 0x8325,
+        WM8326 = 0x8326,
 };
 struct wm831x {
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h
index de79baee4925..3fd36845ca45 100644
--- a/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@ -17,6 +17,11 @@
 #include <linux/interrupt.h>
+enum wm8994_type {
+        WM8994 = 0,
+        WM8958 = 1,
+};
 struct regulator_dev;
 struct regulator_bulk_data;
@@ -48,6 +53,8 @@ struct wm8994 {
        struct mutex io_lock;
        struct mutex irq_lock;
+        enum wm8994_type type;
        struct device *dev;
        int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
                        int bytes, void *dest);
@@ -68,6 +75,7 @@ struct wm8994 {
        u16 gpio_regs[WM8994_NUM_GPIO_REGS];
        struct regulator_dev *dbvdd;
+        int num_supplies;
        struct regulator_bulk_data *supplies;
 };
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index add8a1b8bcf0..9eab263658be 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -30,6 +30,8 @@ struct wm8994_ldo_pdata {
 #define WM8994_DRC_REGS 5
 #define WM8994_EQ_REGS  20
+#define WM8958_MBC_CUTOFF_REGS 20
+#define WM8958_MBC_COEFF_REGS  48
 /**
 * DRC configurations are specified with a label and a set of register
@@ -59,6 +61,18 @@ struct wm8994_retune_mobile_cfg {
        u16 regs[WM8994_EQ_REGS];
 };
+/**
+ * Multiband compressor configurations are specified with a label and
+ * two sets of values to write.  Configurations are expected to be
+ * generated using the multiband compressor configuration panel in
+ * WISCE - see http://www.wolfsonmicro.com/wisce/
+ */
+struct wm8958_mbc_cfg {
+        const char *name;
+        u16 cutoff_regs[WM8958_MBC_CUTOFF_REGS];
+        u16 coeff_regs[WM8958_MBC_COEFF_REGS];
+};
 struct wm8994_pdata {
        int gpio_base;
@@ -78,6 +92,9 @@ struct wm8994_pdata {
        int num_retune_mobile_cfgs;
        struct wm8994_retune_mobile_cfg *retune_mobile_cfgs;
+        int num_mbc_cfgs;
+        struct wm8958_mbc_cfg *mbc_cfgs;
        /* LINEOUT can be differential or single ended */
        unsigned int lineout1_diff:1;
        unsigned int lineout2_diff:1;
diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h
index 967f62f54159..be072faec6f0 100644
--- a/include/linux/mfd/wm8994/registers.h
+++ b/include/linux/mfd/wm8994/registers.h
@@ -64,12 +64,16 @@
 #define WM8994_LDO_1                            0x3B
 #define WM8994_LDO_2                            0x3C
 #define WM8994_CHARGE_PUMP_1                    0x4C
+#define WM8958_CHARGE_PUMP_2                    0x4D
 #define WM8994_CLASS_W_1                        0x51
 #define WM8994_DC_SERVO_1                       0x54
 #define WM8994_DC_SERVO_2                       0x55
 #define WM8994_DC_SERVO_4                       0x57
 #define WM8994_DC_SERVO_READBACK                0x58
 #define WM8994_ANALOGUE_HP_1                    0x60
+#define WM8958_MIC_DETECT_1                     0xD0
+#define WM8958_MIC_DETECT_2                     0xD1
+#define WM8958_MIC_DETECT_3                     0xD2
 #define WM8994_CHIP_REVISION                    0x100
 #define WM8994_CONTROL_INTERFACE                0x101
 #define WM8994_WRITE_SEQUENCER_CTRL_1           0x110
@@ -109,6 +113,10 @@
 #define WM8994_AIF2DAC_LRCLK                    0x315
 #define WM8994_AIF2DAC_DATA                     0x316
 #define WM8994_AIF2ADC_DATA                     0x317
+#define WM8958_AIF3_CONTROL_1                   0x320
+#define WM8958_AIF3_CONTROL_2                   0x321
+#define WM8958_AIF3DAC_DATA                     0x322
+#define WM8958_AIF3ADC_DATA                     0x323
 #define WM8994_AIF1_ADC1_LEFT_VOLUME            0x400
 #define WM8994_AIF1_ADC1_RIGHT_VOLUME           0x401
 #define WM8994_AIF1_DAC1_LEFT_VOLUME            0x402
@@ -242,6 +250,83 @@
 #define WM8994_INTERRUPT_STATUS_2_MASK          0x739
 #define WM8994_INTERRUPT_CONTROL                0x740
 #define WM8994_IRQ_DEBOUNCE                     0x748
+#define WM8958_DSP2_PROGRAM                     0x900
+#define WM8958_DSP2_CONFIG                      0x901
+#define WM8958_DSP2_MAGICNUM                    0xA00
+#define WM8958_DSP2_RELEASEYEAR                 0xA01
+#define WM8958_DSP2_RELEASEMONTHDAY             0xA02
+#define WM8958_DSP2_RELEASETIME                 0xA03
+#define WM8958_DSP2_VERMAJMIN                   0xA04
+#define WM8958_DSP2_VERBUILD                    0xA05
+#define WM8958_DSP2_EXECCONTROL                 0xA0D
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_1     0x2200
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_2     0x2201
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C2_1     0x2202
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C2_2     0x2203
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C3_1     0x2204
+#define WM8958_MBC_BAND_2_LOWER_CUTOFF_C3_2     0x2205
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C2_1     0x2206
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C2_2     0x2207
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C3_1     0x2208
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C3_2     0x2209
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C1_1     0x220A
+#define WM8958_MBC_BAND_2_UPPER_CUTOFF_C1_2     0x220B
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C1_1     0x220C
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C1_2     0x220D
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C2_1     0x220E
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C2_2     0x220F
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C3_1     0x2210
+#define WM8958_MBC_BAND_1_UPPER_CUTOFF_C3_2     0x2211
+#define WM8958_MBC_BAND_1_LOWER_CUTOFF_1        0x2212
+#define WM8958_MBC_BAND_1_LOWER_CUTOFF_2        0x2213
+#define WM8958_MBC_BAND_1_K_1                   0x2400
+#define WM8958_MBC_BAND_1_K_2                   0x2401
+#define WM8958_MBC_BAND_1_N1_1                  0x2402
+#define WM8958_MBC_BAND_1_N1_2                  0x2403
+#define WM8958_MBC_BAND_1_N2_1                  0x2404
+#define WM8958_MBC_BAND_1_N2_2                  0x2405
+#define WM8958_MBC_BAND_1_N3_1                  0x2406
+#define WM8958_MBC_BAND_1_N3_2                  0x2407
+#define WM8958_MBC_BAND_1_N4_1                  0x2408
+#define WM8958_MBC_BAND_1_N4_2                  0x2409
+#define WM8958_MBC_BAND_1_N5_1                  0x240A
+#define WM8958_MBC_BAND_1_N5_2                  0x240B
+#define WM8958_MBC_BAND_1_X1_1                  0x240C
+#define WM8958_MBC_BAND_1_X1_2                  0x240D
+#define WM8958_MBC_BAND_1_X2_1                  0x240E
+#define WM8958_MBC_BAND_1_X2_2                  0x240F
+#define WM8958_MBC_BAND_1_X3_1                  0x2410
+#define WM8958_MBC_BAND_1_X3_2                  0x2411
+#define WM8958_MBC_BAND_1_ATTACK_1              0x2412
+#define WM8958_MBC_BAND_1_ATTACK_2              0x2413
+#define WM8958_MBC_BAND_1_DECAY_1               0x2414
+#define WM8958_MBC_BAND_1_DECAY_2               0x2415
+#define WM8958_MBC_BAND_2_K_1                   0x2416
+#define WM8958_MBC_BAND_2_K_2                   0x2417
+#define WM8958_MBC_BAND_2_N1_1                  0x2418
+#define WM8958_MBC_BAND_2_N1_2                  0x2419
+#define WM8958_MBC_BAND_2_N2_1                  0x241A
+#define WM8958_MBC_BAND_2_N2_2                  0x241B
+#define WM8958_MBC_BAND_2_N3_1                  0x241C
+#define WM8958_MBC_BAND_2_N3_2                  0x241D
+#define WM8958_MBC_BAND_2_N4_1                  0x241E
+#define WM8958_MBC_BAND_2_N4_2                  0x241F
+#define WM8958_MBC_BAND_2_N5_1                  0x2420
+#define WM8958_MBC_BAND_2_N5_2                  0x2421
+#define WM8958_MBC_BAND_2_X1_1                  0x2422
+#define WM8958_MBC_BAND_2_X1_2                  0x2423
+#define WM8958_MBC_BAND_2_X2_1                  0x2424
+#define WM8958_MBC_BAND_2_X2_2                  0x2425
+#define WM8958_MBC_BAND_2_X3_1                  0x2426
+#define WM8958_MBC_BAND_2_X3_2                  0x2427
+#define WM8958_MBC_BAND_2_ATTACK_1              0x2428
+#define WM8958_MBC_BAND_2_ATTACK_2              0x2429
+#define WM8958_MBC_BAND_2_DECAY_1               0x242A
+#define WM8958_MBC_BAND_2_DECAY_2               0x242B
+#define WM8958_MBC_B2_PG2_1                     0x242C
+#define WM8958_MBC_B2_PG2_2                     0x242D
+#define WM8958_MBC_B1_PG2_1                     0x242E
+#define WM8958_MBC_B1_PG2_2                     0x242F
 #define WM8994_WRITE_SEQUENCER_0                0x3000
 #define WM8994_WRITE_SEQUENCER_1                0x3001
 #define WM8994_WRITE_SEQUENCER_2                0x3002
@@ -992,6 +1077,12 @@
 /*
 * R6 (0x06) - Power Management (6)
 */
+#define WM8958_AIF3ADC_SRC_MASK                 0x0600  /* AIF3ADC_SRC - [10:9] */
+#define WM8958_AIF3ADC_SRC_SHIFT                     9  /* AIF3ADC_SRC - [10:9] */
+#define WM8958_AIF3ADC_SRC_WIDTH                     2  /* AIF3ADC_SRC - [10:9] */
+#define WM8958_AIF2DAC_SRC_MASK                 0x0180  /* AIF2DAC_SRC - [8:7] */
+#define WM8958_AIF2DAC_SRC_SHIFT                     7  /* AIF2DAC_SRC - [8:7] */
+#define WM8958_AIF2DAC_SRC_WIDTH                     2  /* AIF2DAC_SRC - [8:7] */
 #define WM8994_AIF3_TRI                         0x0020  /* AIF3_TRI */
 #define WM8994_AIF3_TRI_MASK                    0x0020  /* AIF3_TRI */
 #define WM8994_AIF3_TRI_SHIFT                        5  /* AIF3_TRI */
@@ -1836,6 +1927,14 @@
 #define WM8994_CP_ENA_WIDTH                          1  /* CP_ENA */
 /*
+ * R77 (0x4D) - Charge Pump (2)
+ */
+#define WM8958_CP_DISCH                         0x8000  /* CP_DISCH */
+#define WM8958_CP_DISCH_MASK                    0x8000  /* CP_DISCH */
+#define WM8958_CP_DISCH_SHIFT                       15  /* CP_DISCH */
+#define WM8958_CP_DISCH_WIDTH                        1  /* CP_DISCH */
+/*
 * R81 (0x51) - Class W (1)
 */
 #define WM8994_CP_DYN_SRC_SEL_MASK              0x0300  /* CP_DYN_SRC_SEL - [9:8] */
@@ -1952,6 +2051,46 @@
 #define WM8994_HPOUT1R_DLY_WIDTH                     1  /* HPOUT1R_DLY */
 /*
+ * R208 (0xD0) - Mic Detect 1
+ */
+#define WM8958_MICD_BIAS_STARTTIME_MASK         0xF000  /* MICD_BIAS_STARTTIME - [15:12] */
+#define WM8958_MICD_BIAS_STARTTIME_SHIFT            12  /* MICD_BIAS_STARTTIME - [15:12] */
+#define WM8958_MICD_BIAS_STARTTIME_WIDTH             4  /* MICD_BIAS_STARTTIME - [15:12] */
+#define WM8958_MICD_RATE_MASK                   0x0F00  /* MICD_RATE - [11:8] */
+#define WM8958_MICD_RATE_SHIFT                       8  /* MICD_RATE - [11:8] */
+#define WM8958_MICD_RATE_WIDTH                       4  /* MICD_RATE - [11:8] */
+#define WM8958_MICD_DBTIME                      0x0002  /* MICD_DBTIME */
+#define WM8958_MICD_DBTIME_MASK                 0x0002  /* MICD_DBTIME */
+#define WM8958_MICD_DBTIME_SHIFT                     1  /* MICD_DBTIME */
+#define WM8958_MICD_DBTIME_WIDTH                     1  /* MICD_DBTIME */
+#define WM8958_MICD_ENA                         0x0001  /* MICD_ENA */
+#define WM8958_MICD_ENA_MASK                    0x0001  /* MICD_ENA */
+#define WM8958_MICD_ENA_SHIFT                        0  /* MICD_ENA */
+#define WM8958_MICD_ENA_WIDTH                        1  /* MICD_ENA */
+/*
+ * R209 (0xD1) - Mic Detect 2
+ */
+#define WM8958_MICD_LVL_SEL_MASK                0x00FF  /* MICD_LVL_SEL - [7:0] */
+#define WM8958_MICD_LVL_SEL_SHIFT                    0  /* MICD_LVL_SEL - [7:0] */
+#define WM8958_MICD_LVL_SEL_WIDTH                    8  /* MICD_LVL_SEL - [7:0] */
+/*
+ * R210 (0xD2) - Mic Detect 3
+ */
+#define WM8958_MICD_LVL_MASK                    0x07FC  /* MICD_LVL - [10:2] */
+#define WM8958_MICD_LVL_SHIFT                        2  /* MICD_LVL - [10:2] */
+#define WM8958_MICD_LVL_WIDTH                        9  /* MICD_LVL - [10:2] */
+#define WM8958_MICD_VALID                       0x0002  /* MICD_VALID */
+#define WM8958_MICD_VALID_MASK                  0x0002  /* MICD_VALID */
+#define WM8958_MICD_VALID_SHIFT                      1  /* MICD_VALID */
+#define WM8958_MICD_VALID_WIDTH                      1  /* MICD_VALID */
+#define WM8958_MICD_STS                         0x0001  /* MICD_STS */
+#define WM8958_MICD_STS_MASK                    0x0001  /* MICD_STS */
+#define WM8958_MICD_STS_SHIFT                        0  /* MICD_STS */
+#define WM8958_MICD_STS_WIDTH                        1  /* MICD_STS */
+/*
 * R256 (0x100) - Chip Revision
 */
 #define WM8994_CHIP_REV_MASK                    0x000F  /* CHIP_REV - [3:0] */
@@ -2069,6 +2208,14 @@
 /*
 * R520 (0x208) - Clocking (1)
 */
+#define WM8958_DSP2CLK_ENA                      0x4000  /* DSP2CLK_ENA */
+#define WM8958_DSP2CLK_ENA_MASK                 0x4000  /* DSP2CLK_ENA */
+#define WM8958_DSP2CLK_ENA_SHIFT                    14  /* DSP2CLK_ENA */
+#define WM8958_DSP2CLK_ENA_WIDTH                     1  /* DSP2CLK_ENA */
+#define WM8958_DSP2CLK_SRC                      0x1000  /* DSP2CLK_SRC */
+#define WM8958_DSP2CLK_SRC_MASK                 0x1000  /* DSP2CLK_SRC */
+#define WM8958_DSP2CLK_SRC_SHIFT                    12  /* DSP2CLK_SRC */
+#define WM8958_DSP2CLK_SRC_WIDTH                     1  /* DSP2CLK_SRC */
 #define WM8994_TOCLK_ENA                        0x0010  /* TOCLK_ENA */
 #define WM8994_TOCLK_ENA_MASK                   0x0010  /* TOCLK_ENA */
 #define WM8994_TOCLK_ENA_SHIFT                       4  /* TOCLK_ENA */
@@ -2553,6 +2700,63 @@
 #define WM8994_AIF2ADCR_DAT_INV_WIDTH                1  /* AIF2ADCR_DAT_INV */
 /*
+ * R800 (0x320) - AIF3 Control (1)
+ */
+#define WM8958_AIF3_LRCLK_INV                   0x0080  /* AIF3_LRCLK_INV */
+#define WM8958_AIF3_LRCLK_INV_MASK              0x0080  /* AIF3_LRCLK_INV */
+#define WM8958_AIF3_LRCLK_INV_SHIFT                  7  /* AIF3_LRCLK_INV */
+#define WM8958_AIF3_LRCLK_INV_WIDTH                  1  /* AIF3_LRCLK_INV */
+#define WM8958_AIF3_WL_MASK                     0x0060  /* AIF3_WL - [6:5] */
+#define WM8958_AIF3_WL_SHIFT                         5  /* AIF3_WL - [6:5] */
+#define WM8958_AIF3_WL_WIDTH                         2  /* AIF3_WL - [6:5] */
+#define WM8958_AIF3_FMT_MASK                    0x0018  /* AIF3_FMT - [4:3] */
+#define WM8958_AIF3_FMT_SHIFT                        3  /* AIF3_FMT - [4:3] */
+#define WM8958_AIF3_FMT_WIDTH                        2  /* AIF3_FMT - [4:3] */
+/*
+ * R801 (0x321) - AIF3 Control (2)
+ */
+#define WM8958_AIF3DAC_BOOST_MASK               0x0C00  /* AIF3DAC_BOOST - [11:10] */
+#define WM8958_AIF3DAC_BOOST_SHIFT                  10  /* AIF3DAC_BOOST - [11:10] */
+#define WM8958_AIF3DAC_BOOST_WIDTH                   2  /* AIF3DAC_BOOST - [11:10] */
+#define WM8958_AIF3DAC_COMP                     0x0010  /* AIF3DAC_COMP */
+#define WM8958_AIF3DAC_COMP_MASK                0x0010  /* AIF3DAC_COMP */
+#define WM8958_AIF3DAC_COMP_SHIFT                    4  /* AIF3DAC_COMP */
+#define WM8958_AIF3DAC_COMP_WIDTH                    1  /* AIF3DAC_COMP */
+#define WM8958_AIF3DAC_COMPMODE                 0x0008  /* AIF3DAC_COMPMODE */
+#define WM8958_AIF3DAC_COMPMODE_MASK            0x0008  /* AIF3DAC_COMPMODE */
+#define WM8958_AIF3DAC_COMPMODE_SHIFT                3  /* AIF3DAC_COMPMODE */
+#define WM8958_AIF3DAC_COMPMODE_WIDTH                1  /* AIF3DAC_COMPMODE */
+#define WM8958_AIF3ADC_COMP                     0x0004  /* AIF3ADC_COMP */
+#define WM8958_AIF3ADC_COMP_MASK                0x0004  /* AIF3ADC_COMP */
+#define WM8958_AIF3ADC_COMP_SHIFT                    2  /* AIF3ADC_COMP */
+#define WM8958_AIF3ADC_COMP_WIDTH                    1  /* AIF3ADC_COMP */
+#define WM8958_AIF3ADC_COMPMODE                 0x0002  /* AIF3ADC_COMPMODE */
+#define WM8958_AIF3ADC_COMPMODE_MASK            0x0002  /* AIF3ADC_COMPMODE */
+#define WM8958_AIF3ADC_COMPMODE_SHIFT                1  /* AIF3ADC_COMPMODE */
+#define WM8958_AIF3ADC_COMPMODE_WIDTH                1  /* AIF3ADC_COMPMODE */
+#define WM8958_AIF3_LOOPBACK                    0x0001  /* AIF3_LOOPBACK */
+#define WM8958_AIF3_LOOPBACK_MASK               0x0001  /* AIF3_LOOPBACK */
+#define WM8958_AIF3_LOOPBACK_SHIFT                   0  /* AIF3_LOOPBACK */
+#define WM8958_AIF3_LOOPBACK_WIDTH                   1  /* AIF3_LOOPBACK */
+/*
+ * R802 (0x322) - AIF3DAC Data
+ */
+#define WM8958_AIF3DAC_DAT_INV                  0x0001  /* AIF3DAC_DAT_INV */
+#define WM8958_AIF3DAC_DAT_INV_MASK             0x0001  /* AIF3DAC_DAT_INV */
+#define WM8958_AIF3DAC_DAT_INV_SHIFT                 0  /* AIF3DAC_DAT_INV */
+#define WM8958_AIF3DAC_DAT_INV_WIDTH                 1  /* AIF3DAC_DAT_INV */
+/*
+ * R803 (0x323) - AIF3ADC Data
+ */
+#define WM8958_AIF3ADC_DAT_INV                  0x0001  /* AIF3ADC_DAT_INV */
+#define WM8958_AIF3ADC_DAT_INV_MASK             0x0001  /* AIF3ADC_DAT_INV */
+#define WM8958_AIF3ADC_DAT_INV_SHIFT                 0  /* AIF3ADC_DAT_INV */
+#define WM8958_AIF3ADC_DAT_INV_WIDTH                 1  /* AIF3ADC_DAT_INV */
+/*
 * R1024 (0x400) - AIF1 ADC1 Left Volume
 */
 #define WM8994_AIF1ADC1_VU                      0x0100  /* AIF1ADC1_VU */
@@ -4289,4 +4493,102 @@
 #define WM8994_TEMP_SHUT_DB_SHIFT                    0  /* TEMP_SHUT_DB */
 #define WM8994_TEMP_SHUT_DB_WIDTH                    1  /* TEMP_SHUT_DB */
+/*
+ * R2304 (0x900) - DSP2_Program
+ */
+#define WM8958_DSP2_ENA                         0x0001  /* DSP2_ENA */
+#define WM8958_DSP2_ENA_MASK                    0x0001  /* DSP2_ENA */
+#define WM8958_DSP2_ENA_SHIFT                        0  /* DSP2_ENA */
+#define WM8958_DSP2_ENA_WIDTH                        1  /* DSP2_ENA */
+/*
+ * R2305 (0x901) - DSP2_Config
+ */
+#define WM8958_MBC_SEL_MASK                     0x0030  /* MBC_SEL - [5:4] */
+#define WM8958_MBC_SEL_SHIFT                         4  /* MBC_SEL - [5:4] */
+#define WM8958_MBC_SEL_WIDTH                         2  /* MBC_SEL - [5:4] */
+#define WM8958_MBC_ENA                          0x0001  /* MBC_ENA */
+#define WM8958_MBC_ENA_MASK                     0x0001  /* MBC_ENA */
+#define WM8958_MBC_ENA_SHIFT                         0  /* MBC_ENA */
+#define WM8958_MBC_ENA_WIDTH                         1  /* MBC_ENA */
+/*
+ * R2560 (0xA00) - DSP2_MagicNum
+ */
+#define WM8958_DSP2_MAGIC_NUM_MASK              0xFFFF  /* DSP2_MAGIC_NUM - [15:0] */
+#define WM8958_DSP2_MAGIC_NUM_SHIFT                  0  /* DSP2_MAGIC_NUM - [15:0] */
+#define WM8958_DSP2_MAGIC_NUM_WIDTH                 16  /* DSP2_MAGIC_NUM - [15:0] */
+/*
+ * R2561 (0xA01) - DSP2_ReleaseYear
+ */
+#define WM8958_DSP2_RELEASE_YEAR_MASK           0xFFFF  /* DSP2_RELEASE_YEAR - [15:0] */
+#define WM8958_DSP2_RELEASE_YEAR_SHIFT               0  /* DSP2_RELEASE_YEAR - [15:0] */
+#define WM8958_DSP2_RELEASE_YEAR_WIDTH              16  /* DSP2_RELEASE_YEAR - [15:0] */
+/*
+ * R2562 (0xA02) - DSP2_ReleaseMonthDay
+ */
+#define WM8958_DSP2_RELEASE_MONTH_MASK          0xFF00  /* DSP2_RELEASE_MONTH - [15:8] */
+#define WM8958_DSP2_RELEASE_MONTH_SHIFT              8  /* DSP2_RELEASE_MONTH - [15:8] */
+#define WM8958_DSP2_RELEASE_MONTH_WIDTH              8  /* DSP2_RELEASE_MONTH - [15:8] */
+#define WM8958_DSP2_RELEASE_DAY_MASK            0x00FF  /* DSP2_RELEASE_DAY - [7:0] */
+#define WM8958_DSP2_RELEASE_DAY_SHIFT                0  /* DSP2_RELEASE_DAY - [7:0] */
+#define WM8958_DSP2_RELEASE_DAY_WIDTH                8  /* DSP2_RELEASE_DAY - [7:0] */
+/*
+ * R2563 (0xA03) - DSP2_ReleaseTime
+ */
+#define WM8958_DSP2_RELEASE_HOURS_MASK          0xFF00  /* DSP2_RELEASE_HOURS - [15:8] */
+#define WM8958_DSP2_RELEASE_HOURS_SHIFT              8  /* DSP2_RELEASE_HOURS - [15:8] */
+#define WM8958_DSP2_RELEASE_HOURS_WIDTH              8  /* DSP2_RELEASE_HOURS - [15:8] */
+#define WM8958_DSP2_RELEASE_MINS_MASK           0x00FF  /* DSP2_RELEASE_MINS - [7:0] */
+#define WM8958_DSP2_RELEASE_MINS_SHIFT               0  /* DSP2_RELEASE_MINS - [7:0] */
+#define WM8958_DSP2_RELEASE_MINS_WIDTH               8  /* DSP2_RELEASE_MINS - [7:0] */
+/*
+ * R2564 (0xA04) - DSP2_VerMajMin
+ */
+#define WM8958_DSP2_MAJOR_VER_MASK              0xFF00  /* DSP2_MAJOR_VER - [15:8] */
+#define WM8958_DSP2_MAJOR_VER_SHIFT                  8  /* DSP2_MAJOR_VER - [15:8] */
+#define WM8958_DSP2_MAJOR_VER_WIDTH                  8  /* DSP2_MAJOR_VER - [15:8] */
+#define WM8958_DSP2_MINOR_VER_MASK              0x00FF  /* DSP2_MINOR_VER - [7:0] */
+#define WM8958_DSP2_MINOR_VER_SHIFT                  0  /* DSP2_MINOR_VER - [7:0] */
+#define WM8958_DSP2_MINOR_VER_WIDTH                  8  /* DSP2_MINOR_VER - [7:0] */
+/*
+ * R2565 (0xA05) - DSP2_VerBuild
+ */
+#define WM8958_DSP2_BUILD_VER_MASK              0xFFFF  /* DSP2_BUILD_VER - [15:0] */
+#define WM8958_DSP2_BUILD_VER_SHIFT                  0  /* DSP2_BUILD_VER - [15:0] */
+#define WM8958_DSP2_BUILD_VER_WIDTH                 16  /* DSP2_BUILD_VER - [15:0] */
+/*
+ * R2573 (0xA0D) - DSP2_ExecControl
+ */
+#define WM8958_DSP2_STOPC                       0x0020  /* DSP2_STOPC */
+#define WM8958_DSP2_STOPC_MASK                  0x0020  /* DSP2_STOPC */
+#define WM8958_DSP2_STOPC_SHIFT                      5  /* DSP2_STOPC */
+#define WM8958_DSP2_STOPC_WIDTH                      1  /* DSP2_STOPC */
+#define WM8958_DSP2_STOPS                       0x0010  /* DSP2_STOPS */
+#define WM8958_DSP2_STOPS_MASK                  0x0010  /* DSP2_STOPS */
+#define WM8958_DSP2_STOPS_SHIFT                      4  /* DSP2_STOPS */
+#define WM8958_DSP2_STOPS_WIDTH                      1  /* DSP2_STOPS */
+#define WM8958_DSP2_STOPI                       0x0008  /* DSP2_STOPI */
+#define WM8958_DSP2_STOPI_MASK                  0x0008  /* DSP2_STOPI */
+#define WM8958_DSP2_STOPI_SHIFT                      3  /* DSP2_STOPI */
+#define WM8958_DSP2_STOPI_WIDTH                      1  /* DSP2_STOPI */
+#define WM8958_DSP2_STOP                        0x0004  /* DSP2_STOP */
+#define WM8958_DSP2_STOP_MASK                   0x0004  /* DSP2_STOP */
+#define WM8958_DSP2_STOP_SHIFT                       2  /* DSP2_STOP */
+#define WM8958_DSP2_STOP_WIDTH                       1  /* DSP2_STOP */
+#define WM8958_DSP2_RUNR                        0x0002  /* DSP2_RUNR */
+#define WM8958_DSP2_RUNR_MASK                   0x0002  /* DSP2_RUNR */
+#define WM8958_DSP2_RUNR_SHIFT                       1  /* DSP2_RUNR */
+#define WM8958_DSP2_RUNR_WIDTH                       1  /* DSP2_RUNR */
+#define WM8958_DSP2_RUN                         0x0001  /* DSP2_RUN */
+#define WM8958_DSP2_RUN_MASK                    0x0001  /* DSP2_RUN */
+#define WM8958_DSP2_RUN_SHIFT                        0  /* DSP2_RUN */
+#define WM8958_DSP2_RUN_WIDTH                        1  /* DSP2_RUN */
 #endif
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 085527fb8261..e39aeecfe9a2 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -13,9 +13,11 @@ extern void putback_lru_pages(struct list_head *l);
 extern int migrate_page(struct address_space *,
                        struct page *, struct page *);
 extern int migrate_pages(struct list_head *l, new_page_t x,
-                        unsigned long private, int offlining);
+                        unsigned long private, bool offlining,
+                        bool sync);
 extern int migrate_huge_pages(struct list_head *l, new_page_t x,
-                        unsigned long private, int offlining);
+                        unsigned long private, bool offlining,
+                        bool sync);
 extern int fail_migrate_page(struct address_space *,
                        struct page *, struct page *);
@@ -33,9 +35,11 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping,
 static inline void putback_lru_pages(struct list_head *l) {}
 static inline int migrate_pages(struct list_head *l, new_page_t x,
-                unsigned long private, int offlining) { return -ENOSYS; }
+                unsigned long private, bool offlining,
+                bool sync) { return -ENOSYS; }
 static inline int migrate_huge_pages(struct list_head *l, new_page_t x,
-                unsigned long private, int offlining) { return -ENOSYS; }
+                unsigned long private, bool offlining,
+                bool sync) { return -ENOSYS; }
 static inline int migrate_prep(void) { return -ENOSYS; }
 static inline int migrate_prep_local(void) { return -ENOSYS; }
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index a7b15bc7648e..049214642036 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -144,6 +144,11 @@ enum {
        MLX4_STAT_RATE_OFFSET   = 5
 };
+enum mlx4_protocol {
+        MLX4_PROTOCOL_IB,
+        MLX4_PROTOCOL_EN,
+};
 enum {
        MLX4_MTT_FLAG_PRESENT           = 1
 };
@@ -500,8 +505,9 @@ int mlx4_INIT_PORT(struct mlx4_dev *dev, int port);
 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 block_mcast_loopback);
+                          int block_mcast_loopback, enum mlx4_protocol protocol);
-int mlx4_multicast_detach(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],
+                          enum mlx4_protocol protocol);
 int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index);
 void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int index);
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index f407cd4bfb34..e1eebf78caba 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -34,6 +34,7 @@
 #define MLX4_DRIVER_H
 #include <linux/device.h>
+#include <linux/mlx4/device.h>
 struct mlx4_dev;
@@ -44,11 +45,6 @@ enum mlx4_dev_event {
        MLX4_DEV_EVENT_PORT_REINIT,
 };
-enum mlx4_protocol {
-        MLX4_PROTOCOL_IB,
-        MLX4_PROTOCOL_EN,
-};
 struct mlx4_interface {
        void *                  (*add)   (struct mlx4_dev *dev);
        void                    (*remove)(struct mlx4_dev *dev, void *context);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 721f451c3029..956a35532f47 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -14,6 +14,7 @@
 #include <linux/mm_types.h>
 #include <linux/range.h>
 #include <linux/pfn.h>
+#include <linux/bit_spinlock.h>
 struct mempolicy;
 struct anon_vma;
@@ -82,6 +83,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_GROWSUP      0x00000200
 #else
 #define VM_GROWSUP      0x00000000
+#define VM_NOHUGEPAGE   0x00000200      /* MADV_NOHUGEPAGE marked this vma */
 #endif
 #define VM_PFNMAP       0x00000400      /* Page-ranges managed without "struct page", just pure PFN */
 #define VM_DENYWRITE    0x00000800      /* ETXTBSY on write attempts.. */
@@ -101,7 +103,11 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_NORESERVE    0x00200000      /* should the VM suppress accounting */
 #define VM_HUGETLB      0x00400000      /* Huge TLB Page VM */
 #define VM_NONLINEAR    0x00800000      /* Is non-linear (remap_file_pages) */
+#ifndef CONFIG_TRANSPARENT_HUGEPAGE
 #define VM_MAPPED_COPY  0x01000000      /* T if mapped copy of data (nommu mmap) */
+#else
+#define VM_HUGEPAGE     0x01000000      /* MADV_HUGEPAGE marked this vma */
+#endif
 #define VM_INSERTPAGE   0x02000000      /* The vma has had "vm_insert_page()" done on it */
 #define VM_ALWAYSDUMP   0x04000000      /* Always include in core dumps */
@@ -242,6 +248,7 @@ struct inode;
 * files which need it (119 of them)
 */
 #include <linux/page-flags.h>
+#include <linux/huge_mm.h>
 /*
 * Methods to modify the page usage count.
@@ -305,6 +312,39 @@ static inline int is_vmalloc_or_module_addr(const void *x)
 }
 #endif
+static inline void compound_lock(struct page *page)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        bit_spin_lock(PG_compound_lock, &page->flags);
+#endif
+}
+static inline void compound_unlock(struct page *page)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        bit_spin_unlock(PG_compound_lock, &page->flags);
+#endif
+}
+static inline unsigned long compound_lock_irqsave(struct page *page)
+{
+        unsigned long uninitialized_var(flags);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        local_irq_save(flags);
+        compound_lock(page);
+#endif
+        return flags;
+}
+static inline void compound_unlock_irqrestore(struct page *page,
+                                              unsigned long flags)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        compound_unlock(page);
+        local_irq_restore(flags);
+#endif
+}
 static inline struct page *compound_head(struct page *page)
 {
        if (unlikely(PageTail(page)))
@@ -319,9 +359,29 @@ static inline int page_count(struct page *page)
 static inline void get_page(struct page *page)
 {
-        page = compound_head(page);
+        /*
-        VM_BUG_ON(atomic_read(&page->_count) == 0);
+         * Getting a normal page or the head of a compound page
+         * requires to already have an elevated page->_count. Only if
+         * we're getting a tail page, the elevated page->_count is
+         * required only in the head page, so for tail pages the
+         * bugcheck only verifies that the page->_count isn't
+         * negative.
+         */
+        VM_BUG_ON(atomic_read(&page->_count) < !PageTail(page));
        atomic_inc(&page->_count);
+        /*
+         * Getting a tail page will elevate both the head and tail
+         * page->_count(s).
+         */
+        if (unlikely(PageTail(page))) {
+                /*
+                 * This is safe only because
+                 * __split_huge_page_refcount can't run under
+                 * get_page().
+                 */
+                VM_BUG_ON(atomic_read(&page->first_page->_count) <= 0);
+                atomic_inc(&page->first_page->_count);
+        }
 }
 static inline struct page *virt_to_head_page(const void *x)
@@ -339,6 +399,27 @@ static inline void init_page_count(struct page *page)
        atomic_set(&page->_count, 1);
 }
+/*
+ * PageBuddy() indicate that the page is free and in the buddy system
+ * (see mm/page_alloc.c).
+ */
+static inline int PageBuddy(struct page *page)
+{
+        return atomic_read(&page->_mapcount) == -2;
+}
+static inline void __SetPageBuddy(struct page *page)
+{
+        VM_BUG_ON(atomic_read(&page->_mapcount) != -1);
+        atomic_set(&page->_mapcount, -2);
+}
+static inline void __ClearPageBuddy(struct page *page)
+{
+        VM_BUG_ON(!PageBuddy(page));
+        atomic_set(&page->_mapcount, -1);
+}
 void put_page(struct page *page);
 void put_pages_list(struct list_head *pages);
@@ -370,12 +451,39 @@ static inline int compound_order(struct page *page)
        return (unsigned long)page[1].lru.prev;
 }
+static inline int compound_trans_order(struct page *page)
+{
+        int order;
+        unsigned long flags;
+        if (!PageHead(page))
+                return 0;
+        flags = compound_lock_irqsave(page);
+        order = compound_order(page);
+        compound_unlock_irqrestore(page, flags);
+        return order;
+}
 static inline void set_compound_order(struct page *page, unsigned long order)
 {
        page[1].lru.prev = (void *)order;
 }
 /*
+ * Do pte_mkwrite, but only if the vma says VM_WRITE.  We do this when
+ * servicing faults for write access.  In the normal case, do always want
+ * pte_mkwrite.  But get_user_pages can cause write faults for mappings
+ * that do not have writing enabled, when used by access_process_vm.
+ */
+static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
+{
+        if (likely(vma->vm_flags & VM_WRITE))
+                pte = pte_mkwrite(pte);
+        return pte;
+}
+/*
 * Multiple processes may "see" the same page. E.g. for untouched
 * mappings of /dev/null, all processes see the same page full of
 * zeroes, and text pages of executables and shared libraries have
@@ -657,7 +765,7 @@ static inline struct address_space *page_mapping(struct page *page)
        VM_BUG_ON(PageSlab(page));
        if (unlikely(PageSwapCache(page)))
                mapping = &swapper_space;
-        else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+        else if ((unsigned long)mapping & PAGE_MAPPING_ANON)
                mapping = NULL;
        return mapping;
 }
@@ -1064,7 +1172,8 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
 #endif
-int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address);
+int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
+                pmd_t *pmd, unsigned long address);
 int __pte_alloc_kernel(pmd_t *pmd, unsigned long address);
 /*
@@ -1133,16 +1242,18 @@ static inline void pgtable_page_dtor(struct page *page)
        pte_unmap(pte);                                 \
 } while (0)
-#define pte_alloc_map(mm, pmd, address)                 \
+#define pte_alloc_map(mm, vma, pmd, address)                            \
-        ((unlikely(!pmd_present(*(pmd))) && __pte_alloc(mm, pmd, address))? \
+        ((unlikely(pmd_none(*(pmd))) && __pte_alloc(mm, vma,    \
-                NULL: pte_offset_map(pmd, address))
+                                                        pmd, address))? \
+         NULL: pte_offset_map(pmd, address))
 #define pte_alloc_map_lock(mm, pmd, address, ptlp)      \
-        ((unlikely(!pmd_present(*(pmd))) && __pte_alloc(mm, pmd, address))? \
+        ((unlikely(pmd_none(*(pmd))) && __pte_alloc(mm, NULL,   \
+                                                        pmd, address))? \
                NULL: pte_offset_map_lock(mm, pmd, address, ptlp))
 #define pte_alloc_kernel(pmd, address)                  \
-        ((unlikely(!pmd_present(*(pmd))) && __pte_alloc_kernel(pmd, address))? \
+        ((unlikely(pmd_none(*(pmd))) && __pte_alloc_kernel(pmd, address))? \
                NULL: pte_offset_kernel(pmd, address))
 extern void free_area_init(unsigned long * zones_size);
@@ -1415,6 +1526,8 @@ struct page *follow_page(struct vm_area_struct *, unsigned long address,
 #define FOLL_GET        0x04    /* do get_page on page */
 #define FOLL_DUMP       0x08    /* give error on hole if it would be zero */
 #define FOLL_FORCE      0x10    /* get_user_pages read/write w/o permission */
+#define FOLL_MLOCK      0x40    /* mark page as mlocked */
+#define FOLL_SPLIT      0x80    /* don't return transhuge pages, split them */
 typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
                        void *data);
@@ -1518,5 +1631,14 @@ static inline int is_hwpoison_address(unsigned long addr)
 extern void dump_page(struct page *page);
+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
+extern void clear_huge_page(struct page *page,
+                            unsigned long addr,
+                            unsigned int pages_per_huge_page);
+extern void copy_user_huge_page(struct page *dst, struct page *src,
+                                unsigned long addr, struct vm_area_struct *vma,
+                                unsigned int pages_per_huge_page);
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 8835b877b8db..8f7d24712dc1 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -1,6 +1,8 @@
 #ifndef LINUX_MM_INLINE_H
 #define LINUX_MM_INLINE_H
+#include <linux/huge_mm.h>
 /**
 * page_is_file_cache - should the page be on a file LRU or anon LRU?
 * @page: the page to test
@@ -20,18 +22,25 @@ static inline int page_is_file_cache(struct page *page)
 }
 static inline void
-add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
+__add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l,
+                       struct list_head *head)
 {
-        list_add(&page->lru, &zone->lru[l].list);
+        list_add(&page->lru, head);
-        __inc_zone_state(zone, NR_LRU_BASE + l);
+        __mod_zone_page_state(zone, NR_LRU_BASE + l, hpage_nr_pages(page));
        mem_cgroup_add_lru_list(page, l);
 }
 static inline void
+add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
+{
+        __add_page_to_lru_list(zone, page, l, &zone->lru[l].list);
+}
+static inline void
 del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
 {
        list_del(&page->lru);
-        __dec_zone_state(zone, NR_LRU_BASE + l);
+        __mod_zone_page_state(zone, NR_LRU_BASE + l, -hpage_nr_pages(page));
        mem_cgroup_del_lru_list(page, l);
 }
@@ -66,7 +75,7 @@ del_page_from_lru(struct zone *zone, struct page *page)
                        l += LRU_ACTIVE;
                }
        }
-        __dec_zone_state(zone, NR_LRU_BASE + l);
+        __mod_zone_page_state(zone, NR_LRU_BASE + l, -hpage_nr_pages(page));
        mem_cgroup_del_lru_list(page, l);
 }
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index bb7288a782fd..26bc4e2cd275 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -310,6 +310,9 @@ struct mm_struct {
 #ifdef CONFIG_MMU_NOTIFIER
        struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        pgtable_t pmd_huge_pte; /* protected by page_table_lock */
+#endif
        /* How many tasks sharing this mm are OOM_DISABLE */
        atomic_t oom_disable_count;
 };
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index 44fc5348fd5d..bf173502d744 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -104,6 +104,9 @@ static inline void sh_mmcif_writel(void __iomem *addr, int reg, u32 val)
 #define SH_MMCIF_BBS 512 /* boot block size */
+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,
+       MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };
 static inline void sh_mmcif_boot_cmd_send(void __iomem *base,
                                          unsigned long cmd, unsigned long arg)
 {
@@ -166,6 +169,17 @@ static inline int sh_mmcif_boot_do_read(void __iomem *base,
        unsigned long k;
        int ret = 0;
+        /* In data transfer mode: Set clock to Bus clock/4 (about 20Mhz) */
+        sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL,
+                        CLK_ENABLE | CLKDIV_4 | SRSPTO_256 |
+                        SRBSYTO_29 | SRWDTO_29 | SCCSTO_29);
+        /* CMD9 - Get CSD */
+        sh_mmcif_boot_cmd(base, 0x09806000, 0x00010000);
+        /* CMD7 - Select the card */
+        sh_mmcif_boot_cmd(base, 0x07400000, 0x00010000);
        /* CMD16 - Set the block size */
        sh_mmcif_boot_cmd(base, 0x10400000, SH_MMCIF_BBS);
@@ -209,27 +223,4 @@ static inline void sh_mmcif_boot_init(void __iomem *base)
        sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000);
 }
-static inline void sh_mmcif_boot_slurp(void __iomem *base,
-                                       unsigned char *buf,
-                                       unsigned long no_bytes)
-{
-        unsigned long tmp;
-        /* In data transfer mode: Set clock to Bus clock/4 (about 20Mhz) */
-        sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL,
-                        CLK_ENABLE | CLKDIV_4 | SRSPTO_256 |
-                        SRBSYTO_29 | SRWDTO_29 | SCCSTO_29);
-        /* CMD9 - Get CSD */
-        sh_mmcif_boot_cmd(base, 0x09806000, 0x00010000);
-        /* CMD7 - Select the card */
-        sh_mmcif_boot_cmd(base, 0x07400000, 0x00010000);
-        tmp = no_bytes / SH_MMCIF_BBS;
-        tmp += (no_bytes % SH_MMCIF_BBS) ? 1 : 0;
-        sh_mmcif_boot_do_read(base, 512, tmp, buf);
-}
 #endif /* __SH_MMCIF_H__ */
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index 43dcfbdc39de..cc2e7dfea9d7 100644
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -62,6 +62,16 @@ struct mmu_notifier_ops {
                                 unsigned long address);
        /*
+         * test_young is called to check the young/accessed bitflag in
+         * the secondary pte. This is used to know if the page is
+         * frequently used without actually clearing the flag or tearing
+         * down the secondary mapping on the page.
+         */
+        int (*test_young)(struct mmu_notifier *mn,
+                          struct mm_struct *mm,
+                          unsigned long address);
+        /*
         * change_pte is called in cases that pte mapping to page is changed:
         * for example, when ksm remaps pte to point to a new shared page.
         */
@@ -163,6 +173,8 @@ extern void __mmu_notifier_mm_destroy(struct mm_struct *mm);
 extern void __mmu_notifier_release(struct mm_struct *mm);
 extern int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
                                          unsigned long address);
+extern int __mmu_notifier_test_young(struct mm_struct *mm,
+                                     unsigned long address);
 extern void __mmu_notifier_change_pte(struct mm_struct *mm,
                                      unsigned long address, pte_t pte);
 extern void __mmu_notifier_invalidate_page(struct mm_struct *mm,
@@ -186,6 +198,14 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
+static inline int mmu_notifier_test_young(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        if (mm_has_notifiers(mm))
+                return __mmu_notifier_test_young(mm, address);
+        return 0;
+}
 static inline void mmu_notifier_change_pte(struct mm_struct *mm,
                                           unsigned long address, pte_t pte)
 {
@@ -243,6 +263,32 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
        __pte;                                                          \
 })
+#define pmdp_clear_flush_notify(__vma, __address, __pmdp)               \
+({                                                                      \
+        pmd_t __pmd;                                                    \
+        struct vm_area_struct *___vma = __vma;                          \
+        unsigned long ___address = __address;                           \
+        VM_BUG_ON(__address & ~HPAGE_PMD_MASK);                         \
+        mmu_notifier_invalidate_range_start(___vma->vm_mm, ___address,  \
+                                            (__address)+HPAGE_PMD_SIZE);\
+        __pmd = pmdp_clear_flush(___vma, ___address, __pmdp);           \
+        mmu_notifier_invalidate_range_end(___vma->vm_mm, ___address,    \
+                                          (__address)+HPAGE_PMD_SIZE);  \
+        __pmd;                                                          \
+})
+#define pmdp_splitting_flush_notify(__vma, __address, __pmdp)           \
+({                                                                      \
+        struct vm_area_struct *___vma = __vma;                          \
+        unsigned long ___address = __address;                           \
+        VM_BUG_ON(__address & ~HPAGE_PMD_MASK);                         \
+        mmu_notifier_invalidate_range_start(___vma->vm_mm, ___address,  \
+                                            (__address)+HPAGE_PMD_SIZE);\
+        pmdp_splitting_flush(___vma, ___address, __pmdp);               \
+        mmu_notifier_invalidate_range_end(___vma->vm_mm, ___address,    \
+                                          (__address)+HPAGE_PMD_SIZE);  \
+})
 #define ptep_clear_flush_young_notify(__vma, __address, __ptep)         \
 ({                                                                      \
        int __young;                                                    \
@@ -254,6 +300,17 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
        __young;                                                        \
 })
+#define pmdp_clear_flush_young_notify(__vma, __address, __pmdp)         \
+({                                                                      \
+        int __young;                                                    \
+        struct vm_area_struct *___vma = __vma;                          \
+        unsigned long ___address = __address;                           \
+        __young = pmdp_clear_flush_young(___vma, ___address, __pmdp);   \
+        __young |= mmu_notifier_clear_flush_young(___vma->vm_mm,        \
+                                                  ___address);          \
+        __young;                                                        \
+})
 #define set_pte_at_notify(__mm, __address, __ptep, __pte)               \
 ({                                                                      \
        struct mm_struct *___mm = __mm;                                 \
@@ -276,6 +333,12 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
+static inline int mmu_notifier_test_young(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        return 0;
+}
 static inline void mmu_notifier_change_pte(struct mm_struct *mm,
                                           unsigned long address, pte_t pte)
 {
@@ -305,7 +368,10 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 }
 #define ptep_clear_flush_young_notify ptep_clear_flush_young
+#define pmdp_clear_flush_young_notify pmdp_clear_flush_young
 #define ptep_clear_flush_notify ptep_clear_flush
+#define pmdp_clear_flush_notify pmdp_clear_flush
+#define pmdp_splitting_flush_notify pmdp_splitting_flush
 #define set_pte_at_notify set_pte_at
 #endif /* CONFIG_MMU_NOTIFIER */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 39c24ebe9cfd..02ecb0189b1d 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -114,6 +114,7 @@ enum zone_stat_item {
        NUMA_LOCAL,             /* allocation from local node */
        NUMA_OTHER,             /* allocation from other node */
 #endif
+        NR_ANON_TRANSPARENT_HUGEPAGES,
        NR_VM_ZONE_STAT_ITEMS };
 /*
@@ -458,12 +459,6 @@ static inline int zone_is_oom_locked(const struct zone *zone)
        return test_bit(ZONE_OOM_LOCKED, &zone->flags);
 }
-#ifdef CONFIG_SMP
-unsigned long zone_nr_free_pages(struct zone *zone);
-#else
-#define zone_nr_free_pages(zone) zone_page_state(zone, NR_FREE_PAGES)
-#endif /* CONFIG_SMP */
 /*
 * The "priority" of VM scanning is how much of the queues we will scan in one
 * go. A value of 12 for DEF_PRIORITY implies that we will scan 1/4096th of the
@@ -645,6 +640,7 @@ typedef struct pglist_data {
        wait_queue_head_t kswapd_wait;
        struct task_struct *kswapd;
        int kswapd_max_order;
+        enum zone_type classzone_idx;
 } pg_data_t;
 #define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages)
@@ -660,8 +656,10 @@ typedef struct pglist_data {
 extern struct mutex zonelists_mutex;
 void build_all_zonelists(void *data);
-void wakeup_kswapd(struct zone *zone, int order);
+void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx);
-int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
+bool zone_watermark_ok(struct zone *z, int order, unsigned long mark,
+                int classzone_idx, int alloc_flags);
+bool zone_watermark_ok_safe(struct zone *z, int order, unsigned long mark,
                int classzone_idx, int alloc_flags);
 enum memmap_context {
        MEMMAP_EARLY,
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 1869ea24a739..604f122a2326 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -60,7 +60,7 @@ struct vfsmount {
        struct super_block *mnt_sb;     /* pointer to superblock */
 #ifdef CONFIG_SMP
        struct mnt_pcp __percpu *mnt_pcp;
-        atomic_t mnt_longrefs;
+        atomic_t mnt_longterm;          /* how many of the refs are longterm */
 #else
        int mnt_count;
        int mnt_writers;
@@ -96,8 +96,6 @@ extern int mnt_clone_write(struct vfsmount *mnt);
 extern void mnt_drop_write(struct vfsmount *mnt);
 extern void mntput(struct vfsmount *mnt);
 extern struct vfsmount *mntget(struct vfsmount *mnt);
-extern void mntput_long(struct vfsmount *mnt);
-extern struct vfsmount *mntget_long(struct vfsmount *mnt);
 extern void mnt_pin(struct vfsmount *mnt);
 extern void mnt_unpin(struct vfsmount *mnt);
 extern int __mnt_is_readonly(struct vfsmount *mnt);
@@ -110,12 +108,7 @@ extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
                                      int flags, const char *name,
                                      void *data);
-struct nameidata;
+extern void mnt_set_expiry(struct vfsmount *mnt, struct list_head *expiry_list);
-struct path;
-extern int do_add_mount(struct vfsmount *newmnt, struct path *path,
-                        int mnt_flags, struct list_head *fslist);
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 extern dev_t name_to_dev_t(char *name);
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 4dd0c2cd7659..a9baee6864af 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -527,8 +527,7 @@ struct cfi_extquery *cfi_read_pri(struct map_info *map, uint16_t adr, uint16_t s
 struct cfi_fixup {
        uint16_t mfr;
        uint16_t id;
-        void (*fixup)(struct mtd_info *mtd, void* param);
+        void (*fixup)(struct mtd_info *mtd);
-        void* param;
 };
 #define CFI_MFR_ANY             0xFFFF
diff --git a/include/linux/mtd/fsmc.h b/include/linux/mtd/fsmc.h
index 5d2556700ec2..6987995ad3cf 100644
--- a/include/linux/mtd/fsmc.h
+++ b/include/linux/mtd/fsmc.h
@@ -16,6 +16,7 @@
 #ifndef __MTD_FSMC_H
 #define __MTD_FSMC_H
+#include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/types.h>
@@ -27,7 +28,7 @@
 /*
 * The placement of the Command Latch Enable (CLE) and
- * Address Latch Enable (ALE) is twised around in the
+ * Address Latch Enable (ALE) is twisted around in the
 * SPEAR310 implementation.
 */
 #if defined(CONFIG_MACH_SPEAR310)
@@ -62,7 +63,7 @@ struct fsmc_nor_bank_regs {
 /* ctrl_tim register definitions */
-struct fsms_nand_bank_regs {
+struct fsmc_nand_bank_regs {
        uint32_t pc;
        uint32_t sts;
        uint32_t comm;
@@ -78,7 +79,7 @@ struct fsms_nand_bank_regs {
 struct fsmc_regs {
        struct fsmc_nor_bank_regs nor_bank_regs[FSMC_MAX_NOR_BANKS];
        uint8_t reserved_1[0x40 - 0x20];
-        struct fsms_nand_bank_regs bank_regs[FSMC_MAX_NAND_BANKS];
+        struct fsmc_nand_bank_regs bank_regs[FSMC_MAX_NAND_BANKS];
        uint8_t reserved_2[0xfe0 - 0xc0];
        uint32_t peripid0;                      /* 0xfe0 */
        uint32_t peripid1;                      /* 0xfe4 */
@@ -114,25 +115,6 @@ struct fsmc_regs {
 #define FSMC_THOLD_4            (4 << 16)
 #define FSMC_THIZ_1             (1 << 24)
-/* peripid2 register definitions */
-#define FSMC_REVISION_MSK       (0xf)
-#define FSMC_REVISION_SHFT      (0x4)
-#define FSMC_VER1               1
-#define FSMC_VER2               2
-#define FSMC_VER3               3
-#define FSMC_VER4               4
-#define FSMC_VER5               5
-#define FSMC_VER6               6
-#define FSMC_VER7               7
-#define FSMC_VER8               8
-static inline uint32_t get_fsmc_version(struct fsmc_regs *regs)
-{
-        return (readl(&regs->peripid2) >> FSMC_REVISION_SHFT) &
-                                FSMC_REVISION_MSK;
-}
 /*
 * There are 13 bytes of ecc for every 512 byte block in FSMC version 8
 * and it has to be read consecutively and immediately after the 512
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index fe8d77ebec13..9d5306bad117 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -144,6 +144,17 @@ struct mtd_info {
         */
        uint32_t writesize;
+        /*
+         * Size of the write buffer used by the MTD. MTD devices having a write
+         * buffer can write multiple writesize chunks at a time. E.g. while
+         * writing 4 * writesize bytes to a device with 2 * writesize bytes
+         * buffer the MTD driver can (but doesn't have to) do 2 writesize
+         * operations, but not 4. Currently, all NANDs have writebufsize
+         * equivalent to writesize (NAND page size). Some NOR flashes do have
+         * writebufsize greater than writesize.
+         */
+        uint32_t writebufsize;
        uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
        uint32_t oobavail;  // Available OOB bytes per block
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 63e17d01fde9..1f489b247a29 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -448,6 +448,8 @@ struct nand_buffers {
 *                      See the defines for further explanation.
 * @badblockpos:        [INTERN] position of the bad block marker in the oob
 *                      area.
+ * @badblockbits:       [INTERN] number of bits to left-shift the bad block
+ *                      number
 * @cellinfo:           [INTERN] MLC/multichip data from chip ident
 * @numchips:           [INTERN] number of physical chips
 * @chipsize:           [INTERN] the size of one chip for multichip arrays
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 0c8815bfae1c..ae418e41d8f5 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -118,6 +118,8 @@ struct onenand_chip {
        int (*chip_probe)(struct mtd_info *mtd);
        int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
        int (*scan_bbt)(struct mtd_info *mtd);
+        int (*enable)(struct mtd_info *mtd);
+        int (*disable)(struct mtd_info *mtd);
        struct completion       complete;
        int                     irq;
@@ -137,6 +139,14 @@ struct onenand_chip {
        void                    *bbm;
        void                    *priv;
+        /*
+         * Shows that the current operation is composed
+         * of sequence of commands. For example, cache program.
+         * Such command status OnGo bit is checked at the end of
+         * sequence.
+         */
+        unsigned int            ongoing;
 };
 /*
@@ -171,6 +181,9 @@ struct onenand_chip {
 #define ONENAND_IS_2PLANE(this)                 (0)
 #endif
+#define ONENAND_IS_CACHE_PROGRAM(this)                                  \
+        (this->options & ONENAND_HAS_CACHE_PROGRAM)
 /* Check byte access in OneNAND */
 #define ONENAND_CHECK_BYTE_ACCESS(addr)         (addr & 0x1)
@@ -181,6 +194,7 @@ struct onenand_chip {
 #define ONENAND_HAS_UNLOCK_ALL          (0x0002)
 #define ONENAND_HAS_2PLANE              (0x0004)
 #define ONENAND_HAS_4KB_PAGE            (0x0008)
+#define ONENAND_HAS_CACHE_PROGRAM       (0x0010)
 #define ONENAND_SKIP_UNLOCK_CHECK       (0x0100)
 #define ONENAND_PAGEBUF_ALLOC           (0x1000)
 #define ONENAND_OOBBUF_ALLOC            (0x2000)
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index 2b54316591d2..4a0a8ba90a72 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -89,7 +89,7 @@ static inline int mtd_has_cmdlinepart(void) { return 1; }
 static inline int mtd_has_cmdlinepart(void) { return 0; }
 #endif
-int mtd_is_master(struct mtd_info *mtd);
+int mtd_is_partition(struct mtd_info *mtd);
 int mtd_add_partition(struct mtd_info *master, char *name,
                      long long offset, long long length);
 int mtd_del_partition(struct mtd_info *master, int partno);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 18d06add0a40..f276d4fa01fc 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -45,6 +45,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 *  - ending slashes ok even for nonexistent files
 *  - internal "there are more path components" flag
 *  - dentry cache is untrusted; force a real lookup
+ *  - suppress terminal automount
 */
 #define LOOKUP_FOLLOW           0x0001
 #define LOOKUP_DIRECTORY        0x0002
@@ -53,6 +54,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_PARENT           0x0010
 #define LOOKUP_REVAL            0x0020
 #define LOOKUP_RCU              0x0040
+#define LOOKUP_NO_AUTOMOUNT     0x0080
 /*
 * Intent data
 */
@@ -79,7 +81,8 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
 extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
-extern int follow_down(struct path *);
+extern int follow_down_one(struct path *);
+extern int follow_down(struct path *, bool);
 extern int follow_up(struct path *);
 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index 1c27f201c856..e13eefef0653 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -143,104 +143,4 @@ struct ncp_nls_ioctl
 #define NCP_MAXPATHLEN 255
 #define NCP_MAXNAMELEN 14
-#ifdef __KERNEL__
-#include <linux/ncp_fs_i.h>
-#include <linux/ncp_fs_sb.h>
-/* define because it is easy to change PRINTK to {*}PRINTK */
-#define PRINTK(format, args...) printk(KERN_DEBUG format , ## args)
-#undef NCPFS_PARANOIA
-#ifdef NCPFS_PARANOIA
-#define PPRINTK(format, args...) PRINTK(format , ## args)
-#else
-#define PPRINTK(format, args...)
-#endif
-#ifndef DEBUG_NCP
-#define DEBUG_NCP 0
-#endif
-#if DEBUG_NCP > 0
-#define DPRINTK(format, args...) PRINTK(format , ## args)
-#else
-#define DPRINTK(format, args...)
-#endif
-#if DEBUG_NCP > 1
-#define DDPRINTK(format, args...) PRINTK(format , ## args)
-#else
-#define DDPRINTK(format, args...)
-#endif
-#define NCP_MAX_RPC_TIMEOUT (6*HZ)
-struct ncp_entry_info {
-        struct nw_info_struct   i;
-        ino_t                   ino;
-        int                     opened;
-        int                     access;
-        unsigned int            volume;
-        __u8                    file_handle[6];
-};
-static inline struct ncp_server *NCP_SBP(const struct super_block *sb)
-{
-        return sb->s_fs_info;
-}
-#define NCP_SERVER(inode)       NCP_SBP((inode)->i_sb)
-static inline struct ncp_inode_info *NCP_FINFO(const struct inode *inode)
-{
-        return container_of(inode, struct ncp_inode_info, vfs_inode);
-}
-/* linux/fs/ncpfs/inode.c */
-int ncp_notify_change(struct dentry *, struct iattr *);
-struct inode *ncp_iget(struct super_block *, struct ncp_entry_info *);
-void ncp_update_inode(struct inode *, struct ncp_entry_info *);
-void ncp_update_inode2(struct inode *, struct ncp_entry_info *);
-/* linux/fs/ncpfs/dir.c */
-extern const struct inode_operations ncp_dir_inode_operations;
-extern const struct file_operations ncp_dir_operations;
-extern const struct dentry_operations ncp_root_dentry_operations;
-int ncp_conn_logged_in(struct super_block *);
-int ncp_date_dos2unix(__le16 time, __le16 date);
-void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date);
-/* linux/fs/ncpfs/ioctl.c */
-long ncp_ioctl(struct file *, unsigned int, unsigned long);
-long ncp_compat_ioctl(struct file *, unsigned int, unsigned long);
-/* linux/fs/ncpfs/sock.c */
-int ncp_request2(struct ncp_server *server, int function,
-        void* reply, int max_reply_size);
-static inline int ncp_request(struct ncp_server *server, int function) {
-        return ncp_request2(server, function, server->packet, server->packet_size);
-}
-int ncp_connect(struct ncp_server *server);
-int ncp_disconnect(struct ncp_server *server);
-void ncp_lock_server(struct ncp_server *server);
-void ncp_unlock_server(struct ncp_server *server);
-/* linux/fs/ncpfs/symlink.c */
-#if defined(CONFIG_NCPFS_EXTRAS) || defined(CONFIG_NCPFS_NFS_NS)
-extern const struct address_space_operations ncp_symlink_aops;
-int ncp_symlink(struct inode*, struct dentry*, const char*);
-#endif
-/* linux/fs/ncpfs/file.c */
-extern const struct inode_operations ncp_file_inode_operations;
-extern const struct file_operations ncp_file_operations;
-int ncp_make_open(struct inode *, int);
-/* linux/fs/ncpfs/mmap.c */
-int ncp_mmap(struct file *, struct vm_area_struct *);
-/* linux/fs/ncpfs/ncplib_kernel.c */
-int ncp_make_closed(struct inode *);
-#endif                          /* __KERNEL__ */
 #endif                          /* _LINUX_NCP_FS_H */
diff --git a/include/linux/ncp_fs_i.h b/include/linux/ncp_fs_i.h
deleted file mode 100644
index 4b0bec477846..000000000000
--- a/include/linux/ncp_fs_i.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  ncp_fs_i.h
- *
- *  Copyright (C) 1995 Volker Lendecke
- *
- */
-#ifndef _LINUX_NCP_FS_I
-#define _LINUX_NCP_FS_I
-/*
- * This is the ncpfs part of the inode structure. This must contain
- * all the information we need to work with an inode after creation.
- */
-struct ncp_inode_info {
-        __le32  dirEntNum;
-        __le32  DosDirNum;
-        __u8    volNumber;
-        __le32  nwattr;
-        struct mutex open_mutex;
-        atomic_t        opened;
-        int     access;
-        int     flags;
-#define NCPI_KLUDGE_SYMLINK     0x0001
-        __u8    file_handle[6];
-        struct inode vfs_inode;
-};
-#endif  /* _LINUX_NCP_FS_I */
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
deleted file mode 100644
index d64b0e894336..000000000000
--- a/include/linux/ncp_fs_sb.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  ncp_fs_sb.h
- *
- *  Copyright (C) 1995, 1996 by Volker Lendecke
- *
- */
-#ifndef _NCP_FS_SB
-#define _NCP_FS_SB
-#include <linux/types.h>
-#include <linux/ncp_mount.h>
-#include <linux/net.h>
-#include <linux/mutex.h>
-#include <linux/backing-dev.h>
-#ifdef __KERNEL__
-#include <linux/workqueue.h>
-#define NCP_DEFAULT_OPTIONS 0           /* 2 for packet signatures */
-struct sock;
-struct ncp_server {
-        struct ncp_mount_data_kernel m; /* Nearly all of the mount data is of
-                                           interest for us later, so we store
-                                           it completely. */
-        __u8 name_space[NCP_NUMBER_OF_VOLUMES + 2];
-        struct file *ncp_filp;  /* File pointer to ncp socket */
-        struct socket *ncp_sock;/* ncp socket */
-        struct file *info_filp;
-        struct socket *info_sock;
-        u8 sequence;
-        u8 task;
-        u16 connection;         /* Remote connection number */
-        u8 completion;          /* Status message from server */
-        u8 conn_status;         /* Bit 4 = 1 ==> Server going down, no
-                                   requests allowed anymore.
-                                   Bit 0 = 1 ==> Server is down. */
-        int buffer_size;        /* Negotiated bufsize */
-        int reply_size;         /* Size of last reply */
-        int packet_size;
-        unsigned char *packet;  /* Here we prepare requests and
-                                   receive replies */
-        unsigned char *txbuf;   /* Storage for current request */
-        unsigned char *rxbuf;   /* Storage for reply to current request */
-        int lock;               /* To prevent mismatch in protocols. */
-        struct mutex mutex;
-        int current_size;       /* for packet preparation */
-        int has_subfunction;
-        int ncp_reply_size;
-        int root_setuped;
-        struct mutex root_setup_lock;
-        /* info for packet signing */
-        int sign_wanted;        /* 1=Server needs signed packets */
-        int sign_active;        /* 0=don't do signing, 1=do */
-        char sign_root[8];      /* generated from password and encr. key */
-        char sign_last[16];     
-        /* Authentication info: NDS or BINDERY, username */
-        struct {
-                int     auth_type;
-                size_t  object_name_len;
-                void*   object_name;
-                int     object_type;
-        } auth;
-        /* Password info */
-        struct {
-                size_t  len;
-                void*   data;
-        } priv;
-        struct rw_semaphore auth_rwsem;
-        /* nls info: codepage for volume and charset for I/O */
-        struct nls_table *nls_vol;
-        struct nls_table *nls_io;
-        /* maximum age in jiffies */
-        atomic_t dentry_ttl;
-        /* miscellaneous */
-        unsigned int flags;
-        spinlock_t requests_lock;       /* Lock accesses to tx.requests, tx.creq and rcv.creq when STREAM mode */
-        void (*data_ready)(struct sock* sk, int len);
-        void (*error_report)(struct sock* sk);
-        void (*write_space)(struct sock* sk);   /* STREAM mode only */
-        struct {
-                struct work_struct tq;          /* STREAM/DGRAM: data/error ready */
-                struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */
-                struct mutex creq_mutex;        /* DGRAM only: lock accesses to rcv.creq */
-                unsigned int state;             /* STREAM only: receiver state */
-                struct {
-                        __u32 magic __packed;
-                        __u32 len __packed;
-                        __u16 type __packed;
-                        __u16 p1 __packed;
-                        __u16 p2 __packed;
-                        __u16 p3 __packed;
-                        __u16 type2 __packed;
-                } buf;                          /* STREAM only: temporary buffer */
-                unsigned char* ptr;             /* STREAM only: pointer to data */
-                size_t len;                     /* STREAM only: length of data to receive */
-        } rcv;
-        struct {
-                struct list_head requests;      /* STREAM only: queued requests */
-                struct work_struct tq;          /* STREAM only: transmitter ready */
-                struct ncp_request_reply* creq; /* STREAM only: currently transmitted entry */
-        } tx;
-        struct timer_list timeout_tm;           /* DGRAM only: timeout timer */
-        struct work_struct timeout_tq;          /* DGRAM only: associated queue, we run timers from process context */
-        int timeout_last;                       /* DGRAM only: current timeout length */
-        int timeout_retries;                    /* DGRAM only: retries left */
-        struct {
-                size_t len;
-                __u8 data[128];
-        } unexpected_packet;
-        struct backing_dev_info bdi;
-};
-extern void ncp_tcp_rcv_proc(struct work_struct *work);
-extern void ncp_tcp_tx_proc(struct work_struct *work);
-extern void ncpdgram_rcv_proc(struct work_struct *work);
-extern void ncpdgram_timeout_proc(struct work_struct *work);
-extern void ncpdgram_timeout_call(unsigned long server);
-extern void ncp_tcp_data_ready(struct sock* sk, int len);
-extern void ncp_tcp_write_space(struct sock* sk);
-extern void ncp_tcp_error_report(struct sock* sk);
-#define NCP_FLAG_UTF8   1
-#define NCP_CLR_FLAG(server, flag)      ((server)->flags &= ~(flag))
-#define NCP_SET_FLAG(server, flag)      ((server)->flags |= (flag))
-#define NCP_IS_FLAG(server, flag)       ((server)->flags & (flag))
-static inline int ncp_conn_valid(struct ncp_server *server)
-{
-        return ((server->conn_status & 0x11) == 0);
-}
-static inline void ncp_invalidate_conn(struct ncp_server *server)
-{
-        server->conn_status |= 0x01;
-}
-#endif                          /* __KERNEL__ */
-#endif
- 
diff --git a/include/linux/ncp_mount.h b/include/linux/ncp_mount.h
index a2b549eb1eca..dfcbea2d889f 100644
--- a/include/linux/ncp_mount.h
+++ b/include/linux/ncp_mount.h
@@ -68,26 +68,4 @@ struct ncp_mount_data_v4 {
 #define NCP_MOUNT_VERSION_V5    (5)     /* Text only */
-#ifdef __KERNEL__
-struct ncp_mount_data_kernel {
-        unsigned long    flags;         /* NCP_MOUNT_* flags */
-        unsigned int     int_flags;     /* internal flags */
-#define NCP_IMOUNT_LOGGEDIN_POSSIBLE    0x0001
-        __kernel_uid32_t mounted_uid;   /* Who may umount() this filesystem? */
-        struct pid      *wdog_pid;      /* Who cares for our watchdog packets? */
-        unsigned int     ncp_fd;        /* The socket to the ncp port */
-        unsigned int     time_out;      /* How long should I wait after
-                                           sending a NCP request? */
-        unsigned int     retry_count;   /* And how often should I retry? */
-        unsigned char    mounted_vol[NCP_VOLNAME_LEN + 1];
-        __kernel_uid32_t uid;
-        __kernel_gid32_t gid;
-        __kernel_mode_t  file_mode;
-        __kernel_mode_t  dir_mode;
-        int              info_fd;
-};
-#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index be4957cf6511..d971346b0340 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -520,9 +520,6 @@ struct netdev_queue {
         * please use this field instead of dev->trans_start
         */
        unsigned long           trans_start;
-        u64                     tx_bytes;
-        u64                     tx_packets;
-        u64                     tx_dropped;
 } ____cacheline_aligned_in_smp;
 static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
@@ -2265,8 +2262,6 @@ extern void		dev_load(struct net *net, const char *name);
 extern void             dev_mcast_init(void);
 extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
                                               struct rtnl_link_stats64 *storage);
-extern void             dev_txq_stats_fold(const struct net_device *dev,
-                                           struct rtnl_link_stats64 *stats);
 extern int              netdev_max_backlog;
 extern int              netdev_tstamp_prequeue;
diff --git a/include/linux/nfc/pn544.h b/include/linux/nfc/pn544.h
new file mode 100644
index 000000000000..7ab8521f2347
--- /dev/null
+++ b/include/linux/nfc/pn544.h
@@ -0,0 +1,97 @@
+/*
+ * Driver include for the PN544 NFC chip.
+ *
+ * Copyright (C) Nokia Corporation
+ *
+ * Author: Jari Vanhala <ext-jari.vanhala@nokia.com>
+ * Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * 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 _PN544_H_
+#define _PN544_H_
+#include <linux/i2c.h>
+#define PN544_DRIVER_NAME       "pn544"
+#define PN544_MAXWINDOW_SIZE    7
+#define PN544_WINDOW_SIZE       4
+#define PN544_RETRIES           10
+#define PN544_MAX_I2C_TRANSFER  0x0400
+#define PN544_MSG_MAX_SIZE      0x21 /* at normal HCI mode */
+/* ioctl */
+#define PN544_CHAR_BASE         'P'
+#define PN544_IOR(num, dtype)   _IOR(PN544_CHAR_BASE, num, dtype)
+#define PN544_IOW(num, dtype)   _IOW(PN544_CHAR_BASE, num, dtype)
+#define PN544_GET_FW_MODE       PN544_IOW(1, unsigned int)
+#define PN544_SET_FW_MODE       PN544_IOW(2, unsigned int)
+#define PN544_GET_DEBUG         PN544_IOW(3, unsigned int)
+#define PN544_SET_DEBUG         PN544_IOW(4, unsigned int)
+/* Timing restrictions (ms) */
+#define PN544_RESETVEN_TIME     30 /* 7 */
+#define PN544_PVDDVEN_TIME      0
+#define PN544_VBATVEN_TIME      0
+#define PN544_GPIO4VEN_TIME     0
+#define PN544_WAKEUP_ACK        5
+#define PN544_WAKEUP_GUARD      (PN544_WAKEUP_ACK + 1)
+#define PN544_INACTIVITY_TIME   1000
+#define PN544_INTERFRAME_DELAY  200 /* us */
+#define PN544_BAUDRATE_CHANGE   150 /* us */
+/* Debug bits */
+#define PN544_DEBUG_BUF         0x01
+#define PN544_DEBUG_READ        0x02
+#define PN544_DEBUG_WRITE       0x04
+#define PN544_DEBUG_IRQ         0x08
+#define PN544_DEBUG_CALLS       0x10
+#define PN544_DEBUG_MODE        0x20
+/* Normal (HCI) mode */
+#define PN544_LLC_HCI_OVERHEAD  3 /* header + crc (to length) */
+#define PN544_LLC_MIN_SIZE      (1 + PN544_LLC_HCI_OVERHEAD) /* length + */
+#define PN544_LLC_MAX_DATA      (PN544_MSG_MAX_SIZE - 2)
+#define PN544_LLC_MAX_HCI_SIZE  (PN544_LLC_MAX_DATA - 2)
+struct pn544_llc_packet {
+        unsigned char length; /* of rest of packet */
+        unsigned char header;
+        unsigned char data[PN544_LLC_MAX_DATA]; /* includes crc-ccitt */
+};
+/* Firmware upgrade mode */
+#define PN544_FW_HEADER_SIZE    3
+/* max fw transfer is 1024bytes, but I2C limits it to 0xC0 */
+#define PN544_MAX_FW_DATA       (PN544_MAX_I2C_TRANSFER - PN544_FW_HEADER_SIZE)
+struct pn544_fw_packet {
+        unsigned char command; /* status in answer */
+        unsigned char length[2]; /* big-endian order (msf) */
+        unsigned char data[PN544_MAX_FW_DATA];
+};
+#ifdef __KERNEL__
+/* board config */
+struct pn544_nfc_platform_data {
+        int (*request_resources) (struct i2c_client *client);
+        void (*free_resources) (void);
+        void (*enable) (int fw);
+        int (*test) (void);
+        void (*disable) (void);
+};
+#endif /* __KERNEL__ */
+#endif /* _PN544_H_ */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 9b46300b4305..134716e5e350 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -65,6 +65,9 @@
 #define NFS4_CDFC4_FORE 0x1
 #define NFS4_CDFC4_BACK 0x2
+#define NFS4_CDFC4_BOTH 0x3
+#define NFS4_CDFC4_FORE_OR_BOTH 0x3
+#define NFS4_CDFC4_BACK_OR_BOTH 0x7
 #define NFS4_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
@@ -140,6 +143,9 @@
 #define SEQ4_STATUS_CB_PATH_DOWN_SESSION        0x00000200
 #define SEQ4_STATUS_BACKCHANNEL_FAULT           0x00000400
+#define NFS4_SECINFO_STYLE4_CURRENT_FH  0
+#define NFS4_SECINFO_STYLE4_PARENT      1
 #define NFS4_MAX_UINT64 (~(u64)0)
 /* An NFS4 sessions server must support at least NFS4_MAX_OPS operations.
diff --git a/include/linux/nfs4_acl.h b/include/linux/nfs4_acl.h
deleted file mode 100644
index c9c05a78e9bb..000000000000
--- a/include/linux/nfs4_acl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  include/linux/nfs4_acl.c
- *
- *  Common NFSv4 ACL handling definitions.
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Marius Aamodt Eriksen <marius@umich.edu>
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef LINUX_NFS4_ACL_H
-#define LINUX_NFS4_ACL_H
-#include <linux/posix_acl.h>
-/* Maximum ACL we'll accept from client; chosen (somewhat arbitrarily) to
- * fit in a page: */
-#define NFS4_ACL_MAX 170
-struct nfs4_acl *nfs4_acl_new(int);
-int nfs4_acl_get_whotype(char *, u32);
-int nfs4_acl_write_who(int who, char *p);
-int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
-                                        uid_t who, u32 mask);
-#define NFS4_ACL_TYPE_DEFAULT   0x01
-#define NFS4_ACL_DIR            0x02
-#define NFS4_ACL_OWNER          0x04
-struct nfs4_acl *nfs4_acl_posix_to_nfsv4(struct posix_acl *,
-                                struct posix_acl *, unsigned int flags);
-int nfs4_acl_nfsv4_to_posix(struct nfs4_acl *, struct posix_acl **,
-                                struct posix_acl **, unsigned int flags);
-#endif /* LINUX_NFS4_ACL_H */
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 0779bb8f95be..6023efa9f5d9 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -215,7 +215,6 @@ struct nfs_inode {
 #define NFS_INO_ADVISE_RDPLUS   (0)             /* advise readdirplus */
 #define NFS_INO_STALE           (1)             /* possible stale inode */
 #define NFS_INO_ACL_LRU_SET     (2)             /* Inode is on the LRU list */
-#define NFS_INO_MOUNTPOINT      (3)             /* inode is remote mountpoint */
 #define NFS_INO_FLUSHING        (4)             /* inode is flushing out data */
 #define NFS_INO_FSCACHE         (5)             /* inode can be cached by FS-Cache */
 #define NFS_INO_FSCACHE_LOCK    (6)             /* FS-Cache cookie management lock */
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 8ae78a61eea4..bd316159278c 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -35,7 +35,7 @@
 #define NFSEXP_NOHIDE           0x0200
 #define NFSEXP_NOSUBTREECHECK   0x0400
 #define NFSEXP_NOAUTHNLM        0x0800          /* Don't authenticate NLM requests - just trust */
-#define NFSEXP_MSNFS            0x1000  /* do silly things that MS clients expect */
+#define NFSEXP_MSNFS            0x1000  /* do silly things that MS clients expect; no longer supported */
 #define NFSEXP_FSID             0x2000
 #define NFSEXP_CROSSMOUNT       0x4000
 #define NFSEXP_NOACL            0x8000  /* reserved for possible ACL related use */
diff --git a/include/linux/nfsd_idmap.h b/include/linux/nfsd_idmap.h
deleted file mode 100644
index d4a2ac18bd4c..000000000000
--- a/include/linux/nfsd_idmap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  include/linux/nfsd_idmap.h
- *
- *  Mapping of UID to name and vice versa.
- *
- *  Copyright (c) 2002, 2003 The Regents of the University of
- *  Michigan.  All rights reserved.
-> *
- *  Marius Aamodt Eriksen <marius@umich.edu>
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the University nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef LINUX_NFSD_IDMAP_H
-#define LINUX_NFSD_IDMAP_H
-#include <linux/in.h>
-#include <linux/sunrpc/svc.h>
-/* XXX from linux/nfs_idmap.h */
-#define IDMAP_NAMESZ 128
-#ifdef CONFIG_NFSD_V4
-int nfsd_idmap_init(void);
-void nfsd_idmap_shutdown(void);
-#else
-static inline int nfsd_idmap_init(void)
-{
-        return 0;
-}
-static inline void nfsd_idmap_shutdown(void)
-{
-}
-#endif
-int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);
-int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);
-int nfsd_map_uid_to_name(struct svc_rqst *, __u32, char *);
-int nfsd_map_gid_to_name(struct svc_rqst *, __u32, char *);
-#endif /* LINUX_NFSD_IDMAP_H */
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 2b89b712565b..821ffb954f14 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -148,6 +148,10 @@
 * @NL80211_CMD_SET_MPATH:  Set mesh path attributes for mesh path to
 *      destination %NL80211_ATTR_MAC on the interface identified by
 *      %NL80211_ATTR_IFINDEX.
+ * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by
+ *      %NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP.
+ * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by
+ *      %NL80211_ATTR_MAC.
 * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
 *      the interface identified by %NL80211_ATTR_IFINDEX.
 * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
@@ -612,7 +616,7 @@ enum nl80211_commands {
 *      consisting of a nested array.
 *
 * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes).
- * @NL80211_ATTR_PLINK_ACTION: action to perform on the mesh peer link.
+ * @NL80211_ATTR_STA_PLINK_ACTION: action to perform on the mesh peer link.
 * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path.
 * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path
 *      info given for %NL80211_CMD_GET_MPATH, nested attribute described at
@@ -879,7 +883,9 @@ enum nl80211_commands {
 *      See &enum nl80211_key_default_types.
 *
 * @NL80211_ATTR_MESH_SETUP: Optional mesh setup parameters.  These cannot be
- * changed once the mesh is active.
+ *      changed once the mesh is active.
+ * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute
+ *      containing attributes from &enum nl80211_meshconf_params.
 *
 * @NL80211_ATTR_MAX: highest attribute number currently defined
 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -1225,8 +1231,6 @@ enum nl80211_rate_info {
 * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
 * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
 * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
- * @__NL80211_STA_INFO_AFTER_LAST: internal
- * @NL80211_STA_INFO_MAX: highest possible station info attribute
 * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
 * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
 *      containing info as possible, see &enum nl80211_sta_info_txrate.
@@ -1236,6 +1240,11 @@ enum nl80211_rate_info {
 * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
 * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
 * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)
+ * @NL80211_STA_INFO_LLID: the station's mesh LLID
+ * @NL80211_STA_INFO_PLID: the station's mesh PLID
+ * @NL80211_STA_INFO_PLINK_STATE: peer link state for the station
+ * @__NL80211_STA_INFO_AFTER_LAST: internal
+ * @NL80211_STA_INFO_MAX: highest possible station info attribute
 */
 enum nl80211_sta_info {
        __NL80211_STA_INFO_INVALID,
@@ -1626,7 +1635,7 @@ enum nl80211_mntr_flags {
 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
 * that it takes for an HWMP information element to propagate across the mesh
 *
- * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
+ * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
 *
 * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
 * source mesh point for path selection elements.
@@ -1678,6 +1687,7 @@ enum nl80211_meshconf_params {
 * element that vendors will use to identify the path selection methods and
 * metrics in use.
 *
+ * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
 */
 enum nl80211_mesh_setup_params {
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 0ef22a1f129e..c84d900fbbb3 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -97,7 +97,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
                                     int depth, void *data);
 extern void early_init_dt_add_memory_arch(u64 base, u64 size);
-extern u64 early_init_dt_alloc_memory_arch(u64 size, u64 align);
+extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
 extern u64 dt_mem_next_cell(int s, __be32 **cellp);
 /*
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 5f38c460367e..0db8037e2725 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -48,9 +48,6 @@
 * struct page (these bits with information) are always mapped into kernel
 * address space...
 *
- * PG_buddy is set to indicate that the page is free and in the buddy system
- * (see mm/page_alloc.c).
- *
 * PG_hwpoison indicates that a page got corrupted in hardware and contains
 * data with incorrect ECC bits that triggered a machine check. Accessing is
 * not safe since it may cause another machine check. Don't touch!
@@ -96,7 +93,6 @@ enum pageflags {
        PG_swapcache,           /* Swap page: swp_entry_t in private */
        PG_mappedtodisk,        /* Has blocks allocated on-disk */
        PG_reclaim,             /* To be reclaimed asap */
-        PG_buddy,               /* Page is free, on buddy lists */
        PG_swapbacked,          /* Page is backed by RAM/swap */
        PG_unevictable,         /* Page is "unevictable"  */
 #ifdef CONFIG_MMU
@@ -108,6 +104,9 @@ enum pageflags {
 #ifdef CONFIG_MEMORY_FAILURE
        PG_hwpoison,            /* hardware poisoned page. Don't touch */
 #endif
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        PG_compound_lock,
+#endif
        __NR_PAGEFLAGS,
        /* Filesystems */
@@ -198,7 +197,7 @@ static inline int __TestClearPage##uname(struct page *page) { return 0; }
 struct page;    /* forward declaration */
 TESTPAGEFLAG(Locked, locked) TESTSETFLAG(Locked, locked)
-PAGEFLAG(Error, error)
+PAGEFLAG(Error, error) TESTCLEARFLAG(Error, error)
 PAGEFLAG(Referenced, referenced) TESTCLEARFLAG(Referenced, referenced)
 PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, dirty) __CLEARPAGEFLAG(Dirty, dirty)
 PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru)
@@ -230,7 +229,6 @@ PAGEFLAG(OwnerPriv1, owner_priv_1) TESTCLEARFLAG(OwnerPriv1, owner_priv_1)
 * risky: they bypass page accounting.
 */
 TESTPAGEFLAG(Writeback, writeback) TESTSCFLAG(Writeback, writeback)
-__PAGEFLAG(Buddy, buddy)
 PAGEFLAG(MappedToDisk, mappedtodisk)
 /* PG_readahead is only used for file reads; PG_reclaim is only for writes */
@@ -344,7 +342,7 @@ static inline void set_page_writeback(struct page *page)
 * tests can be used in performance sensitive paths. PageCompound is
 * generally not used in hot code paths.
 */
-__PAGEFLAG(Head, head)
+__PAGEFLAG(Head, head) CLEARPAGEFLAG(Head, head)
 __PAGEFLAG(Tail, tail)
 static inline int PageCompound(struct page *page)
@@ -352,6 +350,13 @@ static inline int PageCompound(struct page *page)
        return page->flags & ((1L << PG_head) | (1L << PG_tail));
 }
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline void ClearPageCompound(struct page *page)
+{
+        BUG_ON(!PageHead(page));
+        ClearPageHead(page);
+}
+#endif
 #else
 /*
 * Reduce page flag use as much as possible by overlapping
@@ -389,14 +394,61 @@ static inline void __ClearPageTail(struct page *page)
        page->flags &= ~PG_head_tail_mask;
 }
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+static inline void ClearPageCompound(struct page *page)
+{
+        BUG_ON((page->flags & PG_head_tail_mask) != (1 << PG_compound));
+        clear_bit(PG_compound, &page->flags);
+}
+#endif
 #endif /* !PAGEFLAGS_EXTENDED */
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+/*
+ * PageHuge() only returns true for hugetlbfs pages, but not for
+ * normal or transparent huge pages.
+ *
+ * PageTransHuge() returns true for both transparent huge and
+ * hugetlbfs pages, but not normal pages. PageTransHuge() can only be
+ * called only in the core VM paths where hugetlbfs pages can't exist.
+ */
+static inline int PageTransHuge(struct page *page)
+{
+        VM_BUG_ON(PageTail(page));
+        return PageHead(page);
+}
+static inline int PageTransCompound(struct page *page)
+{
+        return PageCompound(page);
+}
+#else
+static inline int PageTransHuge(struct page *page)
+{
+        return 0;
+}
+static inline int PageTransCompound(struct page *page)
+{
+        return 0;
+}
+#endif
 #ifdef CONFIG_MMU
 #define __PG_MLOCKED            (1 << PG_mlocked)
 #else
 #define __PG_MLOCKED            0
 #endif
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+#define __PG_COMPOUND_LOCK              (1 << PG_compound_lock)
+#else
+#define __PG_COMPOUND_LOCK              0
+#endif
 /*
 * Flags checked when a page is freed.  Pages being freed should not have
 * these flags set.  It they are, there is a problem.
@@ -404,9 +456,10 @@ static inline void __ClearPageTail(struct page *page)
 #define PAGE_FLAGS_CHECK_AT_FREE \
        (1 << PG_lru     | 1 << PG_locked    | \
         1 << PG_private | 1 << PG_private_2 | \
-         1 << PG_buddy   | 1 << PG_writeback | 1 << PG_reserved | \
+         1 << PG_writeback | 1 << PG_reserved | \
         1 << PG_slab    | 1 << PG_swapcache | 1 << PG_active | \
-         1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON)
+         1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON | \
+         __PG_COMPOUND_LOCK)
 /*
 * Flags checked when a page is prepped for return by the page allocator.
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index b02195dfc1b0..6d6cb7a57bb3 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -35,12 +35,15 @@ struct page_cgroup *lookup_page_cgroup(struct page *page);
 enum {
        /* flags for mem_cgroup */
-        PCG_LOCK,  /* page cgroup is locked */
+        PCG_LOCK,  /* Lock for pc->mem_cgroup and following bits. */
        PCG_CACHE, /* charged as cache */
        PCG_USED, /* this object is in use. */
-        PCG_ACCT_LRU, /* page has been accounted for */
-        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
        PCG_MIGRATION, /* under page migration */
+        /* flags for mem_cgroup and file and I/O status */
+        PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */
+        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
+        /* No lock in page_cgroup */
+        PCG_ACCT_LRU, /* page has been accounted for (under lru_lock) */
 };
 #define TESTPCGFLAG(uname, lname)                       \
@@ -94,6 +97,10 @@ static inline enum zone_type page_cgroup_zid(struct page_cgroup *pc)
 static inline void lock_page_cgroup(struct page_cgroup *pc)
 {
+        /*
+         * Don't take this lock in IRQ context.
+         * This lock is for pc->mem_cgroup, USED, CACHE, MIGRATION
+         */
        bit_spin_lock(PCG_LOCK, &pc->flags);
 }
@@ -107,6 +114,24 @@ static inline int page_is_cgroup_locked(struct page_cgroup *pc)
        return bit_spin_is_locked(PCG_LOCK, &pc->flags);
 }
+static inline void move_lock_page_cgroup(struct page_cgroup *pc,
+        unsigned long *flags)
+{
+        /*
+         * We know updates to pc->flags of page cache's stats are from both of
+         * usual context or IRQ context. Disable IRQ to avoid deadlock.
+         */
+        local_irq_save(*flags);
+        bit_spin_lock(PCG_MOVE_LOCK, &pc->flags);
+}
+static inline void move_unlock_page_cgroup(struct page_cgroup *pc,
+        unsigned long *flags)
+{
+        bit_spin_unlock(PCG_MOVE_LOCK, &pc->flags);
+        local_irq_restore(*flags);
+}
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
 struct page_cgroup;
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 2d1ffe3cf1ee..9c66e994540f 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -48,7 +48,7 @@ static inline void mapping_clear_unevictable(struct address_space *mapping)
 static inline int mapping_unevictable(struct address_space *mapping)
 {
-        if (likely(mapping))
+        if (mapping)
                return test_bit(AS_UNEVICTABLE, &mapping->flags);
        return !!mapping;
 }
diff --git a/include/linux/path.h b/include/linux/path.h
index a581e8c06533..edc98dec6266 100644
--- a/include/linux/path.h
+++ b/include/linux/path.h
@@ -10,9 +10,7 @@ struct path {
 };
 extern void path_get(struct path *);
-extern void path_get_long(struct path *);
 extern void path_put(struct path *);
-extern void path_put_long(struct path *);
 static inline int path_equal(const struct path *path1, const struct path *path2)
 {
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index c8b6473c5f42..44623500f419 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -35,9 +35,12 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
                                              pbus->number);
 }
+#endif
+#ifdef CONFIG_ACPI_APEI
+extern bool aer_acpi_firmware_first(void);
 #else
-static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
+static inline bool aer_acpi_firmware_first(void) { return false; }
-{ return NULL; }
 #endif
 #endif  /* _PCI_ACPI_H_ */
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index 91ba0b338b47..ce6810512c66 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -27,6 +27,7 @@ extern void pcie_aspm_init_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_exit_link_state(struct pci_dev *pdev);
 extern void pcie_aspm_pm_state_change(struct pci_dev *pdev);
 extern void pci_disable_link_state(struct pci_dev *pdev, int state);
+extern void pcie_clear_aspm(void);
 extern void pcie_no_aspm(void);
 #else
 static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
@@ -41,7 +42,9 @@ static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
 static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
 {
 }
+static inline void pcie_clear_aspm(void)
+{
+}
 static inline void pcie_no_aspm(void)
 {
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7454408c41b6..559d02897075 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -806,7 +806,7 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size);
 /* Power management related routines */
 int pci_save_state(struct pci_dev *dev);
-int pci_restore_state(struct pci_dev *dev);
+void pci_restore_state(struct pci_dev *dev);
 int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state);
 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);
@@ -820,7 +820,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev);
 int pci_back_from_sleep(struct pci_dev *dev);
 bool pci_dev_run_wake(struct pci_dev *dev);
 bool pci_check_pme_status(struct pci_dev *dev);
-void pci_wakeup_event(struct pci_dev *dev);
 void pci_pme_wakeup_bus(struct pci_bus *bus);
 static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
@@ -994,6 +993,14 @@ extern void pci_restore_msi_state(struct pci_dev *dev);
 extern int pci_msi_enabled(void);
 #endif
+#ifdef CONFIG_PCIEPORTBUS
+extern bool pcie_ports_disabled;
+extern bool pcie_ports_auto;
+#else
+#define pcie_ports_disabled     true
+#define pcie_ports_auto         false
+#endif
 #ifndef CONFIG_PCIEASPM
 static inline int pcie_aspm_enabled(void)
 {
@@ -1003,6 +1010,14 @@ static inline int pcie_aspm_enabled(void)
 extern int pcie_aspm_enabled(void);
 #endif
+#ifdef CONFIG_PCIEAER
+void pci_no_aer(void);
+bool pci_aer_available(void);
+#else
+static inline void pci_no_aer(void) { }
+static inline bool pci_aer_available(void) { return false; }
+#endif
 #ifndef CONFIG_PCIE_ECRC
 static inline void pcie_set_ecrc_checking(struct pci_dev *dev)
 {
@@ -1168,10 +1183,8 @@ static inline int pci_save_state(struct pci_dev *dev)
        return 0;
 }
-static inline int pci_restore_state(struct pci_dev *dev)
+static inline void pci_restore_state(struct pci_dev *dev)
-{
+{ }
-        return 0;
-}
 static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ab47732d81e0..3adb06ebf841 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2369,8 +2369,10 @@
 #define PCI_DEVICE_ID_JMICRON_JMB38X_SD 0x2381
 #define PCI_DEVICE_ID_JMICRON_JMB38X_MMC 0x2382
 #define PCI_DEVICE_ID_JMICRON_JMB38X_MS 0x2383
+#define PCI_DEVICE_ID_JMICRON_JMB385_MS 0x2388
 #define PCI_DEVICE_ID_JMICRON_JMB388_SD 0x2391
 #define PCI_DEVICE_ID_JMICRON_JMB388_ESD 0x2392
+#define PCI_DEVICE_ID_JMICRON_JMB390_MS 0x2393
 #define PCI_VENDOR_ID_KORENIX           0x1982
 #define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
@@ -2476,7 +2478,8 @@
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
 #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS      0x1d22
-#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC        0x1d40
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0      0x1d40
+#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1      0x1d41
 #define PCI_DEVICE_ID_INTEL_82801AA_0   0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1   0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3   0x2413
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index af83076c31a6..5b7e6b1ba54f 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -309,6 +309,14 @@
 #define PCI_MSIX_PBA            8
 #define  PCI_MSIX_FLAGS_BIRMASK (7 << 0)
+/* MSI-X entry's format */
+#define PCI_MSIX_ENTRY_SIZE             16
+#define  PCI_MSIX_ENTRY_LOWER_ADDR      0
+#define  PCI_MSIX_ENTRY_UPPER_ADDR      4
+#define  PCI_MSIX_ENTRY_DATA            8
+#define  PCI_MSIX_ENTRY_VECTOR_CTRL     12
+#define   PCI_MSIX_ENTRY_CTRL_MASKBIT   1
 /* CompactPCI Hotswap Register */
 #define PCI_CHSWP_CSR           2       /* Control and Status Register */
@@ -496,6 +504,8 @@
 #define  PCI_EXP_RTCTL_CRSSVE   0x10    /* CRS Software Visibility Enable */
 #define PCI_EXP_RTCAP           30      /* Root Capabilities */
 #define PCI_EXP_RTSTA           32      /* Root Status */
+#define PCI_EXP_RTSTA_PME       0x10000 /* PME status */
+#define PCI_EXP_RTSTA_PENDING   0x20000 /* PME pending */
 #define PCI_EXP_DEVCAP2         36      /* Device Capabilities 2 */
 #define  PCI_EXP_DEVCAP2_ARI    0x20    /* Alternative Routing-ID */
 #define PCI_EXP_DEVCTL2         40      /* Device Control 2 */
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 56e76af78102..1a2ccd6f3823 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -57,7 +57,7 @@ struct poll_table_entry {
 };
 /*
- * Structures and helpers for sys_poll/sys_poll
+ * Structures and helpers for select/poll syscall
 */
 struct poll_wqueues {
        poll_table pt;
diff --git a/include/linux/power/gpio-charger.h b/include/linux/power/gpio-charger.h
new file mode 100644
index 000000000000..de1dfe09a03d
--- /dev/null
+++ b/include/linux/power/gpio-charger.h
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  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.
+ *
+ *  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_POWER_GPIO_CHARGER_H__
+#define __LINUX_POWER_GPIO_CHARGER_H__
+#include <linux/power_supply.h>
+#include <linux/types.h>
+/**
+ * struct gpio_charger_platform_data - platform_data for gpio_charger devices
+ * @name:               Name for the chargers power_supply device
+ * @type:               Type of the charger
+ * @gpio:               GPIO which is used to indicate the chargers status
+ * @gpio_active_low:    Should be set to 1 if the GPIO is active low otherwise 0
+ * @supplied_to:        Array of battery names to which this chargers supplies power
+ * @num_supplicants:    Number of entries in the supplied_to array
+ */
+struct gpio_charger_platform_data {
+        const char *name;
+        enum power_supply_type type;
+        int gpio;
+        int gpio_active_low;
+        char **supplied_to;
+        size_t num_supplicants;
+};
+#endif
diff --git a/include/linux/power/max17042_battery.h b/include/linux/power/max17042_battery.h
new file mode 100644
index 000000000000..7995deb8bfc1
--- /dev/null
+++ b/include/linux/power/max17042_battery.h
@@ -0,0 +1,30 @@
+/*
+ * Fuel gauge driver for Maxim 17042 / 8966 / 8997
+ *  Note that Maxim 8966 and 8997 are mfd and this is its subdevice.
+ *
+ * Copyright (C) 2011 Samsung Electronics
+ * MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 __MAX17042_BATTERY_H_
+#define __MAX17042_BATTERY_H_
+struct max17042_platform_data {
+        bool enable_current_sense;
+};
+#endif /* __MAX17042_BATTERY_H_ */
diff --git a/include/linux/pps.h b/include/linux/pps.h
index 0194ab06177b..a9bb1d93451a 100644
--- a/include/linux/pps.h
+++ b/include/linux/pps.h
@@ -114,11 +114,18 @@ struct pps_fdata {
        struct pps_ktime timeout;
 };
+struct pps_bind_args {
+        int tsformat;   /* format of time stamps */
+        int edge;       /* selected event type */
+        int consumer;   /* selected kernel consumer */
+};
 #include <linux/ioctl.h>
 #define PPS_GETPARAMS           _IOR('p', 0xa1, struct pps_kparams *)
 #define PPS_SETPARAMS           _IOW('p', 0xa2, struct pps_kparams *)
 #define PPS_GETCAP              _IOR('p', 0xa3, int *)
 #define PPS_FETCH               _IOWR('p', 0xa4, struct pps_fdata *)
+#define PPS_KC_BIND             _IOW('p', 0xa5, struct pps_bind_args *)
 #endif /* _PPS_H_ */
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index e0a193f830ef..94048547f29a 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -18,6 +18,9 @@
 *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#ifndef LINUX_PPS_KERNEL_H
+#define LINUX_PPS_KERNEL_H
 #include <linux/pps.h>
 #include <linux/cdev.h>
@@ -28,18 +31,28 @@
 * Global defines
 */
+struct pps_device;
 /* The specific PPS source info */
 struct pps_source_info {
        char name[PPS_MAX_NAME_LEN];            /* simbolic name */
        char path[PPS_MAX_NAME_LEN];            /* path of connected device */
        int mode;                               /* PPS's allowed mode */
-        void (*echo)(int source, int event, void *data); /* PPS echo function */
+        void (*echo)(struct pps_device *pps,
+                        int event, void *data); /* PPS echo function */
        struct module *owner;
        struct device *dev;
 };
+struct pps_event_time {
+#ifdef CONFIG_NTP_PPS
+        struct timespec ts_raw;
+#endif /* CONFIG_NTP_PPS */
+        struct timespec ts_real;
+};
 /* The main struct */
 struct pps_device {
        struct pps_source_info info;            /* PSS source info */
@@ -52,38 +65,56 @@ struct pps_device {
        struct pps_ktime clear_tu;
        int current_mode;                       /* PPS mode at event time */
-        int go;                                 /* PPS event is arrived? */
+        unsigned int last_ev;                   /* last PPS event id */
        wait_queue_head_t queue;                /* PPS event queue */
        unsigned int id;                        /* PPS source unique ID */
        struct cdev cdev;
        struct device *dev;
-        int devno;
        struct fasync_struct *async_queue;      /* fasync method */
        spinlock_t lock;
-        atomic_t usage;                         /* usage count */
 };
 /*
 * Global variables
 */
-extern spinlock_t pps_idr_lock;
-extern struct idr pps_idr;
-extern struct timespec pps_irq_ts[];
 extern struct device_attribute pps_attrs[];
 /*
 * Exported functions
 */
-struct pps_device *pps_get_source(int source);
+extern struct pps_device *pps_register_source(
-extern void pps_put_source(struct pps_device *pps);
+                struct pps_source_info *info, int default_params);
-extern int pps_register_source(struct pps_source_info *info,
+extern void pps_unregister_source(struct pps_device *pps);
-                                int default_params);
-extern void pps_unregister_source(int source);
 extern int pps_register_cdev(struct pps_device *pps);
 extern void pps_unregister_cdev(struct pps_device *pps);
-extern void pps_event(int source, struct pps_ktime *ts, int event, void *data);
+extern void pps_event(struct pps_device *pps,
+                struct pps_event_time *ts, int event, void *data);
+static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
+                struct timespec ts)
+{
+        kt->sec = ts.tv_sec;
+        kt->nsec = ts.tv_nsec;
+}
+#ifdef CONFIG_NTP_PPS
+static inline void pps_get_ts(struct pps_event_time *ts)
+{
+        getnstime_raw_and_real(&ts->ts_raw, &ts->ts_real);
+}
+#else /* CONFIG_NTP_PPS */
+static inline void pps_get_ts(struct pps_event_time *ts)
+{
+        getnstimeofday(&ts->ts_real);
+}
+#endif /* CONFIG_NTP_PPS */
+#endif /* LINUX_PPS_KERNEL_H */
diff --git a/include/linux/printk.h b/include/linux/printk.h
index b772ca5fbdf0..ee048e77e1ae 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -4,14 +4,14 @@
 extern const char linux_banner[];
 extern const char linux_proc_banner[];
-#define KERN_EMERG      "<0>"   /* system is unusable                   */
+#define KERN_EMERG      "<0>"   /* system is unusable                   */
-#define KERN_ALERT      "<1>"   /* action must be taken immediately     */
+#define KERN_ALERT      "<1>"   /* action must be taken immediately     */
-#define KERN_CRIT       "<2>"   /* critical conditions                  */
+#define KERN_CRIT       "<2>"   /* critical conditions                  */
-#define KERN_ERR        "<3>"   /* error conditions                     */
+#define KERN_ERR        "<3>"   /* error conditions                     */
-#define KERN_WARNING    "<4>"   /* warning conditions                   */
+#define KERN_WARNING    "<4>"   /* warning conditions                   */
-#define KERN_NOTICE     "<5>"   /* normal but significant condition     */
+#define KERN_NOTICE     "<5>"   /* normal but significant condition     */
-#define KERN_INFO       "<6>"   /* informational                        */
+#define KERN_INFO       "<6>"   /* informational                        */
-#define KERN_DEBUG      "<7>"   /* debug-level messages                 */
+#define KERN_DEBUG      "<7>"   /* debug-level messages                 */
 /* Use the default kernel loglevel */
 #define KERN_DEFAULT    "<d>"
@@ -20,7 +20,7 @@ extern const char linux_proc_banner[];
 * line that had no enclosing \n). Only to be used by core/arch code
 * during early bootup (a continued line is not SMP-safe otherwise).
 */
-#define KERN_CONT       "<c>"
+#define KERN_CONT       "<c>"
 extern int console_printk[];
@@ -29,6 +29,17 @@ extern int console_printk[];
 #define minimum_console_loglevel (console_printk[2])
 #define default_console_loglevel (console_printk[3])
+static inline void console_silent(void)
+{
+        console_loglevel = 0;
+}
+static inline void console_verbose(void)
+{
+        if (console_loglevel)
+                console_loglevel = 15;
+}
 struct va_format {
        const char *fmt;
        va_list *va;
@@ -65,11 +76,27 @@ struct va_format {
 */
 #define HW_ERR          "[Hardware Error]: "
+/*
+ * Dummy printk for disabled debugging statements to use whilst maintaining
+ * gcc's format and side-effect checking.
+ */
+static inline __attribute__ ((format (printf, 1, 2)))
+int no_printk(const char *fmt, ...)
+{
+        return 0;
+}
+extern asmlinkage __attribute__ ((format (printf, 1, 2)))
+void early_printk(const char *fmt, ...);
+extern int printk_needs_cpu(int cpu);
+extern void printk_tick(void);
 #ifdef CONFIG_PRINTK
-asmlinkage int vprintk(const char *fmt, va_list args)
+asmlinkage __attribute__ ((format (printf, 1, 0)))
-        __attribute__ ((format (printf, 1, 0)));
+int vprintk(const char *fmt, va_list args);
-asmlinkage int printk(const char * fmt, ...)
+asmlinkage __attribute__ ((format (printf, 1, 2))) __cold
-        __attribute__ ((format (printf, 1, 2))) __cold;
+int printk(const char *fmt, ...);
 /*
 * Please don't use printk_ratelimit(), because it shares ratelimiting state
@@ -83,99 +110,56 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 extern int printk_delay_msec;
 extern int dmesg_restrict;
+extern int kptr_restrict;
-/*
- * Print a one-time message (analogous to WARN_ONCE() et al):
- */
-#define printk_once(x...) ({                    \
-        static bool __print_once;               \
-                                                \
-        if (!__print_once) {                    \
-                __print_once = true;            \
-                printk(x);                      \
-        }                                       \
-})
 void log_buf_kexec_setup(void);
 #else
-static inline int vprintk(const char *s, va_list args)
+static inline __attribute__ ((format (printf, 1, 0)))
-        __attribute__ ((format (printf, 1, 0)));
+int vprintk(const char *s, va_list args)
-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 __cold printk(const char *s, ...) { return 0; }
-static inline int printk_ratelimit(void) { return 0; }
-static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
-                                          unsigned int interval_msec)   \
-                { return false; }
-/* No effect, but we still get type checking even in the !PRINTK case: */
-#define printk_once(x...) printk(x)
-static inline void log_buf_kexec_setup(void)
 {
+        return 0;
 }
-#endif
+static inline __attribute__ ((format (printf, 1, 2))) __cold
+int printk(const char *s, ...)
-/*
- * Dummy printk for disabled debugging statements to use whilst maintaining
- * gcc's format and side-effect checking.
- */
-static inline __attribute__ ((format (printf, 1, 2)))
-int no_printk(const char *s, ...) { return 0; }
-extern int printk_needs_cpu(int cpu);
-extern void printk_tick(void);
-extern void asmlinkage __attribute__((format(printf, 1, 2)))
-        early_printk(const char *fmt, ...);
-static inline void console_silent(void)
 {
-        console_loglevel = 0;
+        return 0;
+}
+static inline int printk_ratelimit(void)
+{
+        return 0;
+}
+static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies,
+                                          unsigned int interval_msec)
+{
+        return false;
 }
-static inline void console_verbose(void)
+static inline void log_buf_kexec_setup(void)
 {
-        if (console_loglevel)
-                console_loglevel = 15;
 }
+#endif
 extern void dump_stack(void) __cold;
-enum {
-        DUMP_PREFIX_NONE,
-        DUMP_PREFIX_ADDRESS,
-        DUMP_PREFIX_OFFSET
-};
-extern void hex_dump_to_buffer(const void *buf, size_t len,
-                                int rowsize, int groupsize,
-                                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,
-                                const void *buf, size_t len, bool ascii);
-extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
-                        const void *buf, size_t len);
 #ifndef pr_fmt
 #define pr_fmt(fmt) fmt
 #endif
 #define pr_emerg(fmt, ...) \
-        printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_alert(fmt, ...) \
-        printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_crit(fmt, ...) \
-        printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_err(fmt, ...) \
-        printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_warning(fmt, ...) \
-        printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_warn pr_warning
 #define pr_notice(fmt, ...) \
-        printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_info(fmt, ...) \
-        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+        printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 #define pr_cont(fmt, ...) \
        printk(KERN_CONT fmt, ##__VA_ARGS__)
@@ -185,7 +169,7 @@ extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
        printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #else
 #define pr_devel(fmt, ...) \
-        ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #endif
 /* If you are writing a driver, please use dev_dbg instead */
@@ -198,7 +182,51 @@ extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
        dynamic_pr_debug(fmt, ##__VA_ARGS__)
 #else
 #define pr_debug(fmt, ...) \
-        ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+/*
+ * Print a one-time message (analogous to WARN_ONCE() et al):
+ */
+#ifdef CONFIG_PRINTK
+#define printk_once(fmt, ...)                   \
+({                                              \
+        static bool __print_once;               \
+                                                \
+        if (!__print_once) {                    \
+                __print_once = true;            \
+                printk(fmt, ##__VA_ARGS__);     \
+        }                                       \
+})
+#else
+#define printk_once(fmt, ...)                   \
+        no_printk(fmt, ##__VA_ARGS__)
+#endif
+#define pr_emerg_once(fmt, ...)                                 \
+        printk_once(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_alert_once(fmt, ...)                                 \
+        printk_once(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_crit_once(fmt, ...)                                  \
+        printk_once(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_err_once(fmt, ...)                                   \
+        printk_once(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_warn_once(fmt, ...)                                  \
+        printk_once(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_notice_once(fmt, ...)                                \
+        printk_once(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_info_once(fmt, ...)                                  \
+        printk_once(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_cont_once(fmt, ...)                                  \
+        printk_once(KERN_CONT pr_fmt(fmt), ##__VA_ARGS__)
+/* If you are writing a driver, please use dev_dbg instead */
+#if defined(DEBUG)
+#define pr_debug_once(fmt, ...)                                 \
+        printk_once(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_debug_once(fmt, ...)                                 \
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #endif
 /*
@@ -206,7 +234,8 @@ extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
 * no local ratelimit_state used in the !PRINTK case
 */
 #ifdef CONFIG_PRINTK
-#define printk_ratelimited(fmt, ...)  ({                                \
+#define printk_ratelimited(fmt, ...)                                    \
+({                                                                      \
        static DEFINE_RATELIMIT_STATE(_rs,                              \
                                      DEFAULT_RATELIMIT_INTERVAL,       \
                                      DEFAULT_RATELIMIT_BURST);         \
@@ -215,34 +244,59 @@ extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
                printk(fmt, ##__VA_ARGS__);                             \
 })
 #else
-/* No effect, but we still get type checking even in the !PRINTK case: */
+#define printk_ratelimited(fmt, ...)                                    \
-#define printk_ratelimited printk
+        no_printk(fmt, ##__VA_ARGS__)
 #endif
-#define pr_emerg_ratelimited(fmt, ...) \
+#define pr_emerg_ratelimited(fmt, ...)                                  \
        printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_alert_ratelimited(fmt, ...) \
+#define pr_alert_ratelimited(fmt, ...)                                  \
        printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_crit_ratelimited(fmt, ...) \
+#define pr_crit_ratelimited(fmt, ...)                                   \
        printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_err_ratelimited(fmt, ...) \
+#define pr_err_ratelimited(fmt, ...)                                    \
        printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_warning_ratelimited(fmt, ...) \
+#define pr_warn_ratelimited(fmt, ...)                                   \
        printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_warn_ratelimited pr_warning_ratelimited
+#define pr_notice_ratelimited(fmt, ...)                                 \
-#define pr_notice_ratelimited(fmt, ...) \
        printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
-#define pr_info_ratelimited(fmt, ...) \
+#define pr_info_ratelimited(fmt, ...)                                   \
        printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 /* no pr_cont_ratelimited, don't do that... */
 /* If you are writing a driver, please use dev_dbg instead */
 #if defined(DEBUG)
-#define pr_debug_ratelimited(fmt, ...) \
+#define pr_debug_ratelimited(fmt, ...)                                  \
        printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #else
 #define pr_debug_ratelimited(fmt, ...) \
-        ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \
+        no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
-                                     ##__VA_ARGS__); 0; })
+#endif
+enum {
+        DUMP_PREFIX_NONE,
+        DUMP_PREFIX_ADDRESS,
+        DUMP_PREFIX_OFFSET
+};
+extern void hex_dump_to_buffer(const void *buf, size_t len,
+                               int rowsize, int groupsize,
+                               char *linebuf, size_t linebuflen, bool ascii);
+#ifdef CONFIG_PRINTK
+extern void print_hex_dump(const char *level, const char *prefix_str,
+                           int prefix_type, int rowsize, int groupsize,
+                           const void *buf, size_t len, bool ascii);
+extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
+                                 const void *buf, size_t len);
+#else
+static inline void print_hex_dump(const char *level, const char *prefix_str,
+                                  int prefix_type, int rowsize, int groupsize,
+                                  const void *buf, size_t len, bool ascii)
+{
+}
+static inline void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
+                                        const void *buf, size_t len)
+{
+}
 #endif
 #endif
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index ab2baa5c4884..23241c2fecce 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -146,6 +146,22 @@ static inline void *radix_tree_deref_slot(void **pslot)
 }
 /**
+ * radix_tree_deref_slot_protected      - dereference a slot without RCU lock but with tree lock held
+ * @pslot:      pointer to slot, returned by radix_tree_lookup_slot
+ * Returns:     item that was stored in that slot with any direct pointer flag
+ *              removed.
+ *
+ * Similar to radix_tree_deref_slot but only used during migration when a pages
+ * mapping is being moved. The caller does not hold the RCU read lock but it
+ * must hold the tree lock to prevent parallel updates.
+ */
+static inline void *radix_tree_deref_slot_protected(void **pslot,
+                                                        spinlock_t *treelock)
+{
+        return rcu_dereference_protected(*pslot, lockdep_is_held(treelock));
+}
+/**
 * radix_tree_deref_retry       - check radix_tree_deref_slot
 * @arg:        pointer returned by radix_tree_deref_slot
 * Returns:     0 if retry is not required, otherwise retry is required
diff --git a/include/linux/rculist_bl.h b/include/linux/rculist_bl.h
index b872b493724d..cf1244fbf3b6 100644
--- a/include/linux/rculist_bl.h
+++ b/include/linux/rculist_bl.h
@@ -11,7 +11,8 @@ static inline void hlist_bl_set_first_rcu(struct hlist_bl_head *h,
                                        struct hlist_bl_node *n)
 {
        LIST_BL_BUG_ON((unsigned long)n & LIST_BL_LOCKMASK);
-        LIST_BL_BUG_ON(!((unsigned long)h->first & LIST_BL_LOCKMASK));
+        LIST_BL_BUG_ON(((unsigned long)h->first & LIST_BL_LOCKMASK) !=
+                                                        LIST_BL_LOCKMASK);
        rcu_assign_pointer(h->first,
                (struct hlist_bl_node *)((unsigned long)n | LIST_BL_LOCKMASK));
 }
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index f509877c2ed4..6a210f1511fc 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -11,15 +11,17 @@
 #define __LINUX_MFD_AB8500_REGULATOR_H
 /* AB8500 regulators */
-#define AB8500_LDO_AUX1         0
+enum ab8500_regulator_id {
-#define AB8500_LDO_AUX2         1
+        AB8500_LDO_AUX1,
-#define AB8500_LDO_AUX3         2
+        AB8500_LDO_AUX2,
-#define AB8500_LDO_INTCORE      3
+        AB8500_LDO_AUX3,
-#define AB8500_LDO_TVOUT        4
+        AB8500_LDO_INTCORE,
-#define AB8500_LDO_AUDIO        5
+        AB8500_LDO_TVOUT,
-#define AB8500_LDO_ANAMIC1      6
+        AB8500_LDO_AUDIO,
-#define AB8500_LDO_ANAMIC2      7
+        AB8500_LDO_ANAMIC1,
-#define AB8500_LDO_DMIC         8
+        AB8500_LDO_ANAMIC2,
-#define AB8500_LDO_ANA          9
+        AB8500_LDO_DMIC,
+        AB8500_LDO_ANA,
+        AB8500_NUM_REGULATORS,
+};
 #endif
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index ebd747265294..7954f6bd7edb 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -154,6 +154,7 @@ int regulator_is_supported_voltage(struct regulator *regulator,
                                   int min_uV, int max_uV);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
 int regulator_get_voltage(struct regulator *regulator);
+int regulator_sync_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
                               int min_uA, int max_uA);
 int regulator_get_current_limit(struct regulator *regulator);
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 592cd7c642c2..b8ed16a33c47 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -42,7 +42,11 @@ enum regulator_status {
 *
 * @set_voltage: Set the voltage for the regulator within the range specified.
 *               The driver should select the voltage closest to min_uV.
+ * @set_voltage_sel: Set the voltage for the regulator using the specified
+ *                   selector.
 * @get_voltage: Return the currently configured voltage for the regulator.
+ * @get_voltage_sel: Return the currently configured voltage selector for the
+ *                   regulator.
 * @list_voltage: Return one of the supported voltages, in microvolts; zero
 *      if the selector indicates a voltage that is unusable on this system;
 *      or negative errno.  Selectors range from zero to one less than
@@ -79,8 +83,11 @@ struct regulator_ops {
        int (*list_voltage) (struct regulator_dev *, unsigned selector);
        /* get/set regulator voltage */
-        int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV);
+        int (*set_voltage) (struct regulator_dev *, int min_uV, int max_uV,
+                            unsigned *selector);
+        int (*set_voltage_sel) (struct regulator_dev *, unsigned selector);
        int (*get_voltage) (struct regulator_dev *);
+        int (*get_voltage_sel) (struct regulator_dev *);
        /* get/set regulator current  */
        int (*set_current_limit) (struct regulator_dev *,
@@ -168,9 +175,9 @@ struct regulator_desc {
 */
 struct regulator_dev {
        struct regulator_desc *desc;
-        int use_count;
-        int open_count;
        int exclusive;
+        u32 use_count;
+        u32 open_count;
        /* lists we belong to */
        struct list_head list; /* list of all regulators */
@@ -188,10 +195,14 @@ struct regulator_dev {
        struct regulator_dev *supply;   /* for tree */
        void *reg_data;         /* regulator_dev data */
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs;
+#endif
 };
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-        struct device *dev, struct regulator_init_data *init_data,
+        struct device *dev, const struct regulator_init_data *init_data,
        void *driver_data);
 void regulator_unregister(struct regulator_dev *rdev);
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 0bed941f9b13..ff681ebba585 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -66,14 +66,62 @@
 #define RIO_PW_MSG_SIZE         64
+/*
+ * A component tag value (stored in the component tag CSR) is used as device's
+ * unique identifier assigned during enumeration. Besides being used for
+ * identifying switches (which do not have device ID register), it also is used
+ * by error management notification and therefore has to be assigned
+ * to endpoints as well.
+ */
+#define RIO_CTAG_RESRVD 0xfffe0000 /* Reserved */
+#define RIO_CTAG_UDEVID 0x0001ffff /* Unique device identifier */
 extern struct bus_type rio_bus_type;
 extern struct device rio_bus;
 extern struct list_head rio_devices;    /* list of all devices */
 struct rio_mport;
+struct rio_dev;
 union rio_pw_msg;
 /**
+ * struct rio_switch - RIO switch info
+ * @node: Node in global list of switches
+ * @switchid: Switch ID that is unique across a network
+ * @route_table: Copy of switch routing table
+ * @port_ok: Status of each port (one bit per port) - OK=1 or UNINIT=0
+ * @add_entry: Callback for switch-specific route add function
+ * @get_entry: Callback for switch-specific route get function
+ * @clr_table: Callback for switch-specific clear route table function
+ * @set_domain: Callback for switch-specific domain setting function
+ * @get_domain: Callback for switch-specific domain get function
+ * @em_init: Callback for switch-specific error management init function
+ * @em_handle: Callback for switch-specific error management handler function
+ * @sw_sysfs: Callback that initializes switch-specific sysfs attributes
+ * @nextdev: Array of per-port pointers to the next attached device
+ */
+struct rio_switch {
+        struct list_head node;
+        u16 switchid;
+        u8 *route_table;
+        u32 port_ok;
+        int (*add_entry) (struct rio_mport *mport, u16 destid, u8 hopcount,
+                          u16 table, u16 route_destid, u8 route_port);
+        int (*get_entry) (struct rio_mport *mport, u16 destid, u8 hopcount,
+                          u16 table, u16 route_destid, u8 *route_port);
+        int (*clr_table) (struct rio_mport *mport, u16 destid, u8 hopcount,
+                          u16 table);
+        int (*set_domain) (struct rio_mport *mport, u16 destid, u8 hopcount,
+                           u8 sw_domain);
+        int (*get_domain) (struct rio_mport *mport, u16 destid, u8 hopcount,
+                           u8 *sw_domain);
+        int (*em_init) (struct rio_dev *dev);
+        int (*em_handle) (struct rio_dev *dev, u8 swport);
+        int (*sw_sysfs) (struct rio_dev *dev, int create);
+        struct rio_dev *nextdev[0];
+};
+/**
 * struct rio_dev - RIO device info
 * @global_list: Node in list of all RIO devices
 * @net_list: Node in list of RIO devices in a network
@@ -93,13 +141,14 @@ union rio_pw_msg;
 * @phys_efptr: RIO device extended features pointer
 * @em_efptr: RIO Error Management features pointer
 * @dma_mask: Mask of bits of RIO address this device implements
- * @rswitch: Pointer to &struct rio_switch if valid for this device
 * @driver: Driver claiming this device
 * @dev: Device model device
 * @riores: RIO resources this device owns
 * @pwcback: port-write callback function for this device
- * @destid: Network destination ID
+ * @destid: Network destination ID (or associated destid for switch)
+ * @hopcount: Hopcount to this device
 * @prev: Previous RIO device connected to the current one
+ * @rswitch: struct rio_switch (if valid for this device)
 */
 struct rio_dev {
        struct list_head global_list;   /* node in list of all RIO devices */
@@ -120,18 +169,20 @@ struct rio_dev {
        u32 phys_efptr;
        u32 em_efptr;
        u64 dma_mask;
-        struct rio_switch *rswitch;     /* RIO switch info */
        struct rio_driver *driver;      /* RIO driver claiming this device */
        struct device dev;      /* LDM device structure */
        struct resource riores[RIO_MAX_DEV_RESOURCES];
        int (*pwcback) (struct rio_dev *rdev, union rio_pw_msg *msg, int step);
        u16 destid;
+        u8 hopcount;
        struct rio_dev *prev;
+        struct rio_switch rswitch[0];   /* RIO switch info */
 };
 #define rio_dev_g(n) list_entry(n, struct rio_dev, global_list)
 #define rio_dev_f(n) list_entry(n, struct rio_dev, net_list)
 #define to_rio_dev(n) container_of(n, struct rio_dev, dev)
+#define sw_to_rio_dev(n) container_of(n, struct rio_dev, rswitch[0])
 /**
 * struct rio_msg - RIO message event
@@ -224,49 +275,6 @@ struct rio_net {
 #define RIO_SW_SYSFS_CREATE     1       /* Create switch attributes */
 #define RIO_SW_SYSFS_REMOVE     0       /* Remove switch attributes */
-/**
- * struct rio_switch - RIO switch info
- * @node: Node in global list of switches
- * @rdev: Associated RIO device structure
- * @switchid: Switch ID that is unique across a network
- * @hopcount: Hopcount to this switch
- * @destid: Associated destid in the path
- * @route_table: Copy of switch routing table
- * @port_ok: Status of each port (one bit per port) - OK=1 or UNINIT=0
- * @add_entry: Callback for switch-specific route add function
- * @get_entry: Callback for switch-specific route get function
- * @clr_table: Callback for switch-specific clear route table function
- * @set_domain: Callback for switch-specific domain setting function
- * @get_domain: Callback for switch-specific domain get function
- * @em_init: Callback for switch-specific error management initialization function
- * @em_handle: Callback for switch-specific error management handler function
- * @sw_sysfs: Callback that initializes switch-specific sysfs attributes
- * @nextdev: Array of per-port pointers to the next attached device
- */
-struct rio_switch {
-        struct list_head node;
-        struct rio_dev *rdev;
-        u16 switchid;
-        u16 hopcount;
-        u16 destid;
-        u8 *route_table;
-        u32 port_ok;
-        int (*add_entry) (struct rio_mport * mport, u16 destid, u8 hopcount,
-                          u16 table, u16 route_destid, u8 route_port);
-        int (*get_entry) (struct rio_mport * mport, u16 destid, u8 hopcount,
-                          u16 table, u16 route_destid, u8 * route_port);
-        int (*clr_table) (struct rio_mport *mport, u16 destid, u8 hopcount,
-                          u16 table);
-        int (*set_domain) (struct rio_mport *mport, u16 destid, u8 hopcount,
-                           u8 sw_domain);
-        int (*get_domain) (struct rio_mport *mport, u16 destid, u8 hopcount,
-                           u8 *sw_domain);
-        int (*em_init) (struct rio_dev *dev);
-        int (*em_handle) (struct rio_dev *dev, u8 swport);
-        int (*sw_sysfs) (struct rio_dev *dev, int create);
-        struct rio_dev *nextdev[0];
-};
 /* Low-level architecture-dependent routines */
 /**
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index edc55da717b3..e09e565c4bce 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -150,16 +150,8 @@ static inline int rio_local_write_config_8(struct rio_mport *port, u32 offset,
 static inline int rio_read_config_32(struct rio_dev *rdev, u32 offset,
                                     u32 * data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_read_config_32(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                        rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_read_config_32(rdev->net->hport, destid, hopcount,
-                                        offset, data);
 };
 /**
@@ -174,16 +166,8 @@ static inline int rio_read_config_32(struct rio_dev *rdev, u32 offset,
 static inline int rio_write_config_32(struct rio_dev *rdev, u32 offset,
                                      u32 data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_write_config_32(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                         rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_write_config_32(rdev->net->hport, destid, hopcount,
-                                         offset, data);
 };
 /**
@@ -198,16 +182,8 @@ static inline int rio_write_config_32(struct rio_dev *rdev, u32 offset,
 static inline int rio_read_config_16(struct rio_dev *rdev, u32 offset,
                                     u16 * data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_read_config_16(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                        rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_read_config_16(rdev->net->hport, destid, hopcount,
-                                        offset, data);
 };
 /**
@@ -222,16 +198,8 @@ static inline int rio_read_config_16(struct rio_dev *rdev, u32 offset,
 static inline int rio_write_config_16(struct rio_dev *rdev, u32 offset,
                                      u16 data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_write_config_16(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                         rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_write_config_16(rdev->net->hport, destid, hopcount,
-                                         offset, data);
 };
 /**
@@ -245,16 +213,8 @@ static inline int rio_write_config_16(struct rio_dev *rdev, u32 offset,
 */
 static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 * data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_read_config_8(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                       rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_read_config_8(rdev->net->hport, destid, hopcount,
-                                       offset, data);
 };
 /**
@@ -268,16 +228,8 @@ static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 * data)
 */
 static inline int rio_write_config_8(struct rio_dev *rdev, u32 offset, u8 data)
 {
-        u8 hopcount = 0xff;
+        return rio_mport_write_config_8(rdev->net->hport, rdev->destid,
-        u16 destid = rdev->destid;
+                                        rdev->hopcount, offset, data);
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-        return rio_mport_write_config_8(rdev->net->hport, destid, hopcount,
-                                        offset, data);
 };
 extern int rio_mport_send_doorbell(struct rio_mport *mport, u16 destid,
diff --git a/include/linux/rio_ids.h b/include/linux/rio_ids.h
index ee7b6ada188f..7410d3365e2a 100644
--- a/include/linux/rio_ids.h
+++ b/include/linux/rio_ids.h
@@ -36,5 +36,7 @@
 #define RIO_DID_IDTCPS10Q               0x035e
 #define RIO_DID_IDTCPS1848              0x0374
 #define RIO_DID_IDTCPS1616              0x0379
+#define RIO_DID_IDTVPS1616              0x0377
+#define RIO_DID_IDTSPS1616              0x0378
 #endif                          /* LINUX_RIO_IDS_H */
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index bb83c0da2071..e9fd04ca1e51 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -198,6 +198,8 @@ enum ttu_flags {
 };
 #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
+bool is_vma_temporary_stack(struct vm_area_struct *vma);
 int try_to_unmap(struct page *, enum ttu_flags flags);
 int try_to_unmap_one(struct page *, struct vm_area_struct *,
                        unsigned long address, enum ttu_flags flags);
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h
index c490fbc43fe2..5f57f93b284f 100644
--- a/include/linux/romfs_fs.h
+++ b/include/linux/romfs_fs.h
@@ -1,6 +1,9 @@
 #ifndef __LINUX_ROMFS_FS_H
 #define __LINUX_ROMFS_FS_H
+#include <linux/types.h>
+#include <linux/fs.h>
 /* The basic structures of the romfs filesystem */
 #define ROMBSIZE BLOCK_SIZE
diff --git a/include/linux/s3c_adc_battery.h b/include/linux/s3c_adc_battery.h
index dbce22faa660..fbe58b7e63eb 100644
--- a/include/linux/s3c_adc_battery.h
+++ b/include/linux/s3c_adc_battery.h
@@ -14,6 +14,7 @@ struct s3c_adc_bat_pdata {
        void (*disable_charger)(void);
        int gpio_charge_finished;
+        int gpio_inverted;
        const struct s3c_adc_bat_thresh *lut_noac;
        unsigned int lut_noac_cnt;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index abc527aa8550..d747f948b34e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -21,7 +21,8 @@
 #define CLONE_DETACHED          0x00400000      /* Unused, ignored */
 #define CLONE_UNTRACED          0x00800000      /* set if the tracing process can't force CLONE_PTRACE on this clone */
 #define CLONE_CHILD_SETTID      0x01000000      /* set the TID in the child */
-#define CLONE_STOPPED           0x02000000      /* Start in stopped state */
+/* 0x02000000 was previously the unused CLONE_STOPPED (Start in stopped state)
+   and is now available for re-use. */
 #define CLONE_NEWUTS            0x04000000      /* New utsname group? */
 #define CLONE_NEWIPC            0x08000000      /* New ipcs */
 #define CLONE_NEWUSER           0x10000000      /* New user namespace */
@@ -433,6 +434,7 @@ extern int get_dumpable(struct mm_struct *mm);
 #endif
                                        /* leave room for more dump flags */
 #define MMF_VM_MERGEABLE        16      /* KSM may merge identical pages */
+#define MMF_VM_HUGEPAGE         17      /* set when VM_HUGEPAGE is set on vma */
 #define MMF_INIT_MASK           (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK)
@@ -633,6 +635,8 @@ struct signal_struct {
        int oom_adj;            /* OOM kill score adjustment (bit shift) */
        int oom_score_adj;      /* OOM kill score adjustment */
+        int oom_score_adj_min;  /* OOM kill score adjustment minimum value.
+                                 * Only settable by CAP_SYS_RESOURCE. */
        struct mutex cred_guard_mutex;  /* guard against foreign influences on
                                         * credential calculations
@@ -683,7 +687,7 @@ struct user_struct {
        atomic_t fanotify_listeners;
 #endif
 #ifdef CONFIG_EPOLL
-        atomic_t epoll_watches; /* The number of file descriptors currently watched */
+        atomic_long_t epoll_watches; /* The number of file descriptors currently watched */
 #endif
 #ifdef CONFIG_POSIX_MQUEUE
        /* protected by mq_lock */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index a23fa29d4eb0..758c5b0c6fd3 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -212,6 +212,7 @@
 #include <linux/tty.h>
 #include <linux/mutex.h>
 #include <linux/sysrq.h>
+#include <linux/pps_kernel.h>
 struct uart_port;
 struct serial_struct;
@@ -528,10 +529,10 @@ uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
        struct uart_state *state = uport->state;
        struct tty_port *port = &state->port;
        struct tty_ldisc *ld = tty_ldisc_ref(port->tty);
-        struct timespec ts;
+        struct pps_event_time ts;
        if (ld && ld->ops->dcd_change)
-                getnstimeofday(&ts);
+                pps_get_ts(&ts);
        uport->icount.dcd++;
 #ifdef CONFIG_HARD_PPS
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index baed2122c5a6..1630d9cae22a 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -8,6 +8,23 @@
 * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)
 */
+enum {
+        SCBRR_ALGO_1,           /* ((clk + 16 * bps) / (16 * bps) - 1) */
+        SCBRR_ALGO_2,           /* ((clk + 16 * bps) / (32 * bps) - 1) */
+        SCBRR_ALGO_3,           /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
+        SCBRR_ALGO_4,           /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
+        SCBRR_ALGO_5,           /* (((clk * 1000 / 32) / bps) - 1) */
+};
+#define SCSCR_TIE       (1 << 7)
+#define SCSCR_RIE       (1 << 6)
+#define SCSCR_TE        (1 << 5)
+#define SCSCR_RE        (1 << 4)
+#define SCSCR_REIE      (1 << 3)        /* not supported by all parts */
+#define SCSCR_TOIE      (1 << 2)        /* not supported by all parts */
+#define SCSCR_CKE1      (1 << 1)
+#define SCSCR_CKE0      (1 << 0)
 /* Offsets into the sci_port->irqs array */
 enum {
        SCIx_ERI_IRQ,
@@ -29,7 +46,12 @@ struct plat_sci_port {
        unsigned int    type;                   /* SCI / SCIF / IRDA */
        upf_t           flags;                  /* UPF_* flags */
        char            *clk;                   /* clock string */
+        unsigned int    scbrr_algo_id;          /* SCBRR calculation algo */
+        unsigned int    scscr;                  /* SCSCR initialization */
        struct device   *dma_dev;
 #ifdef CONFIG_SERIAL_SH_SCI_DMA
        unsigned int dma_slave_tx;
        unsigned int dma_slave_rx;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 20ec0a64cb9f..bf221d65d9ad 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -255,6 +255,11 @@ typedef unsigned int sk_buff_data_t;
 typedef unsigned char *sk_buff_data_t;
 #endif
+#if defined(CONFIG_NF_DEFRAG_IPV4) || defined(CONFIG_NF_DEFRAG_IPV4_MODULE) || \
+    defined(CONFIG_NF_DEFRAG_IPV6) || defined(CONFIG_NF_DEFRAG_IPV6_MODULE)
+#define NET_SKBUFF_NF_DEFRAG_NEEDED 1
+#endif
 /** 
 *      struct sk_buff - socket buffer
 *      @next: Next buffer in list
@@ -362,6 +367,8 @@ struct sk_buff {
        void                    (*destructor)(struct sk_buff *skb);
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        struct nf_conntrack     *nfct;
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
        struct sk_buff          *nfct_reasm;
 #endif
 #ifdef CONFIG_BRIDGE_NETFILTER
@@ -2057,6 +2064,8 @@ static inline void nf_conntrack_get(struct nf_conntrack *nfct)
        if (nfct)
                atomic_inc(&nfct->use);
 }
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
 static inline void nf_conntrack_get_reasm(struct sk_buff *skb)
 {
        if (skb)
@@ -2085,6 +2094,8 @@ static inline void nf_reset(struct sk_buff *skb)
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        skb->nfct = NULL;
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
        nf_conntrack_put_reasm(skb->nfct_reasm);
        skb->nfct_reasm = NULL;
 #endif
@@ -2101,6 +2112,8 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
        dst->nfct = src->nfct;
        nf_conntrack_get(src->nfct);
        dst->nfctinfo = src->nfctinfo;
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
 #endif
@@ -2114,6 +2127,8 @@ static inline void nf_copy(struct sk_buff *dst, const struct sk_buff *src)
 {
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(dst->nfct);
+#endif
+#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
        nf_conntrack_put_reasm(dst->nfct_reasm);
 #endif
 #ifdef CONFIG_BRIDGE_NETFILTER
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 5f65f14c4f44..edbb1d07ddf4 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -191,7 +191,8 @@ struct ucred {
 #define AF_PHONET       35      /* Phonet sockets               */
 #define AF_IEEE802154   36      /* IEEE802154 sockets           */
 #define AF_CAIF         37      /* CAIF sockets                 */
-#define AF_MAX          38      /* For now.. */
+#define AF_ALG          38      /* Algorithm sockets            */
+#define AF_MAX          39      /* For now.. */
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -232,6 +233,7 @@ struct ucred {
 #define PF_PHONET       AF_PHONET
 #define PF_IEEE802154   AF_IEEE802154
 #define PF_CAIF         AF_CAIF
+#define PF_ALG          AF_ALG
 #define PF_MAX          AF_MAX
 /* Maximum queue length specifiable by listen.  */
@@ -305,6 +307,7 @@ struct ucred {
 #define SOL_RDS         276
 #define SOL_IUCV        277
 #define SOL_CAIF        278
+#define SOL_ALG         279
 /* IPX options */
 #define IPX_TYPE        1
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 78aa104250b7..7898ea13de70 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -256,10 +256,13 @@ static inline time_t get_expiry(char **bpp)
        return rv - boot.tv_sec;
 }
+#ifdef CONFIG_NFSD_DEPRECATED
 static inline void sunrpc_invalidate(struct cache_head *h,
                                     struct cache_detail *detail)
 {
        h->expiry_time = seconds_since_boot() - 1;
        detail->nextcheck = seconds_since_boot();
 }
+#endif /* CONFIG_NFSD_DEPRECATED */
 #endif /*  _LINUX_SUNRPC_CACHE_H_ */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index c81d4d8be3a9..ea29330b78bd 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -269,6 +269,7 @@ struct svc_rqst {
        struct cache_req        rq_chandle;     /* handle passed to caches for 
                                                 * request delaying 
                                                 */
+        bool                    rq_dropme;
        /* Catering to nfsd */
        struct auth_domain *    rq_client;      /* RPC peer info */
        struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 357da5e0daa3..059877b4d85b 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -63,7 +63,6 @@ struct svc_xprt {
 #define XPT_LISTENER    11              /* listening endpoint */
 #define XPT_CACHE_AUTH  12              /* cache auth info */
-        struct svc_pool         *xpt_pool;      /* current pool iff queued */
        struct svc_serv         *xpt_server;    /* service for transport */
        atomic_t                xpt_reserved;   /* space on outq that is rsvd */
        struct mutex            xpt_mutex;      /* to serialize sending data */
@@ -81,6 +80,7 @@ struct svc_xprt {
        void                    *xpt_bc_sid;    /* back channel session ID */
        struct net              *xpt_net;
+        struct rpc_xprt         *xpt_bc_xprt;   /* NFSv4.1 backchannel */
 };
 static inline void unregister_xpt_user(struct svc_xprt *xpt, struct svc_xpt_user *u)
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 1b353a76c304..04dba23c59f2 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -28,7 +28,6 @@ struct svc_sock {
        /* private TCP part */
        u32                     sk_reclen;      /* length of record */
        u32                     sk_tcplen;      /* current read length */
-        struct rpc_xprt         *sk_bc_xprt;    /* NFSv4.1 backchannel xprt */
 };
 /*
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 89d10d279a20..bef0f535f746 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -321,6 +321,7 @@ void			xprt_conditional_disconnect(struct rpc_xprt *xprt, unsigned int cookie);
 #define XPRT_CLOSING            (6)
 #define XPRT_CONNECTION_ABORT   (7)
 #define XPRT_CONNECTION_CLOSE   (8)
+#define XPRT_INITIALIZED        (9)
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 144b34be5c32..5a89e3612875 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -122,7 +122,7 @@ struct platform_suspend_ops {
 * suspend_set_ops - set platform dependent suspend operations
 * @ops: The new suspend operations to set.
 */
-extern void suspend_set_ops(struct platform_suspend_ops *ops);
+extern void suspend_set_ops(const struct platform_suspend_ops *ops);
 extern int suspend_valid_only_mem(suspend_state_t state);
 /**
@@ -147,7 +147,7 @@ extern int pm_suspend(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 #define suspend_valid_only_mem  NULL
-static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
+static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
 #endif /* !CONFIG_SUSPEND */
@@ -245,7 +245,7 @@ extern void swsusp_set_page_free(struct page *);
 extern void swsusp_unset_page_free(struct page *);
 extern unsigned long get_safe_page(gfp_t gfp_mask);
-extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
+extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
 extern int hibernate(void);
 extern bool system_entering_hibernation(void);
 #else /* CONFIG_HIBERNATION */
@@ -253,28 +253,11 @@ 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 platform_hibernation_ops *ops) {}
+static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {}
 static inline int hibernate(void) { return -ENOSYS; }
 static inline bool system_entering_hibernation(void) { return false; }
 #endif /* CONFIG_HIBERNATION */
-#ifdef CONFIG_SUSPEND_NVS
-extern int suspend_nvs_register(unsigned long start, unsigned long size);
-extern int suspend_nvs_alloc(void);
-extern void suspend_nvs_free(void);
-extern void suspend_nvs_save(void);
-extern void suspend_nvs_restore(void);
-#else /* CONFIG_SUSPEND_NVS */
-static inline int suspend_nvs_register(unsigned long a, unsigned long b)
-{
-        return 0;
-}
-static inline int suspend_nvs_alloc(void) { return 0; }
-static inline void suspend_nvs_free(void) {}
-static inline void suspend_nvs_save(void) {}
-static inline void suspend_nvs_restore(void) {}
-#endif /* CONFIG_SUSPEND_NVS */
 #ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);
 void restore_processor_state(void);
diff --git a/include/linux/swap.h b/include/linux/swap.h
index eba53e71d2cc..4d559325d919 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -208,6 +208,8 @@ extern unsigned int nr_free_pagecache_pages(void);
 /* linux/mm/swap.c */
 extern void __lru_cache_add(struct page *, enum lru_list lru);
 extern void lru_cache_add_lru(struct page *, enum lru_list lru);
+extern void lru_add_page_tail(struct zone* zone,
+                              struct page *page, struct page *page_tail);
 extern void activate_page(struct page *);
 extern void mark_page_accessed(struct page *);
 extern void lru_add_drain(void);
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 1de8b9eb841b..8651556dbd52 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -77,7 +77,7 @@ struct thermal_cooling_device {
        char type[THERMAL_NAME_LENGTH];
        struct device device;
        void *devdata;
-        struct thermal_cooling_device_ops *ops;
+        const struct thermal_cooling_device_ops *ops;
        struct list_head node;
 };
@@ -114,7 +114,7 @@ struct thermal_zone_device {
        int last_temperature;
        bool passive;
        unsigned int forced_passive;
-        struct thermal_zone_device_ops *ops;
+        const struct thermal_zone_device_ops *ops;
        struct list_head cooling_devices;
        struct idr idr;
        struct mutex lock;      /* protect cooling devices list */
@@ -127,13 +127,41 @@ struct thermal_zone_device {
        struct thermal_hwmon_attr temp_crit;    /* hwmon sys attr */
 #endif
 };
+/* Adding event notification support elements */
+#define THERMAL_GENL_FAMILY_NAME                "thermal_event"
+#define THERMAL_GENL_VERSION                    0x01
+#define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_group"
+enum events {
+        THERMAL_AUX0,
+        THERMAL_AUX1,
+        THERMAL_CRITICAL,
+        THERMAL_DEV_FAULT,
+};
+struct thermal_genl_event {
+        u32 orig;
+        enum events event;
+};
+/* attributes of thermal_genl_family */
+enum {
+        THERMAL_GENL_ATTR_UNSPEC,
+        THERMAL_GENL_ATTR_EVENT,
+        __THERMAL_GENL_ATTR_MAX,
+};
+#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
+/* commands supported by the thermal_genl_family */
+enum {
+        THERMAL_GENL_CMD_UNSPEC,
+        THERMAL_GENL_CMD_EVENT,
+        __THERMAL_GENL_CMD_MAX,
+};
+#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
 struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
-                                                         struct
+                const struct thermal_zone_device_ops *, int tc1, int tc2,
-                                                         thermal_zone_device_ops
+                int passive_freq, int polling_freq);
-                                                         *, int tc1, int tc2,
-                                                         int passive_freq,
-                                                         int polling_freq);
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
@@ -142,9 +170,8 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
                                       struct thermal_cooling_device *);
 void thermal_zone_device_update(struct thermal_zone_device *);
 struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
-                                                               struct
+                const struct thermal_cooling_device_ops *);
-                                                               thermal_cooling_device_ops
-                                                               *);
 void thermal_cooling_device_unregister(struct thermal_cooling_device *);
+extern int generate_netlink_event(u32 orig, enum events event);
 #endif /* __THERMAL_H__ */
diff --git a/include/linux/time.h b/include/linux/time.h
index 9f15ac7ab92a..1e6d3b59238d 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -158,6 +158,8 @@ extern unsigned int alarm_setitimer(unsigned int seconds);
 extern int do_getitimer(int which, struct itimerval *value);
 extern void getnstimeofday(struct timespec *tv);
 extern void getrawmonotonic(struct timespec *ts);
+extern void getnstime_raw_and_real(struct timespec *ts_raw,
+                struct timespec *ts_real);
 extern void getboottime(struct timespec *ts);
 extern void monotonic_to_bootbased(struct timespec *ts);
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 32d852f8cbe4..d23999f9499d 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -268,6 +268,7 @@ extern u64 tick_length;
 extern void second_overflow(void);
 extern void update_ntp_one_tick(void);
 extern int do_adjtimex(struct timex *);
+extern void hardpps(const struct timespec *, const struct timespec *);
 int read_current_timer(unsigned long *timer_val);
diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h
index 6a7c4edf0e13..772dedbc3a22 100644
--- a/include/linux/toshiba.h
+++ b/include/linux/toshiba.h
@@ -33,6 +33,8 @@ typedef struct {
        unsigned int edi __attribute__ ((packed));
 } SMMRegisters;
+#ifdef __KERNEL__
 int tosh_smm(SMMRegisters *regs);
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 526d66f066a3..ff7dc08696a8 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -101,14 +101,15 @@
 *      any pending driver I/O is completed.
 *
 * void (*dcd_change)(struct tty_struct *tty, unsigned int status,
- *                      struct timespec *ts)
+ *                      struct pps_event_time *ts)
 *
 *      Tells the discipline that the DCD pin has changed its status and
- *      the relative timestamp. Pointer ts can be NULL.
+ *      the relative timestamp. Pointer ts cannot be NULL.
 */
 #include <linux/fs.h>
 #include <linux/wait.h>
+#include <linux/pps_kernel.h>
 struct tty_ldisc_ops {
        int     magic;
@@ -143,7 +144,7 @@ struct tty_ldisc_ops {
                               char *fp, int count);
        void    (*write_wakeup)(struct tty_struct *);
        void    (*dcd_change)(struct tty_struct *, unsigned int,
-                                struct timespec *);
+                                struct pps_event_time *);
        struct  module *owner;
        
diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h
index fa261a0da280..8da8c4e87da3 100644
--- a/include/linux/u64_stats_sync.h
+++ b/include/linux/u64_stats_sync.h
@@ -67,21 +67,21 @@ struct u64_stats_sync {
 #endif
 };
-static void inline u64_stats_update_begin(struct u64_stats_sync *syncp)
+static inline void u64_stats_update_begin(struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
        write_seqcount_begin(&syncp->seq);
 #endif
 }
-static void inline u64_stats_update_end(struct u64_stats_sync *syncp)
+static inline void u64_stats_update_end(struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
        write_seqcount_end(&syncp->seq);
 #endif
 }
-static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *syncp)
+static inline unsigned int u64_stats_fetch_begin(const struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
        return read_seqcount_begin(&syncp->seq);
@@ -93,7 +93,7 @@ static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *sy
 #endif
 }
-static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
+static inline bool u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
                                         unsigned int start)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
@@ -112,7 +112,7 @@ static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
 * - UP 32bit must disable BH.
 * - 64bit have no problem atomically reading u64 values, irq safe.
 */
-static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
+static inline unsigned int u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
        return read_seqcount_begin(&syncp->seq);
@@ -124,7 +124,7 @@ static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync
 #endif
 }
-static bool inline u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
+static inline bool u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
                                         unsigned int start)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
diff --git a/include/linux/unaligned/packed_struct.h b/include/linux/unaligned/packed_struct.h
index c9a6abd972a1..c0d817de4df2 100644
--- a/include/linux/unaligned/packed_struct.h
+++ b/include/linux/unaligned/packed_struct.h
@@ -3,9 +3,9 @@
 #include <linux/kernel.h>
-struct __una_u16 { u16 x; } __attribute__((packed));
+struct __una_u16 { u16 x; } __packed;
-struct __una_u32 { u32 x; } __attribute__((packed));
+struct __una_u32 { u32 x; } __packed;
-struct __una_u64 { u64 x; } __attribute__((packed));
+struct __una_u64 { u64 x; } __packed;
 static inline u16 __get_unaligned_cpu16(const void *p)
 {
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 8178156711f9..faf467944baf 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -6,7 +6,7 @@
 #include <linux/sched.h>
 #include <linux/err.h>
-#define UIDHASH_BITS    (CONFIG_BASE_SMALL ? 3 : 8)
+#define UIDHASH_BITS    (CONFIG_BASE_SMALL ? 3 : 7)
 #define UIDHASH_SZ      (1 << UIDHASH_BITS)
 struct user_namespace {
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 44b54f619ac6..4ed6fcd6b726 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -59,8 +59,9 @@ extern void *vmalloc_exec(unsigned long size);
 extern void *vmalloc_32(unsigned long size);
 extern void *vmalloc_32_user(unsigned long size);
 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
-extern void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask,
+extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
-                                pgprot_t prot);
+                        unsigned long start, unsigned long end, gfp_t gfp_mask,
+                        pgprot_t prot, int node, void *caller);
 extern void vfree(const void *addr);
 extern void *vmap(struct page **pages, unsigned int count,
@@ -90,9 +91,6 @@ extern struct vm_struct *__get_vm_area_caller(unsigned long size,
                                        unsigned long flags,
                                        unsigned long start, unsigned long end,
                                        void *caller);
-extern struct vm_struct *get_vm_area_node(unsigned long size,
-                                          unsigned long flags, int node,
-                                          gfp_t gfp_mask);
 extern struct vm_struct *remove_vm_area(const void *addr);
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
@@ -120,7 +118,7 @@ extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);
 #ifdef CONFIG_SMP
 struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
                                     const size_t *sizes, int nr_vms,
-                                     size_t align, gfp_t gfp_mask);
+                                     size_t align);
 void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
 #endif
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index eaaea37b3b75..833e676d6d92 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -254,6 +254,11 @@ extern void dec_zone_state(struct zone *, enum zone_stat_item);
 extern void __dec_zone_state(struct zone *, enum zone_stat_item);
 void refresh_cpu_vm_stats(int);
+int calculate_pressure_threshold(struct zone *zone);
+int calculate_normal_threshold(struct zone *zone);
+void set_pgdat_percpu_threshold(pg_data_t *pgdat,
+                                int (*calculate_pressure)(struct zone *));
 #else /* CONFIG_SMP */
 /*
@@ -298,6 +303,8 @@ static inline void __dec_zone_page_state(struct page *page,
 #define dec_zone_page_state __dec_zone_page_state
 #define mod_zone_page_state __mod_zone_page_state
+#define set_pgdat_percpu_threshold(pgdat, callback) { }
 static inline void refresh_cpu_vm_stats(int cpu) { }
 #endif
diff --git a/include/linux/xz.h b/include/linux/xz.h
new file mode 100644
index 000000000000..64cffa6ddfce
--- /dev/null
+++ b/include/linux/xz.h
@@ -0,0 +1,264 @@
+/*
+ * XZ decompressor
+ *
+ * Authors: Lasse Collin <lasse.collin@tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+#ifndef XZ_H
+#define XZ_H
+#ifdef __KERNEL__
+#       include <linux/stddef.h>
+#       include <linux/types.h>
+#else
+#       include <stddef.h>
+#       include <stdint.h>
+#endif
+/* In Linux, this is used to make extern functions static when needed. */
+#ifndef XZ_EXTERN
+#       define XZ_EXTERN extern
+#endif
+/**
+ * enum xz_mode - Operation mode
+ *
+ * @XZ_SINGLE:              Single-call mode. This uses less RAM than
+ *                          than multi-call modes, because the LZMA2
+ *                          dictionary doesn't need to be allocated as
+ *                          part of the decoder state. All required data
+ *                          structures are allocated at initialization,
+ *                          so xz_dec_run() cannot return XZ_MEM_ERROR.
+ * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2
+ *                          dictionary buffer. All data structures are
+ *                          allocated at initialization, so xz_dec_run()
+ *                          cannot return XZ_MEM_ERROR.
+ * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is
+ *                          allocated once the required size has been
+ *                          parsed from the stream headers. If the
+ *                          allocation fails, xz_dec_run() will return
+ *                          XZ_MEM_ERROR.
+ *
+ * It is possible to enable support only for a subset of the above
+ * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
+ * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled
+ * with support for all operation modes, but the preboot code may
+ * be built with fewer features to minimize code size.
+ */
+enum xz_mode {
+        XZ_SINGLE,
+        XZ_PREALLOC,
+        XZ_DYNALLOC
+};
+/**
+ * enum xz_ret - Return codes
+ * @XZ_OK:                  Everything is OK so far. More input or more
+ *                          output space is required to continue. This
+ *                          return code is possible only in multi-call mode
+ *                          (XZ_PREALLOC or XZ_DYNALLOC).
+ * @XZ_STREAM_END:          Operation finished successfully.
+ * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
+ *                          is still possible in multi-call mode by simply
+ *                          calling xz_dec_run() again.
+ *                          Note that this return value is used only if
+ *                          XZ_DEC_ANY_CHECK was defined at build time,
+ *                          which is not used in the kernel. Unsupported
+ *                          check types return XZ_OPTIONS_ERROR if
+ *                          XZ_DEC_ANY_CHECK was not defined at build time.
+ * @XZ_MEM_ERROR:           Allocating memory failed. This return code is
+ *                          possible only if the decoder was initialized
+ *                          with XZ_DYNALLOC. The amount of memory that was
+ *                          tried to be allocated was no more than the
+ *                          dict_max argument given to xz_dec_init().
+ * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than
+ *                          allowed by the dict_max argument given to
+ *                          xz_dec_init(). This return value is possible
+ *                          only in multi-call mode (XZ_PREALLOC or
+ *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
+ *                          ignores the dict_max argument.
+ * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic
+ *                          bytes).
+ * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested
+ *                          compression options. In the decoder this means
+ *                          that the header CRC32 matches, but the header
+ *                          itself specifies something that we don't support.
+ * @XZ_DATA_ERROR:          Compressed data is corrupt.
+ * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly
+ *                          different between multi-call and single-call
+ *                          mode; more information below.
+ *
+ * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
+ * to XZ code cannot consume any input and cannot produce any new output.
+ * This happens when there is no new input available, or the output buffer
+ * is full while at least one output byte is still pending. Assuming your
+ * code is not buggy, you can get this error only when decoding a compressed
+ * stream that is truncated or otherwise corrupt.
+ *
+ * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
+ * is too small or the compressed input is corrupt in a way that makes the
+ * decoder produce more output than the caller expected. When it is
+ * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
+ * is used instead of XZ_BUF_ERROR.
+ */
+enum xz_ret {
+        XZ_OK,
+        XZ_STREAM_END,
+        XZ_UNSUPPORTED_CHECK,
+        XZ_MEM_ERROR,
+        XZ_MEMLIMIT_ERROR,
+        XZ_FORMAT_ERROR,
+        XZ_OPTIONS_ERROR,
+        XZ_DATA_ERROR,
+        XZ_BUF_ERROR
+};
+/**
+ * struct xz_buf - Passing input and output buffers to XZ code
+ * @in:         Beginning of the input buffer. This may be NULL if and only
+ *              if in_pos is equal to in_size.
+ * @in_pos:     Current position in the input buffer. This must not exceed
+ *              in_size.
+ * @in_size:    Size of the input buffer
+ * @out:        Beginning of the output buffer. This may be NULL if and only
+ *              if out_pos is equal to out_size.
+ * @out_pos:    Current position in the output buffer. This must not exceed
+ *              out_size.
+ * @out_size:   Size of the output buffer
+ *
+ * Only the contents of the output buffer from out[out_pos] onward, and
+ * the variables in_pos and out_pos are modified by the XZ code.
+ */
+struct xz_buf {
+        const uint8_t *in;
+        size_t in_pos;
+        size_t in_size;
+        uint8_t *out;
+        size_t out_pos;
+        size_t out_size;
+};
+/**
+ * struct xz_dec - Opaque type to hold the XZ decoder state
+ */
+struct xz_dec;
+/**
+ * xz_dec_init() - Allocate and initialize a XZ decoder state
+ * @mode:       Operation mode
+ * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
+ *              multi-call decoding. This is ignored in single-call mode
+ *              (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
+ *              or 2^n + 2^(n-1) bytes (the latter sizes are less common
+ *              in practice), so other values for dict_max don't make sense.
+ *              In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
+ *              512 KiB, and 1 MiB are probably the only reasonable values,
+ *              except for kernel and initramfs images where a bigger
+ *              dictionary can be fine and useful.
+ *
+ * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
+ * once. The caller must provide enough output space or the decoding will
+ * fail. The output space is used as the dictionary buffer, which is why
+ * there is no need to allocate the dictionary as part of the decoder's
+ * internal state.
+ *
+ * Because the output buffer is used as the workspace, streams encoded using
+ * a big dictionary are not a problem in single-call mode. It is enough that
+ * the output buffer is big enough to hold the actual uncompressed data; it
+ * can be smaller than the dictionary size stored in the stream headers.
+ *
+ * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
+ * of memory is preallocated for the LZMA2 dictionary. This way there is no
+ * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
+ * never allocate any memory. Instead, if the preallocated dictionary is too
+ * small for decoding the given input stream, xz_dec_run() will return
+ * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
+ * decoded to avoid allocating excessive amount of memory for the dictionary.
+ *
+ * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
+ * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
+ * may allocate once it has parsed the dictionary size from the stream
+ * headers. This way excessive allocations can be avoided while still
+ * limiting the maximum memory usage to a sane value to prevent running the
+ * system out of memory when decompressing streams from untrusted sources.
+ *
+ * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
+ * ready to be used with xz_dec_run(). If memory allocation fails,
+ * xz_dec_init() returns NULL.
+ */
+XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max);
+/**
+ * xz_dec_run() - Run the XZ decoder
+ * @s:          Decoder state allocated using xz_dec_init()
+ * @b:          Input and output buffers
+ *
+ * The possible return values depend on build options and operation mode.
+ * See enum xz_ret for details.
+ *
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
+ * contents of the output buffer from b->out[b->out_pos] onward are
+ * undefined. This is true even after XZ_BUF_ERROR, because with some filter
+ * chains, there may be a second pass over the output buffer, and this pass
+ * cannot be properly done if the output buffer is truncated. Thus, you
+ * cannot give the single-call decoder a too small buffer and then expect to
+ * get that amount valid data from the beginning of the stream. You must use
+ * the multi-call decoder if you don't want to uncompress the whole stream.
+ */
+XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b);
+/**
+ * xz_dec_reset() - Reset an already allocated decoder state
+ * @s:          Decoder state allocated using xz_dec_init()
+ *
+ * This function can be used to reset the multi-call decoder state without
+ * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
+ *
+ * In single-call mode, xz_dec_reset() is always called in the beginning of
+ * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
+ * multi-call mode.
+ */
+XZ_EXTERN void xz_dec_reset(struct xz_dec *s);
+/**
+ * xz_dec_end() - Free the memory allocated for the decoder state
+ * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
+ *              this function does nothing.
+ */
+XZ_EXTERN void xz_dec_end(struct xz_dec *s);
+/*
+ * Standalone build (userspace build or in-kernel build for boot time use)
+ * needs a CRC32 implementation. For normal in-kernel use, kernel's own
+ * CRC32 module is used instead, and users of this module don't need to
+ * care about the functions below.
+ */
+#ifndef XZ_INTERNAL_CRC32
+#       ifdef __KERNEL__
+#               define XZ_INTERNAL_CRC32 0
+#       else
+#               define XZ_INTERNAL_CRC32 1
+#       endif
+#endif
+#if XZ_INTERNAL_CRC32
+/*
+ * This must be called before any other xz_* function to initialize
+ * the CRC32 lookup table.
+ */
+XZ_EXTERN void xz_crc32_init(void);
+/*
+ * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
+ * calculation, the third argument must be zero. To continue the calculation,
+ * the previously returned value is passed as the third argument.
+ */
+XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
+#endif
+#endif
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
index c59cc029c74a..b586495bcd53 100644
--- a/include/media/davinci/vpss.h
+++ b/include/media/davinci/vpss.h
@@ -44,7 +44,7 @@ struct vpss_pg_frame_size {
        short pplen;
 };
-/* Used for enable/diable VPSS Clock */
+/* Used for enable/disable VPSS Clock */
 enum vpss_clock_sel {
        /* DM355/DM365 */
        VPSS_CCDC_CLOCK,
diff --git a/include/net/ah.h b/include/net/ah.h
index be7798dea6f4..ca95b98969dd 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -4,7 +4,7 @@
 #include <linux/skbuff.h>
 /* This is the maximum truncated ICV length that we know of. */
-#define MAX_AH_AUTH_LEN 16
+#define MAX_AH_AUTH_LEN 64
 struct crypto_ahash;
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index bcc9f448ec4e..1322695beb52 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1103,6 +1103,8 @@ struct cfg80211_pmksa {
 * @change_mpath: change a given mesh path
 * @get_mpath: get a mesh path for the given parameters
 * @dump_mpath: dump mesh path callback -- resume dump at index @idx
+ * @join_mesh: join the mesh network with the specified parameters
+ * @leave_mesh: leave the current mesh network
 *
 * @get_mesh_config: Get the current mesh configuration
 *
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 5b3fd5add7a4..62c0ce2d1dc8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -337,6 +337,10 @@ struct ieee80211_bss_conf {
 * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame
 * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this
 *      frame and selects the maximum number of streams that it can use.
+ * @IEEE80211_TX_CTL_TX_OFFCHAN: Marks this packet to be transmitted on
+ *      the off-channel channel when a remain-on-channel offload is done
+ *      in hardware -- normal packets still flow and are expected to be
+ *      handled properly by the device.
 *
 * Note: If you have to add new flags to the enumeration, then don't
 *       forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -1753,6 +1757,16 @@ enum ieee80211_ampdu_mlme_action {
 *      (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX).
 *
 * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant).
+ *
+ * @remain_on_channel: Starts an off-channel period on the given channel, must
+ *      call back to ieee80211_ready_on_channel() when on that channel. Note
+ *      that normal channel traffic is not stopped as this is intended for hw
+ *      offload. Frames to transmit on the off-channel channel are transmitted
+ *      normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the
+ *      duration (which will always be non-zero) expires, the driver must call
+ *      ieee80211_remain_on_channel_expired(). This callback may sleep.
+ * @cancel_remain_on_channel: Requests that an ongoing off-channel period is
+ *      aborted before it expires. This callback may sleep.
 */
 struct ieee80211_ops {
        int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
index 1ee717eb5b09..a4c993685795 100644
--- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
@@ -7,16 +7,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
-extern int nf_ct_frag6_init(void);
-extern void nf_ct_frag6_cleanup(void);
-extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);
-extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
-                               struct net_device *in,
-                               struct net_device *out,
-                               int (*okfn)(struct sk_buff *));
-struct inet_frags_ctl;
 #include <linux/sysctl.h>
 extern struct ctl_table nf_ct_ipv6_sysctl_table[];
diff --git a/include/net/netfilter/ipv6/nf_defrag_ipv6.h b/include/net/netfilter/ipv6/nf_defrag_ipv6.h
index 94dd54d76b48..fd79c9a1779d 100644
--- a/include/net/netfilter/ipv6/nf_defrag_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_defrag_ipv6.h
@@ -3,4 +3,14 @@
 extern void nf_defrag_ipv6_enable(void);
+extern int nf_ct_frag6_init(void);
+extern void nf_ct_frag6_cleanup(void);
+extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user);
+extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb,
+                               struct net_device *in,
+                               struct net_device *out,
+                               int (*okfn)(struct sk_buff *));
+struct inet_frags_ctl;
 #endif /* _NF_DEFRAG_IPV6_H */
diff --git a/include/net/red.h b/include/net/red.h
index 995108e54d9f..3319f16b3beb 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -97,7 +97,6 @@ struct red_stats {
        u32             forced_mark;    /* Forced marks, qavg > max_thresh */
        u32             pdrop;          /* Drops due to queue limits */
        u32             other;          /* Drops due to drop() calls */
-        u32             backlog;
 };
 struct red_parms {
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 2b2769c5ca9f..e73ebdae323d 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -78,6 +78,7 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_PEER_ADDR_INFO 15
 #define SCTP_DELAYED_ACK_TIME   16
 #define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
+#define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME
 #define SCTP_CONTEXT    17
 #define SCTP_FRAGMENT_INTERLEAVE        18
 #define SCTP_PARTIAL_DELIVERY_POINT     19 /* Set/Get partial delivery point */
@@ -99,8 +100,8 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_SOCKOPT_PEELOFF    102     /* peel off association. */
 /* Options 104-106 are deprecated and removed. Do not use this space */
 #define SCTP_SOCKOPT_CONNECTX_OLD       107     /* CONNECTX old requests. */
-#define SCTP_GET_PEER_ADDRS     108             /* Get all peer addresss. */
+#define SCTP_GET_PEER_ADDRS     108             /* Get all peer address. */
-#define SCTP_GET_LOCAL_ADDRS    109             /* Get all local addresss. */
+#define SCTP_GET_LOCAL_ADDRS    109             /* Get all local address. */
 #define SCTP_SOCKOPT_CONNECTX   110             /* CONNECTX requests. */
 #define SCTP_SOCKOPT_CONNECTX3  111     /* CONNECTX requests (updated) */
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e04c4888d1fd..55cd0a0bc977 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -47,10 +47,13 @@
 #include <linux/list.h>
 #include <linux/rwsem.h>
 #include <linux/scatterlist.h>
+#include <linux/workqueue.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
+extern struct workqueue_struct *ib_wq;
 union ib_gid {
        u8      raw[16];
        struct {
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 8e9b222251c2..8a143ca79878 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -46,7 +46,7 @@
 */
 struct fcp_cmnd {
        __u8            fc_lun[8];      /* logical unit number */
-        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_cmdref;      /* command reference number */
        __u8            fc_pri_ta;      /* priority and task attribute */
        __u8            fc_tm_flags;    /* task management flags */
        __u8            fc_flags;       /* additional len & flags */
@@ -58,7 +58,7 @@ struct fcp_cmnd {
 struct fcp_cmnd32 {
        __u8            fc_lun[8];      /* logical unit number */
-        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_cmdref;      /* command reference number */
        __u8            fc_pri_ta;      /* priority and task attribute */
        __u8            fc_tm_flags;    /* task management flags */
        __u8            fc_flags;       /* additional len & flags */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 1651fef18831..648d23358038 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -104,6 +104,7 @@ struct scsi_cmnd;
 #define UNMAP                 0x42
 #define READ_TOC              0x43
 #define READ_HEADER           0x44
+#define GET_EVENT_STATUS_NOTIFICATION 0x4a
 #define LOG_SELECT            0x4c
 #define LOG_SENSE             0x4d
 #define XDWRITEREAD_10        0x53
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 49400459b477..b602f475cdbb 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -477,7 +477,7 @@ struct snd_ac97_template {
 struct snd_ac97 {
        /* -- lowlevel (hardware) driver specific -- */
-        struct snd_ac97_build_ops * build_ops;
+        const struct snd_ac97_build_ops *build_ops;
        void *private_data;
        void (*private_free) (struct snd_ac97 *ac97);
        /* --- */
diff --git a/include/sound/alc5623.h b/include/sound/alc5623.h
new file mode 100644
index 000000000000..422c97d43df3
--- /dev/null
+++ b/include/sound/alc5623.h
@@ -0,0 +1,15 @@
+#ifndef _INCLUDE_SOUND_ALC5623_H
+#define _INCLUDE_SOUND_ALC5623_H
+struct alc5623_platform_data {
+        /* configure :                              */
+        /* Lineout/Speaker Amps Vmid ratio control  */
+        /* enable/disable adc/dac high pass filters */
+        unsigned int add_ctrl;
+        /* configure :                              */
+        /* output to enable when jack is low        */
+        /* output to enable when jack is high       */
+        /* jack detect (gpio/nc/jack detect [12]    */
+        unsigned int jack_det_ctrl;
+};
+#endif
diff --git a/include/sound/asound.h b/include/sound/asound.h
index a1803ecea34d..5d6074faa279 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -259,6 +259,7 @@ typedef int __bitwise snd_pcm_subformat_t;
 #define SNDRV_PCM_INFO_HALF_DUPLEX      0x00100000      /* only half duplex */
 #define SNDRV_PCM_INFO_JOINT_DUPLEX     0x00200000      /* playback and capture stream are somewhat correlated */
 #define SNDRV_PCM_INFO_SYNC_START       0x00400000      /* pcm support some kind of sync go */
+#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000      /* period wakeup can be disabled */
 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES   0x80000000      /* internal kernel flag - FIFO size is in frames */
 typedef int __bitwise snd_pcm_state_t;
@@ -334,6 +335,8 @@ typedef int snd_pcm_hw_param_t;
 #define SNDRV_PCM_HW_PARAM_LAST_INTERVAL        SNDRV_PCM_HW_PARAM_TICK_TIME
 #define SNDRV_PCM_HW_PARAMS_NORESAMPLE  (1<<0)  /* avoid rate resampling */
+#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER       (1<<1)  /* export buffer */
+#define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP    (1<<2)  /* disable period wakeups */
 struct snd_interval {
        unsigned int min, max;
diff --git a/include/sound/control.h b/include/sound/control.h
index 112374dc0c58..7715e6f00d38 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -160,12 +160,14 @@ static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id
 }
 /*
- * Frequently used control callbacks
+ * Frequently used control callbacks/helpers
 */
 int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_info *uinfo);
 int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_info *uinfo);
+int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
+                      unsigned int items, const char *const names[]);
 /*
 * virtual master control
diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h
index d98a78dff2db..0909a3843479 100644
--- a/include/sound/hdsp.h
+++ b/include/sound/hdsp.h
@@ -28,6 +28,7 @@ enum HDSP_IO_Type {
        Multiface,
        H9652,
        H9632,
+        RPM,
        Undefined,
 };
diff --git a/include/sound/minors.h b/include/sound/minors.h
index a81798ab73ed..8f764204a856 100644
--- a/include/sound/minors.h
+++ b/include/sound/minors.h
@@ -31,8 +31,8 @@
 /* these minors can still be used for autoloading devices (/dev/aload*) */
 #define SNDRV_MINOR_CONTROL             0       /* 0 */
 #define SNDRV_MINOR_GLOBAL              1       /* 1 */
-#define SNDRV_MINOR_SEQUENCER           (SNDRV_MINOR_GLOBAL + 0 * 32)
+#define SNDRV_MINOR_SEQUENCER           1       /* SNDRV_MINOR_GLOBAL + 0 * 32 */
-#define SNDRV_MINOR_TIMER               (SNDRV_MINOR_GLOBAL + 1 * 32)
+#define SNDRV_MINOR_TIMER               33      /* SNDRV_MINOR_GLOBAL + 1 * 32 */
 #ifndef CONFIG_SND_DYNAMIC_MINORS
                                                /* 2 - 3 (reserved) */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index dfd9b76b1853..e731f8d71934 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -297,6 +297,7 @@ struct snd_pcm_runtime {
        unsigned int info;
        unsigned int rate_num;
        unsigned int rate_den;
+        unsigned int no_period_wakeup: 1;
        /* -- SW params -- */
        int tstamp_mode;                /* mmap timestamp is updated */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e7b680248006..1bafe95dcf41 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -16,8 +16,6 @@
 #include <linux/list.h>
-#include <sound/soc.h>
 struct snd_pcm_substream;
 /*
@@ -205,7 +203,7 @@ struct snd_soc_dai_driver {
        int (*resume)(struct snd_soc_dai *dai);
        /* ops */
-        struct snd_soc_dai_ops *ops;
+        const struct snd_soc_dai_ops *ops;
        /* DAI capabilities */
        struct snd_soc_pcm_stream capture;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8fd3b41b763f..8031769ac485 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -16,7 +16,6 @@
 #include <linux/device.h>
 #include <linux/types.h>
 #include <sound/control.h>
-#include <sound/soc.h>
 /* widget has no PM register bit */
 #define SND_SOC_NOPM    -1
@@ -72,6 +71,10 @@
         wcontrols, wncontrols) \
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
+#define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\
+         wcontrols, wncontrols) \
+{       .id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \
+        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \
         wcontrols, wncontrols)\
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
@@ -90,6 +93,9 @@
 #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \
        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}
+#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
+{       .id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \
+        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}
 #define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_value_mux, .name = wname, .reg = wreg, \
        .shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
@@ -116,6 +122,11 @@
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
        .event = wevent, .event_flags = wflags}
+#define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, \
+        wncontrols, wevent, wflags) \
+{       .id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \
+        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
+        .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \
        wncontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
@@ -140,6 +151,11 @@
 {       .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \
        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
        .event = wevent, .event_flags = wflags}
+#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
+        wevent, wflags) \
+{       .id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \
+        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
+        .event = wevent, .event_flags = wflags}
 /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
@@ -219,13 +235,6 @@
        .info = snd_soc_info_volsw, \
        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
-#define SOC_DAPM_DOUBLE(xname, reg, shift_left, shift_right, max, invert, \
-        power) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .info = snd_soc_info_volsw, \
-        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
-        .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) |\
-                ((max) << 16) | ((invert) << 24) }
 #define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
        .info = snd_soc_info_volsw, \
@@ -233,15 +242,6 @@
        .tlv.p = (tlv_array), \
        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
        .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
-#define SOC_DAPM_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, \
-        power, tlv_array) \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw, \
-        .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
-        .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) |\
-                ((max) << 16) | ((invert) << 24) }
 #define SOC_DAPM_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
        .info = snd_soc_info_enum_double, \
@@ -297,6 +297,7 @@ enum snd_soc_dapm_type;
 struct snd_soc_dapm_path;
 struct snd_soc_dapm_pin;
 struct snd_soc_dapm_route;
+struct snd_soc_dapm_context;
 int dapm_reg_event(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event);
@@ -324,16 +325,16 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *uncontrol);
 int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *uncontrol);
-int snd_soc_dapm_new_control(struct snd_soc_codec *codec,
+int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
        const struct snd_soc_dapm_widget *widget);
-int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
+int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
        const struct snd_soc_dapm_widget *widget,
        int num);
 /* dapm path setup */
-int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec);
+int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm);
-void snd_soc_dapm_free(struct snd_soc_codec *codec);
+void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);
-int snd_soc_dapm_add_routes(struct snd_soc_codec *codec,
+int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
                            const struct snd_soc_dapm_route *route, int num);
 /* dapm events */
@@ -343,27 +344,33 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card);
 /* dapm sys fs - used by the core */
 int snd_soc_dapm_sys_add(struct device *dev);
-void snd_soc_dapm_debugfs_init(struct snd_soc_codec *codec);
+void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm);
 /* dapm audio pin control and status */
-int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm,
-int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, const char *pin);
+                            const char *pin);
-int snd_soc_dapm_nc_pin(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm,
-int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, const char *pin);
+                             const char *pin);
-int snd_soc_dapm_sync(struct snd_soc_codec *codec);
+int snd_soc_dapm_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);
-int snd_soc_dapm_force_enable_pin(struct snd_soc_codec *codec,
+int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,
+                                const char *pin);
+int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);
+int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
                                  const char *pin);
-int snd_soc_dapm_ignore_suspend(struct snd_soc_codec *codec, const char *pin);
+int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
+                                const char *pin);
 /* dapm widget types */
 enum snd_soc_dapm_type {
        snd_soc_dapm_input = 0,         /* input pin */
        snd_soc_dapm_output,            /* output pin */
        snd_soc_dapm_mux,                       /* selects 1 analog signal from many inputs */
+        snd_soc_dapm_virt_mux,                  /* virtual version of snd_soc_dapm_mux */
        snd_soc_dapm_value_mux,                 /* selects 1 analog signal from many inputs */
        snd_soc_dapm_mixer,                     /* mixes several analog signals together */
        snd_soc_dapm_mixer_named_ctl,           /* mixer with named controls */
        snd_soc_dapm_pga,                       /* programmable gain/attenuation (volume) */
+        snd_soc_dapm_out_drv,                   /* output driver */
        snd_soc_dapm_adc,                       /* analog to digital converter */
        snd_soc_dapm_dac,                       /* digital to analog converter */
        snd_soc_dapm_micbias,           /* microphone bias (power) */
@@ -425,6 +432,7 @@ struct snd_soc_dapm_widget {
        char *sname;    /* stream name */
        struct snd_soc_codec *codec;
        struct list_head list;
+        struct snd_soc_dapm_context *dapm;
        /* dapm control */
        short reg;                                              /* negative reg = no direct dapm */
@@ -461,4 +469,35 @@ struct snd_soc_dapm_widget {
        struct list_head power_list;
 };
+struct snd_soc_dapm_update {
+        struct snd_soc_dapm_widget *widget;
+        struct snd_kcontrol *kcontrol;
+        int reg;
+        int mask;
+        int val;
+};
+/* DAPM context */
+struct snd_soc_dapm_context {
+        int n_widgets; /* number of widgets in this context */
+        enum snd_soc_bias_level bias_level;
+        enum snd_soc_bias_level suspend_bias_level;
+        struct delayed_work delayed_work;
+        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
+        struct snd_soc_dapm_update *update;
+        struct device *dev; /* from parent - for debug */
+        struct snd_soc_codec *codec; /* parent codec */
+        struct snd_soc_card *card; /* parent card */
+        /* used during DAPM updates */
+        int dev_power;
+        struct list_head list;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_dapm;
+#endif
+};
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5c3bce83f28a..74921f20a1d8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -222,10 +222,8 @@ enum snd_soc_bias_level {
 struct snd_jack;
 struct snd_soc_card;
-struct snd_soc_device;
 struct snd_soc_pcm_stream;
 struct snd_soc_ops;
-struct snd_soc_dai_mode;
 struct snd_soc_pcm_runtime;
 struct snd_soc_dai;
 struct snd_soc_dai_driver;
@@ -235,9 +233,10 @@ struct snd_soc_platform_driver;
 struct snd_soc_codec;
 struct snd_soc_codec_driver;
 struct soc_enum;
-struct snd_soc_ac97_ops;
 struct snd_soc_jack;
 struct snd_soc_jack_pin;
+struct snd_soc_cache_ops;
+#include <sound/soc-dapm.h>
 #ifdef CONFIG_GPIOLIB
 struct snd_soc_jack_gpio;
@@ -253,17 +252,30 @@ enum snd_soc_control_type {
        SND_SOC_SPI,
 };
+enum snd_soc_compress_type {
+        SND_SOC_FLAT_COMPRESSION = 1,
+        SND_SOC_LZO_COMPRESSION,
+        SND_SOC_RBTREE_COMPRESSION
+};
 int snd_soc_register_platform(struct device *dev,
                struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_register_codec(struct device *dev,
-                struct snd_soc_codec_driver *codec_drv,
+                const struct snd_soc_codec_driver *codec_drv,
                struct snd_soc_dai_driver *dai_drv, int num_dai);
 void snd_soc_unregister_codec(struct device *dev);
 int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg);
 int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                               int addr_bits, int data_bits,
                               enum snd_soc_control_type control);
+int snd_soc_cache_sync(struct snd_soc_codec *codec);
+int snd_soc_cache_init(struct snd_soc_codec *codec);
+int snd_soc_cache_exit(struct snd_soc_codec *codec);
+int snd_soc_cache_write(struct snd_soc_codec *codec,
+                        unsigned int reg, unsigned int value);
+int snd_soc_cache_read(struct snd_soc_codec *codec,
+                       unsigned int reg, unsigned int *value);
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
@@ -420,23 +432,37 @@ struct snd_soc_ops {
        int (*trigger)(struct snd_pcm_substream *, int);
 };
+/* SoC cache ops */
+struct snd_soc_cache_ops {
+        const char *name;
+        enum snd_soc_compress_type id;
+        int (*init)(struct snd_soc_codec *codec);
+        int (*exit)(struct snd_soc_codec *codec);
+        int (*read)(struct snd_soc_codec *codec, unsigned int reg,
+                unsigned int *value);
+        int (*write)(struct snd_soc_codec *codec, unsigned int reg,
+                unsigned int value);
+        int (*sync)(struct snd_soc_codec *codec);
+};
 /* SoC Audio Codec device */
 struct snd_soc_codec {
        const char *name;
+        const char *name_prefix;
        int id;
        struct device *dev;
-        struct snd_soc_codec_driver *driver;
+        const struct snd_soc_codec_driver *driver;
        struct mutex mutex;
        struct snd_soc_card *card;
        struct list_head list;
        struct list_head card_list;
        int num_dai;
+        enum snd_soc_compress_type compress_type;
        /* runtime */
        struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
        unsigned int active;
-        unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
        unsigned int cache_only:1;  /* Suppress writes to hardware */
        unsigned int cache_sync:1; /* Cache needs to be synced to hardware */
        unsigned int suspended:1; /* Codec is in suspend PM state */
@@ -444,25 +470,25 @@ struct snd_soc_codec {
        unsigned int ac97_registered:1; /* Codec has been AC97 registered */
        unsigned int ac97_created:1; /* Codec has been created by SoC */
        unsigned int sysfs_registered:1; /* codec has been sysfs registered */
+        unsigned int cache_init:1; /* codec cache has been initialized */
        /* codec IO */
        void *control_data; /* codec control (i2c/3wire) data */
        hw_write_t hw_write;
        unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
+        unsigned int (*read)(struct snd_soc_codec *, unsigned int);
+        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
        void *reg_cache;
+        const void *reg_def_copy;
+        const struct snd_soc_cache_ops *cache_ops;
+        struct mutex cache_rw_mutex;
        /* dapm */
-        u32 pop_time;
+        struct snd_soc_dapm_context dapm;
-        struct list_head dapm_widgets;
-        struct list_head dapm_paths;
-        enum snd_soc_bias_level bias_level;
-        enum snd_soc_bias_level suspend_bias_level;
-        struct delayed_work delayed_work;
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_codec_root;
        struct dentry *debugfs_reg;
-        struct dentry *debugfs_pop_time;
        struct dentry *debugfs_dapm;
 #endif
 };
@@ -488,6 +514,7 @@ struct snd_soc_codec_driver {
        short reg_cache_step;
        short reg_word_size;
        const void *reg_cache_default;
+        enum snd_soc_compress_type compress_type;
        /* codec bias level */
        int (*set_bias_level)(struct snd_soc_codec *,
@@ -554,6 +581,30 @@ struct snd_soc_dai_link {
        struct snd_soc_ops *ops;
 };
+struct snd_soc_codec_conf {
+        const char *dev_name;
+        /*
+         * optional map of kcontrol, widget and path name prefixes that are
+         * associated per device
+         */
+        const char *name_prefix;
+        /*
+         * set this to the desired compression type if you want to
+         * override the one supplied in codec->driver->compress_type
+         */
+        enum snd_soc_compress_type compress_type;
+};
+struct snd_soc_aux_dev {
+        const char *name;               /* Codec name */
+        const char *codec_name;         /* for multi-codec */
+        /* codec/machine specific init - e.g. add machine controls */
+        int (*init)(struct snd_soc_dapm_context *dapm);
+};
 /* SoC card */
 struct snd_soc_card {
        const char *name;
@@ -579,6 +630,8 @@ struct snd_soc_card {
        /* callbacks */
        int (*set_bias_level)(struct snd_soc_card *,
                              enum snd_soc_bias_level level);
+        int (*set_bias_level_post)(struct snd_soc_card *,
+                                   enum snd_soc_bias_level level);
        long pmdown_time;
@@ -588,12 +641,35 @@ struct snd_soc_card {
        struct snd_soc_pcm_runtime *rtd;
        int num_rtd;
+        /* optional codec specific configuration */
+        struct snd_soc_codec_conf *codec_conf;
+        int num_configs;
+        /*
+         * optional auxiliary devices such as amplifiers or codecs with DAI
+         * link unused
+         */
+        struct snd_soc_aux_dev *aux_dev;
+        int num_aux_devs;
+        struct snd_soc_pcm_runtime *rtd_aux;
+        int num_aux_rtd;
        struct work_struct deferred_resume_work;
        /* lists of probed devices belonging to this card */
        struct list_head codec_dev_list;
        struct list_head platform_dev_list;
        struct list_head dai_dev_list;
+        struct list_head widgets;
+        struct list_head paths;
+        struct list_head dapm_list;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_card_root;
+        struct dentry *debugfs_pop_time;
+#endif
+        u32 pop_time;
 };
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */
@@ -639,17 +715,9 @@ struct soc_enum {
 };
 /* codec IO */
-static inline unsigned int snd_soc_read(struct snd_soc_codec *codec,
+unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
-                                        unsigned int reg)
+unsigned int snd_soc_write(struct snd_soc_codec *codec,
-{
+                           unsigned int reg, unsigned int val);
-        return codec->driver->read(codec, reg);
-}
-static inline unsigned int snd_soc_write(struct snd_soc_codec *codec,
-                                         unsigned int reg, unsigned int val)
-{
-        return codec->driver->write(codec, reg, val);
-}
 /* device driver data */
diff --git a/include/target/configfs_macros.h b/include/target/configfs_macros.h
new file mode 100644
index 000000000000..7fe74608b437
--- /dev/null
+++ b/include/target/configfs_macros.h
@@ -0,0 +1,147 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * configfs_macros.h - extends macros for configfs
+ *
+ * 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 021110-1307, USA.
+ *
+ * Based on sysfs:
+ *      sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
+ *
+ * Based on kobject.h:
+ *      Copyright (c) 2002-2003 Patrick Mochel
+ *      Copyright (c) 2002-2003 Open Source Development Labs
+ *
+ * configfs Copyright (C) 2005 Oracle.  All rights reserved.
+ *
+ * Added CONFIGFS_EATTR() macros from original configfs.h macros
+ * Copright (C) 2008-2009 Nicholas A. Bellinger <nab@linux-iscsi.org>
+ *
+ * Please read Documentation/filesystems/configfs.txt before using the
+ * configfs interface, ESPECIALLY the parts about reference counts and
+ * item destructors.
+ */
+#ifndef _CONFIGFS_MACROS_H_
+#define _CONFIGFS_MACROS_H_
+#include <linux/configfs.h>
+/*
+ * Users often need to create attribute structures for their configurable
+ * attributes, containing a configfs_attribute member and function pointers
+ * for the show() and store() operations on that attribute. If they don't
+ * need anything else on the extended attribute structure, they can use
+ * this macro to define it.  The argument _name isends up as
+ * 'struct _name_attribute, as well as names of to CONFIGFS_ATTR_OPS() below.
+ * The argument _item is the name of the structure containing the
+ * struct config_item or struct config_group structure members
+ */
+#define CONFIGFS_EATTR_STRUCT(_name, _item)                             \
+struct _name##_attribute {                                              \
+        struct configfs_attribute attr;                                 \
+        ssize_t (*show)(struct _item *, char *);                        \
+        ssize_t (*store)(struct _item *, const char *, size_t);         \
+}
+/*
+ * With the extended attribute structure, users can use this macro
+ * (similar to sysfs' __ATTR) to make defining attributes easier.
+ * An example:
+ * #define MYITEM_EATTR(_name, _mode, _show, _store)    \
+ * struct myitem_attribute childless_attr_##_name =     \
+ *         __CONFIGFS_EATTR(_name, _mode, _show, _store)
+ */
+#define __CONFIGFS_EATTR(_name, _mode, _show, _store)                   \
+{                                                                       \
+        .attr   = {                                                     \
+                        .ca_name = __stringify(_name),                  \
+                        .ca_mode = _mode,                               \
+                        .ca_owner = THIS_MODULE,                        \
+        },                                                              \
+        .show   = _show,                                                \
+        .store  = _store,                                               \
+}
+/* Here is a readonly version, only requiring a show() operation */
+#define __CONFIGFS_EATTR_RO(_name, _show)                               \
+{                                                                       \
+        .attr   = {                                                     \
+                        .ca_name = __stringify(_name),                  \
+                        .ca_mode = 0444,                                \
+                        .ca_owner = THIS_MODULE,                        \
+        },                                                              \
+        .show   = _show,                                                \
+}
+/*
+ * With these extended attributes, the simple show_attribute() and
+ * store_attribute() operations need to call the show() and store() of the
+ * attributes.  This is a common pattern, so we provide a macro to define
+ * them.  The argument _name is the name of the attribute defined by
+ * CONFIGFS_ATTR_STRUCT(). The argument _item is the name of the structure
+ * containing the struct config_item or struct config_group structure member.
+ * The argument _item_member is the actual name of the struct config_* struct
+ * in your _item structure.  Meaning  my_structure->some_config_group.
+ *                                    ^^_item^^^^^  ^^_item_member^^^
+ * This macro expects the attributes to be named "struct <name>_attribute".
+ */
+#define CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member)          \
+static struct _item *to_##_name(struct config_item *ci)                 \
+{                                                                       \
+        return (ci) ? container_of(to_config_group(ci), struct _item,   \
+                _item_member) : NULL;                                   \
+}
+#define CONFIGFS_EATTR_OPS_SHOW(_name, _item)                           \
+static ssize_t _name##_attr_show(struct config_item *item,              \
+                                 struct configfs_attribute *attr,       \
+                                 char *page)                            \
+{                                                                       \
+        struct _item *_item = to_##_name(item);                         \
+        struct _name##_attribute * _name##_attr =                       \
+                container_of(attr, struct _name##_attribute, attr);     \
+        ssize_t ret = 0;                                                \
+                                                                        \
+        if (_name##_attr->show)                                         \
+                ret = _name##_attr->show(_item, page);                  \
+        return ret;                                                     \
+}
+#define CONFIGFS_EATTR_OPS_STORE(_name, _item)                          \
+static ssize_t _name##_attr_store(struct config_item *item,             \
+                                  struct configfs_attribute *attr,      \
+                                  const char *page, size_t count)       \
+{                                                                       \
+        struct _item *_item = to_##_name(item);                         \
+        struct _name##_attribute * _name##_attr =                       \
+                container_of(attr, struct _name##_attribute, attr);     \
+        ssize_t ret = -EINVAL;                                          \
+                                                                        \
+        if (_name##_attr->store)                                        \
+                ret = _name##_attr->store(_item, page, count);          \
+        return ret;                                                     \
+}
+#define CONFIGFS_EATTR_OPS(_name, _item, _item_member)                  \
+        CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member);         \
+        CONFIGFS_EATTR_OPS_SHOW(_name, _item);                          \
+        CONFIGFS_EATTR_OPS_STORE(_name, _item);
+#define CONFIGFS_EATTR_OPS_RO(_name, _item, _item_member)               \
+        CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member);         \
+        CONFIGFS_EATTR_OPS_SHOW(_name, _item);
+#endif /* _CONFIGFS_MACROS_H_ */
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
new file mode 100644
index 000000000000..07fdfb6b9a9a
--- /dev/null
+++ b/include/target/target_core_base.h
@@ -0,0 +1,937 @@
+#ifndef TARGET_CORE_BASE_H
+#define TARGET_CORE_BASE_H
+#include <linux/in.h>
+#include <linux/configfs.h>
+#include <linux/dma-mapping.h>
+#include <linux/blkdev.h>
+#include <scsi/scsi_cmnd.h>
+#include <net/sock.h>
+#include <net/tcp.h>
+#include "target_core_mib.h"
+#define TARGET_CORE_MOD_VERSION         "v4.0.0-rc6"
+#define SHUTDOWN_SIGS   (sigmask(SIGKILL)|sigmask(SIGINT)|sigmask(SIGABRT))
+/* Used by transport_generic_allocate_iovecs() */
+#define TRANSPORT_IOV_DATA_BUFFER               5
+/* Maximum Number of LUNs per Target Portal Group */
+#define TRANSPORT_MAX_LUNS_PER_TPG              256
+/*
+ * By default we use 32-byte CDBs in TCM Core and subsystem plugin code.
+ *
+ * Note that both include/scsi/scsi_cmnd.h:MAX_COMMAND_SIZE and
+ * include/linux/blkdev.h:BLOCK_MAX_CDB as of v2.6.36-rc4 still use
+ * 16-byte CDBs by default and require an extra allocation for
+ * 32-byte CDBs to becasue of legacy issues.
+ *
+ * Within TCM Core there are no such legacy limitiations, so we go ahead
+ * use 32-byte CDBs by default and use include/scsi/scsi.h:scsi_command_size()
+ * within all TCM Core and subsystem plugin code.
+ */
+#define TCM_MAX_COMMAND_SIZE                    32
+/*
+ * From include/scsi/scsi_cmnd.h:SCSI_SENSE_BUFFERSIZE, currently
+ * defined 96, but the real limit is 252 (or 260 including the header)
+ */
+#define TRANSPORT_SENSE_BUFFER                  SCSI_SENSE_BUFFERSIZE
+/* Used by transport_send_check_condition_and_sense() */
+#define SPC_SENSE_KEY_OFFSET                    2
+#define SPC_ASC_KEY_OFFSET                      12
+#define SPC_ASCQ_KEY_OFFSET                     13
+#define TRANSPORT_IQN_LEN                       224
+/* Used by target_core_store_alua_lu_gp() and target_core_alua_lu_gp_show_attr_members() */
+#define LU_GROUP_NAME_BUF                       256
+/* Used by core_alua_store_tg_pt_gp_info() and target_core_alua_tg_pt_gp_show_attr_members() */
+#define TG_PT_GROUP_NAME_BUF                    256
+/* Used to parse VPD into struct t10_vpd */
+#define VPD_TMP_BUF_SIZE                        128
+/* Used by transport_generic_cmd_sequencer() */
+#define READ_BLOCK_LEN                          6
+#define READ_CAP_LEN                            8
+#define READ_POSITION_LEN                       20
+#define INQUIRY_LEN                             36
+/* Used by transport_get_inquiry_vpd_serial() */
+#define INQUIRY_VPD_SERIAL_LEN                  254
+/* Used by transport_get_inquiry_vpd_device_ident() */
+#define INQUIRY_VPD_DEVICE_IDENTIFIER_LEN       254
+/* struct se_hba->hba_flags */
+enum hba_flags_table {
+        HBA_FLAGS_INTERNAL_USE  = 0x01,
+        HBA_FLAGS_PSCSI_MODE    = 0x02,
+};
+/* struct se_lun->lun_status */
+enum transport_lun_status_table {
+        TRANSPORT_LUN_STATUS_FREE = 0,
+        TRANSPORT_LUN_STATUS_ACTIVE = 1,
+};
+/* struct se_portal_group->se_tpg_type */
+enum transport_tpg_type_table {
+        TRANSPORT_TPG_TYPE_NORMAL = 0,
+        TRANSPORT_TPG_TYPE_DISCOVERY = 1,
+};
+/* Used for generate timer flags */
+enum timer_flags_table {
+        TF_RUNNING      = 0x01,
+        TF_STOP         = 0x02,
+};
+/* Special transport agnostic struct se_cmd->t_states */
+enum transport_state_table {
+        TRANSPORT_NO_STATE      = 0,
+        TRANSPORT_NEW_CMD       = 1,
+        TRANSPORT_DEFERRED_CMD  = 2,
+        TRANSPORT_WRITE_PENDING = 3,
+        TRANSPORT_PROCESS_WRITE = 4,
+        TRANSPORT_PROCESSING    = 5,
+        TRANSPORT_COMPLETE_OK   = 6,
+        TRANSPORT_COMPLETE_FAILURE = 7,
+        TRANSPORT_COMPLETE_TIMEOUT = 8,
+        TRANSPORT_PROCESS_TMR   = 9,
+        TRANSPORT_TMR_COMPLETE  = 10,
+        TRANSPORT_ISTATE_PROCESSING = 11,
+        TRANSPORT_ISTATE_PROCESSED = 12,
+        TRANSPORT_KILL          = 13,
+        TRANSPORT_REMOVE        = 14,
+        TRANSPORT_FREE          = 15,
+        TRANSPORT_NEW_CMD_MAP   = 16,
+};
+/* Used for struct se_cmd->se_cmd_flags */
+enum se_cmd_flags_table {
+        SCF_SUPPORTED_SAM_OPCODE        = 0x00000001,
+        SCF_TRANSPORT_TASK_SENSE        = 0x00000002,
+        SCF_EMULATED_TASK_SENSE         = 0x00000004,
+        SCF_SCSI_DATA_SG_IO_CDB         = 0x00000008,
+        SCF_SCSI_CONTROL_SG_IO_CDB      = 0x00000010,
+        SCF_SCSI_CONTROL_NONSG_IO_CDB   = 0x00000020,
+        SCF_SCSI_NON_DATA_CDB           = 0x00000040,
+        SCF_SCSI_CDB_EXCEPTION          = 0x00000080,
+        SCF_SCSI_RESERVATION_CONFLICT   = 0x00000100,
+        SCF_CMD_PASSTHROUGH_NOALLOC     = 0x00000200,
+        SCF_SE_CMD_FAILED               = 0x00000400,
+        SCF_SE_LUN_CMD                  = 0x00000800,
+        SCF_SE_ALLOW_EOO                = 0x00001000,
+        SCF_SE_DISABLE_ONLINE_CHECK     = 0x00002000,
+        SCF_SENT_CHECK_CONDITION        = 0x00004000,
+        SCF_OVERFLOW_BIT                = 0x00008000,
+        SCF_UNDERFLOW_BIT               = 0x00010000,
+        SCF_SENT_DELAYED_TAS            = 0x00020000,
+        SCF_ALUA_NON_OPTIMIZED          = 0x00040000,
+        SCF_DELAYED_CMD_FROM_SAM_ATTR   = 0x00080000,
+        SCF_PASSTHROUGH_SG_TO_MEM       = 0x00100000,
+        SCF_PASSTHROUGH_CONTIG_TO_SG    = 0x00200000,
+        SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00400000,
+        SCF_EMULATE_SYNC_CACHE          = 0x00800000,
+        SCF_EMULATE_CDB_ASYNC           = 0x01000000,
+        SCF_EMULATE_SYNC_UNMAP          = 0x02000000
+};
+/* struct se_dev_entry->lun_flags and struct se_lun->lun_access */
+enum transport_lunflags_table {
+        TRANSPORT_LUNFLAGS_NO_ACCESS            = 0x00,
+        TRANSPORT_LUNFLAGS_INITIATOR_ACCESS     = 0x01,
+        TRANSPORT_LUNFLAGS_READ_ONLY            = 0x02,
+        TRANSPORT_LUNFLAGS_READ_WRITE           = 0x04,
+};
+/* struct se_device->dev_status */
+enum transport_device_status_table {
+        TRANSPORT_DEVICE_ACTIVATED              = 0x01,
+        TRANSPORT_DEVICE_DEACTIVATED            = 0x02,
+        TRANSPORT_DEVICE_QUEUE_FULL             = 0x04,
+        TRANSPORT_DEVICE_SHUTDOWN               = 0x08,
+        TRANSPORT_DEVICE_OFFLINE_ACTIVATED      = 0x10,
+        TRANSPORT_DEVICE_OFFLINE_DEACTIVATED    = 0x20,
+};
+/*
+ * Used by transport_send_check_condition_and_sense() and se_cmd->scsi_sense_reason
+ * to signal which ASC/ASCQ sense payload should be built.
+ */
+enum tcm_sense_reason_table {
+        TCM_NON_EXISTENT_LUN                    = 0x01,
+        TCM_UNSUPPORTED_SCSI_OPCODE             = 0x02,
+        TCM_INCORRECT_AMOUNT_OF_DATA            = 0x03,
+        TCM_UNEXPECTED_UNSOLICITED_DATA         = 0x04,
+        TCM_SERVICE_CRC_ERROR                   = 0x05,
+        TCM_SNACK_REJECTED                      = 0x06,
+        TCM_SECTOR_COUNT_TOO_MANY               = 0x07,
+        TCM_INVALID_CDB_FIELD                   = 0x08,
+        TCM_INVALID_PARAMETER_LIST              = 0x09,
+        TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE  = 0x0a,
+        TCM_UNKNOWN_MODE_PAGE                   = 0x0b,
+        TCM_WRITE_PROTECTED                     = 0x0c,
+        TCM_CHECK_CONDITION_ABORT_CMD           = 0x0d,
+        TCM_CHECK_CONDITION_UNIT_ATTENTION      = 0x0e,
+        TCM_CHECK_CONDITION_NOT_READY           = 0x0f,
+};
+struct se_obj {
+        atomic_t obj_access_count;
+} ____cacheline_aligned;
+/*
+ * Used by TCM Core internally to signal if ALUA emulation is enabled or
+ * disabled, or running in with TCM/pSCSI passthrough mode
+ */
+typedef enum {
+        SPC_ALUA_PASSTHROUGH,
+        SPC2_ALUA_DISABLED,
+        SPC3_ALUA_EMULATED
+} t10_alua_index_t;
+/*
+ * Used by TCM Core internally to signal if SAM Task Attribute emulation
+ * is enabled or disabled, or running in with TCM/pSCSI passthrough mode
+ */
+typedef enum {
+        SAM_TASK_ATTR_PASSTHROUGH,
+        SAM_TASK_ATTR_UNTAGGED,
+        SAM_TASK_ATTR_EMULATED
+} t10_task_attr_index_t;
+struct se_cmd;
+struct t10_alua {
+        t10_alua_index_t alua_type;
+        /* ALUA Target Port Group ID */
+        u16     alua_tg_pt_gps_counter;
+        u32     alua_tg_pt_gps_count;
+        spinlock_t tg_pt_gps_lock;
+        struct se_subsystem_dev *t10_sub_dev;
+        /* Used for default ALUA Target Port Group */
+        struct t10_alua_tg_pt_gp *default_tg_pt_gp;
+        /* Used for default ALUA Target Port Group ConfigFS group */
+        struct config_group alua_tg_pt_gps_group;
+        int (*alua_state_check)(struct se_cmd *, unsigned char *, u8 *);
+        struct list_head tg_pt_gps_list;
+} ____cacheline_aligned;
+struct t10_alua_lu_gp {
+        u16     lu_gp_id;
+        int     lu_gp_valid_id;
+        u32     lu_gp_members;
+        atomic_t lu_gp_shutdown;
+        atomic_t lu_gp_ref_cnt;
+        spinlock_t lu_gp_lock;
+        struct config_group lu_gp_group;
+        struct list_head lu_gp_list;
+        struct list_head lu_gp_mem_list;
+} ____cacheline_aligned;
+struct t10_alua_lu_gp_member {
+        int lu_gp_assoc:1;
+        atomic_t lu_gp_mem_ref_cnt;
+        spinlock_t lu_gp_mem_lock;
+        struct t10_alua_lu_gp *lu_gp;
+        struct se_device *lu_gp_mem_dev;
+        struct list_head lu_gp_mem_list;
+} ____cacheline_aligned;
+struct t10_alua_tg_pt_gp {
+        u16     tg_pt_gp_id;
+        int     tg_pt_gp_valid_id;
+        int     tg_pt_gp_alua_access_status;
+        int     tg_pt_gp_alua_access_type;
+        int     tg_pt_gp_nonop_delay_msecs;
+        int     tg_pt_gp_trans_delay_msecs;
+        int     tg_pt_gp_pref;
+        int     tg_pt_gp_write_metadata;
+        /* Used by struct t10_alua_tg_pt_gp->tg_pt_gp_md_buf_len */
+#define ALUA_MD_BUF_LEN                         1024
+        u32     tg_pt_gp_md_buf_len;
+        u32     tg_pt_gp_members;
+        atomic_t tg_pt_gp_alua_access_state;
+        atomic_t tg_pt_gp_ref_cnt;
+        spinlock_t tg_pt_gp_lock;
+        struct mutex tg_pt_gp_md_mutex;
+        struct se_subsystem_dev *tg_pt_gp_su_dev;
+        struct config_group tg_pt_gp_group;
+        struct list_head tg_pt_gp_list;
+        struct list_head tg_pt_gp_mem_list;
+} ____cacheline_aligned;
+struct t10_alua_tg_pt_gp_member {
+        int tg_pt_gp_assoc:1;
+        atomic_t tg_pt_gp_mem_ref_cnt;
+        spinlock_t tg_pt_gp_mem_lock;
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct se_port *tg_pt;
+        struct list_head tg_pt_gp_mem_list;
+} ____cacheline_aligned;
+struct t10_vpd {
+        unsigned char device_identifier[INQUIRY_VPD_DEVICE_IDENTIFIER_LEN];
+        int protocol_identifier_set;
+        u32 protocol_identifier;
+        u32 device_identifier_code_set;
+        u32 association;
+        u32 device_identifier_type;
+        struct list_head vpd_list;
+} ____cacheline_aligned;
+struct t10_wwn {
+        unsigned char vendor[8];
+        unsigned char model[16];
+        unsigned char revision[4];
+        unsigned char unit_serial[INQUIRY_VPD_SERIAL_LEN];
+        spinlock_t t10_vpd_lock;
+        struct se_subsystem_dev *t10_sub_dev;
+        struct config_group t10_wwn_group;
+        struct list_head t10_vpd_list;
+} ____cacheline_aligned;
+/*
+ * Used by TCM Core internally to signal if >= SPC-3 peristent reservations
+ * emulation is enabled or disabled, or running in with TCM/pSCSI passthrough
+ * mode
+ */
+typedef enum {
+        SPC_PASSTHROUGH,
+        SPC2_RESERVATIONS,
+        SPC3_PERSISTENT_RESERVATIONS
+} t10_reservations_index_t;
+struct t10_pr_registration {
+        /* Used for fabrics that contain WWN+ISID */
+#define PR_REG_ISID_LEN                         16
+        /* PR_REG_ISID_LEN + ',i,0x' */
+#define PR_REG_ISID_ID_LEN                      (PR_REG_ISID_LEN + 5)
+        char pr_reg_isid[PR_REG_ISID_LEN];
+        /* Used during APTPL metadata reading */
+#define PR_APTPL_MAX_IPORT_LEN                  256
+        unsigned char pr_iport[PR_APTPL_MAX_IPORT_LEN];
+        /* Used during APTPL metadata reading */
+#define PR_APTPL_MAX_TPORT_LEN                  256
+        unsigned char pr_tport[PR_APTPL_MAX_TPORT_LEN];
+        /* For writing out live meta data */
+        unsigned char *pr_aptpl_buf;
+        u16 pr_aptpl_rpti;
+        u16 pr_reg_tpgt;
+        /* Reservation effects all target ports */
+        int pr_reg_all_tg_pt;
+        /* Activate Persistence across Target Power Loss */
+        int pr_reg_aptpl;
+        int pr_res_holder;
+        int pr_res_type;
+        int pr_res_scope;
+        /* Used for fabric initiator WWPNs using a ISID */
+        int isid_present_at_reg:1;
+        u32 pr_res_mapped_lun;
+        u32 pr_aptpl_target_lun;
+        u32 pr_res_generation;
+        u64 pr_reg_bin_isid;
+        u64 pr_res_key;
+        atomic_t pr_res_holders;
+        struct se_node_acl *pr_reg_nacl;
+        struct se_dev_entry *pr_reg_deve;
+        struct se_lun *pr_reg_tg_pt_lun;
+        struct list_head pr_reg_list;
+        struct list_head pr_reg_abort_list;
+        struct list_head pr_reg_aptpl_list;
+        struct list_head pr_reg_atp_list;
+        struct list_head pr_reg_atp_mem_list;
+} ____cacheline_aligned;
+/*
+ * This set of function pointer ops is set based upon SPC3_PERSISTENT_RESERVATIONS,
+ * SPC2_RESERVATIONS or SPC_PASSTHROUGH in drivers/target/target_core_pr.c:
+ * core_setup_reservations()
+ */
+struct t10_reservation_ops {
+        int (*t10_reservation_check)(struct se_cmd *, u32 *);
+        int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
+        int (*t10_pr_register)(struct se_cmd *);
+        int (*t10_pr_clear)(struct se_cmd *);
+};
+struct t10_reservation_template {
+        /* Reservation effects all target ports */
+        int pr_all_tg_pt;
+        /* Activate Persistence across Target Power Loss enabled
+         * for SCSI device */
+        int pr_aptpl_active;
+        /* Used by struct t10_reservation_template->pr_aptpl_buf_len */
+#define PR_APTPL_BUF_LEN                        8192
+        u32 pr_aptpl_buf_len;
+        u32 pr_generation;
+        t10_reservations_index_t res_type;
+        spinlock_t registration_lock;
+        spinlock_t aptpl_reg_lock;
+        /*
+         * This will always be set by one individual I_T Nexus.
+         * However with all_tg_pt=1, other I_T Nexus from the
+         * same initiator can access PR reg/res info on a different
+         * target port.
+         *
+         * There is also the 'All Registrants' case, where there is
+         * a single *pr_res_holder of the reservation, but all
+         * registrations are considered reservation holders.
+         */
+        struct se_node_acl *pr_res_holder;
+        struct list_head registration_list;
+        struct list_head aptpl_reg_list;
+        struct t10_reservation_ops pr_ops;
+} ____cacheline_aligned;
+struct se_queue_req {
+        int                     state;
+        void                    *cmd;
+        struct list_head        qr_list;
+} ____cacheline_aligned;
+struct se_queue_obj {
+        atomic_t                queue_cnt;
+        spinlock_t              cmd_queue_lock;
+        struct list_head        qobj_list;
+        wait_queue_head_t       thread_wq;
+} ____cacheline_aligned;
+/*
+ * Used one per struct se_cmd to hold all extra struct se_task
+ * metadata.  This structure is setup and allocated in
+ * drivers/target/target_core_transport.c:__transport_alloc_se_cmd()
+ */
+struct se_transport_task {
+        unsigned char           *t_task_cdb;
+        unsigned char           __t_task_cdb[TCM_MAX_COMMAND_SIZE];
+        unsigned long long      t_task_lba;
+        int                     t_tasks_failed;
+        int                     t_tasks_fua;
+        int                     t_tasks_bidi:1;
+        u32                     t_task_cdbs;
+        u32                     t_tasks_check;
+        u32                     t_tasks_no;
+        u32                     t_tasks_sectors;
+        u32                     t_tasks_se_num;
+        u32                     t_tasks_se_bidi_num;
+        u32                     t_tasks_sg_chained_no;
+        atomic_t                t_fe_count;
+        atomic_t                t_se_count;
+        atomic_t                t_task_cdbs_left;
+        atomic_t                t_task_cdbs_ex_left;
+        atomic_t                t_task_cdbs_timeout_left;
+        atomic_t                t_task_cdbs_sent;
+        atomic_t                t_transport_aborted;
+        atomic_t                t_transport_active;
+        atomic_t                t_transport_complete;
+        atomic_t                t_transport_queue_active;
+        atomic_t                t_transport_sent;
+        atomic_t                t_transport_stop;
+        atomic_t                t_transport_timeout;
+        atomic_t                transport_dev_active;
+        atomic_t                transport_lun_active;
+        atomic_t                transport_lun_fe_stop;
+        atomic_t                transport_lun_stop;
+        spinlock_t              t_state_lock;
+        struct completion       t_transport_stop_comp;
+        struct completion       transport_lun_fe_stop_comp;
+        struct completion       transport_lun_stop_comp;
+        struct scatterlist      *t_tasks_sg_chained;
+        struct scatterlist      t_tasks_sg_bounce;
+        void                    *t_task_buf;
+        /*
+         * Used for pre-registered fabric SGL passthrough WRITE and READ
+         * with the special SCF_PASSTHROUGH_CONTIG_TO_SG case for TCM_Loop
+         * and other HW target mode fabric modules.
+         */
+        struct scatterlist      *t_task_pt_sgl;
+        struct list_head        *t_mem_list;
+        /* Used for BIDI READ */
+        struct list_head        *t_mem_bidi_list;
+        struct list_head        t_task_list;
+} ____cacheline_aligned;
+struct se_task {
+        unsigned char   task_sense;
+        struct scatterlist *task_sg;
+        struct scatterlist *task_sg_bidi;
+        u8              task_scsi_status;
+        u8              task_flags;
+        int             task_error_status;
+        int             task_state_flags;
+        int             task_padded_sg:1;
+        unsigned long long      task_lba;
+        u32             task_no;
+        u32             task_sectors;
+        u32             task_size;
+        u32             task_sg_num;
+        u32             task_sg_offset;
+        enum dma_data_direction task_data_direction;
+        struct se_cmd *task_se_cmd;
+        struct se_device        *se_dev;
+        struct completion       task_stop_comp;
+        atomic_t        task_active;
+        atomic_t        task_execute_queue;
+        atomic_t        task_timeout;
+        atomic_t        task_sent;
+        atomic_t        task_stop;
+        atomic_t        task_state_active;
+        struct timer_list       task_timer;
+        struct se_device *se_obj_ptr;
+        struct list_head t_list;
+        struct list_head t_execute_list;
+        struct list_head t_state_list;
+} ____cacheline_aligned;
+#define TASK_CMD(task)  ((struct se_cmd *)task->task_se_cmd)
+#define TASK_DEV(task)  ((struct se_device *)task->se_dev)
+struct se_cmd {
+        /* SAM response code being sent to initiator */
+        u8                      scsi_status;
+        u8                      scsi_asc;
+        u8                      scsi_ascq;
+        u8                      scsi_sense_reason;
+        u16                     scsi_sense_length;
+        /* Delay for ALUA Active/NonOptimized state access in milliseconds */
+        int                     alua_nonop_delay;
+        /* See include/linux/dma-mapping.h */
+        enum dma_data_direction data_direction;
+        /* For SAM Task Attribute */
+        int                     sam_task_attr;
+        /* Transport protocol dependent state, see transport_state_table */
+        enum transport_state_table t_state;
+        /* Transport protocol dependent state for out of order CmdSNs */
+        int                     deferred_t_state;
+        /* Transport specific error status */
+        int                     transport_error_status;
+        /* See se_cmd_flags_table */
+        u32                     se_cmd_flags;
+        u32                     se_ordered_id;
+        /* Total size in bytes associated with command */
+        u32                     data_length;
+        /* SCSI Presented Data Transfer Length */
+        u32                     cmd_spdtl;
+        u32                     residual_count;
+        u32                     orig_fe_lun;
+        /* Persistent Reservation key */
+        u64                     pr_res_key;
+        atomic_t                transport_sent;
+        /* Used for sense data */
+        void                    *sense_buffer;
+        struct list_head        se_delayed_list;
+        struct list_head        se_ordered_list;
+        struct list_head        se_lun_list;
+        struct se_device      *se_dev;
+        struct se_dev_entry   *se_deve;
+        struct se_device        *se_obj_ptr;
+        struct se_device        *se_orig_obj_ptr;
+        struct se_lun           *se_lun;
+        /* Only used for internal passthrough and legacy TCM fabric modules */
+        struct se_session       *se_sess;
+        struct se_tmr_req       *se_tmr_req;
+        /* t_task is setup to t_task_backstore in transport_init_se_cmd() */
+        struct se_transport_task *t_task;
+        struct se_transport_task t_task_backstore;
+        struct target_core_fabric_ops *se_tfo;
+        int (*transport_emulate_cdb)(struct se_cmd *);
+        void (*transport_split_cdb)(unsigned long long, u32 *, unsigned char *);
+        void (*transport_wait_for_tasks)(struct se_cmd *, int, int);
+        void (*transport_complete_callback)(struct se_cmd *);
+} ____cacheline_aligned;
+#define T_TASK(cmd)     ((struct se_transport_task *)(cmd->t_task))
+#define CMD_TFO(cmd) ((struct target_core_fabric_ops *)cmd->se_tfo)
+struct se_tmr_req {
+        /* Task Management function to be preformed */
+        u8                      function;
+        /* Task Management response to send */
+        u8                      response;
+        int                     call_transport;
+        /* Reference to ITT that Task Mgmt should be preformed */
+        u32                     ref_task_tag;
+        /* 64-bit encoded SAM LUN from $FABRIC_MOD TMR header */
+        u64                     ref_task_lun;
+        void                    *fabric_tmr_ptr;
+        struct se_cmd           *task_cmd;
+        struct se_cmd           *ref_cmd;
+        struct se_device        *tmr_dev;
+        struct se_lun           *tmr_lun;
+        struct list_head        tmr_list;
+} ____cacheline_aligned;
+struct se_ua {
+        u8                      ua_asc;
+        u8                      ua_ascq;
+        struct se_node_acl      *ua_nacl;
+        struct list_head        ua_dev_list;
+        struct list_head        ua_nacl_list;
+} ____cacheline_aligned;
+struct se_node_acl {
+        char                    initiatorname[TRANSPORT_IQN_LEN];
+        /* Used to signal demo mode created ACL, disabled by default */
+        int                     dynamic_node_acl:1;
+        u32                     queue_depth;
+        u32                     acl_index;
+        u64                     num_cmds;
+        u64                     read_bytes;
+        u64                     write_bytes;
+        spinlock_t              stats_lock;
+        /* Used for PR SPEC_I_PT=1 and REGISTER_AND_MOVE */
+        atomic_t                acl_pr_ref_count;
+        /* Used for MIB access */
+        atomic_t                mib_ref_count;
+        struct se_dev_entry     *device_list;
+        struct se_session       *nacl_sess;
+        struct se_portal_group *se_tpg;
+        spinlock_t              device_list_lock;
+        spinlock_t              nacl_sess_lock;
+        struct config_group     acl_group;
+        struct config_group     acl_attrib_group;
+        struct config_group     acl_auth_group;
+        struct config_group     acl_param_group;
+        struct config_group     *acl_default_groups[4];
+        struct list_head        acl_list;
+        struct list_head        acl_sess_list;
+} ____cacheline_aligned;
+struct se_session {
+        /* Used for MIB access */
+        atomic_t                mib_ref_count;
+        u64                     sess_bin_isid;
+        struct se_node_acl      *se_node_acl;
+        struct se_portal_group *se_tpg;
+        void                    *fabric_sess_ptr;
+        struct list_head        sess_list;
+        struct list_head        sess_acl_list;
+} ____cacheline_aligned;
+#define SE_SESS(cmd)            ((struct se_session *)(cmd)->se_sess)
+#define SE_NODE_ACL(sess)       ((struct se_node_acl *)(sess)->se_node_acl)
+struct se_device;
+struct se_transform_info;
+struct scatterlist;
+struct se_lun_acl {
+        char                    initiatorname[TRANSPORT_IQN_LEN];
+        u32                     mapped_lun;
+        struct se_node_acl      *se_lun_nacl;
+        struct se_lun           *se_lun;
+        struct list_head        lacl_list;
+        struct config_group     se_lun_group;
+}  ____cacheline_aligned;
+struct se_dev_entry {
+        int                     def_pr_registered:1;
+        /* See transport_lunflags_table */
+        u32                     lun_flags;
+        u32                     deve_cmds;
+        u32                     mapped_lun;
+        u32                     average_bytes;
+        u32                     last_byte_count;
+        u32                     total_cmds;
+        u32                     total_bytes;
+        u64                     pr_res_key;
+        u64                     creation_time;
+        u32                     attach_count;
+        u64                     read_bytes;
+        u64                     write_bytes;
+        atomic_t                ua_count;
+        /* Used for PR SPEC_I_PT=1 and REGISTER_AND_MOVE */
+        atomic_t                pr_ref_count;
+        struct se_lun_acl       *se_lun_acl;
+        spinlock_t              ua_lock;
+        struct se_lun           *se_lun;
+        struct list_head        alua_port_list;
+        struct list_head        ua_list;
+}  ____cacheline_aligned;
+struct se_dev_limits {
+        /* Max supported HW queue depth */
+        u32             hw_queue_depth;
+        /* Max supported virtual queue depth */
+        u32             queue_depth;
+        /* From include/linux/blkdev.h for the other HW/SW limits. */
+        struct queue_limits limits;
+} ____cacheline_aligned;
+struct se_dev_attrib {
+        int             emulate_dpo;
+        int             emulate_fua_write;
+        int             emulate_fua_read;
+        int             emulate_write_cache;
+        int             emulate_ua_intlck_ctrl;
+        int             emulate_tas;
+        int             emulate_tpu;
+        int             emulate_tpws;
+        int             emulate_reservations;
+        int             emulate_alua;
+        int             enforce_pr_isids;
+        u32             hw_block_size;
+        u32             block_size;
+        u32             hw_max_sectors;
+        u32             max_sectors;
+        u32             optimal_sectors;
+        u32             hw_queue_depth;
+        u32             queue_depth;
+        u32             task_timeout;
+        u32             max_unmap_lba_count;
+        u32             max_unmap_block_desc_count;
+        u32             unmap_granularity;
+        u32             unmap_granularity_alignment;
+        struct se_subsystem_dev *da_sub_dev;
+        struct config_group da_group;
+} ____cacheline_aligned;
+struct se_subsystem_dev {
+/* Used for struct se_subsystem_dev-->se_dev_alias, must be less than PAGE_SIZE */
+#define SE_DEV_ALIAS_LEN                512
+        unsigned char   se_dev_alias[SE_DEV_ALIAS_LEN];
+/* Used for struct se_subsystem_dev->se_dev_udev_path[], must be less than PAGE_SIZE */
+#define SE_UDEV_PATH_LEN                512
+        unsigned char   se_dev_udev_path[SE_UDEV_PATH_LEN];
+        u32             su_dev_flags;
+        struct se_hba *se_dev_hba;
+        struct se_device *se_dev_ptr;
+        struct se_dev_attrib se_dev_attrib;
+        /* T10 Asymmetric Logical Unit Assignment for Target Ports */
+        struct t10_alua t10_alua;
+        /* T10 Inquiry and VPD WWN Information */
+        struct t10_wwn  t10_wwn;
+        /* T10 SPC-2 + SPC-3 Reservations */
+        struct t10_reservation_template t10_reservation;
+        spinlock_t      se_dev_lock;
+        void            *se_dev_su_ptr;
+        struct list_head g_se_dev_list;
+        struct config_group se_dev_group;
+        /* For T10 Reservations */
+        struct config_group se_dev_pr_group;
+} ____cacheline_aligned;
+#define T10_ALUA(su_dev)        (&(su_dev)->t10_alua)
+#define T10_RES(su_dev)         (&(su_dev)->t10_reservation)
+#define T10_PR_OPS(su_dev)      (&(su_dev)->t10_reservation.pr_ops)
+struct se_device {
+        /* Set to 1 if thread is NOT sleeping on thread_sem */
+        u8                      thread_active;
+        u8                      dev_status_timer_flags;
+        /* RELATIVE TARGET PORT IDENTIFER Counter */
+        u16                     dev_rpti_counter;
+        /* Used for SAM Task Attribute ordering */
+        u32                     dev_cur_ordered_id;
+        u32                     dev_flags;
+        u32                     dev_port_count;
+        /* See transport_device_status_table */
+        u32                     dev_status;
+        u32                     dev_tcq_window_closed;
+        /* Physical device queue depth */
+        u32                     queue_depth;
+        /* Used for SPC-2 reservations enforce of ISIDs */
+        u64                     dev_res_bin_isid;
+        t10_task_attr_index_t   dev_task_attr_type;
+        /* Pointer to transport specific device structure */
+        void                    *dev_ptr;
+        u32                     dev_index;
+        u64                     creation_time;
+        u32                     num_resets;
+        u64                     num_cmds;
+        u64                     read_bytes;
+        u64                     write_bytes;
+        spinlock_t              stats_lock;
+        /* Active commands on this virtual SE device */
+        atomic_t                active_cmds;
+        atomic_t                simple_cmds;
+        atomic_t                depth_left;
+        atomic_t                dev_ordered_id;
+        atomic_t                dev_tur_active;
+        atomic_t                execute_tasks;
+        atomic_t                dev_status_thr_count;
+        atomic_t                dev_hoq_count;
+        atomic_t                dev_ordered_sync;
+        struct se_obj           dev_obj;
+        struct se_obj           dev_access_obj;
+        struct se_obj           dev_export_obj;
+        struct se_queue_obj     *dev_queue_obj;
+        struct se_queue_obj     *dev_status_queue_obj;
+        spinlock_t              delayed_cmd_lock;
+        spinlock_t              ordered_cmd_lock;
+        spinlock_t              execute_task_lock;
+        spinlock_t              state_task_lock;
+        spinlock_t              dev_alua_lock;
+        spinlock_t              dev_reservation_lock;
+        spinlock_t              dev_state_lock;
+        spinlock_t              dev_status_lock;
+        spinlock_t              dev_status_thr_lock;
+        spinlock_t              se_port_lock;
+        spinlock_t              se_tmr_lock;
+        /* Used for legacy SPC-2 reservationsa */
+        struct se_node_acl      *dev_reserved_node_acl;
+        /* Used for ALUA Logical Unit Group membership */
+        struct t10_alua_lu_gp_member *dev_alua_lu_gp_mem;
+        /* Used for SPC-3 Persistent Reservations */
+        struct t10_pr_registration *dev_pr_res_holder;
+        struct list_head        dev_sep_list;
+        struct list_head        dev_tmr_list;
+        struct timer_list       dev_status_timer;
+        /* Pointer to descriptor for processing thread */
+        struct task_struct      *process_thread;
+        pid_t                   process_thread_pid;
+        struct task_struct              *dev_mgmt_thread;
+        struct list_head        delayed_cmd_list;
+        struct list_head        ordered_cmd_list;
+        struct list_head        execute_task_list;
+        struct list_head        state_task_list;
+        /* Pointer to associated SE HBA */
+        struct se_hba           *se_hba;
+        struct se_subsystem_dev *se_sub_dev;
+        /* Pointer to template of function pointers for transport */
+        struct se_subsystem_api *transport;
+        /* Linked list for struct se_hba struct se_device list */
+        struct list_head        dev_list;
+        /* Linked list for struct se_global->g_se_dev_list */
+        struct list_head        g_se_dev_list;
+}  ____cacheline_aligned;
+#define SE_DEV(cmd)             ((struct se_device *)(cmd)->se_lun->lun_se_dev)
+#define SU_DEV(dev)             ((struct se_subsystem_dev *)(dev)->se_sub_dev)
+#define DEV_ATTRIB(dev)         (&(dev)->se_sub_dev->se_dev_attrib)
+#define DEV_T10_WWN(dev)        (&(dev)->se_sub_dev->t10_wwn)
+struct se_hba {
+        u16                     hba_tpgt;
+        u32                     hba_id;
+        /* See hba_flags_table */
+        u32                     hba_flags;
+        /* Virtual iSCSI devices attached. */
+        u32                     dev_count;
+        u32                     hba_index;
+        atomic_t                dev_mib_access_count;
+        atomic_t                load_balance_queue;
+        atomic_t                left_queue_depth;
+        /* Maximum queue depth the HBA can handle. */
+        atomic_t                max_queue_depth;
+        /* Pointer to transport specific host structure. */
+        void                    *hba_ptr;
+        /* Linked list for struct se_device */
+        struct list_head        hba_dev_list;
+        struct list_head        hba_list;
+        spinlock_t              device_lock;
+        spinlock_t              hba_queue_lock;
+        struct config_group     hba_group;
+        struct mutex            hba_access_mutex;
+        struct se_subsystem_api *transport;
+}  ____cacheline_aligned;
+#define SE_HBA(d)               ((struct se_hba *)(d)->se_hba)
+struct se_lun {
+        /* See transport_lun_status_table */
+        enum transport_lun_status_table lun_status;
+        u32                     lun_access;
+        u32                     lun_flags;
+        u32                     unpacked_lun;
+        atomic_t                lun_acl_count;
+        spinlock_t              lun_acl_lock;
+        spinlock_t              lun_cmd_lock;
+        spinlock_t              lun_sep_lock;
+        struct completion       lun_shutdown_comp;
+        struct list_head        lun_cmd_list;
+        struct list_head        lun_acl_list;
+        struct se_device        *lun_se_dev;
+        struct config_group     lun_group;
+        struct se_port  *lun_sep;
+} ____cacheline_aligned;
+#define SE_LUN(c)               ((struct se_lun *)(c)->se_lun)
+struct se_port {
+        /* RELATIVE TARGET PORT IDENTIFER */
+        u16             sep_rtpi;
+        int             sep_tg_pt_secondary_stat;
+        int             sep_tg_pt_secondary_write_md;
+        u32             sep_index;
+        struct scsi_port_stats sep_stats;
+        /* Used for ALUA Target Port Groups membership */
+        atomic_t        sep_tg_pt_gp_active;
+        atomic_t        sep_tg_pt_secondary_offline;
+        /* Used for PR ALL_TG_PT=1 */
+        atomic_t        sep_tg_pt_ref_cnt;
+        spinlock_t      sep_alua_lock;
+        struct mutex    sep_tg_pt_md_mutex;
+        struct t10_alua_tg_pt_gp_member *sep_alua_tg_pt_gp_mem;
+        struct se_lun *sep_lun;
+        struct se_portal_group *sep_tpg;
+        struct list_head sep_alua_list;
+        struct list_head sep_list;
+} ____cacheline_aligned;
+struct se_tpg_np {
+        struct config_group     tpg_np_group;
+} ____cacheline_aligned;
+struct se_portal_group {
+        /* Type of target portal group, see transport_tpg_type_table */
+        enum transport_tpg_type_table se_tpg_type;
+        /* Number of ACLed Initiator Nodes for this TPG */
+        u32                     num_node_acls;
+        /* Used for PR SPEC_I_PT=1 and REGISTER_AND_MOVE */
+        atomic_t                tpg_pr_ref_count;
+        /* Spinlock for adding/removing ACLed Nodes */
+        spinlock_t              acl_node_lock;
+        /* Spinlock for adding/removing sessions */
+        spinlock_t              session_lock;
+        spinlock_t              tpg_lun_lock;
+        /* Pointer to $FABRIC_MOD portal group */
+        void                    *se_tpg_fabric_ptr;
+        struct list_head        se_tpg_list;
+        /* linked list for initiator ACL list */
+        struct list_head        acl_node_list;
+        struct se_lun           *tpg_lun_list;
+        struct se_lun           tpg_virt_lun0;
+        /* List of TCM sessions assoicated wth this TPG */
+        struct list_head        tpg_sess_list;
+        /* Pointer to $FABRIC_MOD dependent code */
+        struct target_core_fabric_ops *se_tpg_tfo;
+        struct se_wwn           *se_tpg_wwn;
+        struct config_group     tpg_group;
+        struct config_group     *tpg_default_groups[6];
+        struct config_group     tpg_lun_group;
+        struct config_group     tpg_np_group;
+        struct config_group     tpg_acl_group;
+        struct config_group     tpg_attrib_group;
+        struct config_group     tpg_param_group;
+} ____cacheline_aligned;
+#define TPG_TFO(se_tpg) ((struct target_core_fabric_ops *)(se_tpg)->se_tpg_tfo)
+struct se_wwn {
+        struct target_fabric_configfs *wwn_tf;
+        struct config_group     wwn_group;
+} ____cacheline_aligned;
+struct se_global {
+        u16                     alua_lu_gps_counter;
+        int                     g_sub_api_initialized;
+        u32                     in_shutdown;
+        u32                     alua_lu_gps_count;
+        u32                     g_hba_id_counter;
+        struct config_group     target_core_hbagroup;
+        struct config_group     alua_group;
+        struct config_group     alua_lu_gps_group;
+        struct list_head        g_lu_gps_list;
+        struct list_head        g_se_tpg_list;
+        struct list_head        g_hba_list;
+        struct list_head        g_se_dev_list;
+        struct se_hba           *g_lun0_hba;
+        struct se_subsystem_dev *g_lun0_su_dev;
+        struct se_device        *g_lun0_dev;
+        struct t10_alua_lu_gp   *default_lu_gp;
+        spinlock_t              g_device_lock;
+        spinlock_t              hba_lock;
+        spinlock_t              se_tpg_lock;
+        spinlock_t              lu_gps_lock;
+        spinlock_t              plugin_class_lock;
+} ____cacheline_aligned;
+#endif /* TARGET_CORE_BASE_H */
diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
new file mode 100644
index 000000000000..40e6e740527c
--- /dev/null
+++ b/include/target/target_core_configfs.h
@@ -0,0 +1,52 @@
+#define TARGET_CORE_CONFIGFS_VERSION TARGET_CORE_MOD_VERSION
+#define TARGET_CORE_CONFIG_ROOT "/sys/kernel/config"
+#define TARGET_CORE_NAME_MAX_LEN        64
+#define TARGET_FABRIC_NAME_SIZE         32
+extern struct target_fabric_configfs *target_fabric_configfs_init(
+                                struct module *, const char *);
+extern void target_fabric_configfs_free(struct target_fabric_configfs *);
+extern int target_fabric_configfs_register(struct target_fabric_configfs *);
+extern void target_fabric_configfs_deregister(struct target_fabric_configfs *);
+struct target_fabric_configfs_template {
+        struct config_item_type tfc_discovery_cit;
+        struct config_item_type tfc_wwn_cit;
+        struct config_item_type tfc_tpg_cit;
+        struct config_item_type tfc_tpg_base_cit;
+        struct config_item_type tfc_tpg_lun_cit;
+        struct config_item_type tfc_tpg_port_cit;
+        struct config_item_type tfc_tpg_np_cit;
+        struct config_item_type tfc_tpg_np_base_cit;
+        struct config_item_type tfc_tpg_attrib_cit;
+        struct config_item_type tfc_tpg_param_cit;
+        struct config_item_type tfc_tpg_nacl_cit;
+        struct config_item_type tfc_tpg_nacl_base_cit;
+        struct config_item_type tfc_tpg_nacl_attrib_cit;
+        struct config_item_type tfc_tpg_nacl_auth_cit;
+        struct config_item_type tfc_tpg_nacl_param_cit;
+        struct config_item_type tfc_tpg_mappedlun_cit;
+};
+struct target_fabric_configfs {
+        char                    tf_name[TARGET_FABRIC_NAME_SIZE];
+        atomic_t                tf_access_cnt;
+        struct list_head        tf_list;
+        struct config_group     tf_group;
+        struct config_group     tf_disc_group;
+        struct config_group     *tf_default_groups[2];
+        /* Pointer to fabric's config_item */
+        struct config_item      *tf_fabric;
+        /* Passed from fabric modules */
+        struct config_item_type *tf_fabric_cit;
+        /* Pointer to target core subsystem */
+        struct configfs_subsystem *tf_subsys;
+        /* Pointer to fabric's struct module */
+        struct module *tf_module;
+        struct target_core_fabric_ops tf_ops;
+        struct target_fabric_configfs_template tf_cit_tmpl;
+};
+#define TF_CIT_TMPL(tf) (&(tf)->tf_cit_tmpl)
diff --git a/include/target/target_core_device.h b/include/target/target_core_device.h
new file mode 100644
index 000000000000..52b18a5752c9
--- /dev/null
+++ b/include/target/target_core_device.h
@@ -0,0 +1,61 @@
+#ifndef TARGET_CORE_DEVICE_H
+#define TARGET_CORE_DEVICE_H
+extern int transport_get_lun_for_cmd(struct se_cmd *, unsigned char *, u32);
+extern int transport_get_lun_for_tmr(struct se_cmd *, u32);
+extern struct se_dev_entry *core_get_se_deve_from_rtpi(
+                                        struct se_node_acl *, u16);
+extern int core_free_device_list_for_node(struct se_node_acl *,
+                                        struct se_portal_group *);
+extern void core_dec_lacl_count(struct se_node_acl *, struct se_cmd *);
+extern void core_update_device_list_access(u32, u32, struct se_node_acl *);
+extern int core_update_device_list_for_node(struct se_lun *, struct se_lun_acl *, u32,
+                                        u32, struct se_node_acl *,
+                                        struct se_portal_group *, int);
+extern void core_clear_lun_from_tpg(struct se_lun *, struct se_portal_group *);
+extern int core_dev_export(struct se_device *, struct se_portal_group *,
+                                        struct se_lun *);
+extern void core_dev_unexport(struct se_device *, struct se_portal_group *,
+                                        struct se_lun *);
+extern int transport_core_report_lun_response(struct se_cmd *);
+extern void se_release_device_for_hba(struct se_device *);
+extern void se_release_vpd_for_dev(struct se_device *);
+extern void se_clear_dev_ports(struct se_device *);
+extern int se_free_virtual_device(struct se_device *, struct se_hba *);
+extern int se_dev_check_online(struct se_device *);
+extern int se_dev_check_shutdown(struct se_device *);
+extern void se_dev_set_default_attribs(struct se_device *, struct se_dev_limits *);
+extern int se_dev_set_task_timeout(struct se_device *, u32);
+extern int se_dev_set_max_unmap_lba_count(struct se_device *, u32);
+extern int se_dev_set_max_unmap_block_desc_count(struct se_device *, u32);
+extern int se_dev_set_unmap_granularity(struct se_device *, u32);
+extern int se_dev_set_unmap_granularity_alignment(struct se_device *, u32);
+extern int se_dev_set_emulate_dpo(struct se_device *, int);
+extern int se_dev_set_emulate_fua_write(struct se_device *, int);
+extern int se_dev_set_emulate_fua_read(struct se_device *, int);
+extern int se_dev_set_emulate_write_cache(struct se_device *, int);
+extern int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *, int);
+extern int se_dev_set_emulate_tas(struct se_device *, int);
+extern int se_dev_set_emulate_tpu(struct se_device *, int);
+extern int se_dev_set_emulate_tpws(struct se_device *, int);
+extern int se_dev_set_enforce_pr_isids(struct se_device *, int);
+extern int se_dev_set_queue_depth(struct se_device *, u32);
+extern int se_dev_set_max_sectors(struct se_device *, u32);
+extern int se_dev_set_optimal_sectors(struct se_device *, u32);
+extern int se_dev_set_block_size(struct se_device *, u32);
+extern struct se_lun *core_dev_add_lun(struct se_portal_group *, struct se_hba *,
+                                        struct se_device *, u32);
+extern int core_dev_del_lun(struct se_portal_group *, u32);
+extern struct se_lun *core_get_lun_from_tpg(struct se_portal_group *, u32);
+extern struct se_lun_acl *core_dev_init_initiator_node_lun_acl(struct se_portal_group *,
+                                                        u32, char *, int *);
+extern int core_dev_add_initiator_node_lun_acl(struct se_portal_group *,
+                                                struct se_lun_acl *, u32, u32);
+extern int core_dev_del_initiator_node_lun_acl(struct se_portal_group *,
+                                                struct se_lun *, struct se_lun_acl *);
+extern void core_dev_free_initiator_node_lun_acl(struct se_portal_group *,
+                                                struct se_lun_acl *lacl);
+extern int core_dev_setup_virtual_lun0(void);
+extern void core_dev_release_virtual_lun0(void);
+#endif /* TARGET_CORE_DEVICE_H */
diff --git a/include/target/target_core_fabric_configfs.h b/include/target/target_core_fabric_configfs.h
new file mode 100644
index 000000000000..a26fb7586a09
--- /dev/null
+++ b/include/target/target_core_fabric_configfs.h
@@ -0,0 +1,106 @@
+/*
+ * Used for tfc_wwn_cit attributes
+ */
+#include <target/configfs_macros.h>
+CONFIGFS_EATTR_STRUCT(target_fabric_nacl_attrib, se_node_acl);
+#define TF_NACL_ATTRIB_ATTR(_fabric, _name, _mode)                      \
+static struct target_fabric_nacl_attrib_attribute _fabric##_nacl_attrib_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_nacl_attrib_show_##_name,                             \
+        _fabric##_nacl_attrib_store_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_nacl_auth, se_node_acl);
+#define TF_NACL_AUTH_ATTR(_fabric, _name, _mode)                        \
+static struct target_fabric_nacl_auth_attribute _fabric##_nacl_auth_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_nacl_auth_show_##_name,                               \
+        _fabric##_nacl_auth_store_##_name);
+#define TF_NACL_AUTH_ATTR_RO(_fabric, _name)                            \
+static struct target_fabric_nacl_auth_attribute _fabric##_nacl_auth_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_nacl_auth_show_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_nacl_param, se_node_acl);
+#define TF_NACL_PARAM_ATTR(_fabric, _name, _mode)                       \
+static struct target_fabric_nacl_param_attribute _fabric##_nacl_param_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_nacl_param_show_##_name,                              \
+        _fabric##_nacl_param_store_##_name);
+#define TF_NACL_PARAM_ATTR_RO(_fabric, _name)                           \
+static struct target_fabric_nacl_param_attribute _fabric##_nacl_param_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_nacl_param_show_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_nacl_base, se_node_acl);
+#define TF_NACL_BASE_ATTR(_fabric, _name, _mode)                        \
+static struct target_fabric_nacl_base_attribute _fabric##_nacl_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_nacl_show_##_name,                                    \
+        _fabric##_nacl_store_##_name);
+#define TF_NACL_BASE_ATTR_RO(_fabric, _name)                            \
+static struct target_fabric_nacl_base_attribute _fabric##_nacl_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_nacl_show_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_np_base, se_tpg_np);
+#define TF_NP_BASE_ATTR(_fabric, _name, _mode)                          \
+static struct target_fabric_np_base_attribute _fabric##_np_##_name =    \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_np_show_##_name,                                      \
+        _fabric##_np_store_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_tpg_attrib, se_portal_group);
+#define TF_TPG_ATTRIB_ATTR(_fabric, _name, _mode)                       \
+static struct target_fabric_tpg_attrib_attribute _fabric##_tpg_attrib_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_tpg_attrib_show_##_name,                              \
+        _fabric##_tpg_attrib_store_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_tpg_param, se_portal_group);
+#define TF_TPG_PARAM_ATTR(_fabric, _name, _mode)                        \
+static struct target_fabric_tpg_param_attribute _fabric##_tpg_param_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_tpg_param_show_##_name,                               \
+        _fabric##_tpg_param_store_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_tpg, se_portal_group);
+#define TF_TPG_BASE_ATTR(_fabric, _name, _mode)                         \
+static struct target_fabric_tpg_attribute _fabric##_tpg_##_name =       \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_tpg_show_##_name,                                     \
+        _fabric##_tpg_store_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_wwn, target_fabric_configfs);
+#define TF_WWN_ATTR(_fabric, _name, _mode)                              \
+static struct target_fabric_wwn_attribute _fabric##_wwn_##_name =       \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_wwn_show_attr_##_name,                                \
+        _fabric##_wwn_store_attr_##_name);
+#define TF_WWN_ATTR_RO(_fabric, _name)                                  \
+static struct target_fabric_wwn_attribute _fabric##_wwn_##_name =       \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_wwn_show_attr_##_name);
+CONFIGFS_EATTR_STRUCT(target_fabric_discovery, target_fabric_configfs);
+#define TF_DISC_ATTR(_fabric, _name, _mode)                             \
+static struct target_fabric_discovery_attribute _fabric##_disc_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        _fabric##_disc_show_##_name,                                    \
+        _fabric##_disc_store_##_name);
+#define TF_DISC_ATTR_RO(_fabric, _name)                                 \
+static struct target_fabric_discovery_attribute _fabric##_disc_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        _fabric##_disc_show_##_name);
+extern int target_fabric_setup_cits(struct target_fabric_configfs *);
diff --git a/include/target/target_core_fabric_lib.h b/include/target/target_core_fabric_lib.h
new file mode 100644
index 000000000000..c2f8d0e3a03b
--- /dev/null
+++ b/include/target/target_core_fabric_lib.h
@@ -0,0 +1,28 @@
+#ifndef TARGET_CORE_FABRIC_LIB_H
+#define TARGET_CORE_FABRIC_LIB_H
+extern u8 sas_get_fabric_proto_ident(struct se_portal_group *);
+extern u32 sas_get_pr_transport_id(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *, unsigned char *);
+extern u32 sas_get_pr_transport_id_len(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *);
+extern char *sas_parse_pr_out_transport_id(struct se_portal_group *,
+                        const char *, u32 *, char **);
+extern u8 fc_get_fabric_proto_ident(struct se_portal_group *);
+extern u32 fc_get_pr_transport_id(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *, unsigned char *);
+extern u32 fc_get_pr_transport_id_len(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *);
+extern char *fc_parse_pr_out_transport_id(struct se_portal_group *,
+                        const char *, u32 *, char **);
+extern u8 iscsi_get_fabric_proto_ident(struct se_portal_group *);
+extern u32 iscsi_get_pr_transport_id(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *, unsigned char *);
+extern u32 iscsi_get_pr_transport_id_len(struct se_portal_group *, struct se_node_acl *,
+                        struct t10_pr_registration *, int *);
+extern char *iscsi_parse_pr_out_transport_id(struct se_portal_group *,
+                        const char *, u32 *, char **);
+#endif /* TARGET_CORE_FABRIC_LIB_H */
diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h
new file mode 100644
index 000000000000..f3ac12b019c2
--- /dev/null
+++ b/include/target/target_core_fabric_ops.h
@@ -0,0 +1,100 @@
+/* Defined in target_core_configfs.h */
+struct target_fabric_configfs;
+struct target_core_fabric_ops {
+        struct configfs_subsystem *tf_subsys;
+        /*
+         * Optional to signal struct se_task->task_sg[] padding entries
+         * for scatterlist chaining using transport_do_task_sg_link(),
+         * disabled by default
+         */
+        int task_sg_chaining:1;
+        char *(*get_fabric_name)(void);
+        u8 (*get_fabric_proto_ident)(struct se_portal_group *);
+        char *(*tpg_get_wwn)(struct se_portal_group *);
+        u16 (*tpg_get_tag)(struct se_portal_group *);
+        u32 (*tpg_get_default_depth)(struct se_portal_group *);
+        u32 (*tpg_get_pr_transport_id)(struct se_portal_group *,
+                                struct se_node_acl *,
+                                struct t10_pr_registration *, int *,
+                                unsigned char *);
+        u32 (*tpg_get_pr_transport_id_len)(struct se_portal_group *,
+                                struct se_node_acl *,
+                                struct t10_pr_registration *, int *);
+        char *(*tpg_parse_pr_out_transport_id)(struct se_portal_group *,
+                                const char *, u32 *, char **);
+        int (*tpg_check_demo_mode)(struct se_portal_group *);
+        int (*tpg_check_demo_mode_cache)(struct se_portal_group *);
+        int (*tpg_check_demo_mode_write_protect)(struct se_portal_group *);
+        int (*tpg_check_prod_mode_write_protect)(struct se_portal_group *);
+        struct se_node_acl *(*tpg_alloc_fabric_acl)(
+                                        struct se_portal_group *);
+        void (*tpg_release_fabric_acl)(struct se_portal_group *,
+                                        struct se_node_acl *);
+        u32 (*tpg_get_inst_index)(struct se_portal_group *);
+        /*
+         * Optional function pointer for TCM to perform command map
+         * from TCM processing thread context, for those struct se_cmd
+         * initally allocated in interrupt context.
+         */
+        int (*new_cmd_map)(struct se_cmd *);
+        /*
+         * Optional function pointer for TCM fabric modules that use
+         * Linux/NET sockets to allocate struct iovec array to struct se_cmd
+         */
+        int (*alloc_cmd_iovecs)(struct se_cmd *);
+        /*
+         * Optional to release struct se_cmd and fabric dependent allocated
+         * I/O descriptor in transport_cmd_check_stop()
+         */
+        void (*check_stop_free)(struct se_cmd *);
+        void (*release_cmd_to_pool)(struct se_cmd *);
+        void (*release_cmd_direct)(struct se_cmd *);
+        /*
+         * Called with spin_lock_bh(struct se_portal_group->session_lock held.
+         */
+        int (*shutdown_session)(struct se_session *);
+        void (*close_session)(struct se_session *);
+        void (*stop_session)(struct se_session *, int, int);
+        void (*fall_back_to_erl0)(struct se_session *);
+        int (*sess_logged_in)(struct se_session *);
+        u32 (*sess_get_index)(struct se_session *);
+        /*
+         * Used only for SCSI fabrics that contain multi-value TransportIDs
+         * (like iSCSI).  All other SCSI fabrics should set this to NULL.
+         */
+        u32 (*sess_get_initiator_sid)(struct se_session *,
+                                      unsigned char *, u32);
+        int (*write_pending)(struct se_cmd *);
+        int (*write_pending_status)(struct se_cmd *);
+        void (*set_default_node_attributes)(struct se_node_acl *);
+        u32 (*get_task_tag)(struct se_cmd *);
+        int (*get_cmd_state)(struct se_cmd *);
+        void (*new_cmd_failure)(struct se_cmd *);
+        int (*queue_data_in)(struct se_cmd *);
+        int (*queue_status)(struct se_cmd *);
+        int (*queue_tm_rsp)(struct se_cmd *);
+        u16 (*set_fabric_sense_len)(struct se_cmd *, u32);
+        u16 (*get_fabric_sense_len)(void);
+        int (*is_state_remove)(struct se_cmd *);
+        u64 (*pack_lun)(unsigned int);
+        /*
+         * fabric module calls for target_core_fabric_configfs.c
+         */
+        struct se_wwn *(*fabric_make_wwn)(struct target_fabric_configfs *,
+                                struct config_group *, const char *);
+        void (*fabric_drop_wwn)(struct se_wwn *);
+        struct se_portal_group *(*fabric_make_tpg)(struct se_wwn *,
+                                struct config_group *, const char *);
+        void (*fabric_drop_tpg)(struct se_portal_group *);
+        int (*fabric_post_link)(struct se_portal_group *,
+                                struct se_lun *);
+        void (*fabric_pre_unlink)(struct se_portal_group *,
+                                struct se_lun *);
+        struct se_tpg_np *(*fabric_make_np)(struct se_portal_group *,
+                                struct config_group *, const char *);
+        void (*fabric_drop_np)(struct se_tpg_np *);
+        struct se_node_acl *(*fabric_make_nodeacl)(struct se_portal_group *,
+                                struct config_group *, const char *);
+        void (*fabric_drop_nodeacl)(struct se_node_acl *);
+};
diff --git a/include/target/target_core_tmr.h b/include/target/target_core_tmr.h
new file mode 100644
index 000000000000..6c8248bc2c66
--- /dev/null
+++ b/include/target/target_core_tmr.h
@@ -0,0 +1,43 @@
+#ifndef TARGET_CORE_TMR_H
+#define TARGET_CORE_TMR_H
+/* task management function values */
+#ifdef ABORT_TASK
+#undef ABORT_TASK
+#endif /* ABORT_TASK */
+#define ABORT_TASK                              1
+#ifdef ABORT_TASK_SET
+#undef ABORT_TASK_SET
+#endif /* ABORT_TASK_SET */
+#define ABORT_TASK_SET                          2
+#ifdef CLEAR_ACA
+#undef CLEAR_ACA
+#endif /* CLEAR_ACA */
+#define CLEAR_ACA                               3
+#ifdef CLEAR_TASK_SET
+#undef CLEAR_TASK_SET
+#endif /* CLEAR_TASK_SET */
+#define CLEAR_TASK_SET                          4
+#define LUN_RESET                               5
+#define TARGET_WARM_RESET                       6
+#define TARGET_COLD_RESET                       7
+#define TASK_REASSIGN                           8
+/* task management response values */
+#define TMR_FUNCTION_COMPLETE                   0
+#define TMR_TASK_DOES_NOT_EXIST                 1
+#define TMR_LUN_DOES_NOT_EXIST                  2
+#define TMR_TASK_STILL_ALLEGIANT                3
+#define TMR_TASK_FAILOVER_NOT_SUPPORTED         4
+#define TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED    5
+#define TMR_FUNCTION_AUTHORIZATION_FAILED       6
+#define TMR_FUNCTION_REJECTED                   255
+extern struct kmem_cache *se_tmr_req_cache;
+extern struct se_tmr_req *core_tmr_alloc_req(struct se_cmd *, void *, u8);
+extern void core_tmr_release_req(struct se_tmr_req *);
+extern int core_tmr_lun_reset(struct se_device *, struct se_tmr_req *,
+                                struct list_head *, struct se_cmd *);
+#endif /* TARGET_CORE_TMR_H */
diff --git a/include/target/target_core_tpg.h b/include/target/target_core_tpg.h
new file mode 100644
index 000000000000..77e18729c4c1
--- /dev/null
+++ b/include/target/target_core_tpg.h
@@ -0,0 +1,35 @@
+#ifndef TARGET_CORE_TPG_H
+#define TARGET_CORE_TPG_H
+extern struct se_node_acl *__core_tpg_get_initiator_node_acl(struct se_portal_group *tpg,
+                                                const char *);
+extern struct se_node_acl *core_tpg_get_initiator_node_acl(struct se_portal_group *tpg,
+                                                unsigned char *);
+extern void core_tpg_add_node_to_devs(struct se_node_acl *,
+                                                struct se_portal_group *);
+extern struct se_node_acl *core_tpg_check_initiator_node_acl(
+                                                struct se_portal_group *,
+                                                unsigned char *);
+extern void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *);
+extern void core_tpg_wait_for_mib_ref(struct se_node_acl *);
+extern void core_tpg_clear_object_luns(struct se_portal_group *);
+extern struct se_node_acl *core_tpg_add_initiator_node_acl(
+                                        struct se_portal_group *,
+                                        struct se_node_acl *,
+                                        const char *, u32);
+extern int core_tpg_del_initiator_node_acl(struct se_portal_group *,
+                                                struct se_node_acl *, int);
+extern int core_tpg_set_initiator_node_queue_depth(struct se_portal_group *,
+                                                unsigned char *, u32, int);
+extern int core_tpg_register(struct target_core_fabric_ops *,
+                                        struct se_wwn *,
+                                        struct se_portal_group *, void *,
+                                        int);
+extern int core_tpg_deregister(struct se_portal_group *);
+extern struct se_lun *core_tpg_pre_addlun(struct se_portal_group *, u32);
+extern int core_tpg_post_addlun(struct se_portal_group *, struct se_lun *, u32,
+                                void *);
+extern struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32, int *);
+extern int core_tpg_post_dellun(struct se_portal_group *, struct se_lun *);
+#endif /* TARGET_CORE_TPG_H */
diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h
new file mode 100644
index 000000000000..66f44e56eb80
--- /dev/null
+++ b/include/target/target_core_transport.h
@@ -0,0 +1,351 @@
+#ifndef TARGET_CORE_TRANSPORT_H
+#define TARGET_CORE_TRANSPORT_H
+#define TARGET_CORE_VERSION                     TARGET_CORE_MOD_VERSION
+/* Attempts before moving from SHORT to LONG */
+#define PYX_TRANSPORT_WINDOW_CLOSED_THRESHOLD   3
+#define PYX_TRANSPORT_WINDOW_CLOSED_WAIT_SHORT  3  /* In milliseconds */
+#define PYX_TRANSPORT_WINDOW_CLOSED_WAIT_LONG   10 /* In milliseconds */
+#define PYX_TRANSPORT_STATUS_INTERVAL           5 /* In seconds */
+#define PYX_TRANSPORT_SENT_TO_TRANSPORT         0
+#define PYX_TRANSPORT_WRITE_PENDING             1
+#define PYX_TRANSPORT_UNKNOWN_SAM_OPCODE        -1
+#define PYX_TRANSPORT_HBA_QUEUE_FULL            -2
+#define PYX_TRANSPORT_REQ_TOO_MANY_SECTORS      -3
+#define PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES   -4
+#define PYX_TRANSPORT_INVALID_CDB_FIELD         -5
+#define PYX_TRANSPORT_INVALID_PARAMETER_LIST    -6
+#define PYX_TRANSPORT_LU_COMM_FAILURE           -7
+#define PYX_TRANSPORT_UNKNOWN_MODE_PAGE         -8
+#define PYX_TRANSPORT_WRITE_PROTECTED           -9
+#define PYX_TRANSPORT_TASK_TIMEOUT              -10
+#define PYX_TRANSPORT_RESERVATION_CONFLICT      -11
+#define PYX_TRANSPORT_ILLEGAL_REQUEST           -12
+#define PYX_TRANSPORT_USE_SENSE_REASON          -13
+#ifndef SAM_STAT_RESERVATION_CONFLICT
+#define SAM_STAT_RESERVATION_CONFLICT           0x18
+#endif
+#define TRANSPORT_PLUGIN_FREE                   0
+#define TRANSPORT_PLUGIN_REGISTERED             1
+#define TRANSPORT_PLUGIN_PHBA_PDEV              1
+#define TRANSPORT_PLUGIN_VHBA_PDEV              2
+#define TRANSPORT_PLUGIN_VHBA_VDEV              3
+/* For SE OBJ Plugins, in seconds */
+#define TRANSPORT_TIMEOUT_TUR                   10
+#define TRANSPORT_TIMEOUT_TYPE_DISK             60
+#define TRANSPORT_TIMEOUT_TYPE_ROM              120
+#define TRANSPORT_TIMEOUT_TYPE_TAPE             600
+#define TRANSPORT_TIMEOUT_TYPE_OTHER            300
+/* For se_task->task_state_flags */
+#define TSF_EXCEPTION_CLEARED                   0x01
+/*
+ * struct se_subsystem_dev->su_dev_flags
+*/
+#define SDF_FIRMWARE_VPD_UNIT_SERIAL            0x00000001
+#define SDF_EMULATED_VPD_UNIT_SERIAL            0x00000002
+#define SDF_USING_UDEV_PATH                     0x00000004
+#define SDF_USING_ALIAS                         0x00000008
+/*
+ * struct se_device->dev_flags
+ */
+#define DF_READ_ONLY                            0x00000001
+#define DF_SPC2_RESERVATIONS                    0x00000002
+#define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000004
+/* struct se_dev_attrib sanity values */
+/* 10 Minutes */
+#define DA_TASK_TIMEOUT_MAX                     600
+/* Default max_unmap_lba_count */
+#define DA_MAX_UNMAP_LBA_COUNT                  0
+/* Default max_unmap_block_desc_count */
+#define DA_MAX_UNMAP_BLOCK_DESC_COUNT           0
+/* Default unmap_granularity */
+#define DA_UNMAP_GRANULARITY_DEFAULT            0
+/* Default unmap_granularity_alignment */
+#define DA_UNMAP_GRANULARITY_ALIGNMENT_DEFAULT  0
+/* Emulation for Direct Page Out */
+#define DA_EMULATE_DPO                          0
+/* Emulation for Forced Unit Access WRITEs */
+#define DA_EMULATE_FUA_WRITE                    1
+/* Emulation for Forced Unit Access READs */
+#define DA_EMULATE_FUA_READ                     0
+/* Emulation for WriteCache and SYNCHRONIZE_CACHE */
+#define DA_EMULATE_WRITE_CACHE                  0
+/* Emulation for UNIT ATTENTION Interlock Control */
+#define DA_EMULATE_UA_INTLLCK_CTRL              0
+/* Emulation for TASK_ABORTED status (TAS) by default */
+#define DA_EMULATE_TAS                          1
+/* Emulation for Thin Provisioning UNMAP using block/blk-lib.c:blkdev_issue_discard() */
+#define DA_EMULATE_TPU                          0
+/*
+ * Emulation for Thin Provisioning WRITE_SAME w/ UNMAP=1 bit using
+ * block/blk-lib.c:blkdev_issue_discard()
+ */
+#define DA_EMULATE_TPWS                         0
+/* No Emulation for PSCSI by default */
+#define DA_EMULATE_RESERVATIONS                 0
+/* No Emulation for PSCSI by default */
+#define DA_EMULATE_ALUA                         0
+/* Enforce SCSI Initiator Port TransportID with 'ISID' for PR */
+#define DA_ENFORCE_PR_ISIDS                     1
+#define DA_STATUS_MAX_SECTORS_MIN               16
+#define DA_STATUS_MAX_SECTORS_MAX               8192
+#define SE_MODE_PAGE_BUF                        512
+#define MOD_MAX_SECTORS(ms, bs)                 (ms % (PAGE_SIZE / bs))
+struct se_mem;
+struct se_subsystem_api;
+extern int init_se_global(void);
+extern void release_se_global(void);
+extern void transport_init_queue_obj(struct se_queue_obj *);
+extern int transport_subsystem_check_init(void);
+extern int transport_subsystem_register(struct se_subsystem_api *);
+extern void transport_subsystem_release(struct se_subsystem_api *);
+extern void transport_load_plugins(void);
+extern struct se_session *transport_init_session(void);
+extern void __transport_register_session(struct se_portal_group *,
+                                        struct se_node_acl *,
+                                        struct se_session *, void *);
+extern void transport_register_session(struct se_portal_group *,
+                                        struct se_node_acl *,
+                                        struct se_session *, void *);
+extern void transport_free_session(struct se_session *);
+extern void transport_deregister_session_configfs(struct se_session *);
+extern void transport_deregister_session(struct se_session *);
+extern void transport_cmd_finish_abort(struct se_cmd *, int);
+extern void transport_cmd_finish_abort_tmr(struct se_cmd *);
+extern void transport_complete_sync_cache(struct se_cmd *, int);
+extern void transport_complete_task(struct se_task *, int);
+extern void transport_add_task_to_execute_queue(struct se_task *,
+                                                struct se_task *,
+                                                struct se_device *);
+unsigned char *transport_dump_cmd_direction(struct se_cmd *);
+extern void transport_dump_dev_state(struct se_device *, char *, int *);
+extern void transport_dump_dev_info(struct se_device *, struct se_lun *,
+                                        unsigned long long, char *, int *);
+extern void transport_dump_vpd_proto_id(struct t10_vpd *,
+                                        unsigned char *, int);
+extern void transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
+extern int transport_dump_vpd_assoc(struct t10_vpd *,
+                                        unsigned char *, int);
+extern int transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);
+extern int transport_dump_vpd_ident_type(struct t10_vpd *,
+                                        unsigned char *, int);
+extern int transport_set_vpd_ident_type(struct t10_vpd *, unsigned char *);
+extern int transport_dump_vpd_ident(struct t10_vpd *,
+                                        unsigned char *, int);
+extern int transport_set_vpd_ident(struct t10_vpd *, unsigned char *);
+extern struct se_device *transport_add_device_to_core_hba(struct se_hba *,
+                                        struct se_subsystem_api *,
+                                        struct se_subsystem_dev *, u32,
+                                        void *, struct se_dev_limits *,
+                                        const char *, const char *);
+extern void transport_device_setup_cmd(struct se_cmd *);
+extern void transport_init_se_cmd(struct se_cmd *,
+                                        struct target_core_fabric_ops *,
+                                        struct se_session *, u32, int, int,
+                                        unsigned char *);
+extern void transport_free_se_cmd(struct se_cmd *);
+extern int transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
+extern int transport_generic_handle_cdb(struct se_cmd *);
+extern int transport_generic_handle_cdb_map(struct se_cmd *);
+extern int transport_generic_handle_data(struct se_cmd *);
+extern void transport_new_cmd_failure(struct se_cmd *);
+extern int transport_generic_handle_tmr(struct se_cmd *);
+extern void __transport_stop_task_timer(struct se_task *, unsigned long *);
+extern unsigned char transport_asciihex_to_binaryhex(unsigned char val[2]);
+extern int transport_generic_map_mem_to_cmd(struct se_cmd *cmd, struct scatterlist *, u32,
+                                struct scatterlist *, u32);
+extern int transport_clear_lun_from_sessions(struct se_lun *);
+extern int transport_check_aborted_status(struct se_cmd *, int);
+extern int transport_send_check_condition_and_sense(struct se_cmd *, u8, int);
+extern void transport_send_task_abort(struct se_cmd *);
+extern void transport_release_cmd_to_pool(struct se_cmd *);
+extern void transport_generic_free_cmd(struct se_cmd *, int, int, int);
+extern void transport_generic_wait_for_cmds(struct se_cmd *, int);
+extern u32 transport_calc_sg_num(struct se_task *, struct se_mem *, u32);
+extern int transport_map_mem_to_sg(struct se_task *, struct list_head *,
+                                        void *, struct se_mem *,
+                                        struct se_mem **, u32 *, u32 *);
+extern void transport_do_task_sg_chain(struct se_cmd *);
+extern void transport_generic_process_write(struct se_cmd *);
+extern int transport_generic_do_tmr(struct se_cmd *);
+/* From target_core_alua.c */
+extern int core_alua_check_nonop_delay(struct se_cmd *);
+/*
+ * Each se_transport_task_t can have N number of possible struct se_task's
+ * for the storage transport(s) to possibly execute.
+ * Used primarily for splitting up CDBs that exceed the physical storage
+ * HBA's maximum sector count per task.
+ */
+struct se_mem {
+        struct page     *se_page;
+        u32             se_len;
+        u32             se_off;
+        struct list_head se_list;
+} ____cacheline_aligned;
+/*
+ *      Each type of disk transport supported MUST have a template defined
+ *      within its .h file.
+ */
+struct se_subsystem_api {
+        /*
+         * The Name. :-)
+         */
+        char name[16];
+        /*
+         * Transport Type.
+         */
+        u8 transport_type;
+        /*
+         * struct module for struct se_hba references
+         */
+        struct module *owner;
+        /*
+         * Used for global se_subsystem_api list_head
+         */
+        struct list_head sub_api_list;
+        /*
+         * For SCF_SCSI_NON_DATA_CDB
+         */
+        int (*cdb_none)(struct se_task *);
+        /*
+         * For SCF_SCSI_CONTROL_NONSG_IO_CDB
+         */
+        int (*map_task_non_SG)(struct se_task *);
+        /*
+         * For SCF_SCSI_DATA_SG_IO_CDB and SCF_SCSI_CONTROL_SG_IO_CDB
+         */
+        int (*map_task_SG)(struct se_task *);
+        /*
+         * attach_hba():
+         */
+        int (*attach_hba)(struct se_hba *, u32);
+        /*
+         * detach_hba():
+         */
+        void (*detach_hba)(struct se_hba *);
+        /*
+         * pmode_hba(): Used for TCM/pSCSI subsystem plugin HBA ->
+         *              Linux/SCSI struct Scsi_Host passthrough
+        */
+        int (*pmode_enable_hba)(struct se_hba *, unsigned long);
+        /*
+         * allocate_virtdevice():
+         */
+        void *(*allocate_virtdevice)(struct se_hba *, const char *);
+        /*
+         * create_virtdevice(): Only for Virtual HBAs
+         */
+        struct se_device *(*create_virtdevice)(struct se_hba *,
+                                struct se_subsystem_dev *, void *);
+        /*
+         * free_device():
+         */
+        void (*free_device)(void *);
+        /*
+         * dpo_emulated():
+         */
+        int (*dpo_emulated)(struct se_device *);
+        /*
+         * fua_write_emulated():
+         */
+        int (*fua_write_emulated)(struct se_device *);
+        /*
+         * fua_read_emulated():
+         */
+        int (*fua_read_emulated)(struct se_device *);
+        /*
+         * write_cache_emulated():
+         */
+        int (*write_cache_emulated)(struct se_device *);
+        /*
+         * transport_complete():
+         *
+         * Use transport_generic_complete() for majority of DAS transport
+         * drivers.  Provided out of convenience.
+         */
+        int (*transport_complete)(struct se_task *task);
+        struct se_task *(*alloc_task)(struct se_cmd *);
+        /*
+         * do_task():
+         */
+        int (*do_task)(struct se_task *);
+        /*
+         * Used by virtual subsystem plugins IBLOCK and FILEIO to emulate
+         * UNMAP and WRITE_SAME_* w/ UNMAP=1 <-> Linux/Block Discard
+         */
+        int (*do_discard)(struct se_device *, sector_t, u32);
+        /*
+         * Used  by virtual subsystem plugins IBLOCK and FILEIO to emulate
+         * SYNCHRONIZE_CACHE_* <-> Linux/Block blkdev_issue_flush()
+         */
+        void (*do_sync_cache)(struct se_task *);
+        /*
+         * free_task():
+         */
+        void (*free_task)(struct se_task *);
+        /*
+         * check_configfs_dev_params():
+         */
+        ssize_t (*check_configfs_dev_params)(struct se_hba *, struct se_subsystem_dev *);
+        /*
+         * set_configfs_dev_params():
+         */
+        ssize_t (*set_configfs_dev_params)(struct se_hba *, struct se_subsystem_dev *,
+                                                const char *, ssize_t);
+        /*
+         * show_configfs_dev_params():
+         */
+        ssize_t (*show_configfs_dev_params)(struct se_hba *, struct se_subsystem_dev *,
+                                                char *);
+        /*
+         * get_cdb():
+         */
+        unsigned char *(*get_cdb)(struct se_task *);
+        /*
+         * get_device_rev():
+         */
+        u32 (*get_device_rev)(struct se_device *);
+        /*
+         * get_device_type():
+         */
+        u32 (*get_device_type)(struct se_device *);
+        /*
+         * Get the sector_t from a subsystem backstore..
+         */
+        sector_t (*get_blocks)(struct se_device *);
+        /*
+         * do_se_mem_map():
+         */
+        int (*do_se_mem_map)(struct se_task *, struct list_head *, void *,
+                                struct se_mem *, struct se_mem **, u32 *, u32 *);
+        /*
+         * get_sense_buffer():
+         */
+        unsigned char *(*get_sense_buffer)(struct se_task *);
+} ____cacheline_aligned;
+#define TRANSPORT(dev)          ((dev)->transport)
+#define HBA_TRANSPORT(hba)      ((hba)->transport)
+extern struct se_global *se_global;
+#endif /* TARGET_CORE_TRANSPORT_H */
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
new file mode 100644
index 000000000000..186e84db4b54
--- /dev/null
+++ b/include/trace/events/asoc.h
@@ -0,0 +1,235 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM asoc
+#if !defined(_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ASOC_H
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+struct snd_soc_jack;
+struct snd_soc_codec;
+struct snd_soc_card;
+struct snd_soc_dapm_widget;
+/*
+ * Log register events
+ */
+DECLARE_EVENT_CLASS(snd_soc_reg,
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+        TP_ARGS(codec, reg, val),
+        TP_STRUCT__entry(
+                __string(       name,           codec->name     )
+                __field(        int,            id              )
+                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   val             )
+        ),
+        TP_fast_assign(
+                __assign_str(name, codec->name);
+                __entry->id = codec->id;
+                __entry->reg = reg;
+                __entry->val = val;
+        ),
+        TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
+                  (int)__entry->id, (unsigned int)__entry->reg,
+                  (unsigned int)__entry->val)
+);
+DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write,
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+        TP_ARGS(codec, reg, val)
+);
+DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read,
+        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
+                 unsigned int val),
+        TP_ARGS(codec, reg, val)
+);
+DECLARE_EVENT_CLASS(snd_soc_card,
+        TP_PROTO(struct snd_soc_card *card, int val),
+        TP_ARGS(card, val),
+        TP_STRUCT__entry(
+                __string(       name,           card->name      )
+                __field(        int,            val             )
+        ),
+        TP_fast_assign(
+                __assign_str(name, card->name);
+                __entry->val = val;
+        ),
+        TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val)
+);
+DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_start,
+        TP_PROTO(struct snd_soc_card *card, int val),
+        TP_ARGS(card, val)
+);
+DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_done,
+        TP_PROTO(struct snd_soc_card *card, int val),
+        TP_ARGS(card, val)
+);
+DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
+        TP_PROTO(struct snd_soc_card *card),
+        TP_ARGS(card),
+        TP_STRUCT__entry(
+                __string(       name,   card->name      )
+        ),
+        TP_fast_assign(
+                __assign_str(name, card->name);
+        ),
+        TP_printk("card=%s", __get_str(name))
+);
+DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start,
+        TP_PROTO(struct snd_soc_card *card),
+        TP_ARGS(card)
+);
+DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done,
+        TP_PROTO(struct snd_soc_card *card),
+        TP_ARGS(card)
+);
+DECLARE_EVENT_CLASS(snd_soc_dapm_widget,
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+        TP_ARGS(w, val),
+        TP_STRUCT__entry(
+                __string(       name,   w->name         )
+                __field(        int,    val             )
+        ),
+        TP_fast_assign(
+                __assign_str(name, w->name);
+                __entry->val = val;
+        ),
+        TP_printk("widget=%s val=%d", __get_str(name),
+                  (int)__entry->val)
+);
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+        TP_ARGS(w, val)
+);
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start,
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+        TP_ARGS(w, val)
+);
+DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done,
+        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
+        TP_ARGS(w, val)
+);
+TRACE_EVENT(snd_soc_jack_irq,
+        TP_PROTO(const char *name),
+        TP_ARGS(name),
+        TP_STRUCT__entry(
+                __string(       name,   name            )
+        ),
+        TP_fast_assign(
+                __assign_str(name, name);
+        ),
+        TP_printk("%s", __get_str(name))
+);
+TRACE_EVENT(snd_soc_jack_report,
+        TP_PROTO(struct snd_soc_jack *jack, int mask, int val),
+        TP_ARGS(jack, mask, val),
+        TP_STRUCT__entry(
+                __string(       name,           jack->jack->name        )
+                __field(        int,            mask                    )
+                __field(        int,            val                     )
+        ),
+        TP_fast_assign(
+                __assign_str(name, jack->jack->name);
+                __entry->mask = mask;
+                __entry->val = val;
+        ),
+        TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val,
+                  (int)__entry->mask)
+);
+TRACE_EVENT(snd_soc_jack_notify,
+        TP_PROTO(struct snd_soc_jack *jack, int val),
+        TP_ARGS(jack, val),
+        TP_STRUCT__entry(
+                __string(       name,           jack->jack->name        )
+                __field(        int,            val                     )
+        ),
+        TP_fast_assign(
+                __assign_str(name, jack->jack->name);
+                __entry->val = val;
+        ),
+        TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
+);
+#endif /* _TRACE_ASOC_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index d8ce278515c3..aba421d68f6f 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -206,15 +206,16 @@ TRACE_EVENT(block_bio_bounce,
 * block_bio_complete - completed all work on the block operation
 * @q: queue holding the block operation
 * @bio: block operation completed
+ * @error: io error value
 *
 * This tracepoint indicates there is no further work to do on this
 * block IO operation @bio.
 */
 TRACE_EVENT(block_bio_complete,
-        TP_PROTO(struct request_queue *q, struct bio *bio),
+        TP_PROTO(struct request_queue *q, struct bio *bio, int error),
-        TP_ARGS(q, bio),
+        TP_ARGS(q, bio, error),
        TP_STRUCT__entry(
                __field( dev_t,         dev             )
@@ -228,6 +229,7 @@ TRACE_EVENT(block_bio_complete,
                __entry->dev            = bio->bi_bdev->bd_dev;
                __entry->sector         = bio->bi_sector;
                __entry->nr_sector      = bio->bi_size >> 9;
+                __entry->error          = error;
                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
        ),
@@ -486,16 +488,16 @@ TRACE_EVENT(block_split,
 );
 /**
- * block_remap - map request for a partition to the raw device
+ * block_bio_remap - map request for a logical device to the raw device
 * @q: queue holding the operation
 * @bio: revised operation
 * @dev: device for the operation
 * @from: original sector for the operation
 *
- * An operation for a partition on a block device has been mapped to the
+ * An operation for a logical device has been mapped to the
 * raw block device.
 */
-TRACE_EVENT(block_remap,
+TRACE_EVENT(block_bio_remap,
        TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
                 sector_t from),
diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h
new file mode 100644
index 000000000000..388bcdd26d46
--- /dev/null
+++ b/include/trace/events/compaction.h
@@ -0,0 +1,74 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM compaction
+#if !defined(_TRACE_COMPACTION_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_COMPACTION_H
+#include <linux/types.h>
+#include <linux/tracepoint.h>
+#include "gfpflags.h"
+DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
+        TP_PROTO(unsigned long nr_scanned,
+                unsigned long nr_taken),
+        TP_ARGS(nr_scanned, nr_taken),
+        TP_STRUCT__entry(
+                __field(unsigned long, nr_scanned)
+                __field(unsigned long, nr_taken)
+        ),
+        TP_fast_assign(
+                __entry->nr_scanned = nr_scanned;
+                __entry->nr_taken = nr_taken;
+        ),
+        TP_printk("nr_scanned=%lu nr_taken=%lu",
+                __entry->nr_scanned,
+                __entry->nr_taken)
+);
+DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_migratepages,
+        TP_PROTO(unsigned long nr_scanned,
+                unsigned long nr_taken),
+        TP_ARGS(nr_scanned, nr_taken)
+);
+DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
+        TP_PROTO(unsigned long nr_scanned,
+                unsigned long nr_taken),
+        TP_ARGS(nr_scanned, nr_taken)
+);
+TRACE_EVENT(mm_compaction_migratepages,
+        TP_PROTO(unsigned long nr_migrated,
+                unsigned long nr_failed),
+        TP_ARGS(nr_migrated, nr_failed),
+        TP_STRUCT__entry(
+                __field(unsigned long, nr_migrated)
+                __field(unsigned long, nr_failed)
+        ),
+        TP_fast_assign(
+                __entry->nr_migrated = nr_migrated;
+                __entry->nr_failed = nr_failed;
+        ),
+        TP_printk("nr_migrated=%lu nr_failed=%lu",
+                __entry->nr_migrated,
+                __entry->nr_failed)
+);
+#endif /* _TRACE_COMPACTION_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 6dd3a51ab1cb..46e3cd8e197a 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -6,6 +6,36 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm
+#define ERSN(x) { KVM_EXIT_##x, "KVM_EXIT_" #x }
+#define kvm_trace_exit_reason                                           \
+        ERSN(UNKNOWN), ERSN(EXCEPTION), ERSN(IO), ERSN(HYPERCALL),      \
+        ERSN(DEBUG), ERSN(HLT), ERSN(MMIO), ERSN(IRQ_WINDOW_OPEN),      \
+        ERSN(SHUTDOWN), ERSN(FAIL_ENTRY), ERSN(INTR), ERSN(SET_TPR),    \
+        ERSN(TPR_ACCESS), ERSN(S390_SIEIC), ERSN(S390_RESET), ERSN(DCR),\
+        ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI)
+TRACE_EVENT(kvm_userspace_exit,
+            TP_PROTO(__u32 reason, int errno),
+            TP_ARGS(reason, errno),
+        TP_STRUCT__entry(
+                __field(        __u32,          reason          )
+                __field(        int,            errno           )
+        ),
+        TP_fast_assign(
+                __entry->reason         = reason;
+                __entry->errno          = errno;
+        ),
+        TP_printk("reason %s (%d)",
+                  __entry->errno < 0 ?
+                  (__entry->errno == -EINTR ? "restart" : "error") :
+                  __print_symbolic(__entry->reason, kvm_trace_exit_reason),
+                  __entry->errno < 0 ? -__entry->errno : __entry->reason)
+);
 #if defined(__KVM_HAVE_IOAPIC)
 TRACE_EVENT(kvm_set_irq,
        TP_PROTO(unsigned int gsi, int level, int irq_source_id),
@@ -185,6 +215,97 @@ TRACE_EVENT(kvm_age_page,
                  __entry->referenced ? "YOUNG" : "OLD")
 );
+#ifdef CONFIG_KVM_ASYNC_PF
+DECLARE_EVENT_CLASS(kvm_async_get_page_class,
+        TP_PROTO(u64 gva, u64 gfn),
+        TP_ARGS(gva, gfn),
+        TP_STRUCT__entry(
+                __field(__u64, gva)
+                __field(u64, gfn)
+        ),
+        TP_fast_assign(
+                __entry->gva = gva;
+                __entry->gfn = gfn;
+        ),
+        TP_printk("gva = %#llx, gfn = %#llx", __entry->gva, __entry->gfn)
+);
+DEFINE_EVENT(kvm_async_get_page_class, kvm_try_async_get_page,
+        TP_PROTO(u64 gva, u64 gfn),
+        TP_ARGS(gva, gfn)
+);
+DEFINE_EVENT(kvm_async_get_page_class, kvm_async_pf_doublefault,
+        TP_PROTO(u64 gva, u64 gfn),
+        TP_ARGS(gva, gfn)
+);
+DECLARE_EVENT_CLASS(kvm_async_pf_nopresent_ready,
+        TP_PROTO(u64 token, u64 gva),
+        TP_ARGS(token, gva),
+        TP_STRUCT__entry(
+                __field(__u64, token)
+                __field(__u64, gva)
+        ),
+        TP_fast_assign(
+                __entry->token = token;
+                __entry->gva = gva;
+        ),
+        TP_printk("token %#llx gva %#llx", __entry->token, __entry->gva)
+);
+DEFINE_EVENT(kvm_async_pf_nopresent_ready, kvm_async_pf_not_present,
+        TP_PROTO(u64 token, u64 gva),
+        TP_ARGS(token, gva)
+);
+DEFINE_EVENT(kvm_async_pf_nopresent_ready, kvm_async_pf_ready,
+        TP_PROTO(u64 token, u64 gva),
+        TP_ARGS(token, gva)
+);
+TRACE_EVENT(
+        kvm_async_pf_completed,
+        TP_PROTO(unsigned long address, struct page *page, u64 gva),
+        TP_ARGS(address, page, gva),
+        TP_STRUCT__entry(
+                __field(unsigned long, address)
+                __field(pfn_t, pfn)
+                __field(u64, gva)
+                ),
+        TP_fast_assign(
+                __entry->address = address;
+                __entry->pfn = page ? page_to_pfn(page) : 0;
+                __entry->gva = gva;
+                ),
+        TP_printk("gva %#llx address %#lx pfn %#llx",  __entry->gva,
+                  __entry->address, __entry->pfn)
+);
+#endif
 #endif /* _TRACE_KVM_MAIN_H */
 /* This part must be outside protection */
diff --git a/include/trace/events/module.h b/include/trace/events/module.h
index c7bb2f0482fe..c6bae36547e5 100644
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
@@ -1,5 +1,15 @@
+/*
+ * Because linux/module.h has tracepoints in the header, and ftrace.h
+ * eventually includes this file, define_trace.h includes linux/module.h
+ * But we do not want the module.h to override the TRACE_SYSTEM macro
+ * variable that define_trace.h is processing, so we only set it
+ * when module events are being processed, which would happen when
+ * CREATE_TRACE_POINTS is defined.
+ */
+#ifdef CREATE_TRACE_POINTS
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM module
+#endif
 #if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_MODULE_H
diff --git a/include/trace/events/regulator.h b/include/trace/events/regulator.h
new file mode 100644
index 000000000000..37502a7404b7
--- /dev/null
+++ b/include/trace/events/regulator.h
@@ -0,0 +1,141 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM regulator
+#if !defined(_TRACE_REGULATOR_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_REGULATOR_H
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+/*
+ * Events which just log themselves and the regulator name for enable/disable
+ * type tracking.
+ */
+DECLARE_EVENT_CLASS(regulator_basic,
+        TP_PROTO(const char *name),
+        TP_ARGS(name),
+        TP_STRUCT__entry(
+                __string(       name,   name    )
+        ),
+        TP_fast_assign(
+                __assign_str(name, name);
+        ),
+        TP_printk("name=%s", __get_str(name))
+);
+DEFINE_EVENT(regulator_basic, regulator_enable,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+DEFINE_EVENT(regulator_basic, regulator_enable_delay,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+DEFINE_EVENT(regulator_basic, regulator_enable_complete,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+DEFINE_EVENT(regulator_basic, regulator_disable,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+DEFINE_EVENT(regulator_basic, regulator_disable_complete,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+/*
+ * Events that take a range of numerical values, mostly for voltages
+ * and so on.
+ */
+DECLARE_EVENT_CLASS(regulator_range,
+        TP_PROTO(const char *name, int min, int max),
+        TP_ARGS(name, min, max),
+        TP_STRUCT__entry(
+                __string(       name,           name            )
+                __field(        int,            min             )
+                __field(        int,            max             )
+        ),
+        TP_fast_assign(
+                __assign_str(name, name);
+                __entry->min  = min;
+                __entry->max  = max;
+        ),
+        TP_printk("name=%s (%d-%d)", __get_str(name),
+                  (int)__entry->min, (int)__entry->max)
+);
+DEFINE_EVENT(regulator_range, regulator_set_voltage,
+        TP_PROTO(const char *name, int min, int max),
+        TP_ARGS(name, min, max)
+);
+/*
+ * Events that take a single value, mostly for readback and refcounts.
+ */
+DECLARE_EVENT_CLASS(regulator_value,
+        TP_PROTO(const char *name, unsigned int val),
+        TP_ARGS(name, val),
+        TP_STRUCT__entry(
+                __string(       name,           name            )
+                __field(        unsigned int,   val             )
+        ),
+        TP_fast_assign(
+                __assign_str(name, name);
+                __entry->val  = val;
+        ),
+        TP_printk("name=%s, val=%u", __get_str(name),
+                  (int)__entry->val)
+);
+DEFINE_EVENT(regulator_value, regulator_set_voltage_complete,
+        TP_PROTO(const char *name, unsigned int value),
+        TP_ARGS(name, value)
+);
+#endif /* _TRACE_POWER_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index c255fcc587bf..ea422aaa23e1 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -25,13 +25,13 @@
 #define trace_reclaim_flags(page, sync) ( \
        (page_is_file_cache(page) ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
-        (sync == LUMPY_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC)   \
+        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC)   \
        )
 #define trace_shrink_flags(file, sync) ( \
-        (sync == LUMPY_MODE_SYNC ? RECLAIM_WB_MIXED : \
+        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_MIXED : \
                        (file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON)) |  \
-        (sync == LUMPY_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
+        (sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
        )
 TRACE_EVENT(mm_vmscan_kswapd_sleep,
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 89a2b2db4375..4e249b927eaa 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -81,6 +81,7 @@ DEFINE_EVENT(writeback_class, name, \
        TP_ARGS(bdi))
 DEFINE_WRITEBACK_EVENT(writeback_nowork);
+DEFINE_WRITEBACK_EVENT(writeback_wake_background);
 DEFINE_WRITEBACK_EVENT(writeback_wake_thread);
 DEFINE_WRITEBACK_EVENT(writeback_wake_forker_thread);
 DEFINE_WRITEBACK_EVENT(writeback_bdi_register);
diff --git a/include/xen/gntdev.h b/include/xen/gntdev.h
new file mode 100644
index 000000000000..eb23f4188f5a
--- /dev/null
+++ b/include/xen/gntdev.h
@@ -0,0 +1,119 @@
+/******************************************************************************
+ * gntdev.h
+ * 
+ * Interface to /dev/xen/gntdev.
+ * 
+ * Copyright (c) 2007, D G Murray
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef __LINUX_PUBLIC_GNTDEV_H__
+#define __LINUX_PUBLIC_GNTDEV_H__
+struct ioctl_gntdev_grant_ref {
+        /* The domain ID of the grant to be mapped. */
+        uint32_t domid;
+        /* The grant reference of the grant to be mapped. */
+        uint32_t ref;
+};
+/*
+ * Inserts the grant references into the mapping table of an instance
+ * of gntdev. N.B. This does not perform the mapping, which is deferred
+ * until mmap() is called with @index as the offset.
+ */
+#define IOCTL_GNTDEV_MAP_GRANT_REF \
+_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
+struct ioctl_gntdev_map_grant_ref {
+        /* IN parameters */
+        /* The number of grants to be mapped. */
+        uint32_t count;
+        uint32_t pad;
+        /* OUT parameters */
+        /* The offset to be used on a subsequent call to mmap(). */
+        uint64_t index;
+        /* Variable IN parameter. */
+        /* Array of grant references, of size @count. */
+        struct ioctl_gntdev_grant_ref refs[1];
+};
+/*
+ * Removes the grant references from the mapping table of an instance of
+ * of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
+ * before this ioctl is called, or an error will result.
+ */
+#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
+_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))
+struct ioctl_gntdev_unmap_grant_ref {
+        /* IN parameters */
+        /* The offset was returned by the corresponding map operation. */
+        uint64_t index;
+        /* The number of pages to be unmapped. */
+        uint32_t count;
+        uint32_t pad;
+};
+/*
+ * Returns the offset in the driver's address space that corresponds
+ * to @vaddr. This can be used to perform a munmap(), followed by an
+ * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
+ * the caller. The number of pages that were allocated at the same time as
+ * @vaddr is returned in @count.
+ *
+ * N.B. Where more than one page has been mapped into a contiguous range, the
+ *      supplied @vaddr must correspond to the start of the range; otherwise
+ *      an error will result. It is only possible to munmap() the entire
+ *      contiguously-allocated range at once, and not any subrange thereof.
+ */
+#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
+_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
+struct ioctl_gntdev_get_offset_for_vaddr {
+        /* IN parameters */
+        /* The virtual address of the first mapped page in a range. */
+        uint64_t vaddr;
+        /* OUT parameters */
+        /* The offset that was used in the initial mmap() operation. */
+        uint64_t offset;
+        /* The number of pages mapped in the VM area that begins at @vaddr. */
+        uint32_t count;
+        uint32_t pad;
+};
+/*
+ * Sets the maximum number of grants that may mapped at once by this gntdev
+ * instance.
+ *
+ * N.B. This must be called before any other ioctl is performed on the device.
+ */
+#define IOCTL_GNTDEV_SET_MAX_GRANTS \
+_IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
+struct ioctl_gntdev_set_max_grants {
+        /* IN parameter */
+        /* The maximum number of grants that may be mapped at once. */
+        uint32_t count;
+};
+#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 9a731706a016..b1fab6b5b3ef 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -37,10 +37,16 @@
 #ifndef __ASM_GNTTAB_H__
 #define __ASM_GNTTAB_H__
-#include <asm/xen/hypervisor.h>
+#include <asm/page.h>
+#include <xen/interface/xen.h>
 #include <xen/interface/grant_table.h>
+#include <asm/xen/hypervisor.h>
 #include <asm/xen/grant_table.h>
+#include <xen/features.h>
 /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
 #define NR_GRANT_FRAMES 4
@@ -107,6 +113,37 @@ void gnttab_grant_foreign_access_ref(grant_ref_t ref, domid_t domid,
 void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid,
                                       unsigned long pfn);
+static inline void
+gnttab_set_map_op(struct gnttab_map_grant_ref *map, phys_addr_t addr,
+                  uint32_t flags, grant_ref_t ref, domid_t domid)
+{
+        if (flags & GNTMAP_contains_pte)
+                map->host_addr = addr;
+        else if (xen_feature(XENFEAT_auto_translated_physmap))
+                map->host_addr = __pa(addr);
+        else
+                map->host_addr = addr;
+        map->flags = flags;
+        map->ref = ref;
+        map->dom = domid;
+}
+static inline void
+gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
+                    uint32_t flags, grant_handle_t handle)
+{
+        if (flags & GNTMAP_contains_pte)
+                unmap->host_addr = addr;
+        else if (xen_feature(XENFEAT_auto_translated_physmap))
+                unmap->host_addr = __pa(addr);
+        else
+                unmap->host_addr = addr;
+        unmap->handle = handle;
+        unmap->dev_bus_addr = 0;
+}
 int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
                           unsigned long max_nr_gframes,
                           struct grant_entry **__shared);
@@ -118,4 +155,9 @@ unsigned int gnttab_max_grant_frames(void);
 #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
+int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
+                    struct page **pages, unsigned int count);
+int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
+                      struct page **pages, unsigned int count);
 #endif /* __ASM_GNTTAB_H__ */
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index 43e2d7d33976..7a1d15ff19b7 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -94,7 +94,7 @@ struct xenbus_driver {
        int (*remove)(struct xenbus_device *dev);
        int (*suspend)(struct xenbus_device *dev, pm_message_t state);
        int (*resume)(struct xenbus_device *dev);
-        int (*uevent)(struct xenbus_device *, char **, int, char *, int);
+        int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *);
        struct device_driver driver;
        int (*read_otherend_details)(struct xenbus_device *dev);
        int (*is_ready)(struct xenbus_device *dev);