156 files changed, 4102 insertions, 1510 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 89bbb2aeabbd..1cef1398e358 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -350,7 +350,6 @@ void acpi_remove_dir(struct acpi_device *);
 /*
 * Bind physical devices with ACPI devices
 */
-#include <linux/device.h>
 struct acpi_bus_type {
        struct list_head list;
        struct bus_type *bus;
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index ef4601149f49..153f12dc3373 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -288,7 +288,7 @@ typedef u32 acpi_physical_address;
 /*
 * Some compilers complain about unused variables. Sometimes we don't want to
 * use all the variables (for example, _acpi_module_name). This allows us
- * to to tell the compiler in a per-variable manner that a variable
+ * to tell the compiler in a per-variable manner that a variable
 * is unused
 */
 #ifndef ACPI_UNUSED_VAR
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index 935c5d7fc86e..6aadbf84ae71 100644
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -57,7 +57,7 @@
 /*
 * Some compilers complain about unused variables. Sometimes we don't want to
 * use all the variables (for example, _acpi_module_name). This allows us
- * to to tell the compiler warning in a per-variable manner that a variable
+ * to tell the compiler warning in a per-variable manner that a variable
 * is unused.
 */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index d6c379dc64fa..9cca3785cab8 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -141,6 +141,8 @@ extern int __gpio_to_irq(unsigned gpio);
 * but more typically is configured entirely from userspace.
 */
 extern int gpio_export(unsigned gpio, bool direction_may_change);
+extern int gpio_export_link(struct device *dev, const char *name,
+                        unsigned gpio);
 extern void gpio_unexport(unsigned gpio);
 #endif  /* CONFIG_GPIO_SYSFS */
@@ -185,6 +187,12 @@ static inline int gpio_export(unsigned gpio, bool direction_may_change)
        return -ENOSYS;
 }
+static inline int gpio_export_link(struct device *dev, const char *name,
+                                unsigned gpio)
+{
+        return -ENOSYS;
+}
 static inline void gpio_unexport(unsigned gpio)
 {
 }
diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index eddbce0f9fb9..e5f234a08540 100644
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@ -2,34 +2,35 @@
 #define _ASM_GENERIC_KMAP_TYPES_H
 #ifdef __WITH_KM_FENCE
-# define D(n) __KM_FENCE_##n ,
+# define KMAP_D(n) __KM_FENCE_##n ,
 #else
-# define D(n)
+# define KMAP_D(n)
 #endif
 enum km_type {
-D(0)    KM_BOUNCE_READ,
+KMAP_D(0)       KM_BOUNCE_READ,
-D(1)    KM_SKB_SUNRPC_DATA,
+KMAP_D(1)       KM_SKB_SUNRPC_DATA,
-D(2)    KM_SKB_DATA_SOFTIRQ,
+KMAP_D(2)       KM_SKB_DATA_SOFTIRQ,
-D(3)    KM_USER0,
+KMAP_D(3)       KM_USER0,
-D(4)    KM_USER1,
+KMAP_D(4)       KM_USER1,
-D(5)    KM_BIO_SRC_IRQ,
+KMAP_D(5)       KM_BIO_SRC_IRQ,
-D(6)    KM_BIO_DST_IRQ,
+KMAP_D(6)       KM_BIO_DST_IRQ,
-D(7)    KM_PTE0,
+KMAP_D(7)       KM_PTE0,
-D(8)    KM_PTE1,
+KMAP_D(8)       KM_PTE1,
-D(9)    KM_IRQ0,
+KMAP_D(9)       KM_IRQ0,
-D(10)   KM_IRQ1,
+KMAP_D(10)      KM_IRQ1,
-D(11)   KM_SOFTIRQ0,
+KMAP_D(11)      KM_SOFTIRQ0,
-D(12)   KM_SOFTIRQ1,
+KMAP_D(12)      KM_SOFTIRQ1,
-D(13)   KM_SYNC_ICACHE,
+KMAP_D(13)      KM_SYNC_ICACHE,
-D(14)   KM_SYNC_DCACHE,
+KMAP_D(14)      KM_SYNC_DCACHE,
-D(15)   KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */
+/* UML specific, for copy_*_user - used in do_op_one_page */
-D(16)   KM_IRQ_PTE,
+KMAP_D(15)      KM_UML_USERCOPY,
-D(17)   KM_NMI,
+KMAP_D(16)      KM_IRQ_PTE,
-D(18)   KM_NMI_PTE,
+KMAP_D(17)      KM_NMI,
-D(19)   KM_TYPE_NR
+KMAP_D(18)      KM_NMI_PTE,
+KMAP_D(19)      KM_TYPE_NR
 };
-#undef D
+#undef KMAP_D
 #endif
diff --git a/include/asm-generic/mman-common.h b/include/asm-generic/mman-common.h
index 3b69ad34189a..dd63bd38864b 100644
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
@@ -35,6 +35,9 @@
 #define MADV_DONTFORK   10              /* don't inherit across fork */
 #define MADV_DOFORK     11              /* do inherit across fork */
+#define MADV_MERGEABLE   12             /* KSM may merge identical pages */
+#define MADV_UNMERGEABLE 13             /* KSM may not merge identical pages */
 /* compatibility flags */
 #define MAP_FILE        0
diff --git a/include/asm-generic/mman.h b/include/asm-generic/mman.h
index 7cab4de2bca6..32c8bd6a196d 100644
--- a/include/asm-generic/mman.h
+++ b/include/asm-generic/mman.h
@@ -11,6 +11,7 @@
 #define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK    0x10000         /* do not block on IO */
 #define MAP_STACK       0x20000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB     0x40000         /* create a huge page mapping */
 #define MCL_CURRENT     1               /* lock all current mappings */
 #define MCL_FUTURE      2               /* lock all future mappings */
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index d083561337f2..b3bfabc258f3 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -23,4 +23,20 @@ extern char __ctors_start[], __ctors_end[];
 #define dereference_function_descriptor(p) (p)
 #endif
+/* random extra sections (if any).  Override
+ * in asm/sections.h */
+#ifndef arch_is_kernel_text
+static inline int arch_is_kernel_text(unsigned long addr)
+{
+        return 0;
+}
+#endif
+#ifndef arch_is_kernel_data
+static inline int arch_is_kernel_data(unsigned long addr)
+{
+        return 0;
+}
+#endif
 #endif /* _ASM_GENERIC_SECTIONS_H_ */
diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h
index ea8087b55ffc..5c122ae6bfa6 100644
--- a/include/asm-generic/syscall.h
+++ b/include/asm-generic/syscall.h
@@ -1,7 +1,7 @@
 /*
 * Access to user system call parameters and results
 *
- * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2008-2009 Red Hat, Inc.  All rights reserved.
 *
 * This copyrighted material is made available to anyone wishing to use,
 * modify, copy, or redistribute it subject to the terms and conditions
@@ -32,9 +32,13 @@ struct pt_regs;
 * If @task is not executing a system call, i.e. it's blocked
 * inside the kernel for a fault or signal, returns -1.
 *
+ * Note this returns int even on 64-bit machines.  Only 32 bits of
+ * system call number can be meaningful.  If the actual arch value
+ * is 64 bits, this truncates to 32 bits so 0xffffffff means -1.
+ *
 * It's only valid to call this when @task is known to be blocked.
 */
-long syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
+int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
 /**
 * syscall_rollback - roll back registers after an aborted system call
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index 1125e5a1ee5d..d76b66acea95 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -620,8 +620,8 @@ __SYSCALL(__NR_move_pages, sys_move_pages)
 #define __NR_rt_tgsigqueueinfo 240
 __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 241
+#define __NR_perf_event_open 241
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 #undef __NR_syscalls
 #define __NR_syscalls 242
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 45b67d9c39c1..c8e64bbadbcf 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -88,7 +88,37 @@ struct drm_device;
 #define DRM_UT_CORE             0x01
 #define DRM_UT_DRIVER           0x02
 #define DRM_UT_KMS              0x04
-#define DRM_UT_MODE             0x08
+/*
+ * Three debug levels are defined.
+ * drm_core, drm_driver, drm_kms
+ * drm_core level can be used in the generic drm code. For example:
+ *      drm_ioctl, drm_mm, drm_memory
+ * The macro definiton of DRM_DEBUG is used.
+ *      DRM_DEBUG(fmt, args...)
+ *      The debug info by using the DRM_DEBUG can be obtained by adding
+ *      the boot option of "drm.debug=1".
+ *
+ * drm_driver level can be used in the specific drm driver. It is used
+ * to add the debug info related with the drm driver. For example:
+ * i915_drv, i915_dma, i915_gem, radeon_drv,
+ *      The macro definition of DRM_DEBUG_DRIVER can be used.
+ *      DRM_DEBUG_DRIVER(fmt, args...)
+ *      The debug info by using the DRM_DEBUG_DRIVER can be obtained by
+ *      adding the boot option of "drm.debug=0x02"
+ *
+ * drm_kms level can be used in the KMS code related with specific drm driver.
+ * It is used to add the debug info related with KMS mode. For example:
+ * the connector/crtc ,
+ *      The macro definition of DRM_DEBUG_KMS can be used.
+ *      DRM_DEBUG_KMS(fmt, args...)
+ *      The debug info by using the DRM_DEBUG_KMS can be obtained by
+ *      adding the boot option of "drm.debug=0x04"
+ *
+ * If we add the boot option of "drm.debug=0x06", we can get the debug info by
+ * using the DRM_DEBUG_KMS and DRM_DEBUG_DRIVER.
+ * If we add the boot option of "drm.debug=0x05", we can get the debug info by
+ * using the DRM_DEBUG_KMS and DRM_DEBUG.
+ */
 extern void drm_ut_debug_printk(unsigned int request_level,
                                const char *prefix,
@@ -174,19 +204,14 @@ extern void drm_ut_debug_printk(unsigned int request_level,
                                        __func__, fmt, ##args);         \
        } while (0)
-#define DRM_DEBUG_DRIVER(prefix, fmt, args...)                          \
+#define DRM_DEBUG_DRIVER(fmt, args...)                                  \
        do {                                                            \
-                drm_ut_debug_printk(DRM_UT_DRIVER, prefix,              \
+                drm_ut_debug_printk(DRM_UT_DRIVER, DRM_NAME,            \
                                        __func__, fmt, ##args);         \
        } while (0)
-#define DRM_DEBUG_KMS(prefix, fmt, args...)                             \
+#define DRM_DEBUG_KMS(fmt, args...)                             \
        do {                                                            \
-                drm_ut_debug_printk(DRM_UT_KMS, prefix,                 \
+                drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME,               \
-                                         __func__, fmt, ##args);        \
-        } while (0)
-#define DRM_DEBUG_MODE(prefix, fmt, args...)                            \
-        do {                                                            \
-                drm_ut_debug_printk(DRM_UT_MODE, prefix,                \
                                         __func__, fmt, ##args);        \
        } while (0)
 #define DRM_LOG(fmt, args...)                                           \
@@ -210,9 +235,8 @@ extern void drm_ut_debug_printk(unsigned int request_level,
                                        NULL, fmt, ##args);             \
        } while (0)
 #else
-#define DRM_DEBUG_DRIVER(prefix, fmt, args...) do { } while (0)
+#define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
-#define DRM_DEBUG_KMS(prefix, fmt, args...)     do { } while (0)
+#define DRM_DEBUG_KMS(fmt, args...)     do { } while (0)
-#define DRM_DEBUG_MODE(prefix, fmt, args...)    do { } while (0)
 #define DRM_DEBUG(fmt, arg...)           do { } while (0)
 #define DRM_LOG(fmt, arg...)            do { } while (0)
 #define DRM_LOG_KMS(fmt, args...) do { } while (0)
@@ -786,6 +810,9 @@ struct drm_driver {
        int (*gem_init_object) (struct drm_gem_object *obj);
        void (*gem_free_object) (struct drm_gem_object *obj);
+        /* vga arb irq handler */
+        void (*vgaarb_irq)(struct drm_device *dev, bool state);
        /* Driver private ops for this object */
        struct vm_operations_struct *gem_vm_ops;
@@ -1417,7 +1444,7 @@ drm_gem_object_unreference(struct drm_gem_object *obj)
 int drm_gem_handle_create(struct drm_file *file_priv,
                          struct drm_gem_object *obj,
-                          int *handlep);
+                          u32 *handlep);
 static inline void
 drm_gem_object_handle_reference(struct drm_gem_object *obj)
@@ -1443,7 +1470,7 @@ drm_gem_object_handle_unreference(struct drm_gem_object *obj)
 struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,
                                             struct drm_file *filp,
-                                             int handle);
+                                             u32 handle);
 int drm_gem_close_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h
new file mode 100644
index 000000000000..7bfb063029d8
--- /dev/null
+++ b/include/drm/drm_cache.h
@@ -0,0 +1,38 @@
+/**************************************************************************
+ *
+ * Copyright 2009 Red Hat Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
+ *
+ *
+ **************************************************************************/
+/*
+ * Authors:
+ * Dave Airlie <airlied@redhat.com>
+ */
+#ifndef _DRM_CACHE_H_
+#define _DRM_CACHE_H_
+void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
+#endif
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 7300fb866767..ae1e9e166959 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -259,6 +259,8 @@ struct drm_framebuffer {
        void *fbdev;
        u32 pseudo_palette[17];
        struct list_head filp_head;
+        /* if you are using the helper */
+        void *helper_private;
 };
 struct drm_property_blob {
@@ -572,6 +574,12 @@ struct drm_mode_config {
        struct drm_property *tv_right_margin_property;
        struct drm_property *tv_top_margin_property;
        struct drm_property *tv_bottom_margin_property;
+        struct drm_property *tv_brightness_property;
+        struct drm_property *tv_contrast_property;
+        struct drm_property *tv_flicker_reduction_property;
+        struct drm_property *tv_overscan_property;
+        struct drm_property *tv_saturation_property;
+        struct drm_property *tv_hue_property;
        /* Optional properties */
        struct drm_property *scaling_mode_property;
@@ -736,4 +744,12 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
 extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                                    void *data, struct drm_file *file_priv);
 extern bool drm_detect_hdmi_monitor(struct edid *edid);
+extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev,
+                                int hdisplay, int vdisplay, int vrefresh,
+                                bool reduced, bool interlaced);
+extern struct drm_display_mode *drm_gtf_mode(struct drm_device *dev,
+                                int hdisplay, int vdisplay, int vrefresh,
+                                bool interlaced, int margins);
+extern int drm_add_modes_noedid(struct drm_connector *connector,
+                                int hdisplay, int vdisplay);
 #endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index 6769ff6c1bc0..4c8dacaf4f58 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -79,6 +79,8 @@ struct drm_encoder_helper_funcs {
        /* detect for DAC style encoders */
        enum drm_connector_status (*detect)(struct drm_encoder *encoder,
                                            struct drm_connector *connector);
+        /* disable encoder when not in use - more explicit than dpms off */
+        void (*disable)(struct drm_encoder *encoder);
 };
 struct drm_connector_helper_funcs {
@@ -98,6 +100,7 @@ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
                                     int x, int y,
                                     struct drm_framebuffer *old_fb);
 extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
+extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
 extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode);
diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h
new file mode 100644
index 000000000000..2f65633d28a7
--- /dev/null
+++ b/include/drm/drm_encoder_slave.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (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 (including the
+ * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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 __DRM_ENCODER_SLAVE_H__
+#define __DRM_ENCODER_SLAVE_H__
+#include "drmP.h"
+#include "drm_crtc.h"
+/**
+ * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver
+ * @set_config: Initialize any encoder-specific modesetting parameters.
+ *              The meaning of the @params parameter is implementation
+ *              dependent. It will usually be a structure with DVO port
+ *              data format settings or timings. It's not required for
+ *              the new parameters to take effect until the next mode
+ *              is set.
+ *
+ * Most of its members are analogous to the function pointers in
+ * &drm_encoder_helper_funcs and they can optionally be used to
+ * initialize the latter. Connector-like methods (e.g. @get_modes and
+ * @set_property) will typically be wrapped around and only be called
+ * if the encoder is the currently selected one for the connector.
+ */
+struct drm_encoder_slave_funcs {
+        void (*set_config)(struct drm_encoder *encoder,
+                           void *params);
+        void (*destroy)(struct drm_encoder *encoder);
+        void (*dpms)(struct drm_encoder *encoder, int mode);
+        void (*save)(struct drm_encoder *encoder);
+        void (*restore)(struct drm_encoder *encoder);
+        bool (*mode_fixup)(struct drm_encoder *encoder,
+                           struct drm_display_mode *mode,
+                           struct drm_display_mode *adjusted_mode);
+        int (*mode_valid)(struct drm_encoder *encoder,
+                          struct drm_display_mode *mode);
+        void (*mode_set)(struct drm_encoder *encoder,
+                         struct drm_display_mode *mode,
+                         struct drm_display_mode *adjusted_mode);
+        enum drm_connector_status (*detect)(struct drm_encoder *encoder,
+                                            struct drm_connector *connector);
+        int (*get_modes)(struct drm_encoder *encoder,
+                         struct drm_connector *connector);
+        int (*create_resources)(struct drm_encoder *encoder,
+                                 struct drm_connector *connector);
+        int (*set_property)(struct drm_encoder *encoder,
+                            struct drm_connector *connector,
+                            struct drm_property *property,
+                            uint64_t val);
+};
+/**
+ * struct drm_encoder_slave - Slave encoder struct
+ * @base: DRM encoder object.
+ * @slave_funcs: Slave encoder callbacks.
+ * @slave_priv: Slave encoder private data.
+ * @bus_priv: Bus specific data.
+ *
+ * A &drm_encoder_slave has two sets of callbacks, @slave_funcs and the
+ * ones in @base. The former are never actually called by the common
+ * CRTC code, it's just a convenience for splitting the encoder
+ * functions in an upper, GPU-specific layer and a (hopefully)
+ * GPU-agnostic lower layer: It's the GPU driver responsibility to
+ * call the slave methods when appropriate.
+ *
+ * drm_i2c_encoder_init() provides a way to get an implementation of
+ * this.
+ */
+struct drm_encoder_slave {
+        struct drm_encoder base;
+        struct drm_encoder_slave_funcs *slave_funcs;
+        void *slave_priv;
+        void *bus_priv;
+};
+#define to_encoder_slave(x) container_of((x), struct drm_encoder_slave, base)
+int drm_i2c_encoder_init(struct drm_device *dev,
+                         struct drm_encoder_slave *encoder,
+                         struct i2c_adapter *adap,
+                         const struct i2c_board_info *info);
+/**
+ * struct drm_i2c_encoder_driver
+ *
+ * Describes a device driver for an encoder connected to the GPU
+ * through an I2C bus. In addition to the entry points in @i2c_driver
+ * an @encoder_init function should be provided. It will be called to
+ * give the driver an opportunity to allocate any per-encoder data
+ * structures and to initialize the @slave_funcs and (optionally)
+ * @slave_priv members of @encoder.
+ */
+struct drm_i2c_encoder_driver {
+        struct i2c_driver i2c_driver;
+        int (*encoder_init)(struct i2c_client *client,
+                            struct drm_device *dev,
+                            struct drm_encoder_slave *encoder);
+};
+#define to_drm_i2c_encoder_driver(x) container_of((x),                  \
+                                                  struct drm_i2c_encoder_driver, \
+                                                  i2c_driver)
+/**
+ * drm_i2c_encoder_get_client - Get the I2C client corresponding to an encoder
+ */
+static inline struct i2c_client *drm_i2c_encoder_get_client(struct drm_encoder *encoder)
+{
+        return (struct i2c_client *)to_encoder_slave(encoder)->bus_priv;
+}
+/**
+ * drm_i2c_encoder_register - Register an I2C encoder driver
+ * @owner:      Module containing the driver.
+ * @driver:     Driver to be registered.
+ */
+static inline int drm_i2c_encoder_register(struct module *owner,
+                                           struct drm_i2c_encoder_driver *driver)
+{
+        return i2c_register_driver(owner, &driver->i2c_driver);
+}
+/**
+ * drm_i2c_encoder_unregister - Unregister an I2C encoder driver
+ * @driver:     Driver to be unregistered.
+ */
+static inline void drm_i2c_encoder_unregister(struct drm_i2c_encoder_driver *driver)
+{
+        i2c_del_driver(&driver->i2c_driver);
+}
+void drm_i2c_encoder_destroy(struct drm_encoder *encoder);
+#endif
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
new file mode 100644
index 000000000000..88fffbdfa26f
--- /dev/null
+++ b/include/drm/drm_fb_helper.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2006-2009 Red Hat Inc.
+ * Copyright (c) 2006-2008 Intel Corporation
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
+ * DRM framebuffer helper functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@linux.ie>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+#ifndef DRM_FB_HELPER_H
+#define DRM_FB_HELPER_H
+struct drm_fb_helper_crtc {
+        uint32_t crtc_id;
+        struct drm_mode_set mode_set;
+};
+struct drm_fb_helper_funcs {
+        void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
+                          u16 blue, int regno);
+};
+struct drm_fb_helper {
+        struct drm_framebuffer *fb;
+        struct drm_device *dev;
+        struct drm_display_mode *mode;
+        int crtc_count;
+        struct drm_fb_helper_crtc *crtc_info;
+        struct drm_fb_helper_funcs *funcs;
+        int conn_limit;
+        struct list_head kernel_fb_list;
+};
+int drm_fb_helper_single_fb_probe(struct drm_device *dev,
+                                  int (*fb_create)(struct drm_device *dev,
+                                                   uint32_t fb_width,
+                                                   uint32_t fb_height,
+                                                   uint32_t surface_width,
+                                                   uint32_t surface_height,
+                                                   struct drm_framebuffer **fb_ptr));
+int drm_fb_helper_init_crtc_count(struct drm_fb_helper *helper, int crtc_count,
+                                  int max_conn);
+void drm_fb_helper_free(struct drm_fb_helper *helper);
+int drm_fb_helper_blank(int blank, struct fb_info *info);
+int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
+                              struct fb_info *info);
+int drm_fb_helper_set_par(struct fb_info *info);
+int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
+                            struct fb_info *info);
+int drm_fb_helper_setcolreg(unsigned regno,
+                            unsigned red,
+                            unsigned green,
+                            unsigned blue,
+                            unsigned transp,
+                            struct fb_info *info);
+void drm_fb_helper_restore(void);
+void drm_fb_helper_fill_var(struct fb_info *info, struct drm_framebuffer *fb,
+                            uint32_t fb_width, uint32_t fb_height);
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch);
+#endif
diff --git a/include/drm/drm_memory.h b/include/drm/drm_memory.h
index 63e425b5ea82..15af9b32ae42 100644
--- a/include/drm/drm_memory.h
+++ b/include/drm/drm_memory.h
@@ -44,8 +44,6 @@
 #if __OS_HAS_AGP
-#include <linux/vmalloc.h>
 #ifdef HAVE_PAGE_AGP
 #include <asm/agp.h>
 #else
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index f8332073d277..62329f9a42cb 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -37,6 +37,9 @@
 * Generic range manager structs
 */
 #include <linux/list.h>
+#ifdef CONFIG_DEBUG_FS
+#include <linux/seq_file.h>
+#endif
 struct drm_mm_node {
        struct list_head fl_entry;
@@ -96,4 +99,8 @@ static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)
        return block->mm;
 }
+#ifdef CONFIG_DEBUG_FS
+int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm);
+#endif
 #endif
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index ae304cc73c90..1f908416aedb 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -68,10 +68,11 @@
 #define DRM_MODE_DPMS_OFF       3
 /* Scaling mode options */
-#define DRM_MODE_SCALE_NON_GPU          0
+#define DRM_MODE_SCALE_NONE             0 /* Unmodified timing (display or
-#define DRM_MODE_SCALE_FULLSCREEN       1
+                                             software can still scale) */
-#define DRM_MODE_SCALE_NO_SCALE         2
+#define DRM_MODE_SCALE_FULLSCREEN       1 /* Full screen, ignore aspect */
-#define DRM_MODE_SCALE_ASPECT           3
+#define DRM_MODE_SCALE_CENTER           2 /* Centered, no scaling */
+#define DRM_MODE_SCALE_ASPECT           3 /* Full screen, preserve aspect */
 /* Dithering mode options */
 #define DRM_MODE_DITHERING_OFF  0
@@ -141,6 +142,7 @@ struct drm_mode_get_encoder {
 #define DRM_MODE_SUBCONNECTOR_Composite 5
 #define DRM_MODE_SUBCONNECTOR_SVIDEO    6
 #define DRM_MODE_SUBCONNECTOR_Component 8
+#define DRM_MODE_SUBCONNECTOR_SCART     9
 #define DRM_MODE_CONNECTOR_Unknown      0
 #define DRM_MODE_CONNECTOR_VGA          1
@@ -155,6 +157,7 @@ struct drm_mode_get_encoder {
 #define DRM_MODE_CONNECTOR_DisplayPort  10
 #define DRM_MODE_CONNECTOR_HDMIA        11
 #define DRM_MODE_CONNECTOR_HDMIB        12
+#define DRM_MODE_CONNECTOR_TV           13
 struct drm_mode_get_connector {
diff --git a/include/drm/drm_sysfs.h b/include/drm/drm_sysfs.h
new file mode 100644
index 000000000000..1d8e033fde67
--- /dev/null
+++ b/include/drm/drm_sysfs.h
@@ -0,0 +1,12 @@
+#ifndef _DRM_SYSFS_H_
+#define _DRM_SYSFS_H_
+/**
+ * This minimalistic include file is intended for users (read TTM) that
+ * don't want to include the full drmP.h file.
+ */
+extern int drm_class_device_register(struct device *dev);
+extern void drm_class_device_unregister(struct device *dev);
+#endif
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 2ba61e18fc8b..3b9932ab1756 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -802,11 +802,12 @@ struct drm_radeon_gem_create {
        uint32_t        flags;
 };
-#define RADEON_TILING_MACRO 0x1
+#define RADEON_TILING_MACRO       0x1
-#define RADEON_TILING_MICRO 0x2
+#define RADEON_TILING_MICRO       0x2
-#define RADEON_TILING_SWAP  0x4
+#define RADEON_TILING_SWAP_16BIT  0x4
-#define RADEON_TILING_SURFACE  0x8 /* this object requires a surface
+#define RADEON_TILING_SWAP_32BIT  0x8
-                                    * when mapped - i.e. front buffer */
+#define RADEON_TILING_SURFACE     0x10 /* this object requires a surface
+                                        * when mapped - i.e. front buffer */
 struct drm_radeon_gem_set_tiling {
        uint32_t        handle;
@@ -899,6 +900,7 @@ struct drm_radeon_cs {
 #define RADEON_INFO_DEVICE_ID           0x00
 #define RADEON_INFO_NUM_GB_PIPES        0x01
 #define RADEON_INFO_NUM_Z_PIPES         0x02
+#define RADEON_INFO_ACCEL_WORKING       0x03
 struct drm_radeon_info {
        uint32_t                request;
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index cd22ab4b495c..491146170522 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -155,6 +155,7 @@ struct ttm_buffer_object {
         * Members constant at init.
         */
+        struct ttm_bo_global *glob;
        struct ttm_bo_device *bdev;
        unsigned long buffer_start;
        enum ttm_bo_type type;
@@ -245,14 +246,15 @@ struct ttm_buffer_object {
 * premapped region.
 */
+#define TTM_BO_MAP_IOMEM_MASK 0x80
 struct ttm_bo_kmap_obj {
        void *virtual;
        struct page *page;
        enum {
-                ttm_bo_map_iomap,
+                ttm_bo_map_iomap        = 1 | TTM_BO_MAP_IOMEM_MASK,
-                ttm_bo_map_vmap,
+                ttm_bo_map_vmap         = 2,
-                ttm_bo_map_kmap,
+                ttm_bo_map_kmap         = 3,
-                ttm_bo_map_premapped,
+                ttm_bo_map_premapped    = 4 | TTM_BO_MAP_IOMEM_MASK,
        } bo_kmap_type;
 };
@@ -522,8 +524,7 @@ extern int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type);
 static inline void *ttm_kmap_obj_virtual(struct ttm_bo_kmap_obj *map,
                                         bool *is_iomem)
 {
-        *is_iomem = (map->bo_kmap_type == ttm_bo_map_iomap ||
+        *is_iomem = !!(map->bo_kmap_type & TTM_BO_MAP_IOMEM_MASK);
-                     map->bo_kmap_type == ttm_bo_map_premapped);
        return map->virtual;
 }
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index a68829db381a..e8cd6d20aed2 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -32,6 +32,7 @@
 #include "ttm/ttm_bo_api.h"
 #include "ttm/ttm_memory.h"
+#include "ttm/ttm_module.h"
 #include "drm_mm.h"
 #include "linux/workqueue.h"
 #include "linux/fs.h"
@@ -161,7 +162,7 @@ struct ttm_tt {
        long last_lomem_page;
        uint32_t page_flags;
        unsigned long num_pages;
-        struct ttm_bo_device *bdev;
+        struct ttm_bo_global *glob;
        struct ttm_backend *be;
        struct task_struct *tsk;
        unsigned long start;
@@ -364,24 +365,73 @@ struct ttm_bo_driver {
        void (*fault_reserve_notify)(struct ttm_buffer_object *bo);
 };
-#define TTM_NUM_MEM_TYPES 8
+/**
+ * struct ttm_bo_global_ref - Argument to initialize a struct ttm_bo_global.
+ */
+struct ttm_bo_global_ref {
+        struct ttm_global_reference ref;
+        struct ttm_mem_global *mem_glob;
+};
-#define TTM_BO_PRIV_FLAG_MOVING  0      /* Buffer object is moving and needs
-                                           idling before CPU mapping */
-#define TTM_BO_PRIV_FLAG_MAX 1
 /**
- * struct ttm_bo_device - Buffer object driver device-specific data.
+ * struct ttm_bo_global - Buffer object driver global data.
 *
 * @mem_glob: Pointer to a struct ttm_mem_global object for accounting.
- * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
- * @count: Current number of buffer object.
- * @pages: Current number of pinned pages.
 * @dummy_read_page: Pointer to a dummy page used for mapping requests
 * of unpopulated pages.
- * @shrink: A shrink callback object used for buffre object swap.
+ * @shrink: A shrink callback object used for buffer object swap.
 * @ttm_bo_extra_size: Extra size (sizeof(struct ttm_buffer_object) excluded)
 * used by a buffer object. This is excluding page arrays and backing pages.
 * @ttm_bo_size: This is @ttm_bo_extra_size + sizeof(struct ttm_buffer_object).
+ * @device_list_mutex: Mutex protecting the device list.
+ * This mutex is held while traversing the device list for pm options.
+ * @lru_lock: Spinlock protecting the bo subsystem lru lists.
+ * @device_list: List of buffer object devices.
+ * @swap_lru: Lru list of buffer objects used for swapping.
+ */
+struct ttm_bo_global {
+        /**
+         * Constant after init.
+         */
+        struct kobject kobj;
+        struct ttm_mem_global *mem_glob;
+        struct page *dummy_read_page;
+        struct ttm_mem_shrink shrink;
+        size_t ttm_bo_extra_size;
+        size_t ttm_bo_size;
+        struct mutex device_list_mutex;
+        spinlock_t lru_lock;
+        /**
+         * Protected by device_list_mutex.
+         */
+        struct list_head device_list;
+        /**
+         * Protected by the lru_lock.
+         */
+        struct list_head swap_lru;
+        /**
+         * Internal protection.
+         */
+        atomic_t bo_count;
+};
+#define TTM_NUM_MEM_TYPES 8
+#define TTM_BO_PRIV_FLAG_MOVING  0      /* Buffer object is moving and needs
+                                           idling before CPU mapping */
+#define TTM_BO_PRIV_FLAG_MAX 1
+/**
+ * struct ttm_bo_device - Buffer object driver device-specific data.
+ *
+ * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
 * @man: An array of mem_type_managers.
 * @addr_space_mm: Range manager for the device address space.
 * lru_lock: Spinlock that protects the buffer+device lru lists and
@@ -399,32 +449,21 @@ struct ttm_bo_device {
        /*
         * Constant after bo device init / atomic.
         */
+        struct list_head device_list;
-        struct ttm_mem_global *mem_glob;
+        struct ttm_bo_global *glob;
        struct ttm_bo_driver *driver;
-        struct page *dummy_read_page;
-        struct ttm_mem_shrink shrink;
-        size_t ttm_bo_extra_size;
-        size_t ttm_bo_size;
        rwlock_t vm_lock;
+        struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
        /*
         * Protected by the vm lock.
         */
-        struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
        struct rb_root addr_space_rb;
        struct drm_mm addr_space_mm;
        /*
-         * Might want to change this to one lock per manager.
+         * Protected by the global:lru lock.
-         */
-        spinlock_t lru_lock;
-        /*
-         * Protected by the lru lock.
         */
        struct list_head ddestroy;
-        struct list_head swap_lru;
        /*
         * Protected by load / firstopen / lastclose /unload sync.
@@ -640,6 +679,9 @@ extern int ttm_bo_pci_offset(struct ttm_bo_device *bdev,
                             unsigned long *bus_offset,
                             unsigned long *bus_size);
+extern void ttm_bo_global_release(struct ttm_global_reference *ref);
+extern int ttm_bo_global_init(struct ttm_global_reference *ref);
 extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 /**
@@ -657,7 +699,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 * !0: Failure.
 */
 extern int ttm_bo_device_init(struct ttm_bo_device *bdev,
-                              struct ttm_mem_global *mem_glob,
+                              struct ttm_bo_global *glob,
                              struct ttm_bo_driver *driver,
                              uint64_t file_page_offset, bool need_dma32);
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index d8b8f042c4f1..6983a7cf4da4 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/errno.h>
+#include <linux/kobject.h>
 /**
 * struct ttm_mem_shrink - callback to shrink TTM memory usage.
@@ -60,34 +61,33 @@ struct ttm_mem_shrink {
 * @queue: Wait queue for processes suspended waiting for memory.
 * @lock: Lock to protect the @shrink - and the memory accounting members,
 * that is, essentially the whole structure with some exceptions.
- * @emer_memory: Lowmem memory limit available for root.
+ * @zones: Array of pointers to accounting zones.
- * @max_memory: Lowmem memory limit available for non-root.
+ * @num_zones: Number of populated entries in the @zones array.
- * @swap_limit: Lowmem memory limit where the shrink workqueue kicks in.
+ * @zone_kernel: Pointer to the kernel zone.
- * @used_memory: Currently used lowmem memory.
+ * @zone_highmem: Pointer to the highmem zone if there is one.
- * @used_total_memory: Currently used total (lowmem + highmem) memory.
+ * @zone_dma32: Pointer to the dma32 zone if there is one.
- * @total_memory_swap_limit: Total memory limit where the shrink workqueue
- * kicks in.
- * @max_total_memory: Total memory available to non-root processes.
- * @emer_total_memory: Total memory available to root processes.
 *
 * Note that this structure is not per device. It should be global for all
 * graphics devices.
 */
+#define TTM_MEM_MAX_ZONES 2
+struct ttm_mem_zone;
 struct ttm_mem_global {
+        struct kobject kobj;
        struct ttm_mem_shrink *shrink;
        struct workqueue_struct *swap_queue;
        struct work_struct work;
        wait_queue_head_t queue;
        spinlock_t lock;
-        uint64_t emer_memory;
+        struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES];
-        uint64_t max_memory;
+        unsigned int num_zones;
-        uint64_t swap_limit;
+        struct ttm_mem_zone *zone_kernel;
-        uint64_t used_memory;
+#ifdef CONFIG_HIGHMEM
-        uint64_t used_total_memory;
+        struct ttm_mem_zone *zone_highmem;
-        uint64_t total_memory_swap_limit;
+#else
-        uint64_t max_total_memory;
+        struct ttm_mem_zone *zone_dma32;
-        uint64_t emer_total_memory;
+#endif
 };
 /**
@@ -146,8 +146,13 @@ static inline void ttm_mem_unregister_shrink(struct ttm_mem_global *glob,
 extern int ttm_mem_global_init(struct ttm_mem_global *glob);
 extern void ttm_mem_global_release(struct ttm_mem_global *glob);
 extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory,
-                                bool no_wait, bool interruptible, bool himem);
+                                bool no_wait, bool interruptible);
 extern void ttm_mem_global_free(struct ttm_mem_global *glob,
-                                uint64_t amount, bool himem);
+                                uint64_t amount);
+extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
+                                     struct page *page,
+                                     bool no_wait, bool interruptible);
+extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
+                                     struct page *page);
 extern size_t ttm_round_pot(size_t size);
 #endif
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h
index d1d433834e4f..cf416aee19af 100644
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
@@ -32,6 +32,7 @@
 #define _TTM_MODULE_H_
 #include <linux/kernel.h>
+struct kobject;
 #define TTM_PFX "[TTM] "
@@ -54,5 +55,6 @@ extern void ttm_global_init(void);
 extern void ttm_global_release(void);
 extern int ttm_global_item_ref(struct ttm_global_reference *ref);
 extern void ttm_global_item_unref(struct ttm_global_reference *ref);
+extern struct kobject *ttm_get_kobj(void);
 #endif /* _TTM_MODULE_H_ */
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 47f7d932a01d..aea219d7d8d1 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -225,8 +225,6 @@ static inline void exit_aio(struct mm_struct *mm) { }
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
-#include <linux/aio_abi.h>
 static inline struct kiocb *list_kiocb(struct list_head *h)
 {
        return list_entry(h, struct kiocb, ki_list);
diff --git a/include/linux/anon_inodes.h b/include/linux/anon_inodes.h
index e0a0cdc2da43..69a21e0ebd33 100644
--- a/include/linux/anon_inodes.h
+++ b/include/linux/anon_inodes.h
@@ -8,6 +8,9 @@
 #ifndef _LINUX_ANON_INODES_H
 #define _LINUX_ANON_INODES_H
+struct file *anon_inode_getfile(const char *name,
+                                const struct file_operations *fops,
+                                void *priv, int flags);
 int anon_inode_getfd(const char *name, const struct file_operations *fops,
                     void *priv, int flags);
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index bc3ab7073695..dd97fb8408a8 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -132,9 +132,6 @@ static inline void *alloc_remap(int nid, unsigned long size)
 }
 #endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
-extern unsigned long __meminitdata nr_kernel_pages;
-extern unsigned long __meminitdata nr_all_pages;
 extern void *alloc_large_system_hash(const char *tablename,
                                     unsigned long bucketsize,
                                     unsigned long numentries,
@@ -145,6 +142,8 @@ extern void *alloc_large_system_hash(const char *tablename,
                                     unsigned long limit);
 #define HASH_EARLY      0x00000001      /* Allocating during early boot? */
+#define HASH_SMALL      0x00000002      /* sub-page allocation allowed, min
+                                         * shift passed via *_hash_shift */
 /* Only NUMA needs hash distribution. 64bit NUMA architectures have
 * sufficient vmalloc space.
diff --git a/include/linux/capability.h b/include/linux/capability.h
index c3021105edc0..c8f2a5f70ed5 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -7,7 +7,7 @@
 *
 * See here for the libcap library ("POSIX draft" compliance):
 *
- * ftp://linux.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+ * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
 */
 #ifndef _LINUX_CAPABILITY_H
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index b8125b2eb665..47dac5ea8d3a 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -52,6 +52,7 @@ struct proc_event {
                PROC_EVENT_EXEC = 0x00000002,
                PROC_EVENT_UID  = 0x00000004,
                PROC_EVENT_GID  = 0x00000040,
+                PROC_EVENT_SID  = 0x00000080,
                /* "next" should be 0x00000400 */
                /* "last" is the last process event: exit */
                PROC_EVENT_EXIT = 0x80000000
@@ -89,6 +90,11 @@ struct proc_event {
                        } e;
                } id;
+                struct sid_proc_event {
+                        __kernel_pid_t process_pid;
+                        __kernel_pid_t process_tgid;
+                } sid;
                struct exit_proc_event {
                        __kernel_pid_t process_pid;
                        __kernel_pid_t process_tgid;
@@ -102,6 +108,7 @@ struct proc_event {
 void proc_fork_connector(struct task_struct *task);
 void proc_exec_connector(struct task_struct *task);
 void proc_id_connector(struct task_struct *task, int which_id);
+void proc_sid_connector(struct task_struct *task);
 void proc_exit_connector(struct task_struct *task);
 #else
 static inline void proc_fork_connector(struct task_struct *task)
@@ -114,6 +121,9 @@ static inline void proc_id_connector(struct task_struct *task,
                                     int which_id)
 {}
+static inline void proc_sid_connector(struct task_struct *task)
+{}
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif  /* CONFIG_PROC_EVENTS */
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 796df12091b7..9b1d458aac6e 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -715,6 +715,18 @@ static inline int cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)
 }
 /**
+ * cpumask_test_and_clear_cpu - atomically test and clear a cpu in a cpumask
+ * @cpu: cpu number (< nr_cpu_ids)
+ * @cpumask: the cpumask pointer
+ *
+ * test_and_clear_bit wrapper for cpumasks.
+ */
+static inline int cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)
+{
+        return test_and_clear_bit(cpumask_check(cpu), cpumask_bits(cpumask));
+}
+/**
 * cpumask_setall - set all cpus (< nr_cpu_ids) in a cpumask
 * @dstp: the cpumask pointer
 */
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 1fbdea4f08eb..a5049eaf782d 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -499,6 +499,7 @@ struct cyclades_card {
                void __iomem *p9050;
                struct RUNTIME_9060 __iomem *p9060;
        } ctl_addr;
+        struct BOARD_CTRL __iomem *board_ctrl;  /* cyz specific */
        int irq;
        unsigned int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */
        unsigned int first_line;        /* minor number of first channel on card */
@@ -541,6 +542,15 @@ struct cyclades_port {
        int                     magic;
        struct tty_port         port;
        struct cyclades_card    *card;
+        union {
+                struct {
+                        void __iomem *base_addr;
+                } cyy;
+                struct {
+                        struct CH_CTRL __iomem  *ch_ctrl;
+                        struct BUF_CTRL __iomem *buf_ctrl;
+                } cyz;
+        } u;
        int                     line;
        int                     flags;          /* defined in tty.h */
        int                     type;           /* UART type */
@@ -568,7 +578,6 @@ struct cyclades_port {
        struct cyclades_idle_stats      idle_stats;
        struct cyclades_icount  icount;
        struct completion       shutdown_wait;
-        wait_queue_head_t       delta_msr_wait;
        int throttle;
 };
diff --git a/include/linux/device.h b/include/linux/device.h
index 847b763e40e9..aca31bf7d8ed 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -193,7 +193,7 @@ struct class {
        struct kobject                  *dev_kobj;
        int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
-        char *(*nodename)(struct device *dev);
+        char *(*devnode)(struct device *dev, mode_t *mode);
        void (*class_release)(struct class *class);
        void (*dev_release)(struct device *dev);
@@ -298,7 +298,7 @@ struct device_type {
        const char *name;
        const struct attribute_group **groups;
        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
-        char *(*nodename)(struct device *dev);
+        char *(*devnode)(struct device *dev, mode_t *mode);
        void (*release)(struct device *dev);
        const struct dev_pm_ops *pm;
@@ -487,7 +487,8 @@ extern struct device *device_find_child(struct device *dev, void *data,
 extern int device_rename(struct device *dev, char *new_name);
 extern int device_move(struct device *dev, struct device *new_parent,
                       enum dpm_order dpm_order);
-extern const char *device_get_nodename(struct device *dev, const char **tmp);
+extern const char *device_get_devnode(struct device *dev,
+                                      mode_t *mode, const char **tmp);
 extern void *dev_get_drvdata(const struct device *dev);
 extern void dev_set_drvdata(struct device *dev, void *data);
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 51c8d2d49e42..b6cb5425cde3 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -173,7 +173,8 @@ typedef enum fe_modulation {
 typedef enum fe_transmit_mode {
        TRANSMISSION_MODE_2K,
        TRANSMISSION_MODE_8K,
-        TRANSMISSION_MODE_AUTO
+        TRANSMISSION_MODE_AUTO,
+        TRANSMISSION_MODE_4K
 } fe_transmit_mode_t;
 typedef enum fe_bandwidth {
@@ -268,15 +269,42 @@ struct dvb_frontend_event {
 #define DTV_FE_CAPABILITY       16
 #define DTV_DELIVERY_SYSTEM     17
-#define DTV_API_VERSION                         35
+/* ISDB-T and ISDB-Tsb */
-#define DTV_API_VERSION                         35
+#define DTV_ISDBT_PARTIAL_RECEPTION     18
-#define DTV_CODE_RATE_HP                        36
+#define DTV_ISDBT_SOUND_BROADCASTING    19
-#define DTV_CODE_RATE_LP                        37
-#define DTV_GUARD_INTERVAL                      38
-#define DTV_TRANSMISSION_MODE                   39
-#define DTV_HIERARCHY                           40
-#define DTV_MAX_COMMAND                         DTV_HIERARCHY
+#define DTV_ISDBT_SB_SUBCHANNEL_ID      20
+#define DTV_ISDBT_SB_SEGMENT_IDX        21
+#define DTV_ISDBT_SB_SEGMENT_COUNT      22
+#define DTV_ISDBT_LAYERA_FEC                    23
+#define DTV_ISDBT_LAYERA_MODULATION             24
+#define DTV_ISDBT_LAYERA_SEGMENT_COUNT          25
+#define DTV_ISDBT_LAYERA_TIME_INTERLEAVING      26
+#define DTV_ISDBT_LAYERB_FEC                    27
+#define DTV_ISDBT_LAYERB_MODULATION             28
+#define DTV_ISDBT_LAYERB_SEGMENT_COUNT          29
+#define DTV_ISDBT_LAYERB_TIME_INTERLEAVING      30
+#define DTV_ISDBT_LAYERC_FEC                    31
+#define DTV_ISDBT_LAYERC_MODULATION             32
+#define DTV_ISDBT_LAYERC_SEGMENT_COUNT          33
+#define DTV_ISDBT_LAYERC_TIME_INTERLEAVING      34
+#define DTV_API_VERSION         35
+#define DTV_CODE_RATE_HP        36
+#define DTV_CODE_RATE_LP        37
+#define DTV_GUARD_INTERVAL      38
+#define DTV_TRANSMISSION_MODE   39
+#define DTV_HIERARCHY           40
+#define DTV_ISDBT_LAYER_ENABLED 41
+#define DTV_ISDBS_TS_ID         42
+#define DTV_MAX_COMMAND                         DTV_ISDBS_TS_ID
 typedef enum fe_pilot {
        PILOT_ON,
diff --git a/include/linux/dvb/version.h b/include/linux/dvb/version.h
index 25b823b81734..540b0583d9fb 100644
--- a/include/linux/dvb/version.h
+++ b/include/linux/dvb/version.h
@@ -24,6 +24,6 @@
 #define _DVBVERSION_H_
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 0
+#define DVB_API_VERSION_MINOR 1
 #endif /*_DVBVERSION_H_*/
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 3b85ba6479f4..94dd10366a78 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -27,6 +27,7 @@
 #ifdef CONFIG_EVENTFD
+struct file *eventfd_file_create(unsigned int count, int flags);
 struct eventfd_ctx *eventfd_ctx_get(struct eventfd_ctx *ctx);
 void eventfd_ctx_put(struct eventfd_ctx *ctx);
 struct file *eventfd_fget(int fd);
@@ -40,6 +41,11 @@ int eventfd_signal(struct eventfd_ctx *ctx, int n);
 * Ugly ugly ugly error layer to support modules that uses eventfd but
 * pretend to work in !CONFIG_EVENTFD configurations. Namely, AIO.
 */
+static inline struct file *eventfd_file_create(unsigned int count, int flags)
+{
+        return ERR_PTR(-ENOSYS);
+}
 static inline struct eventfd_ctx *eventfd_ctx_fdget(int fd)
 {
        return ERR_PTR(-ENOSYS);
diff --git a/include/linux/flex_array.h b/include/linux/flex_array.h
index 45ff18491514..1d747f72298b 100644
--- a/include/linux/flex_array.h
+++ b/include/linux/flex_array.h
@@ -31,10 +31,32 @@ struct flex_array {
        };
 };
-#define FLEX_ARRAY_INIT(size, total) { { {\
+/* Number of bytes left in base struct flex_array, excluding metadata */
-        .element_size = (size),         \
+#define FLEX_ARRAY_BASE_BYTES_LEFT                                      \
-        .total_nr_elements = (total),   \
+        (FLEX_ARRAY_BASE_SIZE - offsetof(struct flex_array, parts))
-} } }
+/* Number of pointers in base to struct flex_array_part pages */
+#define FLEX_ARRAY_NR_BASE_PTRS                                         \
+        (FLEX_ARRAY_BASE_BYTES_LEFT / sizeof(struct flex_array_part *))
+/* Number of elements of size that fit in struct flex_array_part */
+#define FLEX_ARRAY_ELEMENTS_PER_PART(size)                              \
+        (FLEX_ARRAY_PART_SIZE / size)
+/*
+ * Defines a statically allocated flex array and ensures its parameters are
+ * valid.
+ */
+#define DEFINE_FLEX_ARRAY(__arrayname, __element_size, __total)         \
+        struct flex_array __arrayname = { { {                           \
+                .element_size = (__element_size),                       \
+                .total_nr_elements = (__total),                         \
+        } } };                                                          \
+        static inline void __arrayname##_invalid_parameter(void)        \
+        {                                                               \
+                BUILD_BUG_ON((__total) > FLEX_ARRAY_NR_BASE_PTRS *      \
+                        FLEX_ARRAY_ELEMENTS_PER_PART(__element_size));  \
+        }
 struct flex_array *flex_array_alloc(int element_size, unsigned int total,
                gfp_t flags);
@@ -44,6 +66,8 @@ void flex_array_free(struct flex_array *fa);
 void flex_array_free_parts(struct flex_array *fa);
 int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
                gfp_t flags);
+int flex_array_clear(struct flex_array *fa, unsigned int element_nr);
 void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
+int flex_array_shrink(struct flex_array *fa);
 #endif /* _FLEX_ARRAY_H */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 90162fb3bf04..51803528b095 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1066,8 +1066,8 @@ struct file_lock {
        struct fasync_struct *  fl_fasync; /* for lease break notifications */
        unsigned long fl_break_time;    /* for nonblocking lease breaks */
-        struct file_lock_operations *fl_ops;    /* Callbacks for filesystems */
+        const struct file_lock_operations *fl_ops;      /* Callbacks for filesystems */
-        struct lock_manager_operations *fl_lmops;       /* Callbacks for lockmanagers */
+        const struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */
        union {
                struct nfs_lock_info    nfs_fl;
                struct nfs4_lock_info   nfs4_fl;
@@ -1318,8 +1318,8 @@ struct super_block {
        unsigned long long      s_maxbytes;     /* Max file size */
        struct file_system_type *s_type;
        const struct super_operations   *s_op;
-        struct dquot_operations *dq_op;
+        const struct dquot_operations   *dq_op;
-        struct quotactl_ops     *s_qcop;
+        const struct quotactl_ops       *s_qcop;
        const struct export_operations *s_export_op;
        unsigned long           s_flags;
        unsigned long           s_magic;
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index dc3b1328aaeb..3c0924a18daf 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -446,7 +446,6 @@ static inline void unpause_graph_tracing(void) { }
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 #ifdef CONFIG_TRACING
-#include <linux/sched.h>
 /* flags for current->trace */
 enum {
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index bd099ba82ccc..4ec5e67e18cf 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -4,6 +4,7 @@
 #include <linux/ring_buffer.h>
 #include <linux/trace_seq.h>
 #include <linux/percpu.h>
+#include <linux/hardirq.h>
 struct trace_array;
 struct tracer;
@@ -130,10 +131,15 @@ struct ftrace_event_call {
        void                    *data;
        atomic_t                profile_count;
-        int                     (*profile_enable)(struct ftrace_event_call *);
+        int                     (*profile_enable)(void);
-        void                    (*profile_disable)(struct ftrace_event_call *);
+        void                    (*profile_disable)(void);
 };
+#define FTRACE_MAX_PROFILE_SIZE 2048
+extern char                     *trace_profile_buf;
+extern char                     *trace_profile_buf_nmi;
 #define MAX_FILTER_PRED         32
 #define MAX_FILTER_STR_VAL      256     /* Should handle KSYM_SYMBOL_LEN */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 44263cb27121..297df45ffd0a 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -142,7 +142,7 @@ struct gendisk {
                                         * disks that can't be partitioned. */
        char disk_name[DISK_NAME_LEN];  /* name of major driver */
-        char *(*nodename)(struct gendisk *gd);
+        char *(*devnode)(struct gendisk *gd, mode_t *mode);
        /* 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
@@ -151,7 +151,7 @@ struct gendisk {
        struct disk_part_tbl *part_tbl;
        struct hd_struct part0;
-        struct block_device_operations *fops;
+        const struct block_device_operations *fops;
        struct request_queue *queue;
        void *private_data;
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 7c777a0da17a..557bdad320b6 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -220,7 +220,7 @@ static inline enum zone_type gfp_zone(gfp_t flags)
                                         ((1 << ZONES_SHIFT) - 1);
        if (__builtin_constant_p(bit))
-                BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
+                MAYBE_BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
        else {
 #ifdef CONFIG_DEBUG_VM
                BUG_ON((GFP_ZONE_BAD >> bit) & 1);
@@ -326,7 +326,6 @@ void free_pages_exact(void *virt, size_t size);
 extern void __free_pages(struct page *page, unsigned int order);
 extern void free_pages(unsigned long addr, unsigned int order);
 extern void free_hot_page(struct page *page);
-extern void free_cold_page(struct page *page);
 #define __free_page(page) __free_pages((page), 0)
 #define free_page(addr) free_pages((addr),0)
@@ -336,18 +335,6 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);
 void drain_all_pages(void);
 void drain_local_pages(void *dummy);
-extern bool oom_killer_disabled;
-static inline void oom_killer_disable(void)
-{
-        oom_killer_disabled = true;
-}
-static inline void oom_killer_enable(void)
-{
-        oom_killer_disabled = false;
-}
 extern gfp_t gfp_allowed_mask;
 static inline void set_gfp_allowed_mask(gfp_t mask)
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index e10c49a5b96e..059bd189d35d 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -12,6 +12,8 @@
 #include <linux/types.h>
 #include <linux/errno.h>
+struct device;
 /*
 * Some platforms don't support the GPIO programming interface.
 *
@@ -89,6 +91,15 @@ static inline int gpio_export(unsigned gpio, bool direction_may_change)
        return -EINVAL;
 }
+static inline int gpio_export_link(struct device *dev, const char *name,
+                                unsigned gpio)
+{
+        /* GPIO can never have been exported */
+        WARN_ON(1);
+        return -EINVAL;
+}
 static inline void gpio_unexport(unsigned gpio)
 {
        /* GPIO can never have been exported */
diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h
index 940aeb51d53f..92b08cfe4a75 100644
--- a/include/linux/hayesesp.h
+++ b/include/linux/hayesesp.h
@@ -96,7 +96,6 @@ struct esp_struct {
        int                     xmit_head;
        int                     xmit_tail;
        int                     xmit_cnt;
-        wait_queue_head_t       delta_msr_wait;
        wait_queue_head_t       break_wait;
        struct async_icount     icount; /* kernel counters for the 4 input interrupts */
        struct hayes_esp_config config; /* port configuration */
diff --git a/include/linux/hid.h b/include/linux/hid.h
index a0ebdace7baa..10f628416740 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -494,6 +494,7 @@ struct hid_device {							/* device report descriptor */
        /* hiddev event handler */
        int (*hiddev_connect)(struct hid_device *, unsigned int);
+        void (*hiddev_disconnect)(struct hid_device *);
        void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
                                  struct hid_usage *, __s32);
        void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
@@ -691,6 +692,7 @@ struct hid_device *hid_allocate_device(void);
 int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
 int hid_check_keys_pressed(struct hid_device *hid);
 int hid_connect(struct hid_device *hid, unsigned int connect_mask);
+void hid_disconnect(struct hid_device *hid);
 /**
 * hid_map_usage - map usage input bits
@@ -800,6 +802,7 @@ static inline int __must_check hid_hw_start(struct hid_device *hdev,
 */
 static inline void hid_hw_stop(struct hid_device *hdev)
 {
+        hid_disconnect(hdev);
        hdev->ll_driver->stop(hdev);
 }
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 5cbc620bdfe0..176e7ee73eff 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -24,7 +24,9 @@ int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void __user *
 int hugetlb_overcommit_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *);
 int hugetlb_treat_movable_handler(struct ctl_table *, int, struct file *, void __user *, size_t *, loff_t *);
 int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *);
-int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, struct page **, struct vm_area_struct **, unsigned long *, int *, int, int);
+int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *,
+                        struct page **, struct vm_area_struct **,
+                        unsigned long *, int *, int, unsigned int flags);
 void unmap_hugepage_range(struct vm_area_struct *,
                        unsigned long, unsigned long, struct page *);
 void __unmap_hugepage_range(struct vm_area_struct *,
@@ -110,6 +112,21 @@ static inline void hugetlb_report_meminfo(struct seq_file *m)
 #endif /* !CONFIG_HUGETLB_PAGE */
+#define HUGETLB_ANON_FILE "anon_hugepage"
+enum {
+        /*
+         * The file will be used as an shm file so shmfs accounting rules
+         * apply
+         */
+        HUGETLB_SHMFS_INODE     = 1,
+        /*
+         * The file is being created on the internal vfs mount and shmfs
+         * accounting rules do not apply
+         */
+        HUGETLB_ANONHUGE_INODE  = 2,
+};
 #ifdef CONFIG_HUGETLBFS
 struct hugetlbfs_config {
        uid_t   uid;
@@ -148,7 +165,7 @@ static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb)
 extern const struct file_operations hugetlbfs_file_operations;
 extern struct vm_operations_struct hugetlb_vm_ops;
 struct file *hugetlb_file_setup(const char *name, size_t size, int acct,
-                                                struct user_struct **user);
+                                struct user_struct **user, int creat_flags);
 int hugetlb_get_quota(struct address_space *mapping, long delta);
 void hugetlb_put_quota(struct address_space *mapping, long delta);
@@ -170,7 +187,7 @@ static inline void set_file_hugepages(struct file *file)
 #define is_file_hugepages(file)                 0
 #define set_file_hugepages(file)                BUG()
-#define hugetlb_file_setup(name,size,acct,user) ERR_PTR(-ENOSYS)
+#define hugetlb_file_setup(name,size,acct,user,creat)   ERR_PTR(-ENOSYS)
 #endif /* !CONFIG_HUGETLBFS */
@@ -185,7 +202,8 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
 #define HSTATE_NAME_LEN 32
 /* Defines one hugetlb page size */
 struct hstate {
-        int hugetlb_next_nid;
+        int next_nid_to_alloc;
+        int next_nid_to_free;
        unsigned int order;
        unsigned long mask;
        unsigned long max_huge_pages;
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index c9087de5c6c6..e844a0b18695 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -28,17 +28,6 @@
   identify a legacy client. If you don't need them, just don't set them. */
 /*
- * ---- Driver types -----------------------------------------------------
- */
-#define I2C_DRIVERID_MSP3400     1
-#define I2C_DRIVERID_TUNER       2
-#define I2C_DRIVERID_TDA7432    27      /* Stereo sound processor       */
-#define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
-#define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
-/*
 * ---- Adapter types ----------------------------------------------------
 */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index f4784c0fe975..57d41b0abce2 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -98,7 +98,6 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
 /**
 * struct i2c_driver - represent an I2C device driver
- * @id: Unique driver ID (optional)
 * @class: What kind of i2c device we instantiate (for detect)
 * @attach_adapter: Callback for bus addition (for legacy drivers)
 * @detach_adapter: Callback for bus removal (for legacy drivers)
@@ -135,7 +134,6 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
 * not allowed.
 */
 struct i2c_driver {
-        int id;
        unsigned int class;
        /* Notifies the driver that a new bus has appeared or is about to be
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 9e7f2e8fc66e..21a6f5d9af22 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -106,13 +106,13 @@ extern struct group_info init_groups;
 extern struct cred init_cred;
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
-# define INIT_PERF_COUNTERS(tsk)                                        \
+# define INIT_PERF_EVENTS(tsk)                                  \
-        .perf_counter_mutex =                                           \
+        .perf_event_mutex =                                             \
-                 __MUTEX_INITIALIZER(tsk.perf_counter_mutex),           \
+                 __MUTEX_INITIALIZER(tsk.perf_event_mutex),             \
-        .perf_counter_list = LIST_HEAD_INIT(tsk.perf_counter_list),
+        .perf_event_list = LIST_HEAD_INIT(tsk.perf_event_list),
 #else
-# define INIT_PERF_COUNTERS(tsk)
+# define INIT_PERF_EVENTS(tsk)
 #endif
 /*
@@ -178,7 +178,7 @@ extern struct cred init_cred;
        },                                                              \
        .dirties = INIT_PROP_LOCAL_SINGLE(dirties),                     \
        INIT_IDS                                                        \
-        INIT_PERF_COUNTERS(tsk)                                         \
+        INIT_PERF_EVENTS(tsk)                                           \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
        INIT_FTRACE_GRAPH                                               \
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 786e7b8cece9..83aa81297ea3 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -184,5 +184,9 @@ extern void __devm_release_region(struct device *dev, struct resource *parent,
 extern int iomem_map_sanity_check(resource_size_t addr, unsigned long size);
 extern int iomem_is_exclusive(u64 addr);
+extern int
+walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages,
+                void *arg, int (*func)(unsigned long, unsigned long, void *));
 #endif /* __ASSEMBLY__ */
 #endif  /* _LINUX_IOPORT_H */
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index a1187a0c99b4..331530cd3cc6 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -556,7 +556,7 @@ struct transaction_s
         * This transaction is being forced and some process is
         * waiting for it to finish.
         */
-        int t_synchronous_commit:1;
+        unsigned int t_synchronous_commit:1;
 };
 /**
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 2b5b1e0899a8..d3cd23f30039 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -146,7 +146,7 @@ extern int _cond_resched(void);
 #define might_sleep_if(cond) do { if (cond) might_sleep(); } while (0)
 #define abs(x) ({                               \
-                int __x = (x);                  \
+                long __x = (x);                 \
                (__x < 0) ? -__x : __x;         \
        })
@@ -246,14 +246,16 @@ extern int printk_ratelimit(void);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
                                   unsigned int interval_msec);
+extern int printk_delay_msec;
 /*
 * Print a one-time message (analogous to WARN_ONCE() et al):
 */
 #define printk_once(x...) ({                    \
-        static int __print_once = 1;            \
+        static bool __print_once = true;        \
                                                \
        if (__print_once) {                     \
-                __print_once = 0;               \
+                __print_once = false;           \
                printk(x);                      \
        }                                       \
 })
@@ -676,13 +678,17 @@ struct sysinfo {
 };
 /* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition))
+/* Force a compilation error if condition is constant and true */
+#define MAYBE_BUILD_BUG_ON(cond) ((void)sizeof(char[1 - 2 * !!(cond)]))
 /* Force a compilation error if condition is true, but also produce a
   result (of value 0 and type size_t), so the expression can be used
   e.g. in a structure initializer (or where-ever else comma expressions
   aren't permitted). */
-#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1)
+#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
+#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 29f62e1733ff..ad6bdf5a5970 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -38,7 +38,7 @@ extern struct kfifo *kfifo_alloc(unsigned int size, gfp_t gfp_mask,
                                 spinlock_t *lock);
 extern void kfifo_free(struct kfifo *fifo);
 extern unsigned int __kfifo_put(struct kfifo *fifo,
-                                unsigned char *buffer, unsigned int len);
+                                const unsigned char *buffer, unsigned int len);
 extern unsigned int __kfifo_get(struct kfifo *fifo,
                                unsigned char *buffer, unsigned int len);
@@ -77,7 +77,7 @@ static inline void kfifo_reset(struct kfifo *fifo)
 * bytes copied.
 */
 static inline unsigned int kfifo_put(struct kfifo *fifo,
-                                     unsigned char *buffer, unsigned int len)
+                                const unsigned char *buffer, unsigned int len)
 {
        unsigned long flags;
        unsigned int ret;
diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index dc2fd545db00..e880d4cf9e22 100644
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
@@ -144,10 +144,15 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
        int name##_end[0];
 #define kmemcheck_annotate_bitfield(ptr, name)                          \
-        do if (ptr) {                                                   \
+        do {                                                            \
-                int _n = (long) &((ptr)->name##_end)                    \
+                int _n;                                                 \
+                                                                        \
+                if (!ptr)                                               \
+                        break;                                          \
+                                                                        \
+                _n = (long) &((ptr)->name##_end)                        \
                        - (long) &((ptr)->name##_begin);                \
-                BUILD_BUG_ON(_n < 0);                                   \
+                MAYBE_BUILD_BUG_ON(_n < 0);                             \
                                                                        \
                kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
        } while (0)
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
new file mode 100644
index 000000000000..a485c14ecd5d
--- /dev/null
+++ b/include/linux/ksm.h
@@ -0,0 +1,79 @@
+#ifndef __LINUX_KSM_H
+#define __LINUX_KSM_H
+/*
+ * Memory merging support.
+ *
+ * This code enables dynamic sharing of identical pages found in different
+ * memory areas, even if they are not shared by fork().
+ */
+#include <linux/bitops.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/vmstat.h>
+#ifdef CONFIG_KSM
+int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
+                unsigned long end, int advice, unsigned long *vm_flags);
+int __ksm_enter(struct mm_struct *mm);
+void __ksm_exit(struct mm_struct *mm);
+static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        if (test_bit(MMF_VM_MERGEABLE, &oldmm->flags))
+                return __ksm_enter(mm);
+        return 0;
+}
+static inline void ksm_exit(struct mm_struct *mm)
+{
+        if (test_bit(MMF_VM_MERGEABLE, &mm->flags))
+                __ksm_exit(mm);
+}
+/*
+ * A KSM page is one of those write-protected "shared pages" or "merged pages"
+ * which KSM maps into multiple mms, wherever identical anonymous page content
+ * is found in VM_MERGEABLE vmas.  It's a PageAnon page, with NULL anon_vma.
+ */
+static inline int PageKsm(struct page *page)
+{
+        return ((unsigned long)page->mapping == PAGE_MAPPING_ANON);
+}
+/*
+ * But we have to avoid the checking which page_add_anon_rmap() performs.
+ */
+static inline void page_add_ksm_rmap(struct page *page)
+{
+        if (atomic_inc_and_test(&page->_mapcount)) {
+                page->mapping = (void *) PAGE_MAPPING_ANON;
+                __inc_zone_page_state(page, NR_ANON_PAGES);
+        }
+}
+#else  /* !CONFIG_KSM */
+static inline int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
+                unsigned long end, int advice, unsigned long *vm_flags)
+{
+        return 0;
+}
+static inline int ksm_fork(struct mm_struct *mm, struct mm_struct *oldmm)
+{
+        return 0;
+}
+static inline void ksm_exit(struct mm_struct *mm)
+{
+}
+static inline int PageKsm(struct page *page)
+{
+        return 0;
+}
+/* No stub required for page_add_ksm_rmap(page) */
+#endif /* !CONFIG_KSM */
+#endif
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4af56036a6bf..b7bbb5ddd7ae 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -15,7 +15,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/preempt.h>
-#include <linux/marker.h>
 #include <linux/msi.h>
 #include <asm/signal.h>
diff --git a/include/linux/lis3lv02d.h b/include/linux/lis3lv02d.h
index ad651f4e45ac..3cc2f2c53e4c 100644
--- a/include/linux/lis3lv02d.h
+++ b/include/linux/lis3lv02d.h
@@ -32,8 +32,17 @@ struct lis3lv02d_platform_data {
 #define LIS3_IRQ2_DATA_READY    (4 << 3)
 #define LIS3_IRQ2_CLICK         (7 << 3)
 #define LIS3_IRQ_OPEN_DRAIN     (1 << 6)
-#define LIS3_IRQ_ACTIVE_HIGH    (1 << 7)
+#define LIS3_IRQ_ACTIVE_LOW     (1 << 7)
        unsigned char irq_cfg;
+#define LIS3_WAKEUP_X_LO        (1 << 0)
+#define LIS3_WAKEUP_X_HI        (1 << 1)
+#define LIS3_WAKEUP_Y_LO        (1 << 2)
+#define LIS3_WAKEUP_Y_HI        (1 << 3)
+#define LIS3_WAKEUP_Z_LO        (1 << 4)
+#define LIS3_WAKEUP_Z_HI        (1 << 5)
+        unsigned char wakeup_flags;
+        unsigned char wakeup_thresh;
 };
 #endif /* __LIS3LV02D_H_ */
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index c325b187966b..a34dea46b629 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -338,49 +338,6 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp)
        }
 }
-static inline int __nlm_cmp_addr4(const struct sockaddr *sap1,
-                                  const struct sockaddr *sap2)
-{
-        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
-        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
-        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
-}
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
-                                  const struct sockaddr *sap2)
-{
-        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
-        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
-        return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
-}
-#else   /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
-static inline int __nlm_cmp_addr6(const struct sockaddr *sap1,
-                                  const struct sockaddr *sap2)
-{
-        return 0;
-}
-#endif  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
-/*
- * Compare two host addresses
- *
- * Return TRUE if the addresses are the same; otherwise FALSE.
- */
-static inline int nlm_cmp_addr(const struct sockaddr *sap1,
-                               const struct sockaddr *sap2)
-{
-        if (sap1->sa_family == sap2->sa_family) {
-                switch (sap1->sa_family) {
-                case AF_INET:
-                        return __nlm_cmp_addr4(sap1, sap2);
-                case AF_INET6:
-                        return __nlm_cmp_addr6(sap1, sap2);
-                }
-        }
-        return 0;
-}
 /*
 * Compare two NLM locks.
 * When the second lock is of type F_UNLCK, this acts like a wildcard.
@@ -395,7 +352,7 @@ static inline int nlm_compare_locks(const struct file_lock *fl1,
             &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);
 }
-extern struct lock_manager_operations nlmsvc_lock_operations;
+extern const struct lock_manager_operations nlmsvc_lock_operations;
 #endif /* __KERNEL__ */
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 536ca12442ca..78c3bed1c3f5 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -104,7 +104,7 @@
 #define DL_UNITDATA_IND         0x3108
 #define DL_INFORMATION_IND      0x0008
-/* intern layer 2 managment */
+/* intern layer 2 management */
 #define MDL_ASSIGN_REQ          0x1804
 #define MDL_ASSIGN_IND          0x1904
 #define MDL_REMOVE_REQ          0x1A04
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 1923327b9869..76285e01b39e 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -12,7 +12,9 @@
 #define SYSFS_MAGIC             0x62656572
 #define SECURITYFS_MAGIC        0x73636673
 #define SELINUX_MAGIC           0xf97cff8c
+#define RAMFS_MAGIC             0x858458f6      /* some random number */
 #define TMPFS_MAGIC             0x01021994
+#define HUGETLBFS_MAGIC         0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC          0x73717368
 #define EFS_SUPER_MAGIC         0x414A53
 #define EXT2_SUPER_MAGIC        0xEF53
@@ -53,4 +55,8 @@
 #define INOTIFYFS_SUPER_MAGIC   0x2BAD1DEA
 #define STACK_END_MAGIC         0x57AC6E9D
+#define DEVPTS_SUPER_MAGIC      0x1cd1
+#define SOCKFS_MAGIC            0x534F434B
 #endif /* __LINUX_MAGIC_H__ */
diff --git a/include/linux/marker.h b/include/linux/marker.h
deleted file mode 100644
index b85e74ca782f..000000000000
--- a/include/linux/marker.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef _LINUX_MARKER_H
-#define _LINUX_MARKER_H
-/*
- * Code markup for dynamic and static tracing.
- *
- * See Documentation/marker.txt.
- *
- * (C) Copyright 2006 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- * This file is released under the GPLv2.
- * See the file COPYING for more details.
- */
-#include <stdarg.h>
-#include <linux/types.h>
-struct module;
-struct marker;
-/**
- * marker_probe_func - Type of a marker probe function
- * @probe_private: probe private data
- * @call_private: call site private data
- * @fmt: format string
- * @args: variable argument list pointer. Use a pointer to overcome C's
- *        inability to pass this around as a pointer in a portable manner in
- *        the callee otherwise.
- *
- * Type of marker probe functions. They receive the mdata and need to parse the
- * format string to recover the variable argument list.
- */
-typedef void marker_probe_func(void *probe_private, void *call_private,
-                const char *fmt, va_list *args);
-struct marker_probe_closure {
-        marker_probe_func *func;        /* Callback */
-        void *probe_private;            /* Private probe data */
-};
-struct marker {
-        const char *name;       /* Marker name */
-        const char *format;     /* Marker format string, describing the
-                                 * variable argument list.
-                                 */
-        char state;             /* Marker state. */
-        char ptype;             /* probe type : 0 : single, 1 : multi */
-                                /* Probe wrapper */
-        void (*call)(const struct marker *mdata, void *call_private, ...);
-        struct marker_probe_closure single;
-        struct marker_probe_closure *multi;
-        const char *tp_name;    /* Optional tracepoint name */
-        void *tp_cb;            /* Optional tracepoint callback */
-} __attribute__((aligned(8)));
-#ifdef CONFIG_MARKERS
-#define _DEFINE_MARKER(name, tp_name_str, tp_cb, format)                \
-                static const char __mstrtab_##name[]                    \
-                __attribute__((section("__markers_strings")))           \
-                = #name "\0" format;                                    \
-                static struct marker __mark_##name                      \
-                __attribute__((section("__markers"), aligned(8))) =     \
-                { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)],   \
-                  0, 0, marker_probe_cb, { __mark_empty_function, NULL},\
-                  NULL, tp_name_str, tp_cb }
-#define DEFINE_MARKER(name, format)                                     \
-                _DEFINE_MARKER(name, NULL, NULL, format)
-#define DEFINE_MARKER_TP(name, tp_name, tp_cb, format)                  \
-                _DEFINE_MARKER(name, #tp_name, tp_cb, format)
-/*
- * Note : the empty asm volatile with read constraint is used here instead of a
- * "used" attribute to fix a gcc 4.1.x bug.
- * Make sure the alignment of the structure in the __markers section will
- * not add unwanted padding between the beginning of the section and the
- * structure. Force alignment to the same alignment as the section start.
- *
- * The "generic" argument controls which marker enabling mechanism must be used.
- * If generic is true, a variable read is used.
- * If generic is false, immediate values are used.
- */
-#define __trace_mark(generic, name, call_private, format, args...)      \
-        do {                                                            \
-                DEFINE_MARKER(name, format);                            \
-                __mark_check_format(format, ## args);                   \
-                if (unlikely(__mark_##name.state)) {                    \
-                        (*__mark_##name.call)                           \
-                                (&__mark_##name, call_private, ## args);\
-                }                                                       \
-        } while (0)
-#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
-        do {                                                            \
-                void __check_tp_type(void)                              \
-                {                                                       \
-                        register_trace_##tp_name(tp_cb);                \
-                }                                                       \
-                DEFINE_MARKER_TP(name, tp_name, tp_cb, format);         \
-                __mark_check_format(format, ## args);                   \
-                (*__mark_##name.call)(&__mark_##name, call_private,     \
-                                        ## args);                       \
-        } while (0)
-extern void marker_update_probe_range(struct marker *begin,
-        struct marker *end);
-#define GET_MARKER(name)        (__mark_##name)
-#else /* !CONFIG_MARKERS */
-#define DEFINE_MARKER(name, tp_name, tp_cb, format)
-#define __trace_mark(generic, name, call_private, format, args...) \
-                __mark_check_format(format, ## args)
-#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
-        do {                                                            \
-                void __check_tp_type(void)                              \
-                {                                                       \
-                        register_trace_##tp_name(tp_cb);                \
-                }                                                       \
-                __mark_check_format(format, ## args);                   \
-        } while (0)
-static inline void marker_update_probe_range(struct marker *begin,
-        struct marker *end)
-{ }
-#define GET_MARKER(name)
-#endif /* CONFIG_MARKERS */
-/**
- * trace_mark - Marker using code patching
- * @name: marker name, not quoted.
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker using optimized code patching technique (imv_read())
- * to be enabled when immediate values are present.
- */
-#define trace_mark(name, format, args...) \
-        __trace_mark(0, name, NULL, format, ## args)
-/**
- * _trace_mark - Marker using variable read
- * @name: marker name, not quoted.
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker using a standard memory read (_imv_read()) to be
- * enabled. Should be used for markers in code paths where instruction
- * modification based enabling is not welcome. (__init and __exit functions,
- * lockdep, some traps, printk).
- */
-#define _trace_mark(name, format, args...) \
-        __trace_mark(1, name, NULL, format, ## args)
-/**
- * trace_mark_tp - Marker in a tracepoint callback
- * @name: marker name, not quoted.
- * @tp_name: tracepoint name, not quoted.
- * @tp_cb: tracepoint callback. Should have an associated global symbol so it
- *         is not optimized away by the compiler (should not be static).
- * @format: format string
- * @args...: variable argument list
- *
- * Places a marker in a tracepoint callback.
- */
-#define trace_mark_tp(name, tp_name, tp_cb, format, args...)    \
-        __trace_mark_tp(name, NULL, tp_name, tp_cb, format, ## args)
-/**
- * MARK_NOARGS - Format string for a marker with no argument.
- */
-#define MARK_NOARGS " "
-/* To be used for string format validity checking with gcc */
-static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...)
-{
-}
-#define __mark_check_format(format, args...)                            \
-        do {                                                            \
-                if (0)                                                  \
-                        ___mark_check_format(format, ## args);          \
-        } while (0)
-extern marker_probe_func __mark_empty_function;
-extern void marker_probe_cb(const struct marker *mdata,
-        void *call_private, ...);
-/*
- * Connect a probe to a marker.
- * private data pointer must be a valid allocated memory address, or NULL.
- */
-extern int marker_probe_register(const char *name, const char *format,
-                                marker_probe_func *probe, void *probe_private);
-/*
- * Returns the private data given to marker_probe_register.
- */
-extern int marker_probe_unregister(const char *name,
-        marker_probe_func *probe, void *probe_private);
-/*
- * Unregister a marker by providing the registered private data.
- */
-extern int marker_probe_unregister_private_data(marker_probe_func *probe,
-        void *probe_private);
-extern void *marker_get_private_data(const char *name, marker_probe_func *probe,
-        int num);
-/*
- * marker_synchronize_unregister must be called between the last marker probe
- * unregistration and the first one of
- * - the end of module exit function
- * - the free of any resource used by the probes
- * to ensure the code and data are valid for any possibly running probes.
- */
-#define marker_synchronize_unregister() synchronize_sched()
-#endif
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index d95f72e79b82..fed969281a41 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -191,14 +191,6 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
-/*
- * Walk through all memory which is registered as resource.
- * arg is (start_pfn, nr_pages, private_arg_pointer)
- */
-extern int walk_memory_resource(unsigned long start_pfn,
-                        unsigned long nr_pages, void *arg,
-                        int (*func)(unsigned long, unsigned long, void *));
 #ifdef CONFIG_MEMORY_HOTREMOVE
 extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);
diff --git a/include/linux/mempool.h b/include/linux/mempool.h
index 9be484d11283..7c08052e3321 100644
--- a/include/linux/mempool.h
+++ b/include/linux/mempool.h
@@ -47,22 +47,16 @@ mempool_create_slab_pool(int min_nr, struct kmem_cache *kc)
 }
 /*
- * 2 mempool_alloc_t's and a mempool_free_t to kmalloc/kzalloc and kfree
+ * a mempool_alloc_t and a mempool_free_t to kmalloc and kfree the
- * the amount of memory specified by pool_data
+ * amount of memory specified by pool_data
 */
 void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data);
-void *mempool_kzalloc(gfp_t gfp_mask, void *pool_data);
 void mempool_kfree(void *element, void *pool_data);
 static inline mempool_t *mempool_create_kmalloc_pool(int min_nr, size_t size)
 {
        return mempool_create(min_nr, mempool_kmalloc, mempool_kfree,
                              (void *) size);
 }
-static inline mempool_t *mempool_create_kzalloc_pool(int min_nr, size_t size)
-{
-        return mempool_create(min_nr, mempool_kzalloc, mempool_kfree,
-                              (void *) size);
-}
 /*
 * A mempool_alloc_t and mempool_free_t for a simple page allocator that
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 052117744629..adaf3c15e449 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -41,7 +41,8 @@ struct miscdevice  {
        struct list_head list;
        struct device *parent;
        struct device *this_device;
-        const char *devnode;
+        const char *nodename;
+        mode_t mode;
 };
 extern int misc_register(struct miscdevice * misc);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9a72cc78e6b8..b6eae5e3144b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -25,6 +25,7 @@ extern unsigned long max_mapnr;
 #endif
 extern unsigned long num_physpages;
+extern unsigned long totalram_pages;
 extern void * high_memory;
 extern int page_cluster;
@@ -103,6 +104,7 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_MIXEDMAP     0x10000000      /* Can contain "struct page" and pure PFN pages */
 #define VM_SAO          0x20000000      /* Strong Access Ordering (powerpc) */
 #define VM_PFN_AT_MMAP  0x40000000      /* PFNMAP vma that is fully mapped at mmap time */
+#define VM_MERGEABLE    0x80000000      /* KSM may merge identical pages */
 #ifndef VM_STACK_DEFAULT_FLAGS          /* arch can override this */
 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS
@@ -283,6 +285,14 @@ static inline int is_vmalloc_addr(const void *x)
        return 0;
 #endif
 }
+#ifdef CONFIG_MMU
+extern int is_vmalloc_or_module_addr(const void *x);
+#else
+static int is_vmalloc_or_module_addr(const void *x)
+{
+        return 0;
+}
+#endif
 static inline struct page *compound_head(struct page *page)
 {
@@ -700,17 +710,8 @@ extern void pagefault_out_of_memory(void);
 extern void show_free_areas(void);
-#ifdef CONFIG_SHMEM
+int shmem_lock(struct file *file, int lock, struct user_struct *user);
-extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
-#else
-static inline int shmem_lock(struct file *file, int lock,
-                            struct user_struct *user)
-{
-        return 0;
-}
-#endif
 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
 int shmem_zero_setup(struct vm_area_struct *);
 #ifndef CONFIG_MMU
@@ -815,6 +816,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        struct page **pages, struct vm_area_struct **vmas);
 int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                        struct page **pages);
+struct page *get_dump_page(unsigned long addr);
 extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
 extern void do_invalidatepage(struct page *page, unsigned long offset);
@@ -1058,6 +1060,8 @@ extern void setup_per_cpu_pageset(void);
 static inline void setup_per_cpu_pageset(void) {}
 #endif
+extern void zone_pcp_update(struct zone *zone);
 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
@@ -1226,7 +1230,8 @@ struct page *follow_page(struct vm_area_struct *, unsigned long address,
 #define FOLL_WRITE      0x01    /* check pte is writable */
 #define FOLL_TOUCH      0x02    /* mark page accessed */
 #define FOLL_GET        0x04    /* do get_page on page */
-#define FOLL_ANON       0x08    /* give ZERO_PAGE if no pgtable */
+#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 */
 typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
                        void *data);
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 7fbb97267556..8835b877b8db 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -5,7 +5,7 @@
 * page_is_file_cache - should the page be on a file LRU or anon LRU?
 * @page: the page to test
 *
- * Returns LRU_FILE if @page is page cache page backed by a regular filesystem,
+ * Returns 1 if @page is page cache page backed by a regular filesystem,
 * or 0 if @page is anonymous, tmpfs or otherwise ram or swap backed.
 * Used by functions that manipulate the LRU lists, to sort a page
 * onto the right LRU list.
@@ -16,11 +16,7 @@
 */
 static inline int page_is_file_cache(struct page *page)
 {
-        if (PageSwapBacked(page))
+        return !PageSwapBacked(page);
-                return 0;
-        /* The page is page cache backed by a normal filesystem. */
-        return LRU_FILE;
 }
 static inline void
@@ -39,21 +35,36 @@ del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
        mem_cgroup_del_lru_list(page, l);
 }
+/**
+ * page_lru_base_type - which LRU list type should a page be on?
+ * @page: the page to test
+ *
+ * Used for LRU list index arithmetic.
+ *
+ * Returns the base LRU type - file or anon - @page should be on.
+ */
+static inline enum lru_list page_lru_base_type(struct page *page)
+{
+        if (page_is_file_cache(page))
+                return LRU_INACTIVE_FILE;
+        return LRU_INACTIVE_ANON;
+}
 static inline void
 del_page_from_lru(struct zone *zone, struct page *page)
 {
-        enum lru_list l = LRU_BASE;
+        enum lru_list l;
        list_del(&page->lru);
        if (PageUnevictable(page)) {
                __ClearPageUnevictable(page);
                l = LRU_UNEVICTABLE;
        } else {
+                l = page_lru_base_type(page);
                if (PageActive(page)) {
                        __ClearPageActive(page);
                        l += LRU_ACTIVE;
                }
-                l += page_is_file_cache(page);
        }
        __dec_zone_state(zone, NR_LRU_BASE + l);
        mem_cgroup_del_lru_list(page, l);
@@ -68,14 +79,14 @@ del_page_from_lru(struct zone *zone, struct page *page)
 */
 static inline enum lru_list page_lru(struct page *page)
 {
-        enum lru_list lru = LRU_BASE;
+        enum lru_list lru;
        if (PageUnevictable(page))
                lru = LRU_UNEVICTABLE;
        else {
+                lru = page_lru_base_type(page);
                if (PageActive(page))
                        lru += LRU_ACTIVE;
-                lru += page_is_file_cache(page);
        }
        return lru;
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 403aa505f27e..2ee22e8af110 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -40,6 +40,8 @@ struct mmc_csd {
 };
 struct mmc_ext_csd {
+        u8                      rev;
+        unsigned int            sa_timeout;             /* Units: 100ns */
        unsigned int            hs_max_dtr;
        unsigned int            sectors;
 };
@@ -62,7 +64,8 @@ struct sdio_cccr {
                                low_speed:1,
                                wide_bus:1,
                                high_power:1,
-                                high_speed:1;
+                                high_speed:1,
+                                disable_cd:1;
 };
 struct sdio_cis {
@@ -94,6 +97,8 @@ struct mmc_card {
 #define MMC_STATE_READONLY      (1<<1)          /* card is read-only */
 #define MMC_STATE_HIGHSPEED     (1<<2)          /* card is in high speed mode */
 #define MMC_STATE_BLOCKADDR     (1<<3)          /* card uses block-addressing */
+        unsigned int            quirks;         /* card quirks */
+#define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
        u32                     raw_cid[4];     /* raw card CID */
        u32                     raw_csd[4];     /* raw card CSD */
@@ -129,6 +134,11 @@ struct mmc_card {
 #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
+static inline int mmc_card_lenient_fn0(const struct mmc_card *c)
+{
+        return c->quirks & MMC_QUIRK_LENIENT_FN0;
+}
 #define mmc_card_name(c)        ((c)->cid.prod_name)
 #define mmc_card_id(c)          (dev_name(&(c)->dev))
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 7ac8b500d55c..e4898e9eeb59 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -139,6 +139,7 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
+extern int mmc_try_claim_host(struct mmc_host *host);
 /**
 *      mmc_claim_host - exclusively claim a host
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 3e7615e9087e..81bb42358595 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -51,6 +51,35 @@ struct mmc_ios {
 };
 struct mmc_host_ops {
+        /*
+         * Hosts that support power saving can use the 'enable' and 'disable'
+         * methods to exit and enter power saving states. 'enable' is called
+         * when the host is claimed and 'disable' is called (or scheduled with
+         * a delay) when the host is released. The 'disable' is scheduled if
+         * the disable delay set by 'mmc_set_disable_delay()' is non-zero,
+         * otherwise 'disable' is called immediately. 'disable' may be
+         * scheduled repeatedly, to permit ever greater power saving at the
+         * expense of ever greater latency to re-enable. Rescheduling is
+         * determined by the return value of the 'disable' method. A positive
+         * value gives the delay in milliseconds.
+         *
+         * In the case where a host function (like set_ios) may be called
+         * with or without the host claimed, enabling and disabling can be
+         * done directly and will nest correctly. Call 'mmc_host_enable()' and
+         * 'mmc_host_lazy_disable()' for this purpose, but note that these
+         * functions must be paired.
+         *
+         * Alternatively, 'mmc_host_enable()' may be paired with
+         * 'mmc_host_disable()' which calls 'disable' immediately.  In this
+         * case the 'disable' method will be called with 'lazy' set to 0.
+         * This is mainly useful for error paths.
+         *
+         * Because lazy disable may be called from a work queue, the 'disable'
+         * method must claim the host when 'lazy' != 0, which will work
+         * correctly because recursion is detected and handled.
+         */
+        int (*enable)(struct mmc_host *host);
+        int (*disable)(struct mmc_host *host, int lazy);
        void    (*request)(struct mmc_host *host, struct mmc_request *req);
        /*
         * Avoid calling these three functions too often or in a "fast path",
@@ -118,6 +147,9 @@ struct mmc_host {
 #define MMC_CAP_SPI             (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL      (1 << 5)        /* Needs polling for card-detection */
 #define MMC_CAP_8_BIT_DATA      (1 << 6)        /* Can the host do 8 bit transfers */
+#define MMC_CAP_DISABLE         (1 << 7)        /* Can the host be disabled */
+#define MMC_CAP_NONREMOVABLE    (1 << 8)        /* Nonremovable e.g. eMMC */
+#define MMC_CAP_WAIT_WHILE_BUSY (1 << 9)        /* Waits while card is busy */
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
@@ -142,9 +174,18 @@ struct mmc_host {
        unsigned int            removed:1;      /* host is being removed */
 #endif
+        /* Only used with MMC_CAP_DISABLE */
+        int                     enabled;        /* host is enabled */
+        int                     nesting_cnt;    /* "enable" nesting count */
+        int                     en_dis_recurs;  /* detect recursion */
+        unsigned int            disable_delay;  /* disable delay in msecs */
+        struct delayed_work     disable;        /* disabling work */
        struct mmc_card         *card;          /* device attached to this host */
        wait_queue_head_t       wq;
+        struct task_struct      *claimer;       /* task that has host claimed */
+        int                     claim_cnt;      /* "claim" nesting count */
        struct delayed_work     detect;
@@ -183,6 +224,9 @@ static inline void *mmc_priv(struct mmc_host *host)
 extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
 extern int mmc_resume_host(struct mmc_host *);
+extern void mmc_power_save_host(struct mmc_host *host);
+extern void mmc_power_restore_host(struct mmc_host *host);
 extern void mmc_detect_change(struct mmc_host *, unsigned long delay);
 extern void mmc_request_done(struct mmc_host *, struct mmc_request *);
@@ -197,5 +241,19 @@ struct regulator;
 int mmc_regulator_get_ocrmask(struct regulator *supply);
 int mmc_regulator_set_ocr(struct regulator *supply, unsigned short vdd_bit);
+int mmc_card_awake(struct mmc_host *host);
+int mmc_card_sleep(struct mmc_host *host);
+int mmc_card_can_sleep(struct mmc_host *host);
+int mmc_host_enable(struct mmc_host *host);
+int mmc_host_disable(struct mmc_host *host);
+int mmc_host_lazy_disable(struct mmc_host *host);
+static inline void mmc_set_disable_delay(struct mmc_host *host,
+                                         unsigned int disable_delay)
+{
+        host->disable_delay = disable_delay;
+}
 #endif
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 14b81f3e5232..c02c8db73701 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -31,6 +31,7 @@
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
 #define MMC_SET_DSR               4   /* bc   [31:16] RCA            */
+#define MMC_SLEEP_AWAKE           5   /* ac   [31:16] RCA 15:flg R1b */
 #define MMC_SWITCH                6   /* ac   [31:0] See below   R1b */
 #define MMC_SELECT_CARD           7   /* ac   [31:16] RCA        R1  */
 #define MMC_SEND_EXT_CSD          8   /* adtc                    R1  */
@@ -127,6 +128,7 @@
 #define R1_STATUS(x)            (x & 0xFFFFE000)
 #define R1_CURRENT_STATE(x)     ((x & 0x00001E00) >> 9) /* sx, b (4 bits) */
 #define R1_READY_FOR_DATA       (1 << 8)        /* sx, a */
+#define R1_SWITCH_ERROR         (1 << 7)        /* sx, c */
 #define R1_APP_CMD              (1 << 5)        /* sr, c */
 /*
@@ -254,6 +256,7 @@ struct _mmc_csd {
 #define EXT_CSD_CARD_TYPE       196     /* RO */
 #define EXT_CSD_REV             192     /* RO */
 #define EXT_CSD_SEC_CNT         212     /* RO, 4 bytes */
+#define EXT_CSD_S_A_TIMEOUT     217
 /*
 * EXT_CSD field definitions
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 451bdfc85830..ac3ab683fec6 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -67,6 +67,7 @@ struct sdio_func {
 #define sdio_get_drvdata(f)     dev_get_drvdata(&(f)->dev)
 #define sdio_set_drvdata(f,d)   dev_set_drvdata(&(f)->dev, d)
+#define dev_to_sdio_func(d)     container_of(d, struct sdio_func, dev)
 /*
 * SDIO function device driver
@@ -81,6 +82,8 @@ struct sdio_driver {
        struct device_driver drv;
 };
+#define to_sdio_driver(d)       container_of(d, struct sdio_driver, drv)
 /**
 * SDIO_DEVICE - macro used to describe a specific SDIO device
 * @vend: the 16 bit manufacturer code
diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
new file mode 100644
index 000000000000..70fffeba7495
--- /dev/null
+++ b/include/linux/mmu_context.h
@@ -0,0 +1,9 @@
+#ifndef _LINUX_MMU_CONTEXT_H
+#define _LINUX_MMU_CONTEXT_H
+struct mm_struct;
+void use_mm(struct mm_struct *mm);
+void unuse_mm(struct mm_struct *mm);
+#endif
diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
index b77486d152cd..4e02ee2b071e 100644
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@ -62,6 +62,15 @@ struct mmu_notifier_ops {
                                 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.
+         */
+        void (*change_pte)(struct mmu_notifier *mn,
+                           struct mm_struct *mm,
+                           unsigned long address,
+                           pte_t pte);
+        /*
         * Before this is invoked any secondary MMU is still ok to
         * read/write to the page previously pointed to by the Linux
         * pte because the page hasn't been freed yet and it won't be
@@ -154,6 +163,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 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,
                                          unsigned long address);
 extern void __mmu_notifier_invalidate_range_start(struct mm_struct *mm,
@@ -175,6 +186,13 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+                                           unsigned long address, pte_t pte)
+{
+        if (mm_has_notifiers(mm))
+                __mmu_notifier_change_pte(mm, address, pte);
+}
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address)
 {
@@ -236,6 +254,16 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
        __young;                                                        \
 })
+#define set_pte_at_notify(__mm, __address, __ptep, __pte)               \
+({                                                                      \
+        struct mm_struct *___mm = __mm;                                 \
+        unsigned long ___address = __address;                           \
+        pte_t ___pte = __pte;                                           \
+                                                                        \
+        set_pte_at(___mm, ___address, __ptep, ___pte);                  \
+        mmu_notifier_change_pte(___mm, ___address, ___pte);             \
+})
 #else /* CONFIG_MMU_NOTIFIER */
 static inline void mmu_notifier_release(struct mm_struct *mm)
@@ -248,6 +276,11 @@ static inline int mmu_notifier_clear_flush_young(struct mm_struct *mm,
        return 0;
 }
+static inline void mmu_notifier_change_pte(struct mm_struct *mm,
+                                           unsigned long address, pte_t pte)
+{
+}
 static inline void mmu_notifier_invalidate_page(struct mm_struct *mm,
                                          unsigned long address)
 {
@@ -273,6 +306,7 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
 #define ptep_clear_flush_young_notify ptep_clear_flush_young
 #define ptep_clear_flush_notify ptep_clear_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 889598537370..652ef01be582 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -38,6 +38,7 @@
 #define MIGRATE_UNMOVABLE     0
 #define MIGRATE_RECLAIMABLE   1
 #define MIGRATE_MOVABLE       2
+#define MIGRATE_PCPTYPES      3 /* the number of types on the pcp lists */
 #define MIGRATE_RESERVE       3
 #define MIGRATE_ISOLATE       4 /* can't allocate from here */
 #define MIGRATE_TYPES         5
@@ -94,11 +95,15 @@ enum zone_stat_item {
        NR_SLAB_RECLAIMABLE,
        NR_SLAB_UNRECLAIMABLE,
        NR_PAGETABLE,           /* used for pagetables */
+        NR_KERNEL_STACK,
+        /* Second 128 byte cacheline */
        NR_UNSTABLE_NFS,        /* NFS unstable pages */
        NR_BOUNCE,
        NR_VMSCAN_WRITE,
-        /* Second 128 byte cacheline */
        NR_WRITEBACK_TEMP,      /* Writeback using temporary buffers */
+        NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
+        NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
+        NR_SHMEM,               /* shmem pages (included tmpfs/GEM pages) */
 #ifdef CONFIG_NUMA
        NUMA_HIT,               /* allocated in intended node */
        NUMA_MISS,              /* allocated in non intended node */
@@ -165,7 +170,9 @@ struct per_cpu_pages {
        int count;              /* number of pages in the list */
        int high;               /* high watermark, emptying needed */
        int batch;              /* chunk size for buddy add/remove */
-        struct list_head list;  /* the list of pages */
+        /* Lists of pages, one per migrate type stored on the pcp-lists */
+        struct list_head lists[MIGRATE_PCPTYPES];
 };
 struct per_cpu_pageset {
@@ -269,6 +276,11 @@ struct zone_reclaim_stat {
         */
        unsigned long           recent_rotated[2];
        unsigned long           recent_scanned[2];
+        /*
+         * accumulated for batching
+         */
+        unsigned long           nr_saved_scan[NR_LRU_LISTS];
 };
 struct zone {
@@ -323,7 +335,6 @@ struct zone {
        spinlock_t              lru_lock;       
        struct zone_lru {
                struct list_head list;
-                unsigned long nr_saved_scan;    /* accumulated for batching */
        } lru[NR_LRU_LISTS];
        struct zone_reclaim_stat reclaim_stat;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 1bf5900ffe43..f58e9d836f32 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -399,6 +399,17 @@ struct i2c_device_id {
                        __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
+/* spi */
+#define SPI_NAME_SIZE   32
+#define SPI_MODULE_PREFIX "spi:"
+struct spi_device_id {
+        char name[SPI_NAME_SIZE];
+        kernel_ulong_t driver_data      /* Data private to the driver */
+                        __attribute__((aligned(sizeof(kernel_ulong_t))));
+};
 /* dmi */
 enum dmi_field {
        DMI_NONE,
diff --git a/include/linux/module.h b/include/linux/module.h
index f8f92d015efe..1c755b2f937d 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -15,7 +15,6 @@
 #include <linux/stringify.h>
 #include <linux/kobject.h>
 #include <linux/moduleparam.h>
-#include <linux/marker.h>
 #include <linux/tracepoint.h>
 #include <asm/local.h>
@@ -327,10 +326,6 @@ struct module
        /* The command line arguments (may be mangled).  People like
           keeping pointers to this stuff */
        char *args;
-#ifdef CONFIG_MARKERS
-        struct marker *markers;
-        unsigned int num_markers;
-#endif
 #ifdef CONFIG_TRACEPOINTS
        struct tracepoint *tracepoints;
        unsigned int num_tracepoints;
@@ -535,8 +530,6 @@ int unregister_module_notifier(struct notifier_block * nb);
 extern void print_modules(void);
-extern void module_update_markers(void);
 extern void module_update_tracepoints(void);
 extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);
@@ -651,10 +644,6 @@ static inline void print_modules(void)
 {
 }
-static inline void module_update_markers(void)
-{
-}
 static inline void module_update_tracepoints(void)
 {
 }
diff --git a/include/linux/namei.h b/include/linux/namei.h
index d870ae2faedc..ec0f607b364a 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -40,7 +40,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 *  - follow links at the end
 *  - require a directory
 *  - ending slashes ok even for nonexistent files
- *  - internal "there are more path compnents" flag
+ *  - internal "there are more path components" flag
 *  - locked when lookup done with dcache_lock held
 *  - dentry cache is untrusted; force a real lookup
 */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 33b283601f62..c4c060208109 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -234,7 +234,7 @@ enum nfs_opnum4 {
 Needs to be updated if more operations are defined in future.*/
 #define FIRST_NFS4_OP   OP_ACCESS
-#define LAST_NFS4_OP    OP_RELEASE_LOCKOWNER
+#define LAST_NFS4_OP    OP_RECLAIM_COMPLETE
 enum nfsstat4 {
        NFS4_OK = 0,
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 2b49d676d0c9..510ffdd5020e 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -56,8 +56,11 @@ extern struct svc_version	nfsd_version2, nfsd_version3,
 extern u32                      nfsd_supported_minorversion;
 extern struct mutex             nfsd_mutex;
 extern struct svc_serv          *nfsd_serv;
+extern spinlock_t               nfsd_drc_lock;
+extern unsigned int             nfsd_drc_max_mem;
+extern unsigned int             nfsd_drc_mem_used;
-extern struct seq_operations nfs_exports_op;
+extern const struct seq_operations nfs_exports_op;
 /*
 * Function prototypes.
@@ -163,7 +166,7 @@ extern int nfsd_max_blksize;
 extern unsigned int max_delegations;
 int nfs4_state_init(void);
 void nfsd4_free_slabs(void);
-void nfs4_state_start(void);
+int nfs4_state_start(void);
 void nfs4_state_shutdown(void);
 time_t nfs4_lease_time(void);
 void nfs4_reset_lease(time_t leasetime);
@@ -171,7 +174,7 @@ int nfs4_reset_recoverydir(char *recdir);
 #else
 static inline int nfs4_state_init(void) { return 0; }
 static inline void nfsd4_free_slabs(void) { }
-static inline void nfs4_state_start(void) { }
+static inline int nfs4_state_start(void) { return 0; }
 static inline void nfs4_state_shutdown(void) { }
 static inline time_t nfs4_lease_time(void) { return 0; }
 static inline void nfs4_reset_lease(time_t leasetime) { }
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 57ab2ed08459..b38d11324189 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -60,6 +60,12 @@ typedef struct {
 #define si_stateownerid   si_opaque.so_stateownerid
 #define si_fileid         si_opaque.so_fileid
+struct nfsd4_cb_sequence {
+        /* args/res */
+        u32                     cbs_minorversion;
+        struct nfs4_client      *cbs_clp;
+};
 struct nfs4_delegation {
        struct list_head        dl_perfile;
        struct list_head        dl_perclnt;
@@ -81,38 +87,35 @@ struct nfs4_delegation {
 /* client delegation callback info */
 struct nfs4_cb_conn {
        /* SETCLIENTID info */
-        u32                     cb_addr;
+        struct sockaddr_storage cb_addr;
-        unsigned short          cb_port;
+        size_t                  cb_addrlen;
        u32                     cb_prog;
        u32                     cb_minorversion;
        u32                     cb_ident;       /* minorversion 0 only */
        /* RPC client info */
        atomic_t                cb_set;     /* successful CB_NULL call */
        struct rpc_clnt *       cb_client;
-        struct rpc_cred *       cb_cred;
 };
-/* Maximum number of slots per session. 128 is useful for long haul TCP */
+/* Maximum number of slots per session. 160 is useful for long haul TCP */
-#define NFSD_MAX_SLOTS_PER_SESSION      128
+#define NFSD_MAX_SLOTS_PER_SESSION     160
-/* Maximum number of pages per slot cache entry */
-#define NFSD_PAGES_PER_SLOT     1
 /* Maximum number of operations per session compound */
 #define NFSD_MAX_OPS_PER_COMPOUND       16
+/* Maximum  session per slot cache size */
-struct nfsd4_cache_entry {
+#define NFSD_SLOT_CACHE_SIZE            1024
-        __be32          ce_status;
+/* Maximum number of NFSD_SLOT_CACHE_SIZE slots per session */
-        struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
+#define NFSD_CACHE_SIZE_SLOTS_PER_SESSION       32
-        struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
+#define NFSD_MAX_MEM_PER_SESSION  \
-        int             ce_cachethis;
+                (NFSD_CACHE_SIZE_SLOTS_PER_SESSION * NFSD_SLOT_CACHE_SIZE)
-        short           ce_resused;
-        int             ce_opcnt;
-        int             ce_rpchdrlen;
-};
 struct nfsd4_slot {
-        bool                            sl_inuse;
+        bool    sl_inuse;
-        u32                             sl_seqid;
+        bool    sl_cachethis;
-        struct nfsd4_cache_entry        sl_cache_entry;
+        u16     sl_opcnt;
+        u32     sl_seqid;
+        __be32  sl_status;
+        u32     sl_datalen;
+        char    sl_data[];
 };
 struct nfsd4_channel_attrs {
@@ -126,6 +129,25 @@ struct nfsd4_channel_attrs {
        u32             rdma_attrs;
 };
+struct nfsd4_create_session {
+        clientid_t                      clientid;
+        struct nfs4_sessionid           sessionid;
+        u32                             seqid;
+        u32                             flags;
+        struct nfsd4_channel_attrs      fore_channel;
+        struct nfsd4_channel_attrs      back_channel;
+        u32                             callback_prog;
+        u32                             uid;
+        u32                             gid;
+};
+/* The single slot clientid cache structure */
+struct nfsd4_clid_slot {
+        u32                             sl_seqid;
+        __be32                          sl_status;
+        struct nfsd4_create_session     sl_cr_ses;
+};
 struct nfsd4_session {
        struct kref             se_ref;
        struct list_head        se_hash;        /* hash by sessionid */
@@ -135,7 +157,7 @@ struct nfsd4_session {
        struct nfs4_sessionid   se_sessionid;
        struct nfsd4_channel_attrs se_fchannel;
        struct nfsd4_channel_attrs se_bchannel;
-        struct nfsd4_slot       se_slots[];     /* forward channel slots */
+        struct nfsd4_slot       *se_slots[];    /* forward channel slots */
 };
 static inline void
@@ -180,7 +202,7 @@ struct nfs4_client {
        char                    cl_recdir[HEXDIR_LEN]; /* recovery dir */
        nfs4_verifier           cl_verifier;    /* generated by client */
        time_t                  cl_time;        /* time of last lease renewal */
-        __be32                  cl_addr;        /* client ipaddress */
+        struct sockaddr_storage cl_addr;        /* client ipaddress */
        u32                     cl_flavor;      /* setclientid pseudoflavor */
        char                    *cl_principal;  /* setclientid principal name */
        struct svc_cred         cl_cred;        /* setclientid principal */
@@ -192,9 +214,17 @@ struct nfs4_client {
        /* for nfs41 */
        struct list_head        cl_sessions;
-        struct nfsd4_slot       cl_slot;        /* create_session slot */
+        struct nfsd4_clid_slot  cl_cs_slot;     /* create_session slot */
        u32                     cl_exchange_flags;
        struct nfs4_sessionid   cl_sessionid;
+        /* for nfs41 callbacks */
+        /* We currently support a single back channel with a single slot */
+        unsigned long           cl_cb_slot_busy;
+        u32                     cl_cb_seq_nr;
+        struct svc_xprt         *cl_cb_xprt;    /* 4.1 callback transport */
+        struct rpc_wait_queue   cl_cb_waitq;    /* backchannel callers may */
+                                                /* wait here for slots */
 };
 /* struct nfs4_client_reset
@@ -345,6 +375,7 @@ extern int nfs4_in_grace(void);
 extern __be32 nfs4_check_open_reclaim(clientid_t *clid);
 extern void put_nfs4_client(struct nfs4_client *clp);
 extern void nfs4_free_stateowner(struct kref *kref);
+extern int set_callback_cred(void);
 extern void nfsd4_probe_callback(struct nfs4_client *clp);
 extern void nfsd4_cb_recall(struct nfs4_delegation *dp);
 extern void nfs4_put_delegation(struct nfs4_delegation *dp);
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 2bacf7535069..73164c2b3d29 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -51,7 +51,7 @@ struct nfsd4_compound_state {
        /* For sessions DRC */
        struct nfsd4_session    *session;
        struct nfsd4_slot       *slot;
-        __be32                  *statp;
+        __be32                  *datap;
        size_t                  iovlen;
        u32                     minorversion;
        u32                     status;
@@ -366,18 +366,6 @@ struct nfsd4_exchange_id {
        int             spa_how;
 };
-struct nfsd4_create_session {
-        clientid_t              clientid;
-        struct nfs4_sessionid   sessionid;
-        u32                     seqid;
-        u32                     flags;
-        struct nfsd4_channel_attrs fore_channel;
-        struct nfsd4_channel_attrs back_channel;
-        u32                     callback_prog;
-        u32                     uid;
-        u32                     gid;
-};
 struct nfsd4_sequence {
        struct nfs4_sessionid   sessionid;              /* request/response */
        u32                     seqid;                  /* request/response */
@@ -479,13 +467,12 @@ struct nfsd4_compoundres {
 static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
 {
        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
-        return args->opcnt == 1;
+        return resp->opcnt == 1 && args->ops[0].opnum == OP_SEQUENCE;
 }
 static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
 {
-        return !resp->cstate.slot->sl_cache_entry.ce_cachethis ||
+        return !resp->cstate.slot->sl_cachethis || nfsd4_is_solo_sequence(resp);
-                        nfsd4_is_solo_sequence(resp);
 }
 #define NFS4_SVC_XDRSIZE                sizeof(struct nfsd4_compoundargs)
diff --git a/include/linux/oom.h b/include/linux/oom.h
index a7979baf1e39..6aac5fe4f6f1 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -30,5 +30,16 @@ extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
 extern int register_oom_notifier(struct notifier_block *nb);
 extern int unregister_oom_notifier(struct notifier_block *nb);
+extern bool oom_killer_disabled;
+static inline void oom_killer_disable(void)
+{
+        oom_killer_disabled = true;
+}
+static inline void oom_killer_enable(void)
+{
+        oom_killer_disabled = false;
+}
 #endif /* __KERNEL__*/
 #endif /* _INCLUDE_LINUX_OOM_H */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 2b87acfc5f87..13de789f0a5c 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -158,6 +158,9 @@ static inline int TestSetPage##uname(struct page *page)			\
 static inline int TestClearPage##uname(struct page *page)               \
                { return test_and_clear_bit(PG_##lname, &page->flags); }
+#define __TESTCLEARFLAG(uname, lname)                                   \
+static inline int __TestClearPage##uname(struct page *page)             \
+                { return __test_and_clear_bit(PG_##lname, &page->flags); }
 #define PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname)               \
        SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname)
@@ -184,6 +187,9 @@ static inline void __ClearPage##uname(struct page *page) {  }
 #define TESTCLEARFLAG_FALSE(uname)                                      \
 static inline int TestClearPage##uname(struct page *page) { return 0; }
+#define __TESTCLEARFLAG_FALSE(uname)                                    \
+static inline int __TestClearPage##uname(struct page *page) { return 0; }
 struct page;    /* forward declaration */
 TESTPAGEFLAG(Locked, locked) TESTSETFLAG(Locked, locked)
@@ -250,11 +256,11 @@ PAGEFLAG(Unevictable, unevictable) __CLEARPAGEFLAG(Unevictable, unevictable)
 #ifdef CONFIG_HAVE_MLOCKED_PAGE_BIT
 #define MLOCK_PAGES 1
 PAGEFLAG(Mlocked, mlocked) __CLEARPAGEFLAG(Mlocked, mlocked)
-        TESTSCFLAG(Mlocked, mlocked)
+        TESTSCFLAG(Mlocked, mlocked) __TESTCLEARFLAG(Mlocked, mlocked)
 #else
 #define MLOCK_PAGES 0
-PAGEFLAG_FALSE(Mlocked)
+PAGEFLAG_FALSE(Mlocked) SETPAGEFLAG_NOOP(Mlocked)
-        SETPAGEFLAG_NOOP(Mlocked) TESTCLEARFLAG_FALSE(Mlocked)
+        TESTCLEARFLAG_FALSE(Mlocked) __TESTCLEARFLAG_FALSE(Mlocked)
 #endif
 #ifdef CONFIG_ARCH_USES_PG_UNCACHED
@@ -396,8 +402,8 @@ static inline void __ClearPageTail(struct page *page)
 */
 #define PAGE_FLAGS_CHECK_AT_PREP        ((1 << NR_PAGEFLAGS) - 1)
-#endif /* !__GENERATING_BOUNDS_H */
+#define PAGE_FLAGS_PRIVATE                              \
+        (1 << PG_private | 1 << PG_private_2)
 /**
 * page_has_private - Determine if page has private stuff
 * @page: The page to be checked
@@ -405,8 +411,11 @@ static inline void __ClearPageTail(struct page *page)
 * Determine if a page has private stuff, indicating that release routines
 * should be invoked upon it.
 */
-#define page_has_private(page)                  \
+static inline int page_has_private(struct page *page)
-        ((page)->flags & ((1 << PG_private) |   \
+{
-                          (1 << PG_private_2)))
+        return !!(page->flags & PAGE_FLAGS_PRIVATE);
+}
+#endif /* !__GENERATING_BOUNDS_H */
 #endif  /* PAGE_FLAGS_H */
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 13f126c89ae8..ada779f24178 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void)
 #endif
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 #include <linux/swap.h>
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
 extern unsigned short lookup_swap_cgroup(swp_entry_t ent);
 extern int swap_cgroup_swapon(int type, unsigned long max_pages);
 extern void swap_cgroup_swapoff(int type);
 #else
-#include <linux/swap.h>
 static inline
 unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3b6b788fe2b5..7803565aa877 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -543,6 +543,7 @@
 #define PCI_DEVICE_ID_AMD_8131_BRIDGE   0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC     0x7451
 #define PCI_DEVICE_ID_AMD_8132_BRIDGE   0x7458
+#define PCI_DEVICE_ID_AMD_SB900_SMBUS   0x780b
 #define PCI_DEVICE_ID_AMD_CS5535_IDE    0x208F
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 972f90d7a32f..368bd70f1d2d 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -1,5 +1,9 @@
 /*
- *  Performance counters:
+ *  NOTE: this file will be removed in a future kernel release, it is
+ *  provided as a courtesy copy of user-space code that relies on the
+ *  old (pre-rename) symbols and constants.
+ *
+ *  Performance events:
 *
 *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
 *    Copyright (C) 2008-2009, Red Hat, Inc., Ingo Molnar
@@ -131,19 +135,19 @@ enum perf_counter_sample_format {
 * as specified by attr.read_format:
 *
 * struct read_format {
- *      { u64           value;
+ *      { u64           value;
- *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
- *        { u64         time_running; } && PERF_FORMAT_RUNNING
+ *        { u64         time_running; } && PERF_FORMAT_RUNNING
- *        { u64         id;           } && PERF_FORMAT_ID
+ *        { u64         id;           } && PERF_FORMAT_ID
- *      } && !PERF_FORMAT_GROUP
+ *      } && !PERF_FORMAT_GROUP
 *
- *      { u64           nr;
+ *      { u64           nr;
- *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
- *        { u64         time_running; } && PERF_FORMAT_RUNNING
+ *        { u64         time_running; } && PERF_FORMAT_RUNNING
- *        { u64         value;
+ *        { u64         value;
- *          { u64       id;           } && PERF_FORMAT_ID
+ *          { u64       id;           } && PERF_FORMAT_ID
- *        }             cntr[nr];
+ *        }             cntr[nr];
- *      } && PERF_FORMAT_GROUP
+ *      } && PERF_FORMAT_GROUP
 * };
 */
 enum perf_counter_read_format {
@@ -199,10 +203,14 @@ struct perf_counter_attr {
                                inherit_stat   :  1, /* per task counts       */
                                enable_on_exec :  1, /* next exec enables     */
                                task           :  1, /* trace fork/exit       */
+                                watermark      :  1, /* wakeup_watermark      */
-                                __reserved_1   : 50;
+                                __reserved_1   : 49;
-        __u32                   wakeup_events;  /* wakeup every n events */
+        union {
+                __u32           wakeup_events;    /* wakeup every n events */
+                __u32           wakeup_watermark; /* bytes before wakeup   */
+        };
        __u32                   __reserved_2;
        __u64                   __reserved_3;
@@ -310,9 +318,9 @@ enum perf_event_type {
        /*
         * struct {
-         *      struct perf_event_header        header;
+         *      struct perf_event_header        header;
-         *      u64                             id;
+         *      u64                             id;
-         *      u64                             lost;
+         *      u64                             lost;
         * };
         */
        PERF_EVENT_LOST                 = 2,
@@ -332,6 +340,7 @@ enum perf_event_type {
         *      struct perf_event_header        header;
         *      u32                             pid, ppid;
         *      u32                             tid, ptid;
+         *      u64                             time;
         * };
         */
        PERF_EVENT_EXIT                 = 4,
@@ -352,16 +361,17 @@ enum perf_event_type {
         *      struct perf_event_header        header;
         *      u32                             pid, ppid;
         *      u32                             tid, ptid;
+         *      { u64                           time;     } && PERF_SAMPLE_TIME
         * };
         */
        PERF_EVENT_FORK                 = 7,
        /*
         * struct {
-         *      struct perf_event_header        header;
+         *      struct perf_event_header        header;
-         *      u32                             pid, tid;
+         *      u32                             pid, tid;
         *
-         *      struct read_format              values;
+         *      struct read_format              values;
         * };
         */
        PERF_EVENT_READ                 = 8,
@@ -377,23 +387,23 @@ enum perf_event_type {
         *      { u64                   id;       } && PERF_SAMPLE_ID
         *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
         *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
-         *      { u64                   period;   } && PERF_SAMPLE_PERIOD
+         *      { u64                   period;   } && PERF_SAMPLE_PERIOD
         *
         *      { struct read_format    values;   } && PERF_SAMPLE_READ
         *
         *      { u64                   nr,
         *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
         *
-         *      #
+         *      #
-         *      # The RAW record below is opaque data wrt the ABI
+         *      # The RAW record below is opaque data wrt the ABI
-         *      #
+         *      #
-         *      # That is, the ABI doesn't make any promises wrt to
+         *      # That is, the ABI doesn't make any promises wrt to
-         *      # the stability of its content, it may vary depending
+         *      # the stability of its content, it may vary depending
-         *      # on event, hardware, kernel version and phase of
+         *      # on event, hardware, kernel version and phase of
-         *      # the moon.
+         *      # the moon.
-         *      #
+         *      #
-         *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
+         *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
-         *      #
+         *      #
         *
         *      { u32                   size;
         *        char                  data[size];}&& PERF_SAMPLE_RAW
@@ -416,392 +426,16 @@ enum perf_callchain_context {
        PERF_CONTEXT_MAX                = (__u64)-4095,
 };
-#define PERF_FLAG_FD_NO_GROUP   (1U << 0)
+#define PERF_FLAG_FD_NO_GROUP           (1U << 0)
-#define PERF_FLAG_FD_OUTPUT     (1U << 1)
+#define PERF_FLAG_FD_OUTPUT             (1U << 1)
-#ifdef __KERNEL__
 /*
- * Kernel-internal data types and definitions:
+ * In case some app still references the old symbols:
- */
-#ifdef CONFIG_PERF_COUNTERS
-# include <asm/perf_counter.h>
-#endif
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/rculist.h>
-#include <linux/rcupdate.h>
-#include <linux/spinlock.h>
-#include <linux/hrtimer.h>
-#include <linux/fs.h>
-#include <linux/pid_namespace.h>
-#include <asm/atomic.h>
-#define PERF_MAX_STACK_DEPTH            255
-struct perf_callchain_entry {
-        __u64                           nr;
-        __u64                           ip[PERF_MAX_STACK_DEPTH];
-};
-struct perf_raw_record {
-        u32                             size;
-        void                            *data;
-};
-struct task_struct;
-/**
- * struct hw_perf_counter - performance counter hardware details:
- */
-struct hw_perf_counter {
-#ifdef CONFIG_PERF_COUNTERS
-        union {
-                struct { /* hardware */
-                        u64             config;
-                        unsigned long   config_base;
-                        unsigned long   counter_base;
-                        int             idx;
-                };
-                union { /* software */
-                        atomic64_t      count;
-                        struct hrtimer  hrtimer;
-                };
-        };
-        atomic64_t                      prev_count;
-        u64                             sample_period;
-        u64                             last_period;
-        atomic64_t                      period_left;
-        u64                             interrupts;
-        u64                             freq_count;
-        u64                             freq_interrupts;
-        u64                             freq_stamp;
-#endif
-};
-struct perf_counter;
-/**
- * struct pmu - generic performance monitoring unit
- */
-struct pmu {
-        int (*enable)                   (struct perf_counter *counter);
-        void (*disable)                 (struct perf_counter *counter);
-        void (*read)                    (struct perf_counter *counter);
-        void (*unthrottle)              (struct perf_counter *counter);
-};
-/**
- * enum perf_counter_active_state - the states of a counter
- */
-enum perf_counter_active_state {
-        PERF_COUNTER_STATE_ERROR        = -2,
-        PERF_COUNTER_STATE_OFF          = -1,
-        PERF_COUNTER_STATE_INACTIVE     =  0,
-        PERF_COUNTER_STATE_ACTIVE       =  1,
-};
-struct file;
-struct perf_mmap_data {
-        struct rcu_head                 rcu_head;
-        int                             nr_pages;       /* nr of data pages  */
-        int                             writable;       /* are we writable   */
-        int                             nr_locked;      /* nr pages mlocked  */
-        atomic_t                        poll;           /* POLL_ for wakeups */
-        atomic_t                        events;         /* event limit       */
-        atomic_long_t                   head;           /* write position    */
-        atomic_long_t                   done_head;      /* completed head    */
-        atomic_t                        lock;           /* concurrent writes */
-        atomic_t                        wakeup;         /* needs a wakeup    */
-        atomic_t                        lost;           /* nr records lost   */
-        struct perf_counter_mmap_page   *user_page;
-        void                            *data_pages[0];
-};
-struct perf_pending_entry {
-        struct perf_pending_entry *next;
-        void (*func)(struct perf_pending_entry *);
-};
-/**
- * struct perf_counter - performance counter kernel representation:
- */
-struct perf_counter {
-#ifdef CONFIG_PERF_COUNTERS
-        struct list_head                list_entry;
-        struct list_head                event_entry;
-        struct list_head                sibling_list;
-        int                             nr_siblings;
-        struct perf_counter             *group_leader;
-        struct perf_counter             *output;
-        const struct pmu                *pmu;
-        enum perf_counter_active_state  state;
-        atomic64_t                      count;
-        /*
-         * These are the total time in nanoseconds that the counter
-         * has been enabled (i.e. eligible to run, and the task has
-         * been scheduled in, if this is a per-task counter)
-         * and running (scheduled onto the CPU), respectively.
-         *
-         * They are computed from tstamp_enabled, tstamp_running and
-         * tstamp_stopped when the counter is in INACTIVE or ACTIVE state.
-         */
-        u64                             total_time_enabled;
-        u64                             total_time_running;
-        /*
-         * These are timestamps used for computing total_time_enabled
-         * and total_time_running when the counter is in INACTIVE or
-         * ACTIVE state, measured in nanoseconds from an arbitrary point
-         * in time.
-         * tstamp_enabled: the notional time when the counter was enabled
-         * tstamp_running: the notional time when the counter was scheduled on
-         * tstamp_stopped: in INACTIVE state, the notional time when the
-         *      counter was scheduled off.
-         */
-        u64                             tstamp_enabled;
-        u64                             tstamp_running;
-        u64                             tstamp_stopped;
-        struct perf_counter_attr        attr;
-        struct hw_perf_counter          hw;
-        struct perf_counter_context     *ctx;
-        struct file                     *filp;
-        /*
-         * These accumulate total time (in nanoseconds) that children
-         * counters have been enabled and running, respectively.
-         */
-        atomic64_t                      child_total_time_enabled;
-        atomic64_t                      child_total_time_running;
-        /*
-         * Protect attach/detach and child_list:
-         */
-        struct mutex                    child_mutex;
-        struct list_head                child_list;
-        struct perf_counter             *parent;
-        int                             oncpu;
-        int                             cpu;
-        struct list_head                owner_entry;
-        struct task_struct              *owner;
-        /* mmap bits */
-        struct mutex                    mmap_mutex;
-        atomic_t                        mmap_count;
-        struct perf_mmap_data           *data;
-        /* poll related */
-        wait_queue_head_t               waitq;
-        struct fasync_struct            *fasync;
-        /* delayed work for NMIs and such */
-        int                             pending_wakeup;
-        int                             pending_kill;
-        int                             pending_disable;
-        struct perf_pending_entry       pending;
-        atomic_t                        event_limit;
-        void (*destroy)(struct perf_counter *);
-        struct rcu_head                 rcu_head;
-        struct pid_namespace            *ns;
-        u64                             id;
-#endif
-};
-/**
- * struct perf_counter_context - counter context structure
- *
- * Used as a container for task counters and CPU counters as well:
- */
-struct perf_counter_context {
-        /*
-         * Protect the states of the counters in the list,
-         * nr_active, and the list:
-         */
-        spinlock_t                      lock;
-        /*
-         * Protect the list of counters.  Locking either mutex or lock
-         * is sufficient to ensure the list doesn't change; to change
-         * the list you need to lock both the mutex and the spinlock.
-         */
-        struct mutex                    mutex;
-        struct list_head                counter_list;
-        struct list_head                event_list;
-        int                             nr_counters;
-        int                             nr_active;
-        int                             is_active;
-        int                             nr_stat;
-        atomic_t                        refcount;
-        struct task_struct              *task;
-        /*
-         * Context clock, runs when context enabled.
-         */
-        u64                             time;
-        u64                             timestamp;
-        /*
-         * These fields let us detect when two contexts have both
-         * been cloned (inherited) from a common ancestor.
-         */
-        struct perf_counter_context     *parent_ctx;
-        u64                             parent_gen;
-        u64                             generation;
-        int                             pin_count;
-        struct rcu_head                 rcu_head;
-};
-/**
- * struct perf_counter_cpu_context - per cpu counter context structure
 */
-struct perf_cpu_context {
-        struct perf_counter_context     ctx;
-        struct perf_counter_context     *task_ctx;
-        int                             active_oncpu;
-        int                             max_pertask;
-        int                             exclusive;
-        /*
+#define __NR_perf_counter_open          __NR_perf_event_open
-         * Recursion avoidance:
-         *
-         * task, softirq, irq, nmi context
-         */
-        int                             recursion[4];
-};
-#ifdef CONFIG_PERF_COUNTERS
+#define PR_TASK_PERF_COUNTERS_DISABLE   PR_TASK_PERF_EVENTS_DISABLE
+#define PR_TASK_PERF_COUNTERS_ENABLE    PR_TASK_PERF_EVENTS_ENABLE
-/*
- * Set by architecture code:
- */
-extern int perf_max_counters;
-extern const struct pmu *hw_perf_counter_init(struct perf_counter *counter);
-extern void perf_counter_task_sched_in(struct task_struct *task, int cpu);
-extern void perf_counter_task_sched_out(struct task_struct *task,
-                                        struct task_struct *next, int cpu);
-extern void perf_counter_task_tick(struct task_struct *task, int cpu);
-extern int perf_counter_init_task(struct task_struct *child);
-extern void perf_counter_exit_task(struct task_struct *child);
-extern void perf_counter_free_task(struct task_struct *task);
-extern void set_perf_counter_pending(void);
-extern void perf_counter_do_pending(void);
-extern void perf_counter_print_debug(void);
-extern void __perf_disable(void);
-extern bool __perf_enable(void);
-extern void perf_disable(void);
-extern void perf_enable(void);
-extern int perf_counter_task_disable(void);
-extern int perf_counter_task_enable(void);
-extern int hw_perf_group_sched_in(struct perf_counter *group_leader,
-               struct perf_cpu_context *cpuctx,
-               struct perf_counter_context *ctx, int cpu);
-extern void perf_counter_update_userpage(struct perf_counter *counter);
-struct perf_sample_data {
-        struct pt_regs                  *regs;
-        u64                             addr;
-        u64                             period;
-        struct perf_raw_record          *raw;
-};
-extern int perf_counter_overflow(struct perf_counter *counter, int nmi,
-                                 struct perf_sample_data *data);
-extern void perf_counter_output(struct perf_counter *counter, int nmi,
-                                struct perf_sample_data *data);
-/*
- * Return 1 for a software counter, 0 for a hardware counter
- */
-static inline int is_software_counter(struct perf_counter *counter)
-{
-        return (counter->attr.type != PERF_TYPE_RAW) &&
-                (counter->attr.type != PERF_TYPE_HARDWARE) &&
-                (counter->attr.type != PERF_TYPE_HW_CACHE);
-}
-extern atomic_t perf_swcounter_enabled[PERF_COUNT_SW_MAX];
-extern void __perf_swcounter_event(u32, u64, int, struct pt_regs *, u64);
-static inline void
-perf_swcounter_event(u32 event, u64 nr, int nmi, struct pt_regs *regs, u64 addr)
-{
-        if (atomic_read(&perf_swcounter_enabled[event]))
-                __perf_swcounter_event(event, nr, nmi, regs, addr);
-}
-extern void __perf_counter_mmap(struct vm_area_struct *vma);
-static inline void perf_counter_mmap(struct vm_area_struct *vma)
-{
-        if (vma->vm_flags & VM_EXEC)
-                __perf_counter_mmap(vma);
-}
-extern void perf_counter_comm(struct task_struct *tsk);
-extern void perf_counter_fork(struct task_struct *tsk);
-extern struct perf_callchain_entry *perf_callchain(struct pt_regs *regs);
-extern int sysctl_perf_counter_paranoid;
-extern int sysctl_perf_counter_mlock;
-extern int sysctl_perf_counter_sample_rate;
-extern void perf_counter_init(void);
-extern void perf_tpcounter_event(int event_id, u64 addr, u64 count,
-                                 void *record, int entry_size);
-#ifndef perf_misc_flags
-#define perf_misc_flags(regs)   (user_mode(regs) ? PERF_EVENT_MISC_USER : \
-                                 PERF_EVENT_MISC_KERNEL)
-#define perf_instruction_pointer(regs)  instruction_pointer(regs)
-#endif
-#else
-static inline void
-perf_counter_task_sched_in(struct task_struct *task, int cpu)           { }
-static inline void
-perf_counter_task_sched_out(struct task_struct *task,
-                            struct task_struct *next, int cpu)          { }
-static inline void
-perf_counter_task_tick(struct task_struct *task, int cpu)               { }
-static inline int perf_counter_init_task(struct task_struct *child)     { return 0; }
-static inline void perf_counter_exit_task(struct task_struct *child)    { }
-static inline void perf_counter_free_task(struct task_struct *task)     { }
-static inline void perf_counter_do_pending(void)                        { }
-static inline void perf_counter_print_debug(void)                       { }
-static inline void perf_disable(void)                                   { }
-static inline void perf_enable(void)                                    { }
-static inline int perf_counter_task_disable(void)       { return -EINVAL; }
-static inline int perf_counter_task_enable(void)        { return -EINVAL; }
-static inline void
-perf_swcounter_event(u32 event, u64 nr, int nmi,
-                     struct pt_regs *regs, u64 addr)                    { }
-static inline void perf_counter_mmap(struct vm_area_struct *vma)        { }
-static inline void perf_counter_comm(struct task_struct *tsk)           { }
-static inline void perf_counter_fork(struct task_struct *tsk)           { }
-static inline void perf_counter_init(void)                              { }
-#endif
-#endif /* __KERNEL__ */
 #endif /* _LINUX_PERF_COUNTER_H */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
new file mode 100644
index 000000000000..acefaf71e6dd
--- /dev/null
+++ b/include/linux/perf_event.h
@@ -0,0 +1,858 @@
+/*
+ * Performance events:
+ *
+ *    Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>
+ *    Copyright (C) 2008-2009, Red Hat, Inc., Ingo Molnar
+ *    Copyright (C) 2008-2009, Red Hat, Inc., Peter Zijlstra
+ *
+ * Data type definitions, declarations, prototypes.
+ *
+ *    Started by: Thomas Gleixner and Ingo Molnar
+ *
+ * For licencing details see kernel-base/COPYING
+ */
+#ifndef _LINUX_PERF_EVENT_H
+#define _LINUX_PERF_EVENT_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#include <asm/byteorder.h>
+/*
+ * User-space ABI bits:
+ */
+/*
+ * attr.type
+ */
+enum perf_type_id {
+        PERF_TYPE_HARDWARE                      = 0,
+        PERF_TYPE_SOFTWARE                      = 1,
+        PERF_TYPE_TRACEPOINT                    = 2,
+        PERF_TYPE_HW_CACHE                      = 3,
+        PERF_TYPE_RAW                           = 4,
+        PERF_TYPE_MAX,                          /* non-ABI */
+};
+/*
+ * Generalized performance event event_id types, used by the
+ * attr.event_id parameter of the sys_perf_event_open()
+ * syscall:
+ */
+enum perf_hw_id {
+        /*
+         * Common hardware events, generalized by the kernel:
+         */
+        PERF_COUNT_HW_CPU_CYCLES                = 0,
+        PERF_COUNT_HW_INSTRUCTIONS              = 1,
+        PERF_COUNT_HW_CACHE_REFERENCES          = 2,
+        PERF_COUNT_HW_CACHE_MISSES              = 3,
+        PERF_COUNT_HW_BRANCH_INSTRUCTIONS       = 4,
+        PERF_COUNT_HW_BRANCH_MISSES             = 5,
+        PERF_COUNT_HW_BUS_CYCLES                = 6,
+        PERF_COUNT_HW_MAX,                      /* non-ABI */
+};
+/*
+ * Generalized hardware cache events:
+ *
+ *       { L1-D, L1-I, LLC, ITLB, DTLB, BPU } x
+ *       { read, write, prefetch } x
+ *       { accesses, misses }
+ */
+enum perf_hw_cache_id {
+        PERF_COUNT_HW_CACHE_L1D                 = 0,
+        PERF_COUNT_HW_CACHE_L1I                 = 1,
+        PERF_COUNT_HW_CACHE_LL                  = 2,
+        PERF_COUNT_HW_CACHE_DTLB                = 3,
+        PERF_COUNT_HW_CACHE_ITLB                = 4,
+        PERF_COUNT_HW_CACHE_BPU                 = 5,
+        PERF_COUNT_HW_CACHE_MAX,                /* non-ABI */
+};
+enum perf_hw_cache_op_id {
+        PERF_COUNT_HW_CACHE_OP_READ             = 0,
+        PERF_COUNT_HW_CACHE_OP_WRITE            = 1,
+        PERF_COUNT_HW_CACHE_OP_PREFETCH         = 2,
+        PERF_COUNT_HW_CACHE_OP_MAX,             /* non-ABI */
+};
+enum perf_hw_cache_op_result_id {
+        PERF_COUNT_HW_CACHE_RESULT_ACCESS       = 0,
+        PERF_COUNT_HW_CACHE_RESULT_MISS         = 1,
+        PERF_COUNT_HW_CACHE_RESULT_MAX,         /* non-ABI */
+};
+/*
+ * Special "software" events provided by the kernel, even if the hardware
+ * does not support performance events. These events measure various
+ * physical and sw events of the kernel (and allow the profiling of them as
+ * well):
+ */
+enum perf_sw_ids {
+        PERF_COUNT_SW_CPU_CLOCK                 = 0,
+        PERF_COUNT_SW_TASK_CLOCK                = 1,
+        PERF_COUNT_SW_PAGE_FAULTS               = 2,
+        PERF_COUNT_SW_CONTEXT_SWITCHES          = 3,
+        PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
+        PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
+        PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
+        PERF_COUNT_SW_MAX,                      /* non-ABI */
+};
+/*
+ * Bits that can be set in attr.sample_type to request information
+ * in the overflow packets.
+ */
+enum perf_event_sample_format {
+        PERF_SAMPLE_IP                          = 1U << 0,
+        PERF_SAMPLE_TID                         = 1U << 1,
+        PERF_SAMPLE_TIME                        = 1U << 2,
+        PERF_SAMPLE_ADDR                        = 1U << 3,
+        PERF_SAMPLE_READ                        = 1U << 4,
+        PERF_SAMPLE_CALLCHAIN                   = 1U << 5,
+        PERF_SAMPLE_ID                          = 1U << 6,
+        PERF_SAMPLE_CPU                         = 1U << 7,
+        PERF_SAMPLE_PERIOD                      = 1U << 8,
+        PERF_SAMPLE_STREAM_ID                   = 1U << 9,
+        PERF_SAMPLE_RAW                         = 1U << 10,
+        PERF_SAMPLE_MAX = 1U << 11,             /* non-ABI */
+};
+/*
+ * The format of the data returned by read() on a perf event fd,
+ * as specified by attr.read_format:
+ *
+ * struct read_format {
+ *      { u64           value;
+ *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *        { u64         time_running; } && PERF_FORMAT_RUNNING
+ *        { u64         id;           } && PERF_FORMAT_ID
+ *      } && !PERF_FORMAT_GROUP
+ *
+ *      { u64           nr;
+ *        { u64         time_enabled; } && PERF_FORMAT_ENABLED
+ *        { u64         time_running; } && PERF_FORMAT_RUNNING
+ *        { u64         value;
+ *          { u64       id;           } && PERF_FORMAT_ID
+ *        }             cntr[nr];
+ *      } && PERF_FORMAT_GROUP
+ * };
+ */
+enum perf_event_read_format {
+        PERF_FORMAT_TOTAL_TIME_ENABLED          = 1U << 0,
+        PERF_FORMAT_TOTAL_TIME_RUNNING          = 1U << 1,
+        PERF_FORMAT_ID                          = 1U << 2,
+        PERF_FORMAT_GROUP                       = 1U << 3,
+        PERF_FORMAT_MAX = 1U << 4,              /* non-ABI */
+};
+#define PERF_ATTR_SIZE_VER0     64      /* sizeof first published struct */
+/*
+ * Hardware event_id to monitor via a performance monitoring event:
+ */
+struct perf_event_attr {
+        /*
+         * Major type: hardware/software/tracepoint/etc.
+         */
+        __u32                   type;
+        /*
+         * Size of the attr structure, for fwd/bwd compat.
+         */
+        __u32                   size;
+        /*
+         * Type specific configuration information.
+         */
+        __u64                   config;
+        union {
+                __u64           sample_period;
+                __u64           sample_freq;
+        };
+        __u64                   sample_type;
+        __u64                   read_format;
+        __u64                   disabled       :  1, /* off by default        */
+                                inherit        :  1, /* children inherit it   */
+                                pinned         :  1, /* must always be on PMU */
+                                exclusive      :  1, /* only group on PMU     */
+                                exclude_user   :  1, /* don't count user      */
+                                exclude_kernel :  1, /* ditto kernel          */
+                                exclude_hv     :  1, /* ditto hypervisor      */
+                                exclude_idle   :  1, /* don't count when idle */
+                                mmap           :  1, /* include mmap data     */
+                                comm           :  1, /* include comm data     */
+                                freq           :  1, /* use freq, not period  */
+                                inherit_stat   :  1, /* per task counts       */
+                                enable_on_exec :  1, /* next exec enables     */
+                                task           :  1, /* trace fork/exit       */
+                                watermark      :  1, /* wakeup_watermark      */
+                                __reserved_1   : 49;
+        union {
+                __u32           wakeup_events;    /* wakeup every n events */
+                __u32           wakeup_watermark; /* bytes before wakeup   */
+        };
+        __u32                   __reserved_2;
+        __u64                   __reserved_3;
+};
+/*
+ * Ioctls that can be done on a perf event fd:
+ */
+#define PERF_EVENT_IOC_ENABLE           _IO ('$', 0)
+#define PERF_EVENT_IOC_DISABLE          _IO ('$', 1)
+#define PERF_EVENT_IOC_REFRESH          _IO ('$', 2)
+#define PERF_EVENT_IOC_RESET            _IO ('$', 3)
+#define PERF_EVENT_IOC_PERIOD           _IOW('$', 4, u64)
+#define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
+enum perf_event_ioc_flags {
+        PERF_IOC_FLAG_GROUP             = 1U << 0,
+};
+/*
+ * Structure of the page that can be mapped via mmap
+ */
+struct perf_event_mmap_page {
+        __u32   version;                /* version number of this structure */
+        __u32   compat_version;         /* lowest version this is compat with */
+        /*
+         * Bits needed to read the hw events in user-space.
+         *
+         *   u32 seq;
+         *   s64 count;
+         *
+         *   do {
+         *     seq = pc->lock;
+         *
+         *     barrier()
+         *     if (pc->index) {
+         *       count = pmc_read(pc->index - 1);
+         *       count += pc->offset;
+         *     } else
+         *       goto regular_read;
+         *
+         *     barrier();
+         *   } while (pc->lock != seq);
+         *
+         * NOTE: for obvious reason this only works on self-monitoring
+         *       processes.
+         */
+        __u32   lock;                   /* seqlock for synchronization */
+        __u32   index;                  /* hardware event identifier */
+        __s64   offset;                 /* add to hardware event value */
+        __u64   time_enabled;           /* time event active */
+        __u64   time_running;           /* time event on cpu */
+                /*
+                 * Hole for extension of the self monitor capabilities
+                 */
+        __u64   __reserved[123];        /* align to 1k */
+        /*
+         * Control data for the mmap() data buffer.
+         *
+         * User-space reading the @data_head value should issue an rmb(), on
+         * SMP capable platforms, after reading this value -- see
+         * perf_event_wakeup().
+         *
+         * When the mapping is PROT_WRITE the @data_tail value should be
+         * written by userspace to reflect the last read data. In this case
+         * the kernel will not over-write unread data.
+         */
+        __u64   data_head;              /* head in the data section */
+        __u64   data_tail;              /* user-space written tail */
+};
+#define PERF_RECORD_MISC_CPUMODE_MASK           (3 << 0)
+#define PERF_RECORD_MISC_CPUMODE_UNKNOWN                (0 << 0)
+#define PERF_RECORD_MISC_KERNEL                 (1 << 0)
+#define PERF_RECORD_MISC_USER                   (2 << 0)
+#define PERF_RECORD_MISC_HYPERVISOR             (3 << 0)
+struct perf_event_header {
+        __u32   type;
+        __u16   misc;
+        __u16   size;
+};
+enum perf_event_type {
+        /*
+         * The MMAP events record the PROT_EXEC mappings so that we can
+         * correlate userspace IPs to code. They have the following structure:
+         *
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u32                             pid, tid;
+         *      u64                             addr;
+         *      u64                             len;
+         *      u64                             pgoff;
+         *      char                            filename[];
+         * };
+         */
+        PERF_RECORD_MMAP                        = 1,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u64                             id;
+         *      u64                             lost;
+         * };
+         */
+        PERF_RECORD_LOST                        = 2,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      u32                             pid, tid;
+         *      char                            comm[];
+         * };
+         */
+        PERF_RECORD_COMM                        = 3,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, ppid;
+         *      u32                             tid, ptid;
+         *      u64                             time;
+         * };
+         */
+        PERF_RECORD_EXIT                        = 4,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u64                             time;
+         *      u64                             id;
+         *      u64                             stream_id;
+         * };
+         */
+        PERF_RECORD_THROTTLE            = 5,
+        PERF_RECORD_UNTHROTTLE          = 6,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, ppid;
+         *      u32                             tid, ptid;
+         *      { u64                           time;     } && PERF_SAMPLE_TIME
+         * };
+         */
+        PERF_RECORD_FORK                        = 7,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid, tid;
+         *
+         *      struct read_format              values;
+         * };
+         */
+        PERF_RECORD_READ                        = 8,
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *
+         *      { u64                   ip;       } && PERF_SAMPLE_IP
+         *      { u32                   pid, tid; } && PERF_SAMPLE_TID
+         *      { u64                   time;     } && PERF_SAMPLE_TIME
+         *      { u64                   addr;     } && PERF_SAMPLE_ADDR
+         *      { u64                   id;       } && PERF_SAMPLE_ID
+         *      { u64                   stream_id;} && PERF_SAMPLE_STREAM_ID
+         *      { u32                   cpu, res; } && PERF_SAMPLE_CPU
+         *      { u64                   period;   } && PERF_SAMPLE_PERIOD
+         *
+         *      { struct read_format    values;   } && PERF_SAMPLE_READ
+         *
+         *      { u64                   nr,
+         *        u64                   ips[nr];  } && PERF_SAMPLE_CALLCHAIN
+         *
+         *      #
+         *      # The RAW record below is opaque data wrt the ABI
+         *      #
+         *      # That is, the ABI doesn't make any promises wrt to
+         *      # the stability of its content, it may vary depending
+         *      # on event, hardware, kernel version and phase of
+         *      # the moon.
+         *      #
+         *      # In other words, PERF_SAMPLE_RAW contents are not an ABI.
+         *      #
+         *
+         *      { u32                   size;
+         *        char                  data[size];}&& PERF_SAMPLE_RAW
+         * };
+         */
+        PERF_RECORD_SAMPLE              = 9,
+        PERF_RECORD_MAX,                        /* non-ABI */
+};
+enum perf_callchain_context {
+        PERF_CONTEXT_HV                 = (__u64)-32,
+        PERF_CONTEXT_KERNEL             = (__u64)-128,
+        PERF_CONTEXT_USER               = (__u64)-512,
+        PERF_CONTEXT_GUEST              = (__u64)-2048,
+        PERF_CONTEXT_GUEST_KERNEL       = (__u64)-2176,
+        PERF_CONTEXT_GUEST_USER         = (__u64)-2560,
+        PERF_CONTEXT_MAX                = (__u64)-4095,
+};
+#define PERF_FLAG_FD_NO_GROUP   (1U << 0)
+#define PERF_FLAG_FD_OUTPUT     (1U << 1)
+#ifdef __KERNEL__
+/*
+ * Kernel-internal data types and definitions:
+ */
+#ifdef CONFIG_PERF_EVENTS
+# include <asm/perf_event.h>
+#endif
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/rculist.h>
+#include <linux/rcupdate.h>
+#include <linux/spinlock.h>
+#include <linux/hrtimer.h>
+#include <linux/fs.h>
+#include <linux/pid_namespace.h>
+#include <asm/atomic.h>
+#define PERF_MAX_STACK_DEPTH            255
+struct perf_callchain_entry {
+        __u64                           nr;
+        __u64                           ip[PERF_MAX_STACK_DEPTH];
+};
+struct perf_raw_record {
+        u32                             size;
+        void                            *data;
+};
+struct task_struct;
+/**
+ * struct hw_perf_event - performance event hardware details:
+ */
+struct hw_perf_event {
+#ifdef CONFIG_PERF_EVENTS
+        union {
+                struct { /* hardware */
+                        u64             config;
+                        unsigned long   config_base;
+                        unsigned long   event_base;
+                        int             idx;
+                };
+                union { /* software */
+                        atomic64_t      count;
+                        struct hrtimer  hrtimer;
+                };
+        };
+        atomic64_t                      prev_count;
+        u64                             sample_period;
+        u64                             last_period;
+        atomic64_t                      period_left;
+        u64                             interrupts;
+        u64                             freq_count;
+        u64                             freq_interrupts;
+        u64                             freq_stamp;
+#endif
+};
+struct perf_event;
+/**
+ * struct pmu - generic performance monitoring unit
+ */
+struct pmu {
+        int (*enable)                   (struct perf_event *event);
+        void (*disable)                 (struct perf_event *event);
+        void (*read)                    (struct perf_event *event);
+        void (*unthrottle)              (struct perf_event *event);
+};
+/**
+ * enum perf_event_active_state - the states of a event
+ */
+enum perf_event_active_state {
+        PERF_EVENT_STATE_ERROR          = -2,
+        PERF_EVENT_STATE_OFF            = -1,
+        PERF_EVENT_STATE_INACTIVE       =  0,
+        PERF_EVENT_STATE_ACTIVE         =  1,
+};
+struct file;
+struct perf_mmap_data {
+        struct rcu_head                 rcu_head;
+        int                             nr_pages;       /* nr of data pages  */
+        int                             writable;       /* are we writable   */
+        int                             nr_locked;      /* nr pages mlocked  */
+        atomic_t                        poll;           /* POLL_ for wakeups */
+        atomic_t                        events;         /* event_id limit       */
+        atomic_long_t                   head;           /* write position    */
+        atomic_long_t                   done_head;      /* completed head    */
+        atomic_t                        lock;           /* concurrent writes */
+        atomic_t                        wakeup;         /* needs a wakeup    */
+        atomic_t                        lost;           /* nr records lost   */
+        long                            watermark;      /* wakeup watermark  */
+        struct perf_event_mmap_page     *user_page;
+        void                            *data_pages[0];
+};
+struct perf_pending_entry {
+        struct perf_pending_entry *next;
+        void (*func)(struct perf_pending_entry *);
+};
+/**
+ * struct perf_event - performance event kernel representation:
+ */
+struct perf_event {
+#ifdef CONFIG_PERF_EVENTS
+        struct list_head                group_entry;
+        struct list_head                event_entry;
+        struct list_head                sibling_list;
+        int                             nr_siblings;
+        struct perf_event               *group_leader;
+        struct perf_event               *output;
+        const struct pmu                *pmu;
+        enum perf_event_active_state    state;
+        atomic64_t                      count;
+        /*
+         * These are the total time in nanoseconds that the event
+         * has been enabled (i.e. eligible to run, and the task has
+         * been scheduled in, if this is a per-task event)
+         * and running (scheduled onto the CPU), respectively.
+         *
+         * They are computed from tstamp_enabled, tstamp_running and
+         * tstamp_stopped when the event is in INACTIVE or ACTIVE state.
+         */
+        u64                             total_time_enabled;
+        u64                             total_time_running;
+        /*
+         * These are timestamps used for computing total_time_enabled
+         * and total_time_running when the event is in INACTIVE or
+         * ACTIVE state, measured in nanoseconds from an arbitrary point
+         * in time.
+         * tstamp_enabled: the notional time when the event was enabled
+         * tstamp_running: the notional time when the event was scheduled on
+         * tstamp_stopped: in INACTIVE state, the notional time when the
+         *      event was scheduled off.
+         */
+        u64                             tstamp_enabled;
+        u64                             tstamp_running;
+        u64                             tstamp_stopped;
+        struct perf_event_attr  attr;
+        struct hw_perf_event            hw;
+        struct perf_event_context       *ctx;
+        struct file                     *filp;
+        /*
+         * These accumulate total time (in nanoseconds) that children
+         * events have been enabled and running, respectively.
+         */
+        atomic64_t                      child_total_time_enabled;
+        atomic64_t                      child_total_time_running;
+        /*
+         * Protect attach/detach and child_list:
+         */
+        struct mutex                    child_mutex;
+        struct list_head                child_list;
+        struct perf_event               *parent;
+        int                             oncpu;
+        int                             cpu;
+        struct list_head                owner_entry;
+        struct task_struct              *owner;
+        /* mmap bits */
+        struct mutex                    mmap_mutex;
+        atomic_t                        mmap_count;
+        struct perf_mmap_data           *data;
+        /* poll related */
+        wait_queue_head_t               waitq;
+        struct fasync_struct            *fasync;
+        /* delayed work for NMIs and such */
+        int                             pending_wakeup;
+        int                             pending_kill;
+        int                             pending_disable;
+        struct perf_pending_entry       pending;
+        atomic_t                        event_limit;
+        void (*destroy)(struct perf_event *);
+        struct rcu_head                 rcu_head;
+        struct pid_namespace            *ns;
+        u64                             id;
+#endif
+};
+/**
+ * struct perf_event_context - event context structure
+ *
+ * Used as a container for task events and CPU events as well:
+ */
+struct perf_event_context {
+        /*
+         * Protect the states of the events in the list,
+         * nr_active, and the list:
+         */
+        spinlock_t                      lock;
+        /*
+         * Protect the list of events.  Locking either mutex or lock
+         * is sufficient to ensure the list doesn't change; to change
+         * the list you need to lock both the mutex and the spinlock.
+         */
+        struct mutex                    mutex;
+        struct list_head                group_list;
+        struct list_head                event_list;
+        int                             nr_events;
+        int                             nr_active;
+        int                             is_active;
+        int                             nr_stat;
+        atomic_t                        refcount;
+        struct task_struct              *task;
+        /*
+         * Context clock, runs when context enabled.
+         */
+        u64                             time;
+        u64                             timestamp;
+        /*
+         * These fields let us detect when two contexts have both
+         * been cloned (inherited) from a common ancestor.
+         */
+        struct perf_event_context       *parent_ctx;
+        u64                             parent_gen;
+        u64                             generation;
+        int                             pin_count;
+        struct rcu_head                 rcu_head;
+};
+/**
+ * struct perf_event_cpu_context - per cpu event context structure
+ */
+struct perf_cpu_context {
+        struct perf_event_context       ctx;
+        struct perf_event_context       *task_ctx;
+        int                             active_oncpu;
+        int                             max_pertask;
+        int                             exclusive;
+        /*
+         * Recursion avoidance:
+         *
+         * task, softirq, irq, nmi context
+         */
+        int                             recursion[4];
+};
+struct perf_output_handle {
+        struct perf_event               *event;
+        struct perf_mmap_data           *data;
+        unsigned long                   head;
+        unsigned long                   offset;
+        int                             nmi;
+        int                             sample;
+        int                             locked;
+        unsigned long                   flags;
+};
+#ifdef CONFIG_PERF_EVENTS
+/*
+ * Set by architecture code:
+ */
+extern int perf_max_events;
+extern const struct pmu *hw_perf_event_init(struct perf_event *event);
+extern void perf_event_task_sched_in(struct task_struct *task, int cpu);
+extern void perf_event_task_sched_out(struct task_struct *task,
+                                        struct task_struct *next, int cpu);
+extern void perf_event_task_tick(struct task_struct *task, int cpu);
+extern int perf_event_init_task(struct task_struct *child);
+extern void perf_event_exit_task(struct task_struct *child);
+extern void perf_event_free_task(struct task_struct *task);
+extern void set_perf_event_pending(void);
+extern void perf_event_do_pending(void);
+extern void perf_event_print_debug(void);
+extern void __perf_disable(void);
+extern bool __perf_enable(void);
+extern void perf_disable(void);
+extern void perf_enable(void);
+extern int perf_event_task_disable(void);
+extern int perf_event_task_enable(void);
+extern int hw_perf_group_sched_in(struct perf_event *group_leader,
+               struct perf_cpu_context *cpuctx,
+               struct perf_event_context *ctx, int cpu);
+extern void perf_event_update_userpage(struct perf_event *event);
+struct perf_sample_data {
+        u64                             type;
+        u64                             ip;
+        struct {
+                u32     pid;
+                u32     tid;
+        }                               tid_entry;
+        u64                             time;
+        u64                             addr;
+        u64                             id;
+        u64                             stream_id;
+        struct {
+                u32     cpu;
+                u32     reserved;
+        }                               cpu_entry;
+        u64                             period;
+        struct perf_callchain_entry     *callchain;
+        struct perf_raw_record          *raw;
+};
+extern void perf_output_sample(struct perf_output_handle *handle,
+                               struct perf_event_header *header,
+                               struct perf_sample_data *data,
+                               struct perf_event *event);
+extern void perf_prepare_sample(struct perf_event_header *header,
+                                struct perf_sample_data *data,
+                                struct perf_event *event,
+                                struct pt_regs *regs);
+extern int perf_event_overflow(struct perf_event *event, int nmi,
+                                 struct perf_sample_data *data,
+                                 struct pt_regs *regs);
+/*
+ * Return 1 for a software event, 0 for a hardware event
+ */
+static inline int is_software_event(struct perf_event *event)
+{
+        return (event->attr.type != PERF_TYPE_RAW) &&
+                (event->attr.type != PERF_TYPE_HARDWARE) &&
+                (event->attr.type != PERF_TYPE_HW_CACHE);
+}
+extern atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX];
+extern void __perf_sw_event(u32, u64, int, struct pt_regs *, u64);
+static inline void
+perf_sw_event(u32 event_id, u64 nr, int nmi, struct pt_regs *regs, u64 addr)
+{
+        if (atomic_read(&perf_swevent_enabled[event_id]))
+                __perf_sw_event(event_id, nr, nmi, regs, addr);
+}
+extern void __perf_event_mmap(struct vm_area_struct *vma);
+static inline void perf_event_mmap(struct vm_area_struct *vma)
+{
+        if (vma->vm_flags & VM_EXEC)
+                __perf_event_mmap(vma);
+}
+extern void perf_event_comm(struct task_struct *tsk);
+extern void perf_event_fork(struct task_struct *tsk);
+extern struct perf_callchain_entry *perf_callchain(struct pt_regs *regs);
+extern int sysctl_perf_event_paranoid;
+extern int sysctl_perf_event_mlock;
+extern int sysctl_perf_event_sample_rate;
+extern void perf_event_init(void);
+extern void perf_tp_event(int event_id, u64 addr, u64 count,
+                                 void *record, int entry_size);
+#ifndef perf_misc_flags
+#define perf_misc_flags(regs)   (user_mode(regs) ? PERF_RECORD_MISC_USER : \
+                                 PERF_RECORD_MISC_KERNEL)
+#define perf_instruction_pointer(regs)  instruction_pointer(regs)
+#endif
+extern int perf_output_begin(struct perf_output_handle *handle,
+                             struct perf_event *event, unsigned int size,
+                             int nmi, int sample);
+extern void perf_output_end(struct perf_output_handle *handle);
+extern void perf_output_copy(struct perf_output_handle *handle,
+                             const void *buf, unsigned int len);
+#else
+static inline void
+perf_event_task_sched_in(struct task_struct *task, int cpu)             { }
+static inline void
+perf_event_task_sched_out(struct task_struct *task,
+                            struct task_struct *next, int cpu)          { }
+static inline void
+perf_event_task_tick(struct task_struct *task, int cpu)                 { }
+static inline int perf_event_init_task(struct task_struct *child)       { return 0; }
+static inline void perf_event_exit_task(struct task_struct *child)      { }
+static inline void perf_event_free_task(struct task_struct *task)       { }
+static inline void perf_event_do_pending(void)                          { }
+static inline void perf_event_print_debug(void)                         { }
+static inline void perf_disable(void)                                   { }
+static inline void perf_enable(void)                                    { }
+static inline int perf_event_task_disable(void)                         { return -EINVAL; }
+static inline int perf_event_task_enable(void)                          { return -EINVAL; }
+static inline void
+perf_sw_event(u32 event_id, u64 nr, int nmi,
+                     struct pt_regs *regs, u64 addr)                    { }
+static inline void perf_event_mmap(struct vm_area_struct *vma)          { }
+static inline void perf_event_comm(struct task_struct *tsk)             { }
+static inline void perf_event_fork(struct task_struct *tsk)             { }
+static inline void perf_event_init(void)                                { }
+#endif
+#define perf_output_put(handle, x) \
+        perf_output_copy((handle), &(x), sizeof(x))
+#endif /* __KERNEL__ */
+#endif /* _LINUX_PERF_EVENT_H */
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index b063c7328ba5..fddfafaed024 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -360,6 +360,7 @@ struct pnp_driver {
        unsigned int flags;
        int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
        void (*remove) (struct pnp_dev *dev);
+        void (*shutdown) (struct pnp_dev *dev);
        int (*suspend) (struct pnp_dev *dev, pm_message_t state);
        int (*resume) (struct pnp_dev *dev);
        struct device_driver driver;
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 6729f7dcd60e..7fc194aef8c2 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -65,6 +65,9 @@
 #define MUTEX_DEBUG_INIT        0x11
 #define MUTEX_DEBUG_FREE        0x22
+/********** lib/flex_array.c **********/
+#define FLEX_ARRAY_FREE 0x6c    /* for use-after-free poisoning */
 /********** security/ **********/
 #define KEY_DESTROY             0xbd
diff --git a/include/linux/prctl.h b/include/linux/prctl.h
index b00df4c79c63..07bff666e65b 100644
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@ -85,7 +85,7 @@
 #define PR_SET_TIMERSLACK 29
 #define PR_GET_TIMERSLACK 30
-#define PR_TASK_PERF_COUNTERS_DISABLE           31
+#define PR_TASK_PERF_EVENTS_DISABLE             31
-#define PR_TASK_PERF_COUNTERS_ENABLE            32
+#define PR_TASK_PERF_EVENTS_ENABLE              32
 #endif /* _LINUX_PRCTL_H */
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index e6e77d31c418..379eaed72d4b 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -78,10 +78,19 @@ struct proc_dir_entry {
        struct list_head pde_openers;   /* who did ->open, but not ->release */
 };
+enum kcore_type {
+        KCORE_TEXT,
+        KCORE_VMALLOC,
+        KCORE_RAM,
+        KCORE_VMEMMAP,
+        KCORE_OTHER,
+};
 struct kcore_list {
-        struct kcore_list *next;
+        struct list_head list;
        unsigned long addr;
        size_t size;
+        int type;
 };
 struct vmcore {
@@ -233,11 +242,12 @@ static inline void dup_mm_exe_file(struct mm_struct *oldmm,
 #endif /* CONFIG_PROC_FS */
 #if !defined(CONFIG_PROC_KCORE)
-static inline void kclist_add(struct kcore_list *new, void *addr, size_t size)
+static inline void
+kclist_add(struct kcore_list *new, void *addr, size_t size, int type)
 {
 }
 #else
-extern void kclist_add(struct kcore_list *, void *, size_t);
+extern void kclist_add(struct kcore_list *, void *, size_t, int type);
 #endif
 union proc_op {
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 26361c4c037a..3ebb23153640 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -135,8 +135,8 @@ static inline int sb_any_quota_active(struct super_block *sb)
 /*
 * Operations supported for diskquotas.
 */
-extern struct dquot_operations dquot_operations;
+extern const struct dquot_operations dquot_operations;
-extern struct quotactl_ops vfs_quotactl_ops;
+extern const struct quotactl_ops vfs_quotactl_ops;
 #define sb_dquot_ops (&dquot_operations)
 #define sb_quotactl_ops (&vfs_quotactl_ops)
diff --git a/include/linux/rculist_nulls.h b/include/linux/rculist_nulls.h
index f9ddd03961a8..589a40919f01 100644
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
@@ -102,7 +102,7 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
 */
 #define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
        for (pos = rcu_dereference((head)->first);                       \
-                (!is_a_nulls(pos)) &&                   \
+                (!is_a_nulls(pos)) &&                   \
                ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
                pos = rcu_dereference(pos->next))
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 95e0615f4d75..6fe0363724e9 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -1,5 +1,5 @@
 /*
- * Read-Copy Update mechanism for mutual exclusion 
+ * Read-Copy Update mechanism for mutual exclusion
 *
 * 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
@@ -18,7 +18,7 @@
 * Copyright IBM Corporation, 2001
 *
 * Author: Dipankar Sarma <dipankar@in.ibm.com>
- * 
+ *
 * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
 * Papers:
@@ -26,7 +26,7 @@
 * http://lse.sourceforge.net/locking/rclock_OLS.2001.05.01c.sc.pdf (OLS2001)
 *
 * For detailed explanation of Read-Copy Update mechanism see -
- *              http://lse.sourceforge.net/locking/rcupdate.html
+ *              http://lse.sourceforge.net/locking/rcupdate.html
 *
 */
@@ -52,8 +52,13 @@ struct rcu_head {
 };
 /* Exported common interfaces */
+#ifdef CONFIG_TREE_PREEMPT_RCU
 extern void synchronize_rcu(void);
+#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
+#define synchronize_rcu synchronize_sched
+#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */
 extern void synchronize_rcu_bh(void);
+extern void synchronize_sched(void);
 extern void rcu_barrier(void);
 extern void rcu_barrier_bh(void);
 extern void rcu_barrier_sched(void);
@@ -262,24 +267,6 @@ struct rcu_synchronize {
 extern void wakeme_after_rcu(struct rcu_head  *head);
 /**
- * synchronize_sched - block until all CPUs have exited any non-preemptive
- * kernel code sequences.
- *
- * This means that all preempt_disable code sequences, including NMI and
- * hardware-interrupt handlers, in progress on entry will have completed
- * before this primitive returns.  However, this does not guarantee that
- * softirq handlers will have completed, since in some kernels, these
- * handlers can run in process context, and can block.
- *
- * This primitive provides the guarantees made by the (now removed)
- * synchronize_kernel() API.  In contrast, synchronize_rcu() only
- * guarantees that rcu_read_lock() sections will have completed.
- * In "classic RCU", these two guarantees happen to be one and
- * the same, but can differ in realtime RCU implementations.
- */
-#define synchronize_sched() __synchronize_sched()
-/**
 * call_rcu - Queue an RCU callback for invocation after a grace period.
 * @head: structure to be used for queueing the RCU updates.
 * @func: actual update function to be invoked after the grace period
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index a89307717825..37682770e9d2 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -24,7 +24,7 @@
 * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
 *
 * For detailed explanation of Read-Copy Update mechanism see -
- *      Documentation/RCU
+ *      Documentation/RCU
 */
 #ifndef __LINUX_RCUTREE_H
@@ -53,6 +53,8 @@ static inline void __rcu_read_unlock(void)
        preempt_enable();
 }
+#define __synchronize_sched() synchronize_rcu()
 static inline void exit_rcu(void)
 {
 }
@@ -68,8 +70,6 @@ static inline void __rcu_read_unlock_bh(void)
        local_bh_enable();
 }
-#define __synchronize_sched() synchronize_rcu()
 extern void call_rcu_sched(struct rcu_head *head,
                           void (*func)(struct rcu_head *rcu));
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index bf116d0dbf23..477841d29fce 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -71,14 +71,10 @@ void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned lon
 void page_add_file_rmap(struct page *);
 void page_remove_rmap(struct page *);
-#ifdef CONFIG_DEBUG_VM
+static inline void page_dup_rmap(struct page *page)
-void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address);
-#else
-static inline void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address)
 {
        atomic_inc(&page->_mapcount);
 }
-#endif
 /*
 * Called from mm/vmscan.c to handle paging out
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8af3d249170e..3cbc6c0be666 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -100,7 +100,7 @@ struct robust_list_head;
 struct bio;
 struct fs_struct;
 struct bts_context;
-struct perf_counter_context;
+struct perf_event_context;
 /*
 * List of flags we want to share for kernel threads,
@@ -140,6 +140,10 @@ extern int nr_processes(void);
 extern unsigned long nr_running(void);
 extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_iowait(void);
+extern unsigned long nr_iowait_cpu(void);
+extern unsigned long this_cpu_load(void);
 extern void calc_global_load(void);
 extern u64 cpu_nr_migrations(int cpu);
@@ -257,7 +261,7 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);
 extern void init_idle(struct task_struct *idle, int cpu);
 extern void init_idle_bootup_task(struct task_struct *idle);
-extern int runqueue_is_locked(void);
+extern int runqueue_is_locked(int cpu);
 extern void task_rq_unlock_wait(struct task_struct *p);
 extern cpumask_var_t nohz_cpu_mask;
@@ -422,6 +426,15 @@ static inline unsigned long get_mm_hiwater_rss(struct mm_struct *mm)
        return max(mm->hiwater_rss, get_mm_rss(mm));
 }
+static inline void setmax_mm_hiwater_rss(unsigned long *maxrss,
+                                         struct mm_struct *mm)
+{
+        unsigned long hiwater_rss = get_mm_hiwater_rss(mm);
+        if (*maxrss < hiwater_rss)
+                *maxrss = hiwater_rss;
+}
 static inline unsigned long get_mm_hiwater_vm(struct mm_struct *mm)
 {
        return max(mm->hiwater_vm, mm->total_vm);
@@ -434,7 +447,9 @@ extern int get_dumpable(struct mm_struct *mm);
 /* dumpable bits */
 #define MMF_DUMPABLE      0  /* core dump is permitted */
 #define MMF_DUMP_SECURELY 1  /* core file is readable only by root */
 #define MMF_DUMPABLE_BITS 2
+#define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1)
 /* coredump filter bits */
 #define MMF_DUMP_ANON_PRIVATE   2
@@ -444,6 +459,7 @@ extern int get_dumpable(struct mm_struct *mm);
 #define MMF_DUMP_ELF_HEADERS    6
 #define MMF_DUMP_HUGETLB_PRIVATE 7
 #define MMF_DUMP_HUGETLB_SHARED  8
 #define MMF_DUMP_FILTER_SHIFT   MMF_DUMPABLE_BITS
 #define MMF_DUMP_FILTER_BITS    7
 #define MMF_DUMP_FILTER_MASK \
@@ -457,6 +473,10 @@ extern int get_dumpable(struct mm_struct *mm);
 #else
 # define MMF_DUMP_MASK_DEFAULT_ELF      0
 #endif
+                                        /* leave room for more dump flags */
+#define MMF_VM_MERGEABLE        16      /* KSM may merge identical pages */
+#define MMF_INIT_MASK           (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK)
 struct sighand_struct {
        atomic_t                count;
@@ -601,6 +621,7 @@ struct signal_struct {
        unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
        unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
        unsigned long inblock, oublock, cinblock, coublock;
+        unsigned long maxrss, cmaxrss;
        struct task_io_accounting ioac;
        /*
@@ -632,6 +653,8 @@ struct signal_struct {
        unsigned audit_tty;
        struct tty_audit_buf *tty_audit_buf;
 #endif
+        int oom_adj;    /* OOM kill score adjustment (bit shift) */
 };
 /* Context switch must be unlocked if interrupts are to be enabled */
@@ -701,7 +724,7 @@ struct user_struct {
 #endif
 #endif
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
        atomic_long_t locked_vm;
 #endif
 };
@@ -1075,6 +1098,8 @@ struct sched_class {
        void (*prio_changed) (struct rq *this_rq, struct task_struct *task,
                             int oldprio, int running);
+        unsigned int (*get_rr_interval) (struct task_struct *task);
 #ifdef CONFIG_FAIR_GROUP_SCHED
        void (*moved_group) (struct task_struct *p);
 #endif
@@ -1212,7 +1237,6 @@ struct task_struct {
         * a short time
         */
        unsigned char fpu_counter;
-        s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
 #ifdef CONFIG_BLK_DEV_IO_TRACE
        unsigned int btrace_seq;
 #endif
@@ -1449,10 +1473,10 @@ struct task_struct {
        struct list_head pi_state_list;
        struct futex_pi_state *pi_state_cache;
 #endif
-#ifdef CONFIG_PERF_COUNTERS
+#ifdef CONFIG_PERF_EVENTS
-        struct perf_counter_context *perf_counter_ctxp;
+        struct perf_event_context *perf_event_ctxp;
-        struct mutex perf_counter_mutex;
+        struct mutex perf_event_mutex;
-        struct list_head perf_counter_list;
+        struct list_head perf_event_list;
 #endif
 #ifdef CONFIG_NUMA
        struct mempolicy *mempolicy;    /* Protected by alloc_lock */
@@ -1505,6 +1529,7 @@ struct task_struct {
        /* bitmask of trace recursion */
        unsigned long trace_recursion;
 #endif /* CONFIG_TRACING */
+        unsigned long stack_start;
 };
 /* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -1711,7 +1736,7 @@ extern cputime_t task_gtime(struct task_struct *p);
 #define PF_FROZEN       0x00010000      /* frozen for system suspend */
 #define PF_FSTRANS      0x00020000      /* inside a filesystem transaction */
 #define PF_KSWAPD       0x00040000      /* I am kswapd */
-#define PF_SWAPOFF      0x00080000      /* I am in swapoff */
+#define PF_OOM_ORIGIN   0x00080000      /* Allocating much memory to others */
 #define PF_LESS_THROTTLE 0x00100000     /* Throttle me less: I clean memory */
 #define PF_KTHREAD      0x00200000      /* I am a kernel thread */
 #define PF_RANDOMIZE    0x00400000      /* randomize virtual address space */
@@ -1753,7 +1778,6 @@ extern cputime_t task_gtime(struct task_struct *p);
 #define RCU_READ_UNLOCK_BLOCKED (1 << 0) /* blocked while in RCU read-side. */
 #define RCU_READ_UNLOCK_NEED_QS (1 << 1) /* RCU core needs CPU response. */
-#define RCU_READ_UNLOCK_GOT_QS  (1 << 2) /* CPU has responded to RCU core. */
 static inline void rcu_copy_process(struct task_struct *p)
 {
diff --git a/include/linux/serial.h b/include/linux/serial.h
index e5bb75a63802..c8613c3ff9d3 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -122,6 +122,7 @@ struct serial_uart_config {
 /* Internal flags used only by kernel */
 #define ASYNCB_INITIALIZED      31 /* Serial port was initialized */
+#define ASYNCB_SUSPENDED        30 /* Serial port is suspended */
 #define ASYNCB_NORMAL_ACTIVE    29 /* Normal device is active */
 #define ASYNCB_BOOT_AUTOCONF    28 /* Autoconfigure port on bootup */
 #define ASYNCB_CLOSING          27 /* Serial port is closing */
@@ -133,6 +134,7 @@ struct serial_uart_config {
 #define ASYNCB_FIRST_KERNEL     22
 #define ASYNC_HUP_NOTIFY        (1U << ASYNCB_HUP_NOTIFY)
+#define ASYNC_SUSPENDED         (1U << ASYNCB_SUSPENDED)
 #define ASYNC_FOURPORT          (1U << ASYNCB_FOURPORT)
 #define ASYNC_SAK               (1U << ASYNCB_SAK)
 #define ASYNC_SPLIT_TERMIOS     (1U << ASYNCB_SPLIT_TERMIOS)
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index d4d2a78ad43e..fb46aba11fb5 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -22,6 +22,7 @@ struct plat_serial8250_port {
        void __iomem    *membase;       /* ioremap cookie or NULL */
        resource_size_t mapbase;        /* resource base */
        unsigned int    irq;            /* interrupt number */
+        unsigned long   irqflags;       /* request_irq flags */
        unsigned int    uartclk;        /* UART clock rate */
        void            *private_data;
        unsigned char   regshift;       /* register shift */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 23d2fb051f97..d58e460844dd 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -20,6 +20,8 @@
 #ifndef LINUX_SERIAL_CORE_H
 #define LINUX_SERIAL_CORE_H
+#include <linux/serial.h>
 /*
 * The type definitions.  These are from Ted Ts'o's serial.h
 */
@@ -186,7 +188,6 @@
 #include <linux/sysrq.h>
 struct uart_port;
-struct uart_info;
 struct serial_struct;
 struct device;
@@ -265,6 +266,7 @@ struct uart_port {
        unsigned int            (*serial_in)(struct uart_port *, int);
        void                    (*serial_out)(struct uart_port *, int, int);
        unsigned int            irq;                    /* irq number */
+        unsigned long           irqflags;               /* irq flags  */
        unsigned int            uartclk;                /* base uart clock */
        unsigned int            fifosize;               /* tx fifo size */
        unsigned char           x_char;                 /* xon/xoff char */
@@ -283,7 +285,7 @@ struct uart_port {
        unsigned int            read_status_mask;       /* driver specific */
        unsigned int            ignore_status_mask;     /* driver specific */
-        struct uart_info        *info;                  /* pointer to parent info */
+        struct uart_state       *state;                 /* pointer to parent state */
        struct uart_icount      icount;                 /* statistics */
        struct console          *cons;                  /* struct console, if any */
@@ -335,52 +337,16 @@ struct uart_port {
 };
 /*
- * This is the state information which is only valid when the port
- * is open; it may be cleared the core driver once the device has
- * been closed.  Either the low level driver or the core can modify
- * stuff here.
- */
-typedef unsigned int __bitwise__ uif_t;
-struct uart_info {
-        struct tty_port         port;
-        struct circ_buf         xmit;
-        uif_t                   flags;
-/*
- * Definitions for info->flags.  These are _private_ to serial_core, and
- * are specific to this structure.  They may be queried by low level drivers.
- *
- * FIXME: use the ASY_ definitions
- */
-#define UIF_CHECK_CD            ((__force uif_t) (1 << 25))
-#define UIF_CTS_FLOW            ((__force uif_t) (1 << 26))
-#define UIF_NORMAL_ACTIVE       ((__force uif_t) (1 << 29))
-#define UIF_INITIALIZED         ((__force uif_t) (1 << 31))
-#define UIF_SUSPENDED           ((__force uif_t) (1 << 30))
-        struct tasklet_struct   tlet;
-        wait_queue_head_t       delta_msr_wait;
-};
-/*
 * This is the state information which is persistent across opens.
- * The low level driver must not to touch any elements contained
- * within.
 */
 struct uart_state {
-        unsigned int            close_delay;            /* msec */
+        struct tty_port         port;
-        unsigned int            closing_wait;           /* msec */
-#define USF_CLOSING_WAIT_INF    (0)
-#define USF_CLOSING_WAIT_NONE   (~0U)
-        int                     count;
        int                     pm_state;
-        struct uart_info        info;
+        struct circ_buf         xmit;
-        struct uart_port        *port;
-        struct mutex            mutex;
+        struct tasklet_struct   tlet;
+        struct uart_port        *uart_port;
 };
 #define UART_XMIT_SIZE  PAGE_SIZE
@@ -461,7 +427,7 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
 static inline int uart_tx_stopped(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        if(tty->stopped || tty->hw_stopped)
                return 1;
        return 0;
@@ -476,7 +442,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
        if (port->sysrq) {
                if (ch && time_before(jiffies, port->sysrq)) {
-                        handle_sysrq(ch, port->info->port.tty);
+                        handle_sysrq(ch, port->state->port.tty);
                        port->sysrq = 0;
                        return 1;
                }
@@ -494,7 +460,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 */
 static inline int uart_handle_break(struct uart_port *port)
 {
-        struct uart_info *info = port->info;
+        struct uart_state *state = port->state;
 #ifdef SUPPORT_SYSRQ
        if (port->cons && port->cons->index == port->line) {
                if (!port->sysrq) {
@@ -505,7 +471,7 @@ static inline int uart_handle_break(struct uart_port *port)
        }
 #endif
        if (port->flags & UPF_SAK)
-                do_SAK(info->port.tty);
+                do_SAK(state->port.tty);
        return 0;
 }
@@ -515,22 +481,23 @@ static inline int uart_handle_break(struct uart_port *port)
 *      @status: new carrier detect status, nonzero if active
 */
 static inline void
-uart_handle_dcd_change(struct uart_port *port, unsigned int status)
+uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
 {
-        struct uart_info *info = port->info;
+        struct uart_state *state = uport->state;
+        struct tty_port *port = &state->port;
-        port->icount.dcd++;
+        uport->icount.dcd++;
 #ifdef CONFIG_HARD_PPS
-        if ((port->flags & UPF_HARDPPS_CD) && status)
+        if ((uport->flags & UPF_HARDPPS_CD) && status)
                hardpps();
 #endif
-        if (info->flags & UIF_CHECK_CD) {
+        if (port->flags & ASYNC_CHECK_CD) {
                if (status)
-                        wake_up_interruptible(&info->port.open_wait);
+                        wake_up_interruptible(&port->open_wait);
-                else if (info->port.tty)
+                else if (port->tty)
-                        tty_hangup(info->port.tty);
+                        tty_hangup(port->tty);
        }
 }
@@ -540,24 +507,24 @@ uart_handle_dcd_change(struct uart_port *port, unsigned int status)
 *      @status: new clear to send status, nonzero if active
 */
 static inline void
-uart_handle_cts_change(struct uart_port *port, unsigned int status)
+uart_handle_cts_change(struct uart_port *uport, unsigned int status)
 {
-        struct uart_info *info = port->info;
+        struct tty_port *port = &uport->state->port;
-        struct tty_struct *tty = info->port.tty;
+        struct tty_struct *tty = port->tty;
-        port->icount.cts++;
+        uport->icount.cts++;
-        if (info->flags & UIF_CTS_FLOW) {
+        if (port->flags & ASYNC_CTS_FLOW) {
                if (tty->hw_stopped) {
                        if (status) {
                                tty->hw_stopped = 0;
-                                port->ops->start_tx(port);
+                                uport->ops->start_tx(uport);
-                                uart_write_wakeup(port);
+                                uart_write_wakeup(uport);
                        }
                } else {
                        if (!status) {
                                tty->hw_stopped = 1;
-                                port->ops->stop_tx(port);
+                                uport->ops->stop_tx(uport);
                        }
                }
        }
@@ -569,7 +536,7 @@ static inline void
 uart_insert_char(struct uart_port *port, unsigned int status,
                 unsigned int overrun, unsigned int ch, unsigned int flag)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        if ((status & port->ignore_status_mask & ~overrun) == 0)
                tty_insert_flip_char(tty, ch, flag);
diff --git a/include/linux/spi/mc33880.h b/include/linux/spi/mc33880.h
new file mode 100644
index 000000000000..82ffccd6fbe5
--- /dev/null
+++ b/include/linux/spi/mc33880.h
@@ -0,0 +1,10 @@
+#ifndef LINUX_SPI_MC33880_H
+#define LINUX_SPI_MC33880_H
+struct mc33880_platform_data {
+        /* number assigned to the first GPIO */
+        unsigned        base;
+};
+#endif
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index c47c4b4da97e..97b60b37f445 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -20,6 +20,7 @@
 #define __LINUX_SPI_H
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 /*
 * INTERFACES between SPI master-side drivers and SPI infrastructure.
@@ -86,7 +87,7 @@ struct spi_device {
        int                     irq;
        void                    *controller_state;
        void                    *controller_data;
-        char                    modalias[32];
+        char                    modalias[SPI_NAME_SIZE];
        /*
         * likely need more hooks for more protocol options affecting how
@@ -145,6 +146,7 @@ struct spi_message;
 /**
 * struct spi_driver - Host side "protocol" driver
+ * @id_table: List of SPI devices supported by this driver
 * @probe: Binds this driver to the spi device.  Drivers can verify
 *      that the device is actually present, and may need to configure
 *      characteristics (such as bits_per_word) which weren't needed for
@@ -170,6 +172,7 @@ struct spi_message;
 * MMC, RTC, filesystem character device nodes, and hardware monitoring.
 */
 struct spi_driver {
+        const struct spi_device_id *id_table;
        int                     (*probe)(struct spi_device *spi);
        int                     (*remove)(struct spi_device *spi);
        void                    (*shutdown)(struct spi_device *spi);
@@ -207,6 +210,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
 *      each slave has a chipselect signal, but it's common that not
 *      every chipselect is connected to a slave.
 * @dma_alignment: SPI controller constraint on DMA buffers alignment.
+ * @mode_bits: flags understood by this controller driver
+ * @flags: other constraints relevant to this driver
 * @setup: updates the device mode and clocking records used by a
 *      device's SPI controller; protocol code may call this.  This
 *      must fail if an unrecognized or unsupported mode is requested.
@@ -253,6 +258,8 @@ struct spi_master {
        /* other constraints relevant to this driver */
        u16                     flags;
 #define SPI_MASTER_HALF_DUPLEX  BIT(0)          /* can't do full duplex */
+#define SPI_MASTER_NO_RX        BIT(1)          /* can't do buffer read */
+#define SPI_MASTER_NO_TX        BIT(2)          /* can't do buffer write */
        /* Setup mode and clock, etc (spi driver may call many times).
         *
@@ -533,42 +540,7 @@ static inline void spi_message_free(struct spi_message *m)
 }
 extern int spi_setup(struct spi_device *spi);
+extern int spi_async(struct spi_device *spi, struct spi_message *message);
-/**
- * spi_async - asynchronous SPI transfer
- * @spi: device with which data will be exchanged
- * @message: describes the data transfers, including completion callback
- * Context: any (irqs may be blocked, etc)
- *
- * This call may be used in_irq and other contexts which can't sleep,
- * as well as from task contexts which can sleep.
- *
- * The completion callback is invoked in a context which can't sleep.
- * Before that invocation, the value of message->status is undefined.
- * When the callback is issued, message->status holds either zero (to
- * indicate complete success) or a negative error code.  After that
- * callback returns, the driver which issued the transfer request may
- * deallocate the associated memory; it's no longer in use by any SPI
- * core or controller driver code.
- *
- * Note that although all messages to a spi_device are handled in
- * FIFO order, messages may go to different devices in other orders.
- * Some device might be higher priority, or have various "hard" access
- * time requirements, for example.
- *
- * On detection of any fault during the transfer, processing of
- * the entire message is aborted, and the device is deselected.
- * Until returning from the associated message completion callback,
- * no other spi_message queued to that device will be processed.
- * (This rule applies equally to all the synchronous transfer calls,
- * which are wrappers around this core asynchronous primitive.)
- */
-static inline int
-spi_async(struct spi_device *spi, struct spi_message *message)
-{
-        message->spi = spi;
-        return spi->master->transfer(spi, message);
-}
 /*---------------------------------------------------------------------------*/
@@ -732,7 +704,7 @@ struct spi_board_info {
         * controller_data goes to spi_device.controller_data,
         * irq is copied too
         */
-        char            modalias[32];
+        char            modalias[SPI_NAME_SIZE];
        const void      *platform_data;
        void            *controller_data;
        int             irq;
@@ -800,4 +772,7 @@ spi_unregister_device(struct spi_device *spi)
                device_unregister(&spi->dev);
 }
+extern const struct spi_device_id *
+spi_get_device_id(const struct spi_device *sdev);
 #endif /* __LINUX_SPI_H */
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 3f632182d8eb..996df4dac7d4 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -111,7 +111,7 @@ struct rpc_credops {
        void                    (*crdestroy)(struct rpc_cred *);
        int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-        void                    (*crbind)(struct rpc_task *, struct rpc_cred *);
+        void                    (*crbind)(struct rpc_task *, struct rpc_cred *, int);
        __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
        int                     (*crrefresh)(struct rpc_task *);
        __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
@@ -140,7 +140,7 @@ struct rpc_cred *	rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *
 void                    rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
 struct rpc_cred *       rpcauth_lookupcred(struct rpc_auth *, int);
 void                    rpcauth_bindcred(struct rpc_task *, struct rpc_cred *, int);
-void                    rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *);
+void                    rpcauth_generic_bind_cred(struct rpc_task *, struct rpc_cred *, int);
 void                    put_rpccred(struct rpc_cred *);
 void                    rpcauth_unbindcred(struct rpc_task *);
 __be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index ab3f6e90caa5..8ed9642a5a76 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -22,6 +22,7 @@
 #include <linux/sunrpc/timer.h>
 #include <asm/signal.h>
 #include <linux/path.h>
+#include <net/ipv6.h>
 struct rpc_inode;
@@ -113,6 +114,7 @@ struct rpc_create_args {
        rpc_authflavor_t        authflavor;
        unsigned long           flags;
        char                    *client_name;
+        struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 };
 /* Values for "flags" field */
@@ -188,5 +190,117 @@ static inline void rpc_set_port(struct sockaddr *sap,
 #define IPV6_SCOPE_DELIMITER            '%'
 #define IPV6_SCOPE_ID_LEN               sizeof("%nnnnnnnnnn")
+static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
+        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
+        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
+}
+static inline bool __rpc_copy_addr4(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
+        struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+        dsin->sin_family = ssin->sin_family;
+        dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
+        return true;
+}
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
+        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
+        return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
+}
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
+        struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
+        dsin6->sin6_family = ssin6->sin6_family;
+        ipv6_addr_copy(&dsin6->sin6_addr, &ssin6->sin6_addr);
+        return true;
+}
+#else   /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        return false;
+}
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        return false;
+}
+#endif  /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
+/**
+ * rpc_cmp_addr - compare the address portion of two sockaddrs.
+ * @sap1: first sockaddr
+ * @sap2: second sockaddr
+ *
+ * Just compares the family and address portion. Ignores port, scope, etc.
+ * Returns true if the addrs are equal, false if they aren't.
+ */
+static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
+                                const struct sockaddr *sap2)
+{
+        if (sap1->sa_family == sap2->sa_family) {
+                switch (sap1->sa_family) {
+                case AF_INET:
+                        return __rpc_cmp_addr4(sap1, sap2);
+                case AF_INET6:
+                        return __rpc_cmp_addr6(sap1, sap2);
+                }
+        }
+        return false;
+}
+/**
+ * rpc_copy_addr - copy the address portion of one sockaddr to another
+ * @dst: destination sockaddr
+ * @src: source sockaddr
+ *
+ * Just copies the address portion and family. Ignores port, scope, etc.
+ * Caller is responsible for making certain that dst is large enough to hold
+ * the address in src. Returns true if address family is supported. Returns
+ * false otherwise.
+ */
+static inline bool rpc_copy_addr(struct sockaddr *dst,
+                                 const struct sockaddr *src)
+{
+        switch (src->sa_family) {
+        case AF_INET:
+                return __rpc_copy_addr4(dst, src);
+        case AF_INET6:
+                return __rpc_copy_addr6(dst, src);
+        }
+        return false;
+}
+/**
+ * rpc_get_scope_id - return scopeid for a given sockaddr
+ * @sa: sockaddr to get scopeid from
+ *
+ * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
+ * not an AF_INET6 address.
+ */
+static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+{
+        if (sa->sa_family != AF_INET6)
+                return 0;
+        return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
+}
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_CLNT_H */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index ea8009695c69..52e8cb0a7569 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -94,8 +94,6 @@ struct svc_serv {
        struct module *         sv_module;      /* optional module to count when
                                                 * adding threads */
        svc_thread_fn           sv_function;    /* main function for threads */
-        unsigned int            sv_drc_max_pages; /* Total pages for DRC */
-        unsigned int            sv_drc_pages_used;/* DRC pages used */
 #if defined(CONFIG_NFS_V4_1)
        struct list_head        sv_cb_list;     /* queue for callback requests
                                                 * that arrive over the same
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 2223ae0b5ed5..5f4e18b3ce73 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -65,6 +65,7 @@ struct svc_xprt {
        size_t                  xpt_locallen;   /* length of address */
        struct sockaddr_storage xpt_remote;     /* remote peer's address */
        size_t                  xpt_remotelen;  /* length of address */
+        struct rpc_wait_queue   xpt_bc_pending; /* backchannel wait queue */
 };
 int     svc_reg_xprt_class(struct svc_xprt_class *);
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 04dba23c59f2..1b353a76c304 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -28,6 +28,7 @@ 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 c090df442572..6f9457a75b8f 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -124,6 +124,23 @@ struct rpc_xprt_ops {
        void            (*print_stats)(struct rpc_xprt *xprt, struct seq_file *seq);
 };
+/*
+ * RPC transport identifiers
+ *
+ * To preserve compatibility with the historical use of raw IP protocol
+ * id's for transport selection, UDP and TCP identifiers are specified
+ * with the previous values. No such restriction exists for new transports,
+ * except that they may not collide with these values (17 and 6,
+ * respectively).
+ */
+#define XPRT_TRANSPORT_BC       (1 << 31)
+enum xprt_transports {
+        XPRT_TRANSPORT_UDP      = IPPROTO_UDP,
+        XPRT_TRANSPORT_TCP      = IPPROTO_TCP,
+        XPRT_TRANSPORT_BC_TCP   = IPPROTO_TCP | XPRT_TRANSPORT_BC,
+        XPRT_TRANSPORT_RDMA     = 256
+};
 struct rpc_xprt {
        struct kref             kref;           /* Reference count */
        struct rpc_xprt_ops *   ops;            /* transport methods */
@@ -179,6 +196,7 @@ struct rpc_xprt {
        spinlock_t              reserve_lock;   /* lock slot table */
        u32                     xid;            /* Next XID value to use */
        struct rpc_task *       snd_task;       /* Task blocked in send */
+        struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 #if defined(CONFIG_NFS_V4_1)
        struct svc_serv         *bc_serv;       /* The RPC service which will */
                                                /* process the callback */
@@ -231,6 +249,7 @@ struct xprt_create {
        struct sockaddr *       srcaddr;        /* optional local address */
        struct sockaddr *       dstaddr;        /* remote peer address */
        size_t                  addrlen;
+        struct svc_xprt         *bc_xprt;       /* NFSv4.1 backchannel */
 };
 struct xprt_class {
diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
index 54a379c9e8eb..c2f04e1ae159 100644
--- a/include/linux/sunrpc/xprtrdma.h
+++ b/include/linux/sunrpc/xprtrdma.h
@@ -41,11 +41,6 @@
 #define _LINUX_SUNRPC_XPRTRDMA_H
 /*
- * RPC transport identifier for RDMA
- */
-#define XPRT_TRANSPORT_RDMA     256
-/*
 * rpcbind (v3+) RDMA netid.
 */
 #define RPCBIND_NETID_RDMA      "rdma"
diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
index c2a46c45c8f7..3f14a02e9cc0 100644
--- a/include/linux/sunrpc/xprtsock.h
+++ b/include/linux/sunrpc/xprtsock.h
@@ -13,17 +13,6 @@ int		init_socket_xprt(void);
 void            cleanup_socket_xprt(void);
 /*
- * RPC transport identifiers for UDP, TCP
- *
- * To preserve compatibility with the historical use of raw IP protocol
- * id's for transport selection, these are specified with the previous
- * values. No such restriction exists for new transports, except that
- * they may not collide with these values (17 and 6, respectively).
- */
-#define XPRT_TRANSPORT_UDP      IPPROTO_UDP
-#define XPRT_TRANSPORT_TCP      IPPROTO_TCP
-/*
 * RPC slot table sizes for UDP, TCP transports
 */
 extern unsigned int xprt_udp_slot_table_entries;
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 7c15334f3ff2..6c990e658f4e 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -419,10 +419,22 @@ static inline swp_entry_t get_swap_page(void)
 }
 /* linux/mm/thrash.c */
-#define put_swap_token(mm)      do { } while (0)
+static inline void put_swap_token(struct mm_struct *mm)
-#define grab_swap_token(mm)     do { } while (0)
+{
-#define has_swap_token(mm)      0
+}
-#define disable_swap_token()    do { } while (0)
+static inline void grab_swap_token(struct mm_struct *mm)
+{
+}
+static inline int has_swap_token(struct mm_struct *mm)
+{
+        return 0;
+}
+static inline void disable_swap_token(void)
+{
+}
 static inline void
 mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a8e37821cc60..a990ace1a838 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -55,7 +55,7 @@ struct compat_timeval;
 struct robust_list_head;
 struct getcpu_cache;
 struct old_linux_dirent;
-struct perf_counter_attr;
+struct perf_event_attr;
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -100,33 +100,25 @@ struct perf_counter_attr;
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE(sname)                                         \
-static int prof_sysenter_enable_##sname(struct ftrace_event_call *event_call)  \
+static int prof_sysenter_enable_##sname(void)                                  \
 {                                                                              \
-        int ret = 0;                                                           \
+        return reg_prof_syscall_enter("sys"#sname);                            \
-        if (!atomic_inc_return(&event_enter_##sname.profile_count))            \
-                ret = reg_prof_syscall_enter("sys"#sname);                     \
-        return ret;                                                            \
 }                                                                              \
                                                                               \
-static void prof_sysenter_disable_##sname(struct ftrace_event_call *event_call)\
+static void prof_sysenter_disable_##sname(void)                                \
 {                                                                              \
-        if (atomic_add_negative(-1, &event_enter_##sname.profile_count))       \
+        unreg_prof_syscall_enter("sys"#sname);                                 \
-                unreg_prof_syscall_enter("sys"#sname);                         \
 }
 #define TRACE_SYS_EXIT_PROFILE(sname)                                          \
-static int prof_sysexit_enable_##sname(struct ftrace_event_call *event_call)   \
+static int prof_sysexit_enable_##sname(void)                                   \
 {                                                                              \
-        int ret = 0;                                                           \
+        return reg_prof_syscall_exit("sys"#sname);                             \
-        if (!atomic_inc_return(&event_exit_##sname.profile_count))             \
-                ret = reg_prof_syscall_exit("sys"#sname);                      \
-        return ret;                                                            \
 }                                                                              \
                                                                               \
-static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
+static void prof_sysexit_disable_##sname(void)                                 \
 {                                                                              \
-        if (atomic_add_negative(-1, &event_exit_##sname.profile_count))        \
+        unreg_prof_syscall_exit("sys"#sname);                                  \
-                unreg_prof_syscall_exit("sys"#sname);                          \
 }
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                    \
@@ -468,8 +460,7 @@ asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
                                void __user *data);
 asmlinkage long sys_umount(char __user *name, int flags);
 asmlinkage long sys_oldumount(char __user *name);
-asmlinkage long sys_truncate(const char __user *path,
+asmlinkage long sys_truncate(const char __user *path, long length);
-                                unsigned long length);
 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
 asmlinkage long sys_stat(char __user *filename,
                        struct __old_kernel_stat __user *statbuf);
@@ -885,7 +876,7 @@ asmlinkage long sys_ppoll(struct pollfd __user *, unsigned int,
 int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
-asmlinkage long sys_perf_counter_open(
+asmlinkage long sys_perf_event_open(
-                struct perf_counter_attr __user *attr_uptr,
+                struct perf_event_attr __user *attr_uptr,
                pid_t pid, int cpu, int group_fd, unsigned long flags);
 #endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index a916a318004e..f0f43d08d8b8 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -187,7 +187,12 @@ struct tty_port;
 struct tty_port_operations {
        /* Return 1 if the carrier is raised */
        int (*carrier_raised)(struct tty_port *port);
+        /* Control the DTR line */
        void (*dtr_rts)(struct tty_port *port, int raise);
+        /* Called when the last close completes or a hangup finishes
+           IFF the port was initialized. Do not use to free resources */
+        void (*shutdown)(struct tty_port *port);
+        void (*drop)(struct tty_port *port);
 };
        
 struct tty_port {
@@ -198,11 +203,12 @@ struct tty_port {
        int                     count;          /* Usage count */
        wait_queue_head_t       open_wait;      /* Open waiters */
        wait_queue_head_t       close_wait;     /* Close waiters */
+        wait_queue_head_t       delta_msr_wait; /* Modem status change */
        unsigned long           flags;          /* TTY flags ASY_*/
        struct mutex            mutex;          /* Locking */
        unsigned char           *xmit_buf;      /* Optional buffer */
-        int                     close_delay;    /* Close port delay */
+        unsigned int            close_delay;    /* Close port delay */
-        int                     closing_wait;   /* Delay for output */
+        unsigned int            closing_wait;   /* Delay for output */
        int                     drain_delay;    /* Set to zero if no pure time
                                                   based drain is needed else
                                                   set to size of fifo */
@@ -459,6 +465,12 @@ extern int tty_port_block_til_ready(struct tty_port *port,
 extern int tty_port_close_start(struct tty_port *port,
                                struct tty_struct *tty, struct file *filp);
 extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
+extern void tty_port_close(struct tty_port *port,
+                                struct tty_struct *tty, struct file *filp);
+extern inline int tty_port_users(struct tty_port *port)
+{
+        return port->count + port->blocked_open;
+}
 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
@@ -524,5 +536,8 @@ extern int pcxe_open(struct tty_struct *tty, struct file *filp);
 extern int vt_ioctl(struct tty_struct *tty, struct file *file,
                    unsigned int cmd, unsigned long arg);
+extern long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
+                     unsigned int cmd, unsigned long arg);
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index ae779bb8cc0f..adb44066680c 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -26,6 +26,7 @@
 #include <sound/ac97_codec.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 /*
 * UCB1400 AC-link registers
@@ -82,6 +83,17 @@
 #define UCB_ID                  0x7e
 #define UCB_ID_1400             0x4304
+struct ucb1400_gpio_data {
+        int gpio_offset;
+        int (*gpio_setup)(struct device *dev, int ngpio);
+        int (*gpio_teardown)(struct device *dev, int ngpio);
+};
+struct ucb1400_gpio {
+        struct gpio_chip        gc;
+        struct snd_ac97         *ac97;
+};
 struct ucb1400_ts {
        struct input_dev        *ts_idev;
        struct task_struct      *ts_task;
@@ -95,6 +107,7 @@ struct ucb1400_ts {
 struct ucb1400 {
        struct platform_device  *ucb1400_ts;
+        struct platform_device  *ucb1400_gpio;
 };
 static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
@@ -147,4 +160,10 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
 unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
                              int adcsync);
+#ifdef CONFIG_GPIO_UCB1400
+void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data);
+#else
+static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {}
+#endif
 #endif
diff --git a/include/linux/usb.h b/include/linux/usb.h
index b1e3c2fbfe11..a34fa89f1474 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -195,7 +195,7 @@ struct usb_interface {
        struct device dev;              /* interface specific device info */
        struct device *usb_dev;
-        int pm_usage_cnt;               /* usage counter for autosuspend */
+        atomic_t pm_usage_cnt;          /* usage counter for autosuspend */
        struct work_struct reset_ws;    /* for resets in atomic context */
 };
 #define to_usb_interface(d) container_of(d, struct usb_interface, dev)
@@ -551,13 +551,13 @@ extern void usb_autopm_put_interface_async(struct usb_interface *intf);
 static inline void usb_autopm_enable(struct usb_interface *intf)
 {
-        intf->pm_usage_cnt = 0;
+        atomic_set(&intf->pm_usage_cnt, 0);
        usb_autopm_set_interface(intf);
 }
 static inline void usb_autopm_disable(struct usb_interface *intf)
 {
-        intf->pm_usage_cnt = 1;
+        atomic_set(&intf->pm_usage_cnt, 1);
        usb_autopm_set_interface(intf);
 }
@@ -922,7 +922,7 @@ extern struct bus_type usb_bus_type;
 /**
 * struct usb_class_driver - identifies a USB driver that wants to use the USB major number
 * @name: the usb class device name for this driver.  Will show up in sysfs.
- * @nodename: Callback to provide a naming hint for a possible
+ * @devnode: Callback to provide a naming hint for a possible
 *      device node to create.
 * @fops: pointer to the struct file_operations of this driver.
 * @minor_base: the start of the minor range for this driver.
@@ -933,7 +933,7 @@ extern struct bus_type usb_bus_type;
 */
 struct usb_class_driver {
        char *name;
-        char *(*nodename)(struct device *dev);
+        char *(*devnode)(struct device *dev, mode_t *mode);
        const struct file_operations *fops;
        int minor_base;
 };
@@ -1036,9 +1036,10 @@ typedef void (*usb_complete_t)(struct urb *);
 * @transfer_flags: A variety of flags may be used to affect how URB
 *      submission, unlinking, or operation are handled.  Different
 *      kinds of URB can use different flags.
- * @transfer_buffer:  This identifies the buffer to (or from) which
+ * @transfer_buffer:  This identifies the buffer to (or from) which the I/O
- *      the I/O request will be performed (unless URB_NO_TRANSFER_DMA_MAP
+ *      request will be performed unless URB_NO_TRANSFER_DMA_MAP is set
- *      is set).  This buffer must be suitable for DMA; allocate it with
+ *      (however, do not leave garbage in transfer_buffer even then).
+ *      This buffer must be suitable for DMA; allocate it with
 *      kmalloc() or equivalent.  For transfers to "in" endpoints, contents
 *      of this buffer will be modified.  This buffer is used for the data
 *      stage of control transfers.
@@ -1071,7 +1072,7 @@ typedef void (*usb_complete_t)(struct urb *);
 * @start_frame: Returns the initial frame for isochronous transfers.
 * @number_of_packets: Lists the number of ISO transfer buffers.
 * @interval: Specifies the polling interval for interrupt or isochronous
- *      transfers.  The units are frames (milliseconds) for for full and low
+ *      transfers.  The units are frames (milliseconds) for full and low
 *      speed devices, and microframes (1/8 millisecond) for highspeed ones.
 * @error_count: Returns the number of ISO transfers that reported errors.
 * @context: For use in completion functions.  This normally points to
@@ -1104,9 +1105,15 @@ typedef void (*usb_complete_t)(struct urb *);
 * allocate a DMA buffer with usb_buffer_alloc() or call usb_buffer_map().
 * When these transfer flags are provided, host controller drivers will
 * attempt to use the dma addresses found in the transfer_dma and/or
- * setup_dma fields rather than determining a dma address themselves.  (Note
+ * setup_dma fields rather than determining a dma address themselves.
- * that transfer_buffer and setup_packet must still be set because not all
+ *
- * host controllers use DMA, nor do virtual root hubs).
+ * Note that transfer_buffer must still be set if the controller
+ * does not support DMA (as indicated by bus.uses_dma) and when talking
+ * to root hub. If you have to trasfer between highmem zone and the device
+ * on such controller, create a bounce buffer or bail out with an error.
+ * If transfer_buffer cannot be set (is in highmem) and the controller is DMA
+ * capable, assign NULL to it, so that usbmon knows not to use the value.
+ * The setup_packet must always be set, so it cannot be located in highmem.
 *
 * Initialization:
 *
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index b5744bc218ab..eaf9dffe0a01 100644
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -24,88 +24,78 @@
 #define USB_SUBCLASS_AUDIOCONTROL       0x01
 #define USB_SUBCLASS_AUDIOSTREAMING     0x02
 #define USB_SUBCLASS_MIDISTREAMING      0x03
-#define USB_SUBCLASS_VENDOR_SPEC        0xff
+/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-/* A.5 Audio Class-Specific AC interface Descriptor Subtypes*/
+#define UAC_HEADER                      0x01
-#define HEADER                          0x01
+#define UAC_INPUT_TERMINAL              0x02
-#define INPUT_TERMINAL                  0x02
+#define UAC_OUTPUT_TERMINAL             0x03
-#define OUTPUT_TERMINAL                 0x03
+#define UAC_MIXER_UNIT                  0x04
-#define MIXER_UNIT                      0x04
+#define UAC_SELECTOR_UNIT               0x05
-#define SELECTOR_UNIT                   0x05
+#define UAC_FEATURE_UNIT                0x06
-#define FEATURE_UNIT                    0x06
+#define UAC_PROCESSING_UNIT             0x07
-#define PROCESSING_UNIT                 0x07
+#define UAC_EXTENSION_UNIT              0x08
-#define EXTENSION_UNIT                  0x08
+/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define AS_GENERAL                      0x01
+#define UAC_AS_GENERAL                  0x01
-#define FORMAT_TYPE                     0x02
+#define UAC_FORMAT_TYPE                 0x02
-#define FORMAT_SPECIFIC                 0x03
+#define UAC_FORMAT_SPECIFIC             0x03
-#define EP_GENERAL                      0x01
+/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
+#define UAC_EP_GENERAL                  0x01
-#define MS_GENERAL                      0x01
-#define MIDI_IN_JACK                    0x02
+/* A.9 Audio Class-Specific Request Codes */
-#define MIDI_OUT_JACK                   0x03
+#define UAC_SET_                        0x00
+#define UAC_GET_                        0x80
-/* endpoint attributes */
-#define EP_ATTR_MASK                    0x0c
+#define UAC__CUR                        0x1
-#define EP_ATTR_ASYNC                   0x04
+#define UAC__MIN                        0x2
-#define EP_ATTR_ADAPTIVE                0x08
+#define UAC__MAX                        0x3
-#define EP_ATTR_SYNC                    0x0c
+#define UAC__RES                        0x4
+#define UAC__MEM                        0x5
-/* cs endpoint attributes */
-#define EP_CS_ATTR_SAMPLE_RATE          0x01
+#define UAC_SET_CUR                     (UAC_SET_ | UAC__CUR)
-#define EP_CS_ATTR_PITCH_CONTROL        0x02
+#define UAC_GET_CUR                     (UAC_GET_ | UAC__CUR)
-#define EP_CS_ATTR_FILL_MAX             0x80
+#define UAC_SET_MIN                     (UAC_SET_ | UAC__MIN)
+#define UAC_GET_MIN                     (UAC_GET_ | UAC__MIN)
-/* Audio Class specific Request Codes */
+#define UAC_SET_MAX                     (UAC_SET_ | UAC__MAX)
-#define USB_AUDIO_SET_INTF              0x21
+#define UAC_GET_MAX                     (UAC_GET_ | UAC__MAX)
-#define USB_AUDIO_SET_ENDPOINT          0x22
+#define UAC_SET_RES                     (UAC_SET_ | UAC__RES)
-#define USB_AUDIO_GET_INTF              0xa1
+#define UAC_GET_RES                     (UAC_GET_ | UAC__RES)
-#define USB_AUDIO_GET_ENDPOINT          0xa2
+#define UAC_SET_MEM                     (UAC_SET_ | UAC__MEM)
+#define UAC_GET_MEM                     (UAC_GET_ | UAC__MEM)
-#define SET_    0x00
-#define GET_    0x80
+#define UAC_GET_STAT                    0xff
-#define _CUR    0x1
+/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define _MIN    0x2
+#define UAC_MS_HEADER                   0x01
-#define _MAX    0x3
+#define UAC_MIDI_IN_JACK                0x02
-#define _RES    0x4
+#define UAC_MIDI_OUT_JACK               0x03
-#define _MEM    0x5
+/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
-#define SET_CUR         (SET_ | _CUR)
+#define UAC_MS_GENERAL                  0x01
-#define GET_CUR         (GET_ | _CUR)
-#define SET_MIN         (SET_ | _MIN)
+/* Terminals - 2.1 USB Terminal Types */
-#define GET_MIN         (GET_ | _MIN)
+#define UAC_TERMINAL_UNDEFINED          0x100
-#define SET_MAX         (SET_ | _MAX)
+#define UAC_TERMINAL_STREAMING          0x101
-#define GET_MAX         (GET_ | _MAX)
+#define UAC_TERMINAL_VENDOR_SPEC        0x1FF
-#define SET_RES         (SET_ | _RES)
-#define GET_RES         (GET_ | _RES)
-#define SET_MEM         (SET_ | _MEM)
-#define GET_MEM         (GET_ | _MEM)
-#define GET_STAT        0xff
-#define USB_AC_TERMINAL_UNDEFINED       0x100
-#define USB_AC_TERMINAL_STREAMING       0x101
-#define USB_AC_TERMINAL_VENDOR_SPEC     0x1FF
 /* Terminal Control Selectors */
 /* 4.3.2  Class-Specific AC Interface Descriptor */
-struct usb_ac_header_descriptor {
+struct uac_ac_header_descriptor {
        __u8  bLength;                  /* 8 + n */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
-        __u8  bDescriptorSubtype;       /* USB_MS_HEADER */
+        __u8  bDescriptorSubtype;       /* UAC_MS_HEADER */
        __le16 bcdADC;                  /* 0x0100 */
        __le16 wTotalLength;            /* includes Unit and Terminal desc. */
        __u8  bInCollection;            /* n */
        __u8  baInterfaceNr[];          /* [n] */
 } __attribute__ ((packed));
-#define USB_DT_AC_HEADER_SIZE(n)        (8 + (n))
+#define UAC_DT_AC_HEADER_SIZE(n)        (8 + (n))
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_AC_HEADER_DESCRIPTOR(n)                     \
+#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)                     \
-struct usb_ac_header_descriptor_##n {                           \
+struct uac_ac_header_descriptor_##n {                           \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -116,7 +106,7 @@ struct usb_ac_header_descriptor_##n {				\
 } __attribute__ ((packed))
 /* 4.3.2.1 Input Terminal Descriptor */
-struct usb_input_terminal_descriptor {
+struct uac_input_terminal_descriptor {
        __u8  bLength;                  /* in bytes: 12 */
        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
        __u8  bDescriptorSubtype;       /* INPUT_TERMINAL descriptor subtype */
@@ -129,18 +119,19 @@ struct usb_input_terminal_descriptor {
        __u8  iTerminal;
 } __attribute__ ((packed));
-#define USB_DT_AC_INPUT_TERMINAL_SIZE                   12
+#define UAC_DT_INPUT_TERMINAL_SIZE                      12
-#define USB_AC_INPUT_TERMINAL_UNDEFINED                 0x200
+/* Terminals - 2.2 Input Terminal Types */
-#define USB_AC_INPUT_TERMINAL_MICROPHONE                0x201
+#define UAC_INPUT_TERMINAL_UNDEFINED                    0x200
-#define USB_AC_INPUT_TERMINAL_DESKTOP_MICROPHONE        0x202
+#define UAC_INPUT_TERMINAL_MICROPHONE                   0x201
-#define USB_AC_INPUT_TERMINAL_PERSONAL_MICROPHONE       0x203
+#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE           0x202
-#define USB_AC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE       0x204
+#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE          0x203
-#define USB_AC_INPUT_TERMINAL_MICROPHONE_ARRAY          0x205
+#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE          0x204
-#define USB_AC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY     0x206
+#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY             0x205
+#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY        0x206
 /* 4.3.2.2 Output Terminal Descriptor */
-struct usb_output_terminal_descriptor {
+struct uac_output_terminal_descriptor {
        __u8  bLength;                  /* in bytes: 9 */
        __u8  bDescriptorType;          /* CS_INTERFACE descriptor type */
        __u8  bDescriptorSubtype;       /* OUTPUT_TERMINAL descriptor subtype */
@@ -151,23 +142,24 @@ struct usb_output_terminal_descriptor {
        __u8  iTerminal;
 } __attribute__ ((packed));
-#define USB_DT_AC_OUTPUT_TERMINAL_SIZE                          9
+#define UAC_DT_OUTPUT_TERMINAL_SIZE                     9
-#define USB_AC_OUTPUT_TERMINAL_UNDEFINED                        0x300
+/* Terminals - 2.3 Output Terminal Types */
-#define USB_AC_OUTPUT_TERMINAL_SPEAKER                          0x301
+#define UAC_OUTPUT_TERMINAL_UNDEFINED                   0x300
-#define USB_AC_OUTPUT_TERMINAL_HEADPHONES                       0x302
+#define UAC_OUTPUT_TERMINAL_SPEAKER                     0x301
-#define USB_AC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO       0x303
+#define UAC_OUTPUT_TERMINAL_HEADPHONES                  0x302
-#define USB_AC_OUTPUT_TERMINAL_DESKTOP_SPEAKER                  0x304
+#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO  0x303
-#define USB_AC_OUTPUT_TERMINAL_ROOM_SPEAKER                     0x305
+#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER             0x304
-#define USB_AC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER            0x306
+#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER                0x305
-#define USB_AC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER         0x307
+#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER       0x306
+#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER    0x307
 /* Set bControlSize = 2 as default setting */
-#define USB_DT_AC_FEATURE_UNIT_SIZE(ch)         (7 + ((ch) + 1) * 2)
+#define UAC_DT_FEATURE_UNIT_SIZE(ch)            (7 + ((ch) + 1) * 2)
 /* As above, but more useful for defining your own descriptors: */
-#define DECLARE_USB_AC_FEATURE_UNIT_DESCRIPTOR(ch)              \
+#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch)                 \
-struct usb_ac_feature_unit_descriptor_##ch {                    \
+struct uac_feature_unit_descriptor_##ch {                       \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -179,7 +171,7 @@ struct usb_ac_feature_unit_descriptor_##ch {			\
 } __attribute__ ((packed))
 /* 4.5.2 Class-Specific AS Interface Descriptor */
-struct usb_as_header_descriptor {
+struct uac_as_header_descriptor {
        __u8  bLength;                  /* in bytes: 7 */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* AS_GENERAL */
@@ -188,16 +180,17 @@ struct usb_as_header_descriptor {
        __le16 wFormatTag;              /* The Audio Data Format */
 } __attribute__ ((packed));
-#define USB_DT_AS_HEADER_SIZE           7
+#define UAC_DT_AS_HEADER_SIZE           7
-#define USB_AS_AUDIO_FORMAT_TYPE_I_UNDEFINED    0x0
+/* Formats - A.1.1 Audio Data Format Type I Codes */
-#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM          0x1
+#define UAC_FORMAT_TYPE_I_UNDEFINED     0x0
-#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM8         0x2
+#define UAC_FORMAT_TYPE_I_PCM           0x1
-#define USB_AS_AUDIO_FORMAT_TYPE_I_IEEE_FLOAT   0x3
+#define UAC_FORMAT_TYPE_I_PCM8          0x2
-#define USB_AS_AUDIO_FORMAT_TYPE_I_ALAW         0x4
+#define UAC_FORMAT_TYPE_I_IEEE_FLOAT    0x3
-#define USB_AS_AUDIO_FORMAT_TYPE_I_MULAW        0x5
+#define UAC_FORMAT_TYPE_I_ALAW          0x4
+#define UAC_FORMAT_TYPE_I_MULAW         0x5
-struct usb_as_format_type_i_continuous_descriptor {
+struct uac_format_type_i_continuous_descriptor {
        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
@@ -210,9 +203,9 @@ struct usb_as_format_type_i_continuous_descriptor {
        __u8  tUpperSamFreq[3];
 } __attribute__ ((packed));
-#define USB_AS_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE       14
+#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE  14
-struct usb_as_formate_type_i_discrete_descriptor {
+struct uac_format_type_i_discrete_descriptor {
        __u8  bLength;                  /* in bytes: 8 + (ns * 3) */
        __u8  bDescriptorType;          /* USB_DT_CS_INTERFACE */
        __u8  bDescriptorSubtype;       /* FORMAT_TYPE */
@@ -224,8 +217,8 @@ struct usb_as_formate_type_i_discrete_descriptor {
        __u8  tSamFreq[][3];
 } __attribute__ ((packed));
-#define DECLARE_USB_AS_FORMAT_TYPE_I_DISCRETE_DESC(n)           \
+#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n)              \
-struct usb_as_formate_type_i_discrete_descriptor_##n {          \
+struct uac_format_type_i_discrete_descriptor_##n {              \
        __u8  bLength;                                          \
        __u8  bDescriptorType;                                  \
        __u8  bDescriptorSubtype;                               \
@@ -237,18 +230,15 @@ struct usb_as_formate_type_i_discrete_descriptor_##n {		\
        __u8  tSamFreq[n][3];                                   \
 } __attribute__ ((packed))
-#define USB_AS_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n)      (8 + (n * 3))
+#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
-#define USB_AS_FORMAT_TYPE_UNDEFINED    0x0
-#define USB_AS_FORMAT_TYPE_I            0x1
-#define USB_AS_FORMAT_TYPE_II           0x2
-#define USB_AS_FORMAT_TYPE_III          0x3
-#define USB_AS_ENDPOINT_ASYNC           (1 << 2)
+/* Formats - A.2 Format Type Codes */
-#define USB_AS_ENDPOINT_ADAPTIVE        (2 << 2)
+#define UAC_FORMAT_TYPE_UNDEFINED       0x0
-#define USB_AS_ENDPOINT_SYNC            (3 << 2)
+#define UAC_FORMAT_TYPE_I               0x1
+#define UAC_FORMAT_TYPE_II              0x2
+#define UAC_FORMAT_TYPE_III             0x3
-struct usb_as_iso_endpoint_descriptor {
+struct uac_iso_endpoint_descriptor {
        __u8  bLength;                  /* in bytes: 7 */
        __u8  bDescriptorType;          /* USB_DT_CS_ENDPOINT */
        __u8  bDescriptorSubtype;       /* EP_GENERAL */
@@ -256,30 +246,37 @@ struct usb_as_iso_endpoint_descriptor {
        __u8  bLockDelayUnits;
        __le16 wLockDelay;
 };
-#define USB_AS_ISO_ENDPOINT_DESC_SIZE   7
+#define UAC_ISO_ENDPOINT_DESC_SIZE      7
-#define FU_CONTROL_UNDEFINED            0x00
+#define UAC_EP_CS_ATTR_SAMPLE_RATE      0x01
-#define MUTE_CONTROL                    0x01
+#define UAC_EP_CS_ATTR_PITCH_CONTROL    0x02
-#define VOLUME_CONTROL                  0x02
+#define UAC_EP_CS_ATTR_FILL_MAX         0x80
-#define BASS_CONTROL                    0x03
-#define MID_CONTROL                     0x04
+/* A.10.2 Feature Unit Control Selectors */
-#define TREBLE_CONTROL                  0x05
+#define UAC_FU_CONTROL_UNDEFINED        0x00
-#define GRAPHIC_EQUALIZER_CONTROL       0x06
+#define UAC_MUTE_CONTROL                0x01
-#define AUTOMATIC_GAIN_CONTROL          0x07
+#define UAC_VOLUME_CONTROL              0x02
-#define DELAY_CONTROL                   0x08
+#define UAC_BASS_CONTROL                0x03
-#define BASS_BOOST_CONTROL              0x09
+#define UAC_MID_CONTROL                 0x04
-#define LOUDNESS_CONTROL                0x0a
+#define UAC_TREBLE_CONTROL              0x05
+#define UAC_GRAPHIC_EQUALIZER_CONTROL   0x06
-#define FU_MUTE         (1 << (MUTE_CONTROL - 1))
+#define UAC_AUTOMATIC_GAIN_CONTROL      0x07
-#define FU_VOLUME       (1 << (VOLUME_CONTROL - 1))
+#define UAC_DELAY_CONTROL               0x08
-#define FU_BASS         (1 << (BASS_CONTROL - 1))
+#define UAC_BASS_BOOST_CONTROL          0x09
-#define FU_MID          (1 << (MID_CONTROL - 1))
+#define UAC_LOUDNESS_CONTROL            0x0a
-#define FU_TREBLE       (1 << (TREBLE_CONTROL - 1))
-#define FU_GRAPHIC_EQ   (1 << (GRAPHIC_EQUALIZER_CONTROL - 1))
+#define UAC_FU_MUTE             (1 << (UAC_MUTE_CONTROL - 1))
-#define FU_AUTO_GAIN    (1 << (AUTOMATIC_GAIN_CONTROL - 1))
+#define UAC_FU_VOLUME           (1 << (UAC_VOLUME_CONTROL - 1))
-#define FU_DELAY        (1 << (DELAY_CONTROL - 1))
+#define UAC_FU_BASS             (1 << (UAC_BASS_CONTROL - 1))
-#define FU_BASS_BOOST   (1 << (BASS_BOOST_CONTROL - 1))
+#define UAC_FU_MID              (1 << (UAC_MID_CONTROL - 1))
-#define FU_LOUDNESS     (1 << (LOUDNESS_CONTROL - 1))
+#define UAC_FU_TREBLE           (1 << (UAC_TREBLE_CONTROL - 1))
+#define UAC_FU_GRAPHIC_EQ       (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1))
+#define UAC_FU_AUTO_GAIN        (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1))
+#define UAC_FU_DELAY            (1 << (UAC_DELAY_CONTROL - 1))
+#define UAC_FU_BASS_BOOST       (1 << (UAC_BASS_BOOST_CONTROL - 1))
+#define UAC_FU_LOUDNESS         (1 << (UAC_LOUDNESS_CONTROL - 1))
+#ifdef __KERNEL__
 struct usb_audio_control {
        struct list_head list;
@@ -290,18 +287,6 @@ struct usb_audio_control {
        int (*get)(struct usb_audio_control *con, u8 cmd);
 };
-static inline int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
-{
-        con->data[cmd] = value;
-        return 0;
-}
-static inline int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
-{
-        return con->data[cmd];
-}
 struct usb_audio_control_selector {
        struct list_head list;
        struct list_head control;
@@ -311,4 +296,6 @@ struct usb_audio_control_selector {
        struct usb_descriptor_header *desc;
 };
+#endif /* __KERNEL__ */
 #endif /* __LINUX_USB_AUDIO_H */
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 93223638f702..94012e649d86 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -258,6 +258,8 @@ struct usb_device_descriptor {
 #define USB_CLASS_APP_SPEC              0xfe
 #define USB_CLASS_VENDOR_SPEC           0xff
+#define USB_SUBCLASS_VENDOR_SPEC        0xff
 /*-------------------------------------------------------------------------*/
 /* USB_DT_CONFIG: Configuration descriptor information.
@@ -348,6 +350,12 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_NUMBER_MASK        0x0f    /* in bEndpointAddress */
 #define USB_ENDPOINT_DIR_MASK           0x80
+#define USB_ENDPOINT_SYNCTYPE           0x0c
+#define USB_ENDPOINT_SYNC_NONE          (0 << 2)
+#define USB_ENDPOINT_SYNC_ASYNC         (1 << 2)
+#define USB_ENDPOINT_SYNC_ADAPTIVE      (2 << 2)
+#define USB_ENDPOINT_SYNC_SYNC          (3 << 2)
 #define USB_ENDPOINT_XFERTYPE_MASK      0x03    /* in bmAttributes */
 #define USB_ENDPOINT_XFER_CONTROL       0
 #define USB_ENDPOINT_XFER_ISOC          1
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index 5b88e36c9103..af4b86f3aca3 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -105,6 +105,7 @@ struct ehci_regs {
 #define PORT_WKDISC_E   (1<<21)         /* wake on disconnect (enable) */
 #define PORT_WKCONN_E   (1<<20)         /* wake on connect (enable) */
 /* 19:16 for port testing */
+#define PORT_TEST_PKT   (0x4<<16)       /* Port Test Control - packet test */
 #define PORT_LED_OFF    (0<<14)
 #define PORT_LED_AMBER  (1<<14)
 #define PORT_LED_GREEN  (2<<14)
@@ -132,6 +133,19 @@ struct ehci_regs {
 #define USBMODE_CM_HC   (3<<0)          /* host controller mode */
 #define USBMODE_CM_IDLE (0<<0)          /* idle state */
+/* Moorestown has some non-standard registers, partially due to the fact that
+ * its EHCI controller has both TT and LPM support. HOSTPCx are extentions to
+ * PORTSCx
+ */
+#define HOSTPC0         0x84            /* HOSTPC extension */
+#define HOSTPC_PHCD     (1<<22)         /* Phy clock disable */
+#define HOSTPC_PSPD     (3<<25)         /* Port speed detection */
+#define USBMODE_EX      0xc8            /* USB Device mode extension */
+#define USBMODE_EX_VBPS (1<<5)          /* VBus Power Select On */
+#define USBMODE_EX_HC   (3<<0)          /* host controller mode */
+#define TXFILLTUNING    0x24            /* TX FIFO Tuning register */
+#define TXFIFO_DEFAULT  (8<<16)         /* FIFO burst threshold 8 */
 /* Appendix C, Debug port ... intended for use with special "debug devices"
 * that can help if there's no serial console.  (nonstandard enumeration.)
 */
@@ -157,4 +171,25 @@ struct ehci_dbg_port {
 #define DBGP_EPADDR(dev, ep)    (((dev)<<8)|(ep))
 } __attribute__ ((packed));
+#ifdef CONFIG_EARLY_PRINTK_DBGP
+#include <linux/init.h>
+extern int __init early_dbgp_init(char *s);
+extern struct console early_dbgp_console;
+#endif /* CONFIG_EARLY_PRINTK_DBGP */
+#ifdef CONFIG_EARLY_PRINTK_DBGP
+/* Call backs from ehci host driver to ehci debug driver */
+extern int dbgp_external_startup(void);
+extern int dbgp_reset_prep(void);
+#else
+static inline int dbgp_reset_prep(void)
+{
+        return 1;
+}
+static inline int dbgp_external_startup(void)
+{
+        return -1;
+}
+#endif
 #endif /* __LINUX_USB_EHCI_DEF_H */
diff --git a/include/linux/usb/isp1362.h b/include/linux/usb/isp1362.h
new file mode 100644
index 000000000000..642684bb9292
--- /dev/null
+++ b/include/linux/usb/isp1362.h
@@ -0,0 +1,46 @@
+/*
+ * board initialization code should put one of these into dev->platform_data
+ * and place the isp1362 onto platform_bus.
+ */
+#ifndef __LINUX_USB_ISP1362_H__
+#define __LINUX_USB_ISP1362_H__
+struct isp1362_platform_data {
+        /* Enable internal pulldown resistors on downstream ports */
+        unsigned sel15Kres:1;
+        /* Clock cannot be stopped */
+        unsigned clknotstop:1;
+        /* On-chip overcurrent protection */
+        unsigned oc_enable:1;
+        /* INT output polarity */
+        unsigned int_act_high:1;
+        /* INT edge or level triggered */
+        unsigned int_edge_triggered:1;
+        /* DREQ output polarity */
+        unsigned dreq_act_high:1;
+        /* DACK input polarity */
+        unsigned dack_act_high:1;
+        /* chip can be resumed via H_WAKEUP pin */
+        unsigned remote_wakeup_connected:1;
+        /* Switch or not to switch (keep always powered) */
+        unsigned no_power_switching:1;
+        /* Ganged port power switching (0) or individual port power switching (1) */
+        unsigned power_switching_mode:1;
+        /* Given port_power, msec/2 after power on till power good */
+        u8 potpg;
+        /* Hardware reset set/clear */
+        void (*reset) (struct device *dev, int set);
+        /* Clock start/stop */
+        void (*clock) (struct device *dev, int start);
+        /* Inter-io delay (ns). The chip is picky about access timings; it
+         * expects at least:
+         * 110ns delay between consecutive accesses to DATA_REG,
+         * 300ns delay between access to ADDR_REG and DATA_REG (registers)
+         * 462ns delay between access to ADDR_REG and DATA_REG (buffer memory)
+         * WE MUST NOT be activated during these intervals (even without CS!)
+         */
+        void (*delay) (struct device *dev, unsigned int delay);
+};
+#endif
diff --git a/include/linux/usb/isp1760.h b/include/linux/usb/isp1760.h
new file mode 100644
index 000000000000..de7de53c5531
--- /dev/null
+++ b/include/linux/usb/isp1760.h
@@ -0,0 +1,18 @@
+/*
+ * board initialization should put one of these into dev->platform_data
+ * and place the isp1760 onto platform_bus named "isp1760-hcd".
+ */
+#ifndef __LINUX_USB_ISP1760_H
+#define __LINUX_USB_ISP1760_H
+struct isp1760_platform_data {
+        unsigned is_isp1761:1;                  /* Chip is ISP1761 */
+        unsigned bus_width_16:1;                /* 16/32-bit data bus width */
+        unsigned port1_otg:1;                   /* Port 1 supports OTG */
+        unsigned analog_oc:1;                   /* Analog overcurrent */
+        unsigned dack_polarity_high:1;          /* DACK active high */
+        unsigned dreq_polarity_high:1;          /* DREQ active high */
+};
+#endif /* __LINUX_USB_ISP1760_H */
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 0ec50ba62139..c17eb64d7213 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -59,6 +59,7 @@ enum port_dev_state {
 * @bulk_out_buffer: pointer to the bulk out buffer for this port.
 * @bulk_out_size: the size of the bulk_out_buffer, in bytes.
 * @write_urb: pointer to the bulk out struct urb for this port.
+ * @write_fifo: kfifo used to buffer outgoing data
 * @write_urb_busy: port`s writing status
 * @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
 *      port.
@@ -96,6 +97,7 @@ struct usb_serial_port {
        unsigned char           *bulk_out_buffer;
        int                     bulk_out_size;
        struct urb              *write_urb;
+        struct kfifo            *write_fifo;
        int                     write_urb_busy;
        __u8                    bulk_out_endpointAddress;
@@ -238,9 +240,8 @@ struct usb_serial_driver {
        int (*resume)(struct usb_serial *serial);
        /* serial function calls */
-        /* Called by console with tty = NULL and by tty */
+        /* Called by console and by the tty layer */
-        int  (*open)(struct tty_struct *tty,
+        int  (*open)(struct tty_struct *tty, struct usb_serial_port *port);
-                        struct usb_serial_port *port, struct file *filp);
        void (*close)(struct usb_serial_port *port);
        int  (*write)(struct tty_struct *tty, struct usb_serial_port *port,
                        const unsigned char *buf, int count);
@@ -261,6 +262,9 @@ struct usb_serial_driver {
           be an attached tty at this point */
        void (*dtr_rts)(struct usb_serial_port *port, int on);
        int  (*carrier_raised)(struct usb_serial_port *port);
+        /* Called by the usb serial hooks to allow the user to rework the
+           termios state */
+        void (*init_termios)(struct tty_struct *tty);
        /* USB events */
        void (*read_int_callback)(struct urb *urb);
        void (*write_int_callback)(struct urb *urb);
@@ -300,7 +304,7 @@ static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}
 extern struct usb_serial *usb_serial_get_by_index(unsigned int minor);
 extern void usb_serial_put(struct usb_serial *serial);
 extern int usb_serial_generic_open(struct tty_struct *tty,
-                struct usb_serial_port *port, struct file *filp);
+        struct usb_serial_port *port);
 extern int usb_serial_generic_write(struct tty_struct *tty,
        struct usb_serial_port *port, const unsigned char *buf, int count);
 extern void usb_serial_generic_close(struct usb_serial_port *port);
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
index 0044d9b4cb85..b2a7d8ba6ee3 100644
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -77,6 +77,7 @@ struct usbdevfs_connectinfo {
 #define USBDEVFS_URB_SHORT_NOT_OK       0x01
 #define USBDEVFS_URB_ISO_ASAP           0x02
+#define USBDEVFS_URB_BULK_CONTINUATION  0x04
 #define USBDEVFS_URB_NO_FSBR            0x20
 #define USBDEVFS_URB_ZERO_PACKET        0x40
 #define USBDEVFS_URB_NO_INTERRUPT       0x80
@@ -175,4 +176,6 @@ struct usbdevfs_ioctl32 {
 #define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)
 #define USBDEVFS_DISCONNECT        _IO('U', 22)
 #define USBDEVFS_CONNECT           _IO('U', 23)
+#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)
+#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)
 #endif /* _LINUX_USBDEVICE_FS_H */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 3689d7d81fe9..b59e78c57161 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -910,9 +910,10 @@ enum v4l2_colorfx {
        V4L2_COLORFX_SEPIA      = 2,
 };
 #define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
+#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+33)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 4fca4f5440ba..057a2e010758 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -34,7 +34,7 @@ struct virtqueue {
 *      out_num: the number of sg readable by other side
 *      in_num: the number of sg which are writable (after readable ones)
 *      data: the token identifying the buffer.
- *      Returns 0 or an error.
+ *      Returns remaining capacity of queue (sg segments) or a negative error.
 * @kick: update after add_buf
 *      vq: the struct virtqueue
 *      After one or more add_buf calls, invoke this to kick the other side.
diff --git a/include/linux/virtio_9p.h b/include/linux/virtio_9p.h
index b3c4a60ceeb3..ea7226a45acb 100644
--- a/include/linux/virtio_9p.h
+++ b/include/linux/virtio_9p.h
@@ -4,8 +4,6 @@
 * compatible drivers/servers. */
 #include <linux/virtio_config.h>
-/* The ID for virtio console */
-#define VIRTIO_ID_9P    9
 /* Maximum number of virtio channels per partition (1 for now) */
 #define MAX_9P_CHAN     1
diff --git a/include/linux/virtio_balloon.h b/include/linux/virtio_balloon.h
index 8726ff77763e..09d730085060 100644
--- a/include/linux/virtio_balloon.h
+++ b/include/linux/virtio_balloon.h
@@ -4,9 +4,6 @@
 * compatible drivers/servers. */
 #include <linux/virtio_config.h>
-/* The ID for virtio_balloon */
-#define VIRTIO_ID_BALLOON       5
 /* The feature bitmap for virtio balloon */
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index 8dab9f2b8832..15cb666581d7 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -5,9 +5,6 @@
 #include <linux/types.h>
 #include <linux/virtio_config.h>
-/* The ID for virtio_block */
-#define VIRTIO_ID_BLOCK 2
 /* Feature bits */
 #define VIRTIO_BLK_F_BARRIER    0       /* Does host support barriers? */
 #define VIRTIO_BLK_F_SIZE_MAX   1       /* Indicates maximum segment size */
@@ -17,6 +14,7 @@
 #define VIRTIO_BLK_F_BLK_SIZE   6       /* Block size of disk is available*/
 #define VIRTIO_BLK_F_SCSI       7       /* Supports scsi command passthru */
 #define VIRTIO_BLK_F_IDENTIFY   8       /* ATA IDENTIFY supported */
+#define VIRTIO_BLK_F_FLUSH      9       /* Cache flush command support */
 #define VIRTIO_BLK_ID_BYTES     (sizeof(__u16[256]))    /* IDENTIFY DATA */
@@ -38,6 +36,17 @@ struct virtio_blk_config {
        __u8 identify[VIRTIO_BLK_ID_BYTES];
 } __attribute__((packed));
+/*
+ * Command types
+ *
+ * Usage is a bit tricky as some bits are used as flags and some are not.
+ *
+ * Rules:
+ *   VIRTIO_BLK_T_OUT may be combined with VIRTIO_BLK_T_SCSI_CMD or
+ *   VIRTIO_BLK_T_BARRIER.  VIRTIO_BLK_T_FLUSH is a command of its own
+ *   and may not be combined with any of the other flags.
+ */
 /* These two define direction. */
 #define VIRTIO_BLK_T_IN         0
 #define VIRTIO_BLK_T_OUT        1
@@ -45,6 +54,9 @@ struct virtio_blk_config {
 /* This bit says it's a scsi command, not an actual read or write. */
 #define VIRTIO_BLK_T_SCSI_CMD   2
+/* Cache flush command */
+#define VIRTIO_BLK_T_FLUSH      4
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER    0x80000000
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index e547e3c8ee9a..0093dd7c1d6f 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -109,8 +109,7 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
                                      unsigned int fbit)
 {
        /* Did you forget to fix assumptions on max features? */
-        if (__builtin_constant_p(fbit))
+        MAYBE_BUILD_BUG_ON(fbit >= 32);
-                BUILD_BUG_ON(fbit >= 32);
        if (fbit < VIRTIO_TRANSPORT_F_START)
                virtio_check_driver_offered_feature(vdev, fbit);
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index dc161115ae35..b5f519806014 100644
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -5,9 +5,6 @@
 /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
 * anyone can use the definitions to implement compatible drivers/servers. */
-/* The ID for virtio console */
-#define VIRTIO_ID_CONSOLE       3
 /* Feature bits */
 #define VIRTIO_CONSOLE_F_SIZE   0       /* Does host provide console size? */
diff --git a/include/linux/virtio_ids.h b/include/linux/virtio_ids.h
new file mode 100644
index 000000000000..06660c0a78d7
--- /dev/null
+++ b/include/linux/virtio_ids.h
@@ -0,0 +1,17 @@
+#ifndef _LINUX_VIRTIO_IDS_H
+#define _LINUX_VIRTIO_IDS_H
+/*
+ * Virtio IDs
+ *
+ * This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ */
+#define VIRTIO_ID_NET           1 /* virtio net */
+#define VIRTIO_ID_BLOCK         2 /* virtio block */
+#define VIRTIO_ID_CONSOLE       3 /* virtio console */
+#define VIRTIO_ID_RNG           4 /* virtio ring */
+#define VIRTIO_ID_BALLOON       5 /* virtio balloon */
+#define VIRTIO_ID_9P            9 /* 9p virtio console */
+#endif /* _LINUX_VIRTIO_IDS_H */
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index d8dd539c9f48..1f41734bbb77 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -6,9 +6,6 @@
 #include <linux/virtio_config.h>
 #include <linux/if_ether.h>
-/* The ID for virtio_net */
-#define VIRTIO_ID_NET   1
 /* The feature bitmap for virtio net */
 #define VIRTIO_NET_F_CSUM       0       /* Host handles pkts w/ partial csum */
 #define VIRTIO_NET_F_GUEST_CSUM 1       /* Guest handles pkts w/ partial csum */
diff --git a/include/linux/virtio_rng.h b/include/linux/virtio_rng.h
index 1a85dab8a940..48121c3c434b 100644
--- a/include/linux/virtio_rng.h
+++ b/include/linux/virtio_rng.h
@@ -4,7 +4,4 @@
 * compatible drivers/servers. */
 #include <linux/virtio_config.h>
-/* The ID for virtio_rng */
-#define VIRTIO_ID_RNG   4
 #endif /* _LINUX_VIRTIO_RNG_H */
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 81a97cf8f0a0..2d0f222388a8 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -166,15 +166,8 @@ static inline unsigned long zone_page_state(struct zone *zone,
        return x;
 }
-extern unsigned long global_lru_pages(void);
+extern unsigned long global_reclaimable_pages(void);
+extern unsigned long zone_reclaimable_pages(struct zone *zone);
-static inline unsigned long zone_lru_pages(struct zone *zone)
-{
-        return (zone_page_state(zone, NR_ACTIVE_ANON)
-                + zone_page_state(zone, NR_ACTIVE_FILE)
-                + zone_page_state(zone, NR_INACTIVE_ANON)
-                + zone_page_state(zone, NR_INACTIVE_FILE));
-}
 #ifdef CONFIG_NUMA
 /*
@@ -210,11 +203,6 @@ extern void zone_statistics(struct zone *, struct zone *);
 #endif /* CONFIG_NUMA */
-#define __add_zone_page_state(__z, __i, __d)    \
-                __mod_zone_page_state(__z, __i, __d)
-#define __sub_zone_page_state(__z, __i, __d)    \
-                __mod_zone_page_state(__z, __i,-(__d))
 #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d)
 #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d))
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 02c1c0288770..7afca0d72139 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -1,17 +1,6 @@
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
-#ifdef __KERNEL__
-struct notifier_block;
-struct vt_notifier_param {
-        struct vc_data *vc;     /* VC on which the update happened */
-        unsigned int c;         /* Printed char */
-};
-extern int register_vt_notifier(struct notifier_block *nb);
-extern int unregister_vt_notifier(struct notifier_block *nb);
-#endif
 /*
 * These constants are also useful for user-level apps (e.g., VC
@@ -74,4 +63,25 @@ struct vt_consize {
 #define VT_UNLOCKSWITCH 0x560C  /* allow vt switching */
 #define VT_GETHIFONTMASK 0x560D  /* return hi font mask */
+struct vt_event {
+        unsigned int event;
+#define VT_EVENT_SWITCH         0x0001  /* Console switch */
+#define VT_EVENT_BLANK          0x0002  /* Screen blank */
+#define VT_EVENT_UNBLANK        0x0004  /* Screen unblank */
+#define VT_EVENT_RESIZE         0x0008  /* Resize display */
+#define VT_MAX_EVENT            0x000F
+        unsigned int old;               /* Old console */
+        unsigned int new;               /* New console (if changing) */
+        unsigned int pad[4];            /* Padding for expansion */
+};
+#define VT_WAITEVENT    0x560E  /* Wait for an event */
+struct vt_setactivate {
+        unsigned int console;
+        struct vt_mode mode;
+};
+#define VT_SETACTIVATE  0x560F  /* Activate and set the mode of a console */
 #endif /* _LINUX_VT_H */
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 2f1113467f70..c0c4e1103a73 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -13,6 +13,7 @@
 #include <linux/console_struct.h>
 #include <linux/mm.h>
 #include <linux/consolemap.h>
+#include <linux/notifier.h>
 /*
 * Presently, a lot of graphics programs do not restore the contents of
@@ -91,7 +92,8 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 #endif
 /* vt.c */
-int vt_waitactive(int vt);
+void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
+int vt_waitactive(int n);
 void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
 extern int unbind_con_driver(const struct consw *csw, int first, int last,
@@ -116,4 +118,16 @@ struct vt_spawn_console {
 };
 extern struct vt_spawn_console vt_spawn_con;
+extern int vt_move_to_console(unsigned int vt, int alloc);
+/* Interfaces for VC notification of character events (for accessibility etc) */
+struct vt_notifier_param {
+        struct vc_data *vc;     /* VC on which the update happened */
+        unsigned int c;         /* Printed char */
+};
+extern int register_vt_notifier(struct notifier_block *nb);
+extern int unregister_vt_notifier(struct notifier_block *nb);
 #endif /* _VT_KERN_H */
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 6273fa97b527..7ef0c7b94f31 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -94,7 +94,7 @@ struct execute_work {
 /*
 * initialize all of a work item in one go
 *
- * NOTE! No point in using "atomic_long_set()": useing a direct
+ * NOTE! No point in using "atomic_long_set()": using a direct
 * assignment of the work data initializer allows the compiler
 * to generate better code.
 */
diff --git a/include/media/davinci/ccdc_types.h b/include/media/davinci/ccdc_types.h
new file mode 100644
index 000000000000..5773874bf266
--- /dev/null
+++ b/include/media/davinci/ccdc_types.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * 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 _CCDC_TYPES_H
+#define _CCDC_TYPES_H
+enum ccdc_pixfmt {
+        CCDC_PIXFMT_RAW,
+        CCDC_PIXFMT_YCBCR_16BIT,
+        CCDC_PIXFMT_YCBCR_8BIT
+};
+enum ccdc_frmfmt {
+        CCDC_FRMFMT_PROGRESSIVE,
+        CCDC_FRMFMT_INTERLACED
+};
+/* PIXEL ORDER IN MEMORY from LSB to MSB */
+/* only applicable for 8-bit input mode  */
+enum ccdc_pixorder {
+        CCDC_PIXORDER_YCBYCR,
+        CCDC_PIXORDER_CBYCRY,
+};
+enum ccdc_buftype {
+        CCDC_BUFTYPE_FLD_INTERLEAVED,
+        CCDC_BUFTYPE_FLD_SEPARATED
+};
+#endif
diff --git a/include/media/davinci/dm355_ccdc.h b/include/media/davinci/dm355_ccdc.h
new file mode 100644
index 000000000000..df8a7b107477
--- /dev/null
+++ b/include/media/davinci/dm355_ccdc.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2005-2009 Texas Instruments Inc
+ *
+ * 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 _DM355_CCDC_H
+#define _DM355_CCDC_H
+#include <media/davinci/ccdc_types.h>
+#include <media/davinci/vpfe_types.h>
+/* enum for No of pixel per line to be avg. in Black Clamping */
+enum ccdc_sample_length {
+        CCDC_SAMPLE_1PIXELS,
+        CCDC_SAMPLE_2PIXELS,
+        CCDC_SAMPLE_4PIXELS,
+        CCDC_SAMPLE_8PIXELS,
+        CCDC_SAMPLE_16PIXELS
+};
+/* enum for No of lines in Black Clamping */
+enum ccdc_sample_line {
+        CCDC_SAMPLE_1LINES,
+        CCDC_SAMPLE_2LINES,
+        CCDC_SAMPLE_4LINES,
+        CCDC_SAMPLE_8LINES,
+        CCDC_SAMPLE_16LINES
+};
+/* enum for Alaw gama width */
+enum ccdc_gamma_width {
+        CCDC_GAMMA_BITS_13_4,
+        CCDC_GAMMA_BITS_12_3,
+        CCDC_GAMMA_BITS_11_2,
+        CCDC_GAMMA_BITS_10_1,
+        CCDC_GAMMA_BITS_09_0
+};
+enum ccdc_colpats {
+        CCDC_RED,
+        CCDC_GREEN_RED,
+        CCDC_GREEN_BLUE,
+        CCDC_BLUE
+};
+struct ccdc_col_pat {
+        enum ccdc_colpats olop;
+        enum ccdc_colpats olep;
+        enum ccdc_colpats elop;
+        enum ccdc_colpats elep;
+};
+enum ccdc_datasft {
+        CCDC_DATA_NO_SHIFT,
+        CCDC_DATA_SHIFT_1BIT,
+        CCDC_DATA_SHIFT_2BIT,
+        CCDC_DATA_SHIFT_3BIT,
+        CCDC_DATA_SHIFT_4BIT,
+        CCDC_DATA_SHIFT_5BIT,
+        CCDC_DATA_SHIFT_6BIT
+};
+enum ccdc_data_size {
+        CCDC_DATA_16BITS,
+        CCDC_DATA_15BITS,
+        CCDC_DATA_14BITS,
+        CCDC_DATA_13BITS,
+        CCDC_DATA_12BITS,
+        CCDC_DATA_11BITS,
+        CCDC_DATA_10BITS,
+        CCDC_DATA_8BITS
+};
+enum ccdc_mfilt1 {
+        CCDC_NO_MEDIAN_FILTER1,
+        CCDC_AVERAGE_FILTER1,
+        CCDC_MEDIAN_FILTER1
+};
+enum ccdc_mfilt2 {
+        CCDC_NO_MEDIAN_FILTER2,
+        CCDC_AVERAGE_FILTER2,
+        CCDC_MEDIAN_FILTER2
+};
+/* structure for ALaw */
+struct ccdc_a_law {
+        /* Enable/disable A-Law */
+        unsigned char enable;
+        /* Gama Width Input */
+        enum ccdc_gamma_width gama_wd;
+};
+/* structure for Black Clamping */
+struct ccdc_black_clamp {
+        /* only if bClampEnable is TRUE */
+        unsigned char b_clamp_enable;
+        /* only if bClampEnable is TRUE */
+        enum ccdc_sample_length sample_pixel;
+        /* only if bClampEnable is TRUE */
+        enum ccdc_sample_line sample_ln;
+        /* only if bClampEnable is TRUE */
+        unsigned short start_pixel;
+        /* only if bClampEnable is FALSE */
+        unsigned short sgain;
+        unsigned short dc_sub;
+};
+/* structure for Black Level Compensation */
+struct ccdc_black_compensation {
+        /* Constant value to subtract from Red component */
+        unsigned char r;
+        /* Constant value to subtract from Gr component */
+        unsigned char gr;
+        /* Constant value to subtract from Blue component */
+        unsigned char b;
+        /* Constant value to subtract from Gb component */
+        unsigned char gb;
+};
+struct ccdc_float {
+        int integer;
+        unsigned int decimal;
+};
+#define CCDC_CSC_COEFF_TABLE_SIZE       16
+/* structure for color space converter */
+struct ccdc_csc {
+        unsigned char enable;
+        /*
+         * S8Q5. Use 2 decimal precision, user values range from -3.00 to 3.99.
+         * example - to use 1.03, set integer part as 1, and decimal part as 3
+         * to use -1.03, set integer part as -1 and decimal part as 3
+         */
+        struct ccdc_float coeff[CCDC_CSC_COEFF_TABLE_SIZE];
+};
+/* Structures for Vertical Defect Correction*/
+enum ccdc_vdf_csl {
+        CCDC_VDF_NORMAL,
+        CCDC_VDF_HORZ_INTERPOL_SAT,
+        CCDC_VDF_HORZ_INTERPOL
+};
+enum ccdc_vdf_cuda {
+        CCDC_VDF_WHOLE_LINE_CORRECT,
+        CCDC_VDF_UPPER_DISABLE
+};
+enum ccdc_dfc_mwr {
+        CCDC_DFC_MWR_WRITE_COMPLETE,
+        CCDC_DFC_WRITE_REG
+};
+enum ccdc_dfc_mrd {
+        CCDC_DFC_READ_COMPLETE,
+        CCDC_DFC_READ_REG
+};
+enum ccdc_dfc_ma_rst {
+        CCDC_DFC_INCR_ADDR,
+        CCDC_DFC_CLR_ADDR
+};
+enum ccdc_dfc_mclr {
+        CCDC_DFC_CLEAR_COMPLETE,
+        CCDC_DFC_CLEAR
+};
+struct ccdc_dft_corr_ctl {
+        enum ccdc_vdf_csl vdfcsl;
+        enum ccdc_vdf_cuda vdfcuda;
+        unsigned int vdflsft;
+};
+struct ccdc_dft_corr_mem_ctl {
+        enum ccdc_dfc_mwr dfcmwr;
+        enum ccdc_dfc_mrd dfcmrd;
+        enum ccdc_dfc_ma_rst dfcmarst;
+        enum ccdc_dfc_mclr dfcmclr;
+};
+#define CCDC_DFT_TABLE_SIZE     16
+/*
+ * Main Structure for vertical defect correction. Vertical defect
+ * correction can correct upto 16 defects if defects less than 16
+ * then pad the rest with 0
+ */
+struct ccdc_vertical_dft {
+        unsigned char ver_dft_en;
+        unsigned char gen_dft_en;
+        unsigned int saturation_ctl;
+        struct ccdc_dft_corr_ctl dft_corr_ctl;
+        struct ccdc_dft_corr_mem_ctl dft_corr_mem_ctl;
+        int table_size;
+        unsigned int dft_corr_horz[CCDC_DFT_TABLE_SIZE];
+        unsigned int dft_corr_vert[CCDC_DFT_TABLE_SIZE];
+        unsigned int dft_corr_sub1[CCDC_DFT_TABLE_SIZE];
+        unsigned int dft_corr_sub2[CCDC_DFT_TABLE_SIZE];
+        unsigned int dft_corr_sub3[CCDC_DFT_TABLE_SIZE];
+};
+struct ccdc_data_offset {
+        unsigned char horz_offset;
+        unsigned char vert_offset;
+};
+/*
+ * Structure for CCDC configuration parameters for raw capture mode passed
+ * by application
+ */
+struct ccdc_config_params_raw {
+        /* data shift to be applied before storing */
+        enum ccdc_datasft datasft;
+        /* data size value from 8 to 16 bits */
+        enum ccdc_data_size data_sz;
+        /* median filter for sdram */
+        enum ccdc_mfilt1 mfilt1;
+        enum ccdc_mfilt2 mfilt2;
+        /* low pass filter enable/disable */
+        unsigned char lpf_enable;
+        /* Threshold of median filter */
+        int med_filt_thres;
+        /*
+         * horz and vertical data offset. Appliable for defect correction
+         * and lsc
+         */
+        struct ccdc_data_offset data_offset;
+        /* Structure for Optional A-Law */
+        struct ccdc_a_law alaw;
+        /* Structure for Optical Black Clamp */
+        struct ccdc_black_clamp blk_clamp;
+        /* Structure for Black Compensation */
+        struct ccdc_black_compensation blk_comp;
+        /* struture for vertical Defect Correction Module Configuration */
+        struct ccdc_vertical_dft vertical_dft;
+        /* structure for color space converter Module Configuration */
+        struct ccdc_csc csc;
+        /* color patters for bayer capture */
+        struct ccdc_col_pat col_pat_field0;
+        struct ccdc_col_pat col_pat_field1;
+};
+#ifdef __KERNEL__
+#include <linux/io.h>
+#define CCDC_WIN_PAL    {0, 0, 720, 576}
+#define CCDC_WIN_VGA    {0, 0, 640, 480}
+struct ccdc_params_ycbcr {
+        /* pixel format */
+        enum ccdc_pixfmt pix_fmt;
+        /* progressive or interlaced frame */
+        enum ccdc_frmfmt frm_fmt;
+        /* video window */
+        struct v4l2_rect win;
+        /* field id polarity */
+        enum vpfe_pin_pol fid_pol;
+        /* vertical sync polarity */
+        enum vpfe_pin_pol vd_pol;
+        /* horizontal sync polarity */
+        enum vpfe_pin_pol hd_pol;
+        /* enable BT.656 embedded sync mode */
+        int bt656_enable;
+        /* cb:y:cr:y or y:cb:y:cr in memory */
+        enum ccdc_pixorder pix_order;
+        /* interleaved or separated fields  */
+        enum ccdc_buftype buf_type;
+};
+/* Gain applied to Raw Bayer data */
+struct ccdc_gain {
+        unsigned short r_ye;
+        unsigned short gr_cy;
+        unsigned short gb_g;
+        unsigned short b_mg;
+};
+/* Structure for CCDC configuration parameters for raw capture mode */
+struct ccdc_params_raw {
+        /* pixel format */
+        enum ccdc_pixfmt pix_fmt;
+        /* progressive or interlaced frame */
+        enum ccdc_frmfmt frm_fmt;
+        /* video window */
+        struct v4l2_rect win;
+        /* field id polarity */
+        enum vpfe_pin_pol fid_pol;
+        /* vertical sync polarity */
+        enum vpfe_pin_pol vd_pol;
+        /* horizontal sync polarity */
+        enum vpfe_pin_pol hd_pol;
+        /* interleaved or separated fields */
+        enum ccdc_buftype buf_type;
+        /* Gain values */
+        struct ccdc_gain gain;
+        /* offset */
+        unsigned int ccdc_offset;
+        /* horizontal flip enable */
+        unsigned char horz_flip_enable;
+        /*
+         * enable to store the image in inverse order in memory
+         * (bottom to top)
+         */
+        unsigned char image_invert_enable;
+        /* Configurable part of raw data */
+        struct ccdc_config_params_raw config_params;
+};
+#endif
+#endif                          /* DM355_CCDC_H */
diff --git a/include/media/davinci/dm644x_ccdc.h b/include/media/davinci/dm644x_ccdc.h
new file mode 100644
index 000000000000..3e178eb52fb3
--- /dev/null
+++ b/include/media/davinci/dm644x_ccdc.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2006-2009 Texas Instruments Inc
+ *
+ * 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 _DM644X_CCDC_H
+#define _DM644X_CCDC_H
+#include <media/davinci/ccdc_types.h>
+#include <media/davinci/vpfe_types.h>
+/* enum for No of pixel per line to be avg. in Black Clamping*/
+enum ccdc_sample_length {
+        CCDC_SAMPLE_1PIXELS,
+        CCDC_SAMPLE_2PIXELS,
+        CCDC_SAMPLE_4PIXELS,
+        CCDC_SAMPLE_8PIXELS,
+        CCDC_SAMPLE_16PIXELS
+};
+/* enum for No of lines in Black Clamping */
+enum ccdc_sample_line {
+        CCDC_SAMPLE_1LINES,
+        CCDC_SAMPLE_2LINES,
+        CCDC_SAMPLE_4LINES,
+        CCDC_SAMPLE_8LINES,
+        CCDC_SAMPLE_16LINES
+};
+/* enum for Alaw gama width */
+enum ccdc_gama_width {
+        CCDC_GAMMA_BITS_15_6,
+        CCDC_GAMMA_BITS_14_5,
+        CCDC_GAMMA_BITS_13_4,
+        CCDC_GAMMA_BITS_12_3,
+        CCDC_GAMMA_BITS_11_2,
+        CCDC_GAMMA_BITS_10_1,
+        CCDC_GAMMA_BITS_09_0
+};
+enum ccdc_data_size {
+        CCDC_DATA_16BITS,
+        CCDC_DATA_15BITS,
+        CCDC_DATA_14BITS,
+        CCDC_DATA_13BITS,
+        CCDC_DATA_12BITS,
+        CCDC_DATA_11BITS,
+        CCDC_DATA_10BITS,
+        CCDC_DATA_8BITS
+};
+/* structure for ALaw */
+struct ccdc_a_law {
+        /* Enable/disable A-Law */
+        unsigned char enable;
+        /* Gama Width Input */
+        enum ccdc_gama_width gama_wd;
+};
+/* structure for Black Clamping */
+struct ccdc_black_clamp {
+        unsigned char enable;
+        /* only if bClampEnable is TRUE */
+        enum ccdc_sample_length sample_pixel;
+        /* only if bClampEnable is TRUE */
+        enum ccdc_sample_line sample_ln;
+        /* only if bClampEnable is TRUE */
+        unsigned short start_pixel;
+        /* only if bClampEnable is TRUE */
+        unsigned short sgain;
+        /* only if bClampEnable is FALSE */
+        unsigned short dc_sub;
+};
+/* structure for Black Level Compensation */
+struct ccdc_black_compensation {
+        /* Constant value to subtract from Red component */
+        char r;
+        /* Constant value to subtract from Gr component */
+        char gr;
+        /* Constant value to subtract from Blue component */
+        char b;
+        /* Constant value to subtract from Gb component */
+        char gb;
+};
+/* structure for fault pixel correction */
+struct ccdc_fault_pixel {
+        /* Enable or Disable fault pixel correction */
+        unsigned char enable;
+        /* Number of fault pixel */
+        unsigned short fp_num;
+        /* Address of fault pixel table */
+        unsigned int fpc_table_addr;
+};
+/* Structure for CCDC configuration parameters for raw capture mode passed
+ * by application
+ */
+struct ccdc_config_params_raw {
+        /* data size value from 8 to 16 bits */
+        enum ccdc_data_size data_sz;
+        /* Structure for Optional A-Law */
+        struct ccdc_a_law alaw;
+        /* Structure for Optical Black Clamp */
+        struct ccdc_black_clamp blk_clamp;
+        /* Structure for Black Compensation */
+        struct ccdc_black_compensation blk_comp;
+        /* Structure for Fault Pixel Module Configuration */
+        struct ccdc_fault_pixel fault_pxl;
+};
+#ifdef __KERNEL__
+#include <linux/io.h>
+/* Define to enable/disable video port */
+#define FP_NUM_BYTES            4
+/* Define for extra pixel/line and extra lines/frame */
+#define NUM_EXTRAPIXELS         8
+#define NUM_EXTRALINES          8
+/* settings for commonly used video formats */
+#define CCDC_WIN_PAL     {0, 0, 720, 576}
+/* ntsc square pixel */
+#define CCDC_WIN_VGA    {0, 0, (640 + NUM_EXTRAPIXELS), (480 + NUM_EXTRALINES)}
+/* Structure for CCDC configuration parameters for raw capture mode */
+struct ccdc_params_raw {
+        /* pixel format */
+        enum ccdc_pixfmt pix_fmt;
+        /* progressive or interlaced frame */
+        enum ccdc_frmfmt frm_fmt;
+        /* video window */
+        struct v4l2_rect win;
+        /* field id polarity */
+        enum vpfe_pin_pol fid_pol;
+        /* vertical sync polarity */
+        enum vpfe_pin_pol vd_pol;
+        /* horizontal sync polarity */
+        enum vpfe_pin_pol hd_pol;
+        /* interleaved or separated fields */
+        enum ccdc_buftype buf_type;
+        /*
+         * enable to store the image in inverse
+         * order in memory(bottom to top)
+         */
+        unsigned char image_invert_enable;
+        /* configurable paramaters */
+        struct ccdc_config_params_raw config_params;
+};
+struct ccdc_params_ycbcr {
+        /* pixel format */
+        enum ccdc_pixfmt pix_fmt;
+        /* progressive or interlaced frame */
+        enum ccdc_frmfmt frm_fmt;
+        /* video window */
+        struct v4l2_rect win;
+        /* field id polarity */
+        enum vpfe_pin_pol fid_pol;
+        /* vertical sync polarity */
+        enum vpfe_pin_pol vd_pol;
+        /* horizontal sync polarity */
+        enum vpfe_pin_pol hd_pol;
+        /* enable BT.656 embedded sync mode */
+        int bt656_enable;
+        /* cb:y:cr:y or y:cb:y:cr in memory */
+        enum ccdc_pixorder pix_order;
+        /* interleaved or separated fields  */
+        enum ccdc_buftype buf_type;
+};
+#endif
+#endif                          /* _DM644X_CCDC_H */
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h
new file mode 100644
index 000000000000..71d8982e13ff
--- /dev/null
+++ b/include/media/davinci/vpfe_capture.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * 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 _VPFE_CAPTURE_H
+#define _VPFE_CAPTURE_H
+#ifdef __KERNEL__
+/* Header files */
+#include <media/v4l2-dev.h>
+#include <linux/videodev2.h>
+#include <linux/clk.h>
+#include <linux/i2c.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-device.h>
+#include <media/videobuf-dma-contig.h>
+#include <media/davinci/vpfe_types.h>
+#define VPFE_CAPTURE_NUM_DECODERS        5
+/* Macros */
+#define VPFE_MAJOR_RELEASE              0
+#define VPFE_MINOR_RELEASE              0
+#define VPFE_BUILD                      1
+#define VPFE_CAPTURE_VERSION_CODE       ((VPFE_MAJOR_RELEASE << 16) | \
+                                        (VPFE_MINOR_RELEASE << 8)  | \
+                                        VPFE_BUILD)
+#define CAPTURE_DRV_NAME                "vpfe-capture"
+struct vpfe_pixel_format {
+        struct v4l2_fmtdesc fmtdesc;
+        /* bytes per pixel */
+        int bpp;
+};
+struct vpfe_std_info {
+        int active_pixels;
+        int active_lines;
+        /* current frame format */
+        int frame_format;
+};
+struct vpfe_route {
+        u32 input;
+        u32 output;
+};
+struct vpfe_subdev_info {
+        /* Sub device name */
+        char name[32];
+        /* Sub device group id */
+        int grp_id;
+        /* Number of inputs supported */
+        int num_inputs;
+        /* inputs available at the sub device */
+        struct v4l2_input *inputs;
+        /* Sub dev routing information for each input */
+        struct vpfe_route *routes;
+        /* check if sub dev supports routing */
+        int can_route;
+        /* ccdc bus/interface configuration */
+        struct vpfe_hw_if_param ccdc_if_params;
+        /* i2c subdevice board info */
+        struct i2c_board_info board_info;
+};
+struct vpfe_config {
+        /* Number of sub devices connected to vpfe */
+        int num_subdevs;
+        /* information about each subdev */
+        struct vpfe_subdev_info *sub_devs;
+        /* evm card info */
+        char *card_name;
+        /* ccdc name */
+        char *ccdc;
+        /* vpfe clock */
+        struct clk *vpssclk;
+        struct clk *slaveclk;
+};
+struct vpfe_device {
+        /* V4l2 specific parameters */
+        /* Identifies video device for this channel */
+        struct video_device *video_dev;
+        /* sub devices */
+        struct v4l2_subdev **sd;
+        /* vpfe cfg */
+        struct vpfe_config *cfg;
+        /* V4l2 device */
+        struct v4l2_device v4l2_dev;
+        /* parent device */
+        struct device *pdev;
+        /* Used to keep track of state of the priority */
+        struct v4l2_prio_state prio;
+        /* number of open instances of the channel */
+        u32 usrs;
+        /* Indicates id of the field which is being displayed */
+        u32 field_id;
+        /* flag to indicate whether decoder is initialized */
+        u8 initialized;
+        /* current interface type */
+        struct vpfe_hw_if_param vpfe_if_params;
+        /* ptr to currently selected sub device */
+        struct vpfe_subdev_info *current_subdev;
+        /* current input at the sub device */
+        int current_input;
+        /* Keeps track of the information about the standard */
+        struct vpfe_std_info std_info;
+        /* std index into std table */
+        int std_index;
+        /* CCDC IRQs used when CCDC/ISIF output to SDRAM */
+        unsigned int ccdc_irq0;
+        unsigned int ccdc_irq1;
+        /* number of buffers in fbuffers */
+        u32 numbuffers;
+        /* List of buffer pointers for storing frames */
+        u8 *fbuffers[VIDEO_MAX_FRAME];
+        /* Pointer pointing to current v4l2_buffer */
+        struct videobuf_buffer *cur_frm;
+        /* Pointer pointing to next v4l2_buffer */
+        struct videobuf_buffer *next_frm;
+        /*
+         * This field keeps track of type of buffer exchange mechanism
+         * user has selected
+         */
+        enum v4l2_memory memory;
+        /* Used to store pixel format */
+        struct v4l2_format fmt;
+        /*
+         * used when IMP is chained to store the crop window which
+         * is different from the image window
+         */
+        struct v4l2_rect crop;
+        /* Buffer queue used in video-buf */
+        struct videobuf_queue buffer_queue;
+        /* Queue of filled frames */
+        struct list_head dma_queue;
+        /* Used in video-buf */
+        spinlock_t irqlock;
+        /* IRQ lock for DMA queue */
+        spinlock_t dma_queue_lock;
+        /* lock used to access this structure */
+        struct mutex lock;
+        /* number of users performing IO */
+        u32 io_usrs;
+        /* Indicates whether streaming started */
+        u8 started;
+        /*
+         * offset where second field starts from the starting of the
+         * buffer for field seperated YCbCr formats
+         */
+        u32 field_off;
+};
+/* File handle structure */
+struct vpfe_fh {
+        struct vpfe_device *vpfe_dev;
+        /* Indicates whether this file handle is doing IO */
+        u8 io_allowed;
+        /* Used to keep track priority of this instance */
+        enum v4l2_priority prio;
+};
+struct vpfe_config_params {
+        u8 min_numbuffers;
+        u8 numbuffers;
+        u32 min_bufsize;
+        u32 device_bufsize;
+};
+#endif                          /* End of __KERNEL__ */
+/**
+ * VPFE_CMD_S_CCDC_RAW_PARAMS - EXPERIMENTAL IOCTL to set raw capture params
+ * This can be used to configure modules such as defect pixel correction,
+ * color space conversion, culling etc. This is an experimental ioctl that
+ * will change in future kernels. So use this ioctl with care !
+ * TODO: This is to be split into multiple ioctls and also explore the
+ * possibility of extending the v4l2 api to include this
+ **/
+#define VPFE_CMD_S_CCDC_RAW_PARAMS _IOW('V', BASE_VIDIOC_PRIVATE + 1, \
+                                        void *)
+#endif                          /* _DAVINCI_VPFE_H */
diff --git a/include/media/davinci/vpfe_types.h b/include/media/davinci/vpfe_types.h
new file mode 100644
index 000000000000..76fb74bad08c
--- /dev/null
+++ b/include/media/davinci/vpfe_types.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * 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 _VPFE_TYPES_H
+#define _VPFE_TYPES_H
+#ifdef __KERNEL__
+enum vpfe_pin_pol {
+        VPFE_PINPOL_POSITIVE,
+        VPFE_PINPOL_NEGATIVE
+};
+enum vpfe_hw_if_type {
+        /* BT656 - 8 bit */
+        VPFE_BT656,
+        /* BT1120 - 16 bit */
+        VPFE_BT1120,
+        /* Raw Bayer */
+        VPFE_RAW_BAYER,
+        /* YCbCr - 8 bit with external sync */
+        VPFE_YCBCR_SYNC_8,
+        /* YCbCr - 16 bit with external sync */
+        VPFE_YCBCR_SYNC_16,
+        /* BT656 - 10 bit */
+        VPFE_BT656_10BIT
+};
+/* interface description */
+struct vpfe_hw_if_param {
+        enum vpfe_hw_if_type if_type;
+        enum vpfe_pin_pol hdpol;
+        enum vpfe_pin_pol vdpol;
+};
+#endif
+#endif
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
new file mode 100644
index 000000000000..fcdff745fae2
--- /dev/null
+++ b/include/media/davinci/vpss.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2009 Texas Instruments Inc
+ *
+ * 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
+ *
+ * vpss - video processing subsystem module header file.
+ *
+ * Include this header file if a driver needs to configure vpss system
+ * module. It exports a set of library functions  for video drivers to
+ * configure vpss system module functions such as clock enable/disable,
+ * vpss interrupt mux to arm, and other common vpss system module
+ * functions.
+ */
+#ifndef _VPSS_H
+#define _VPSS_H
+/* selector for ccdc input selection on DM355 */
+enum vpss_ccdc_source_sel {
+        VPSS_CCDCIN,
+        VPSS_HSSIIN
+};
+/* Used for enable/diable VPSS Clock */
+enum vpss_clock_sel {
+        /* DM355/DM365 */
+        VPSS_CCDC_CLOCK,
+        VPSS_IPIPE_CLOCK,
+        VPSS_H3A_CLOCK,
+        VPSS_CFALD_CLOCK,
+        /*
+         * When using VPSS_VENC_CLOCK_SEL in vpss_enable_clock() api
+         * following applies:-
+         * en = 0 selects ENC_CLK
+         * en = 1 selects ENC_CLK/2
+         */
+        VPSS_VENC_CLOCK_SEL,
+        VPSS_VPBE_CLOCK,
+};
+/* select input to ccdc on dm355 */
+int vpss_select_ccdc_source(enum vpss_ccdc_source_sel src_sel);
+/* enable/disable a vpss clock, 0 - success, -1 - failure */
+int vpss_enable_clock(enum vpss_clock_sel clock_sel, int en);
+/* wbl reset for dm644x */
+enum vpss_wbl_sel {
+        VPSS_PCR_AEW_WBL_0 = 16,
+        VPSS_PCR_AF_WBL_0,
+        VPSS_PCR_RSZ4_WBL_0,
+        VPSS_PCR_RSZ3_WBL_0,
+        VPSS_PCR_RSZ2_WBL_0,
+        VPSS_PCR_RSZ1_WBL_0,
+        VPSS_PCR_PREV_WBL_0,
+        VPSS_PCR_CCDC_WBL_O,
+};
+int vpss_clear_wbl_overflow(enum vpss_wbl_sel wbl_sel);
+#endif
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 23ecead35e7a..3d74e60032dd 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -16,24 +16,17 @@
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
+#include <media/v4l2-device.h>
 struct soc_camera_device {
        struct list_head list;
        struct device dev;
-        struct device *control;
+        struct device *pdev;            /* Platform device */
-        unsigned short width;           /* Current window */
+        s32 user_width;
-        unsigned short height;          /* sizes */
+        s32 user_height;
-        unsigned short x_min;           /* Camera capabilities */
-        unsigned short y_min;
-        unsigned short x_current;       /* Current window location */
-        unsigned short y_current;
        unsigned short width_min;
-        unsigned short width_max;
        unsigned short height_min;
-        unsigned short height_max;
        unsigned short y_skip_top;      /* Lines to skip at the top */
-        unsigned short gain;
-        unsigned short exposure;
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        unsigned char buswidth;         /* See comment in .c */
@@ -46,7 +39,6 @@ struct soc_camera_device {
        struct soc_camera_format_xlate *user_formats;
        int num_user_formats;
        enum v4l2_field field;          /* Preserve field over close() */
-        struct module *owner;
        void *host_priv;                /* Per-device host private data */
        /* soc_camera.c private count. Only accessed with .video_lock held */
        int use_count;
@@ -59,8 +51,8 @@ struct soc_camera_file {
 };
 struct soc_camera_host {
+        struct v4l2_device v4l2_dev;
        struct list_head list;
-        struct device *dev;
        unsigned char nr;                               /* Host number */
        void *priv;
        const char *drv_name;
@@ -73,9 +65,18 @@ struct soc_camera_host_ops {
        void (*remove)(struct soc_camera_device *);
        int (*suspend)(struct soc_camera_device *, pm_message_t);
        int (*resume)(struct soc_camera_device *);
+        /*
+         * .get_formats() is called for each client device format, but
+         * .put_formats() is only called once. Further, if any of the calls to
+         * .get_formats() fail, .put_formats() will not be called at all, the
+         * failing .get_formats() must then clean up internally.
+         */
        int (*get_formats)(struct soc_camera_device *, int,
                           struct soc_camera_format_xlate *);
-        int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
+        void (*put_formats)(struct soc_camera_device *);
+        int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
+        int (*get_crop)(struct soc_camera_device *, struct v4l2_crop *);
+        int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *);
        int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        void (*init_videobuf)(struct videobuf_queue *,
@@ -83,7 +84,11 @@ struct soc_camera_host_ops {
        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
        int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
        int (*set_bus_param)(struct soc_camera_device *, __u32);
+        int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *);
+        int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);
        unsigned int (*poll)(struct file *, poll_table *);
+        const struct v4l2_queryctrl *controls;
+        int num_controls;
 };
 #define SOCAM_SENSOR_INVERT_PCLK        (1 << 0)
@@ -102,6 +107,12 @@ struct soc_camera_link {
        int i2c_adapter_id;
        struct i2c_board_info *board_info;
        const char *module_name;
+        /*
+         * For non-I2C devices platform platform has to provide methods to
+         * add a device to the system and to remove
+         */
+        int (*add_device)(struct soc_camera_link *, struct device *);
+        void (*del_device)(struct soc_camera_link *);
        /* Optional callbacks to power on or off and reset the sensor */
        int (*power)(struct device *, int);
        int (*reset)(struct device *);
@@ -115,27 +126,45 @@ struct soc_camera_link {
        void (*free_bus)(struct soc_camera_link *);
 };
-static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev)
+static inline struct soc_camera_device *to_soc_camera_dev(
+        const struct device *dev)
 {
        return container_of(dev, struct soc_camera_device, dev);
 }
-static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
+static inline struct soc_camera_host *to_soc_camera_host(
+        const struct device *dev)
 {
-        return dev_get_drvdata(dev);
+        struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
+        return container_of(v4l2_dev, struct soc_camera_host, v4l2_dev);
 }
-extern int soc_camera_host_register(struct soc_camera_host *ici);
+static inline struct soc_camera_link *to_soc_camera_link(
-extern void soc_camera_host_unregister(struct soc_camera_host *ici);
+        const struct soc_camera_device *icd)
-extern int soc_camera_device_register(struct soc_camera_device *icd);
+{
-extern void soc_camera_device_unregister(struct soc_camera_device *icd);
+        return icd->dev.platform_data;
+}
-extern int soc_camera_video_start(struct soc_camera_device *icd);
+static inline struct device *to_soc_camera_control(
-extern void soc_camera_video_stop(struct soc_camera_device *icd);
+        const struct soc_camera_device *icd)
+{
+        return dev_get_drvdata(&icd->dev);
+}
-extern const struct soc_camera_data_format *soc_camera_format_by_fourcc(
+static inline struct v4l2_subdev *soc_camera_to_subdev(
+        const struct soc_camera_device *icd)
+{
+        struct device *control = to_soc_camera_control(icd);
+        return dev_get_drvdata(control);
+}
+int soc_camera_host_register(struct soc_camera_host *ici);
+void soc_camera_host_unregister(struct soc_camera_host *ici);
+const struct soc_camera_data_format *soc_camera_format_by_fourcc(
        struct soc_camera_device *icd, unsigned int fourcc);
-extern const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
+const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
        struct soc_camera_device *icd, unsigned int fourcc);
 struct soc_camera_data_format {
@@ -163,30 +192,11 @@ struct soc_camera_format_xlate {
 };
 struct soc_camera_ops {
-        struct module *owner;
-        int (*probe)(struct soc_camera_device *);
-        void (*remove)(struct soc_camera_device *);
        int (*suspend)(struct soc_camera_device *, pm_message_t state);
        int (*resume)(struct soc_camera_device *);
-        int (*init)(struct soc_camera_device *);
-        int (*release)(struct soc_camera_device *);
-        int (*start_capture)(struct soc_camera_device *);
-        int (*stop_capture)(struct soc_camera_device *);
-        int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *);
-        int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
-        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-        int (*get_chip_id)(struct soc_camera_device *,
-                           struct v4l2_dbg_chip_ident *);
-        int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
        int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        int (*get_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
-        int (*set_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
-#endif
-        int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
-        int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
        const struct v4l2_queryctrl *controls;
        int num_controls;
 };
@@ -268,6 +278,21 @@ static inline unsigned long soc_camera_bus_param_compatible(
                common_flags;
 }
+static inline void soc_camera_limit_side(unsigned int *start,
+                unsigned int *length, unsigned int start_min,
+                unsigned int length_min, unsigned int length_max)
+{
+        if (*length < length_min)
+                *length = length_min;
+        else if (*length > length_max)
+                *length = length_max;
+        if (*start < start_min)
+                *start = start_min;
+        else if (*start > start_min + length_max - *length)
+                *start = start_min + length_max - *length;
+}
 extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
                                                   unsigned long flags);
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index 1d092b4678aa..bb70401b8141 100644
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -12,15 +12,18 @@
 #define __SOC_CAMERA_H__
 #include <linux/videodev2.h>
+#include <media/soc_camera.h>
+struct device;
 struct soc_camera_platform_info {
-        int iface;
+        const char *format_name;
-        char *format_name;
        unsigned long format_depth;
        struct v4l2_pix_format format;
        unsigned long bus_param;
-        void (*power)(int);
+        struct device *dev;
        int (*set_capture)(struct soc_camera_platform_info *info, int enable);
+        struct soc_camera_link link;
 };
 #endif /* __SOC_CAMERA_H__ */
diff --git a/include/media/tuner.h b/include/media/tuner.h
index c146f2f530b0..4d5b53ff17db 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -127,6 +127,8 @@
 #define TUNER_PHILIPS_FM1216MK5         79
 #define TUNER_PHILIPS_FQ1216LME_MK3     80      /* Active loopthrough, no FM */
 #define TUNER_PARTSNIC_PTI_5NF05        81
+#define TUNER_PHILIPS_CU1216L           82
+#define TUNER_NXP_TDA18271              83
 /* tv card specific */
 #define TDA9887_PRESENT                 (1<<0)
diff --git a/include/media/tvp514x.h b/include/media/tvp514x.h
index 5e7ee968c6dc..74387e83f5b9 100644
--- a/include/media/tvp514x.h
+++ b/include/media/tvp514x.h
@@ -104,10 +104,6 @@ enum tvp514x_output {
 * @ vs_polarity: VSYNC Polarity configuration for current interface.
 */
 struct tvp514x_platform_data {
-        char *master;
-        int (*power_set) (enum v4l2_power on);
-        int (*ifparm) (struct v4l2_ifparm *p);
-        int (*priv_data_set) (void *);
        /* Interface control params */
        bool clk_polarity;
        bool hs_polarity;
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 94e908c0d7a0..cf16689adba7 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -135,6 +135,9 @@ enum {
        /* module adv7175: just ident 7175 */
        V4L2_IDENT_ADV7175 = 7175,
+        /* module adv7180: just ident 7180 */
+        V4L2_IDENT_ADV7180 = 7180,
        /* module saa7185: just ident 7185 */
        V4L2_IDENT_SAA7185 = 7185,
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 33a18426ab9b..1c25b10da34b 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -139,29 +139,23 @@ struct v4l2_subdev_ops;
 /* Load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
-                struct i2c_adapter *adapter,
-                const char *module_name, const char *client_type, u8 addr);
-/* Probe and load an i2c module and return an initialized v4l2_subdev struct.
-   Only call request_module if module_name != NULL.
-   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
-                const unsigned short *addrs);
+                int irq, void *platform_data,
-/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
+                u8 addr, const unsigned short *probe_addrs);
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
-                struct i2c_adapter *adapter,
-                const char *module_name, const char *client_type, u8 addr);
 /* Load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
+static inline struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
-                int irq, void *platform_data,
+                u8 addr, const unsigned short *probe_addrs)
-                u8 addr, const unsigned short *probe_addrs);
+{
+        return v4l2_i2c_new_subdev_cfg(v4l2_dev, adapter, module_name,
+                                client_type, 0, NULL, addr, probe_addrs);
+}
 struct i2c_board_info;
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 2058dd45e915..73c9867d744c 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -100,8 +100,10 @@ struct video_device
   Also note that vdev->minor is set to -1 if the registration failed. */
 int __must_check video_register_device(struct video_device *vdev, int type, int nr);
-int __must_check video_register_device_index(struct video_device *vdev,
-                                                int type, int nr, int index);
+/* Same as video_register_device, but no warning is issued if the desired
+   device node number was already in use. */
+int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr);
 /* Unregister video devices. Will do nothing if vdev == NULL or
   vdev->minor < 0. */
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 938858304300..c8f94e8db69c 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -482,7 +482,7 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id,
 *   message.
 * @cm_id: Connection identifier associated with the connection message.
 * @service_timeout: The lower 5-bits specify the maximum time required for
- *   the sender to reply to to the connection message.  The upper 3-bits
+ *   the sender to reply to the connection message.  The upper 3-bits
 *   specify additional control flags.
 * @private_data: Optional user-defined private data sent with the
 *   message receipt acknowledgement.
diff --git a/include/scsi/fc/fc_fc2.h b/include/scsi/fc/fc_fc2.h
index cff8a8c22f50..f87777d0d5bd 100644
--- a/include/scsi/fc/fc_fc2.h
+++ b/include/scsi/fc/fc_fc2.h
@@ -92,8 +92,7 @@ struct fc_esb {
        __u8    _esb_resvd[4];
        __u8    esb_service_params[112]; /* TBD */
        __u8    esb_seq_status[8];      /* sequence statuses, 8 bytes each */
-} __attribute__((packed));;
+} __attribute__((packed));
 /*
 * Define expected size for ASSERTs.
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 1493c541f9c4..eaf46bdd18a5 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -225,6 +225,169 @@ TRACE_EVENT(kmem_cache_free,
        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
 );
+TRACE_EVENT(mm_page_free_direct,
+        TP_PROTO(struct page *page, unsigned int order),
+        TP_ARGS(page, order),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page            )
+                __field(        unsigned int,   order           )
+        ),
+        TP_fast_assign(
+                __entry->page           = page;
+                __entry->order          = order;
+        ),
+        TP_printk("page=%p pfn=%lu order=%d",
+                        __entry->page,
+                        page_to_pfn(__entry->page),
+                        __entry->order)
+);
+TRACE_EVENT(mm_pagevec_free,
+        TP_PROTO(struct page *page, int cold),
+        TP_ARGS(page, cold),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page            )
+                __field(        int,            cold            )
+        ),
+        TP_fast_assign(
+                __entry->page           = page;
+                __entry->cold           = cold;
+        ),
+        TP_printk("page=%p pfn=%lu order=0 cold=%d",
+                        __entry->page,
+                        page_to_pfn(__entry->page),
+                        __entry->cold)
+);
+TRACE_EVENT(mm_page_alloc,
+        TP_PROTO(struct page *page, unsigned int order,
+                        gfp_t gfp_flags, int migratetype),
+        TP_ARGS(page, order, gfp_flags, migratetype),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page            )
+                __field(        unsigned int,   order           )
+                __field(        gfp_t,          gfp_flags       )
+                __field(        int,            migratetype     )
+        ),
+        TP_fast_assign(
+                __entry->page           = page;
+                __entry->order          = order;
+                __entry->gfp_flags      = gfp_flags;
+                __entry->migratetype    = migratetype;
+        ),
+        TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
+                __entry->page,
+                page_to_pfn(__entry->page),
+                __entry->order,
+                __entry->migratetype,
+                show_gfp_flags(__entry->gfp_flags))
+);
+TRACE_EVENT(mm_page_alloc_zone_locked,
+        TP_PROTO(struct page *page, unsigned int order, int migratetype),
+        TP_ARGS(page, order, migratetype),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page            )
+                __field(        unsigned int,   order           )
+                __field(        int,            migratetype     )
+        ),
+        TP_fast_assign(
+                __entry->page           = page;
+                __entry->order          = order;
+                __entry->migratetype    = migratetype;
+        ),
+        TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
+                __entry->page,
+                page_to_pfn(__entry->page),
+                __entry->order,
+                __entry->migratetype,
+                __entry->order == 0)
+);
+TRACE_EVENT(mm_page_pcpu_drain,
+        TP_PROTO(struct page *page, int order, int migratetype),
+        TP_ARGS(page, order, migratetype),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page            )
+                __field(        int,            order           )
+                __field(        int,            migratetype     )
+        ),
+        TP_fast_assign(
+                __entry->page           = page;
+                __entry->order          = order;
+                __entry->migratetype    = migratetype;
+        ),
+        TP_printk("page=%p pfn=%lu order=%d migratetype=%d",
+                __entry->page,
+                page_to_pfn(__entry->page),
+                __entry->order,
+                __entry->migratetype)
+);
+TRACE_EVENT(mm_page_alloc_extfrag,
+        TP_PROTO(struct page *page,
+                        int alloc_order, int fallback_order,
+                        int alloc_migratetype, int fallback_migratetype),
+        TP_ARGS(page,
+                alloc_order, fallback_order,
+                alloc_migratetype, fallback_migratetype),
+        TP_STRUCT__entry(
+                __field(        struct page *,  page                    )
+                __field(        int,            alloc_order             )
+                __field(        int,            fallback_order          )
+                __field(        int,            alloc_migratetype       )
+                __field(        int,            fallback_migratetype    )
+        ),
+        TP_fast_assign(
+                __entry->page                   = page;
+                __entry->alloc_order            = alloc_order;
+                __entry->fallback_order         = fallback_order;
+                __entry->alloc_migratetype      = alloc_migratetype;
+                __entry->fallback_migratetype   = fallback_migratetype;
+        ),
+        TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
+                __entry->page,
+                page_to_pfn(__entry->page),
+                __entry->alloc_order,
+                __entry->fallback_order,
+                pageblock_order,
+                __entry->alloc_migratetype,
+                __entry->fallback_migratetype,
+                __entry->fallback_order < pageblock_order,
+                __entry->alloc_migratetype == __entry->fallback_migratetype)
+);
 #endif /* _TRACE_KMEM_H */
 /* This part must be outside protection */
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
new file mode 100644
index 000000000000..ea6d579261ad
--- /dev/null
+++ b/include/trace/events/power.h
@@ -0,0 +1,81 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM power
+#if !defined(_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_POWER_H
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+#ifndef _TRACE_POWER_ENUM_
+#define _TRACE_POWER_ENUM_
+enum {
+        POWER_NONE = 0,
+        POWER_CSTATE = 1,
+        POWER_PSTATE = 2,
+};
+#endif
+TRACE_EVENT(power_start,
+        TP_PROTO(unsigned int type, unsigned int state),
+        TP_ARGS(type, state),
+        TP_STRUCT__entry(
+                __field(        u64,            type            )
+                __field(        u64,            state           )
+        ),
+        TP_fast_assign(
+                __entry->type = type;
+                __entry->state = state;
+        ),
+        TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
+);
+TRACE_EVENT(power_end,
+        TP_PROTO(int dummy),
+        TP_ARGS(dummy),
+        TP_STRUCT__entry(
+                __field(        u64,            dummy           )
+        ),
+        TP_fast_assign(
+                __entry->dummy = 0xffff;
+        ),
+        TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+);
+TRACE_EVENT(power_frequency,
+        TP_PROTO(unsigned int type, unsigned int state),
+        TP_ARGS(type, state),
+        TP_STRUCT__entry(
+                __field(        u64,            type            )
+                __field(        u64,            state           )
+        ),
+        TP_fast_assign(
+                __entry->type = type;
+                __entry->state = state;
+        ),
+        TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long) __entry->state)
+);
+#endif /* _TRACE_POWER_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index b48f1ad7c946..4069c43f4187 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -380,6 +380,39 @@ TRACE_EVENT(sched_stat_wait,
 );
 /*
+ * Tracepoint for accounting runtime (time the task is executing
+ * on a CPU).
+ */
+TRACE_EVENT(sched_stat_runtime,
+        TP_PROTO(struct task_struct *tsk, u64 runtime, u64 vruntime),
+        TP_ARGS(tsk, runtime, vruntime),
+        TP_STRUCT__entry(
+                __array( char,  comm,   TASK_COMM_LEN   )
+                __field( pid_t, pid                     )
+                __field( u64,   runtime                 )
+                __field( u64,   vruntime                        )
+        ),
+        TP_fast_assign(
+                memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
+                __entry->pid            = tsk->pid;
+                __entry->runtime        = runtime;
+                __entry->vruntime       = vruntime;
+        )
+        TP_perf_assign(
+                __perf_count(runtime);
+        ),
+        TP_printk("task: %s:%d runtime: %Lu [ns], vruntime: %Lu [ns]",
+                        __entry->comm, __entry->pid,
+                        (unsigned long long)__entry->runtime,
+                        (unsigned long long)__entry->vruntime)
+);
+/*
 * Tracepoint for accounting sleep time (time the task is not runnable,
 * including iowait, see below).
 */
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 72a3b437b829..cc0d9667e182 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -378,24 +378,18 @@ static inline int ftrace_get_offsets_##call(				\
 #ifdef CONFIG_EVENT_PROFILE
 /*
- * Generate the functions needed for tracepoint perf_counter support.
+ * Generate the functions needed for tracepoint perf_event support.
 *
 * NOTE: The insertion profile callback (ftrace_profile_<call>) is defined later
 *
- * static int ftrace_profile_enable_<call>(struct ftrace_event_call *event_call)
+ * static int ftrace_profile_enable_<call>(void)
 * {
- *      int ret = 0;
+ *      return register_trace_<call>(ftrace_profile_<call>);
- *
- *      if (!atomic_inc_return(&event_call->profile_count))
- *              ret = register_trace_<call>(ftrace_profile_<call>);
- *
- *      return ret;
 * }
 *
- * static void ftrace_profile_disable_<call>(struct ftrace_event_call *event_call)
+ * static void ftrace_profile_disable_<call>(void)
 * {
- *      if (atomic_add_negative(-1, &event->call->profile_count))
+ *      unregister_trace_<call>(ftrace_profile_<call>);
- *              unregister_trace_<call>(ftrace_profile_<call>);
 * }
 *
 */
@@ -405,20 +399,14 @@ static inline int ftrace_get_offsets_##call(				\
                                                                        \
 static void ftrace_profile_##call(proto);                               \
                                                                        \
-static int ftrace_profile_enable_##call(struct ftrace_event_call *event_call) \
+static int ftrace_profile_enable_##call(void)                           \
 {                                                                       \
-        int ret = 0;                                                    \
+        return register_trace_##call(ftrace_profile_##call);            \
-                                                                        \
-        if (!atomic_inc_return(&event_call->profile_count))             \
-                ret = register_trace_##call(ftrace_profile_##call);     \
-                                                                        \
-        return ret;                                                     \
 }                                                                       \
                                                                        \
-static void ftrace_profile_disable_##call(struct ftrace_event_call *event_call)\
+static void ftrace_profile_disable_##call(void)                         \
 {                                                                       \
-        if (atomic_add_negative(-1, &event_call->profile_count))        \
+        unregister_trace_##call(ftrace_profile_##call);                 \
-                unregister_trace_##call(ftrace_profile_##call);         \
 }
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
@@ -656,15 +644,16 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 * {
 *      struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
 *      struct ftrace_event_call *event_call = &event_<call>;
- *      extern void perf_tpcounter_event(int, u64, u64, void *, int);
+ *      extern void perf_tp_event(int, u64, u64, void *, int);
 *      struct ftrace_raw_##call *entry;
 *      u64 __addr = 0, __count = 1;
 *      unsigned long irq_flags;
+ *      struct trace_entry *ent;
 *      int __entry_size;
 *      int __data_size;
+ *      int __cpu
 *      int pc;
 *
- *      local_save_flags(irq_flags);
 *      pc = preempt_count();
 *
 *      __data_size = ftrace_get_offsets_<call>(&__data_offsets, args);
@@ -675,25 +664,34 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 *                           sizeof(u64));
 *      __entry_size -= sizeof(u32);
 *
- *      do {
+ *      // Protect the non nmi buffer
- *              char raw_data[__entry_size]; <- allocate our sample in the stack
+ *      // This also protects the rcu read side
- *              struct trace_entry *ent;
+ *      local_irq_save(irq_flags);
+ *      __cpu = smp_processor_id();
+ *
+ *      if (in_nmi())
+ *              raw_data = rcu_dereference(trace_profile_buf_nmi);
+ *      else
+ *              raw_data = rcu_dereference(trace_profile_buf);
+ *
+ *      if (!raw_data)
+ *              goto end;
 *
- *              zero dead bytes from alignment to avoid stack leak to userspace:
+ *      raw_data = per_cpu_ptr(raw_data, __cpu);
 *
- *              *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
+ *      //zero dead bytes from alignment to avoid stack leak to userspace:
- *              entry = (struct ftrace_raw_<call> *)raw_data;
+ *      *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
- *              ent = &entry->ent;
+ *      entry = (struct ftrace_raw_<call> *)raw_data;
- *              tracing_generic_entry_update(ent, irq_flags, pc);
+ *      ent = &entry->ent;
- *              ent->type = event_call->id;
+ *      tracing_generic_entry_update(ent, irq_flags, pc);
+ *      ent->type = event_call->id;
 *
- *              <tstruct> <- do some jobs with dynamic arrays
+ *      <tstruct> <- do some jobs with dynamic arrays
 *
- *              <assign>  <- affect our values
+ *      <assign>  <- affect our values
 *
- *              perf_tpcounter_event(event_call->id, __addr, __count, entry,
+ *      perf_tp_event(event_call->id, __addr, __count, entry,
- *                           __entry_size);  <- submit them to perf counter
+ *                   __entry_size);  <- submit them to perf counter
- *      } while (0);
 *
 * }
 */
@@ -712,15 +710,17 @@ static void ftrace_profile_##call(proto)				\
 {                                                                       \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
        struct ftrace_event_call *event_call = &event_##call;           \
-        extern void perf_tpcounter_event(int, u64, u64, void *, int);   \
+        extern void perf_tp_event(int, u64, u64, void *, int);  \
        struct ftrace_raw_##call *entry;                                \
        u64 __addr = 0, __count = 1;                                    \
        unsigned long irq_flags;                                        \
+        struct trace_entry *ent;                                        \
        int __entry_size;                                               \
        int __data_size;                                                \
+        char *raw_data;                                                 \
+        int __cpu;                                                      \
        int pc;                                                         \
                                                                        \
-        local_save_flags(irq_flags);                                    \
        pc = preempt_count();                                           \
                                                                        \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
@@ -728,23 +728,38 @@ static void ftrace_profile_##call(proto)				\
                             sizeof(u64));                              \
        __entry_size -= sizeof(u32);                                    \
                                                                        \
-        do {                                                            \
+        if (WARN_ONCE(__entry_size > FTRACE_MAX_PROFILE_SIZE,           \
-                char raw_data[__entry_size];                            \
+                      "profile buffer not large enough"))               \
-                struct trace_entry *ent;                                \
+                return;                                                 \
+                                                                        \
+        local_irq_save(irq_flags);                                      \
+        __cpu = smp_processor_id();                                     \
                                                                        \
-                *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL; \
+        if (in_nmi())                                                   \
-                entry = (struct ftrace_raw_##call *)raw_data;           \
+                raw_data = rcu_dereference(trace_profile_buf_nmi);              \
-                ent = &entry->ent;                                      \
+        else                                                            \
-                tracing_generic_entry_update(ent, irq_flags, pc);       \
+                raw_data = rcu_dereference(trace_profile_buf);          \
-                ent->type = event_call->id;                             \
                                                                        \
-                tstruct                                                 \
+        if (!raw_data)                                                  \
+                goto end;                                               \
                                                                        \
-                { assign; }                                             \
+        raw_data = per_cpu_ptr(raw_data, __cpu);                        \
                                                                        \
-                perf_tpcounter_event(event_call->id, __addr, __count, entry,\
+        *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;         \
+        entry = (struct ftrace_raw_##call *)raw_data;                   \
+        ent = &entry->ent;                                              \
+        tracing_generic_entry_update(ent, irq_flags, pc);               \
+        ent->type = event_call->id;                                     \
+                                                                        \
+        tstruct                                                         \
+                                                                        \
+        { assign; }                                                     \
+                                                                        \
+        perf_tp_event(event_call->id, __addr, __count, entry,           \
                             __entry_size);                             \
-        } while (0);                                                    \
+                                                                        \
+end:                                                                    \
+        local_irq_restore(irq_flags);                                   \
                                                                        \
 }
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
new file mode 100644
index 000000000000..c051a50ed528
--- /dev/null
+++ b/include/video/da8xx-fb.h
@@ -0,0 +1,103 @@
+/*
+ * Header file for TI DA8XX LCD controller platform data.
+ *
+ * Copyright (C) 2008-2009 MontaVista Software Inc.
+ * Copyright (C) 2008-2009 Texas Instruments Inc
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef DA8XX_FB_H
+#define DA8XX_FB_H
+enum panel_type {
+        QVGA = 0
+};
+enum panel_shade {
+        MONOCHROME = 0,
+        COLOR_ACTIVE,
+        COLOR_PASSIVE,
+};
+enum raster_load_mode {
+        LOAD_DATA = 1,
+        LOAD_PALETTE,
+};
+struct display_panel {
+        enum panel_type panel_type; /* QVGA */
+        int max_bpp;
+        int min_bpp;
+        enum panel_shade panel_shade;
+};
+struct da8xx_lcdc_platform_data {
+        const char manu_name[10];
+        void *controller_data;
+        const char type[25];
+};
+struct lcd_ctrl_config {
+        const struct display_panel *p_disp_panel;
+        /* AC Bias Pin Frequency */
+        int ac_bias;
+        /* AC Bias Pin Transitions per Interrupt */
+        int ac_bias_intrpt;
+        /* DMA burst size */
+        int dma_burst_sz;
+        /* Bits per pixel */
+        int bpp;
+        /* FIFO DMA Request Delay */
+        int fdd;
+        /* TFT Alternative Signal Mapping (Only for active) */
+        unsigned char tft_alt_mode;
+        /* 12 Bit Per Pixel (5-6-5) Mode (Only for passive) */
+        unsigned char stn_565_mode;
+        /* Mono 8-bit Mode: 1=D0-D7 or 0=D0-D3 */
+        unsigned char mono_8bit_mode;
+        /* Invert line clock */
+        unsigned char invert_line_clock;
+        /* Invert frame clock  */
+        unsigned char invert_frm_clock;
+        /* Horizontal and Vertical Sync Edge: 0=rising 1=falling */
+        unsigned char sync_edge;
+        /* Horizontal and Vertical Sync: Control: 0=ignore */
+        unsigned char sync_ctrl;
+        /* Raster Data Order Select: 1=Most-to-least 0=Least-to-most */
+        unsigned char raster_order;
+};
+struct lcd_sync_arg {
+        int back_porch;
+        int front_porch;
+        int pulse_width;
+};
+/* ioctls */
+#define FBIOGET_CONTRAST        _IOR('F', 1, int)
+#define FBIOPUT_CONTRAST        _IOW('F', 2, int)
+#define FBIGET_BRIGHTNESS       _IOR('F', 3, int)
+#define FBIPUT_BRIGHTNESS       _IOW('F', 3, int)
+#define FBIGET_COLOR            _IOR('F', 5, int)
+#define FBIPUT_COLOR            _IOW('F', 6, int)
+#define FBIPUT_HSYNC            _IOW('F', 9, int)
+#define FBIPUT_VSYNC            _IOW('F', 10, int)
+#endif  /* ifndef DA8XX_FB_H */