151 files changed, 2638 insertions, 419 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 2ce1be9f6291..f72403c4b51a 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -59,7 +59,7 @@
 #include <linux/ctype.h>
 #include <linux/sched.h>
 #include <asm/system.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/div64.h>
 #include <asm/acpi.h>
 #include <linux/slab.h>
diff --git a/include/acpi/video.h b/include/acpi/video.h
index 0e98e679d3a7..61109f2609fc 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -5,6 +5,8 @@
 struct acpi_device;
+#define ACPI_VIDEO_CLASS        "video"
 #define ACPI_VIDEO_DISPLAY_CRT  1
 #define ACPI_VIDEO_DISPLAY_TV   2
 #define ACPI_VIDEO_DISPLAY_DVI  3
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index e994197f84b7..e37963c1df4d 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -1,5 +1,7 @@
 /*
- * Generic C implementation of atomic counter operations
+ * Generic C implementation of atomic counter operations. Usable on
+ * UP systems only. Do not include in machine independent code.
+ *
 * Originally implemented for MN10300.
 *
 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
@@ -14,7 +16,11 @@
 #define __ASM_GENERIC_ATOMIC_H
 #ifdef CONFIG_SMP
-#error not SMP safe
+/* Force people to define core atomics */
+# if !defined(atomic_add_return) || !defined(atomic_sub_return) || \
+     !defined(atomic_clear_mask) || !defined(atomic_set_mask)
+#  error "SMP requires a little arch-specific magic"
+# endif
 #endif
 /*
@@ -32,7 +38,9 @@
 *
 * Atomically reads the value of @v.
 */
+#ifndef atomic_read
 #define atomic_read(v)  (*(volatile int *)&(v)->counter)
+#endif
 /**
 * atomic_set - set atomic variable
@@ -53,6 +61,7 @@
 *
 * Atomically adds @i to @v and returns the result
 */
+#ifndef atomic_add_return
 static inline int atomic_add_return(int i, atomic_t *v)
 {
        unsigned long flags;
@@ -66,6 +75,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
        return temp;
 }
+#endif
 /**
 * atomic_sub_return - subtract integer from atomic variable
@@ -74,6 +84,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
 *
 * Atomically subtracts @i from @v and returns the result
 */
+#ifndef atomic_sub_return
 static inline int atomic_sub_return(int i, atomic_t *v)
 {
        unsigned long flags;
@@ -87,6 +98,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
        return temp;
 }
+#endif
 static inline int atomic_add_negative(int i, atomic_t *v)
 {
@@ -117,8 +129,8 @@ static inline void atomic_dec(atomic_t *v)
 #define atomic_inc_return(v)            atomic_add_return(1, (v))
 #define atomic_sub_and_test(i, v)       (atomic_sub_return((i), (v)) == 0)
-#define atomic_dec_and_test(v)          (atomic_sub_return(1, (v)) == 0)
+#define atomic_dec_and_test(v)          (atomic_dec_return(v) == 0)
-#define atomic_inc_and_test(v)          (atomic_add_return(1, (v)) == 0)
+#define atomic_inc_and_test(v)          (atomic_inc_return(v) == 0)
 #define atomic_xchg(ptr, v)             (xchg(&(ptr)->counter, (v)))
 #define atomic_cmpxchg(v, old, new)     (cmpxchg(&((v)->counter), (old), (new)))
@@ -129,26 +141,51 @@ static inline void atomic_dec(atomic_t *v)
 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-static inline int atomic_add_unless(atomic_t *v, int a, int u)
+static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 {
  int c, old;
  c = atomic_read(v);
  while (c != u && (old = atomic_cmpxchg(v, c, c + a)) != c)
    c = old;
-  return c != u;
+  return c;
 }
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+/**
+ * atomic_clear_mask - Atomically clear bits in atomic variable
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
+ * @mask: Mask of the bits to be cleared
+ * @v: pointer of type atomic_t
+ *
+ * Atomically clears the bits set in @mask from @v
+ */
+#ifndef atomic_clear_mask
+static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
 {
        unsigned long flags;
        mask = ~mask;
        raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
-        *addr &= mask;
+        v->counter &= mask;
        raw_local_irq_restore(flags);
 }
+#endif
+/**
+ * atomic_set_mask - Atomically set bits in atomic variable
+ * @mask: Mask of the bits to be set
+ * @v: pointer of type atomic_t
+ *
+ * Atomically sets the bits set in @mask in @v
+ */
+#ifndef atomic_set_mask
+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
+{
+        unsigned long flags;
+        raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
+        v->counter |= mask;
+        raw_local_irq_restore(flags);
+}
+#endif
 /* Assume that atomic operations are already serializing */
 #define smp_mb__before_atomic_dec()     barrier()
@@ -156,7 +193,5 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
-#include <asm-generic/atomic-long.h>
 #endif /* __KERNEL__ */
 #endif /* __ASM_GENERIC_ATOMIC_H */
diff --git a/include/asm-generic/bitops/ext2-atomic-setbit.h b/include/asm-generic/bitops/ext2-atomic-setbit.h
new file mode 100644
index 000000000000..5a0997857b34
--- /dev/null
+++ b/include/asm-generic/bitops/ext2-atomic-setbit.h
@@ -0,0 +1,11 @@
+#ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
+#define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
+/*
+ * Atomic bitops based version of ext2 atomic bitops
+ */
+#define ext2_set_bit_atomic(l, nr, addr)        test_and_set_bit_le(nr, addr)
+#define ext2_clear_bit_atomic(l, nr, addr)      test_and_clear_bit_le(nr, addr)
+#endif /* _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_ */
diff --git a/include/asm-generic/bitops/ext2-atomic.h b/include/asm-generic/bitops/ext2-atomic.h
index ecf1c9d8a7cc..87f0f109d7f1 100644
--- a/include/asm-generic/bitops/ext2-atomic.h
+++ b/include/asm-generic/bitops/ext2-atomic.h
@@ -1,6 +1,10 @@
 #ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
 #define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
+/*
+ * Spinlock based version of ext2 atomic bitops
+ */
 #define ext2_set_bit_atomic(lock, nr, addr)             \
        ({                                              \
                int ret;                                \
diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
index c8a5d68541d7..9ceb03b4f466 100644
--- a/include/asm-generic/local.h
+++ b/include/asm-generic/local.h
@@ -2,7 +2,7 @@
 #define _ASM_GENERIC_LOCAL_H
 #include <linux/percpu.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/types.h>
 /*
diff --git a/include/asm-generic/local64.h b/include/asm-generic/local64.h
index 02ac760c1a8b..5980002b8b7b 100644
--- a/include/asm-generic/local64.h
+++ b/include/asm-generic/local64.h
@@ -55,7 +55,7 @@ typedef struct {
 #else /* BITS_PER_LONG != 64 */
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /* Don't use typedef: don't want them to be mixed with atomic_t's. */
 typedef struct {
diff --git a/include/asm-generic/pci-bridge.h b/include/asm-generic/pci-bridge.h
new file mode 100644
index 000000000000..4a5aca2a2c94
--- /dev/null
+++ b/include/asm-generic/pci-bridge.h
@@ -0,0 +1,62 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _ASM_GENERIC_PCI_BRIDGE_H
+#define _ASM_GENERIC_PCI_BRIDGE_H
+#ifdef __KERNEL__
+enum {
+        /* Force re-assigning all resources (ignore firmware
+         * setup completely)
+         */
+        PCI_REASSIGN_ALL_RSRC   = 0x00000001,
+        /* Re-assign all bus numbers */
+        PCI_REASSIGN_ALL_BUS    = 0x00000002,
+        /* Do not try to assign, just use existing setup */
+        PCI_PROBE_ONLY          = 0x00000004,
+        /* Don't bother with ISA alignment unless the bridge has
+         * ISA forwarding enabled
+         */
+        PCI_CAN_SKIP_ISA_ALIGN  = 0x00000008,
+        /* Enable domain numbers in /proc */
+        PCI_ENABLE_PROC_DOMAINS = 0x00000010,
+        /* ... except for domain 0 */
+        PCI_COMPAT_DOMAIN_0     = 0x00000020,
+};
+#ifdef CONFIG_PCI
+extern unsigned int pci_flags;
+static inline void pci_set_flags(int flags)
+{
+        pci_flags = flags;
+}
+static inline void pci_add_flags(int flags)
+{
+        pci_flags |= flags;
+}
+static inline int pci_has_flag(int flag)
+{
+        return pci_flags & flag;
+}
+#else
+static inline void pci_set_flags(int flags) { }
+static inline void pci_add_flags(int flags) { }
+static inline int pci_has_flag(int flag)
+{
+        return 0;
+}
+#endif  /* CONFIG_PCI */
+#endif  /* __KERNEL__ */
+#endif  /* _ASM_GENERIC_PCI_BRIDGE_H */
diff --git a/include/asm-generic/system.h b/include/asm-generic/system.h
index 4b0b9cbbfae5..215efa74f5a2 100644
--- a/include/asm-generic/system.h
+++ b/include/asm-generic/system.h
@@ -14,7 +14,6 @@
 #ifndef __ASM_GENERIC_SYSTEM_H
 #define __ASM_GENERIC_SYSTEM_H
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
@@ -139,5 +138,4 @@ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 #endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* __ASM_GENERIC_SYSTEM_H */
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 738b3a5faa12..9b7c2bb4bb44 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -886,6 +886,8 @@ struct drm_driver {
         */
        int (*gem_init_object) (struct drm_gem_object *obj);
        void (*gem_free_object) (struct drm_gem_object *obj);
+        int (*gem_open_object) (struct drm_gem_object *, struct drm_file *);
+        void (*gem_close_object) (struct drm_gem_object *, struct drm_file *);
        /* vga arb irq handler */
        void (*vgaarb_irq)(struct drm_device *dev, bool state);
@@ -1539,6 +1541,8 @@ struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev,
                                            size_t size);
 int drm_gem_object_init(struct drm_device *dev,
                        struct drm_gem_object *obj, size_t size);
+int drm_gem_private_object_init(struct drm_device *dev,
+                        struct drm_gem_object *obj, size_t size);
 void drm_gem_object_handle_free(struct drm_gem_object *obj);
 void drm_gem_vm_open(struct vm_area_struct *vma);
 void drm_gem_vm_close(struct vm_area_struct *vma);
@@ -1672,13 +1676,6 @@ static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
        return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
 }
-static __inline__ int drm_pci_device_is_pcie(struct drm_device *dev)
-{
-        return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
-}
 extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
 extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
 extern int drm_get_pci_dev(struct pci_dev *pdev,
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 787f7b6fd622..b65be6054a18 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -911,6 +911,7 @@ struct drm_radeon_cs {
 #define RADEON_INFO_NUM_BACKENDS        0x0a /* DB/backends for r600+ - need for OQ */
 #define RADEON_INFO_NUM_TILE_PIPES      0x0b /* tile pipes for r600+ */
 #define RADEON_INFO_FUSION_GART_WORKING 0x0c /* fusion writes to GTT were broken before this */
+#define RADEON_INFO_BACKEND_MAP         0x0d /* pipe to backend map, needed by mesa */
 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 62a0e4c4ceee..42e346985186 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -662,9 +662,6 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page,
 extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);
-#if 0
-#endif
 /**
 * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object.
 *
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 09af2d746d1c..94eb1434316e 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -78,7 +78,7 @@ struct ttm_backend_func {
         *
         * Bind the backend pages into the aperture in the location
         * indicated by @bo_mem. This function should be able to handle
-         * differences between aperture- and system page sizes.
+         * differences between aperture and system page sizes.
         */
        int (*bind) (struct ttm_backend *backend, struct ttm_mem_reg *bo_mem);
@@ -88,7 +88,7 @@ struct ttm_backend_func {
         * @backend: Pointer to a struct ttm_backend.
         *
         * Unbind previously bound backend pages. This function should be
-         * able to handle differences between aperture- and system page sizes.
+         * able to handle differences between aperture and system page sizes.
         */
        int (*unbind) (struct ttm_backend *backend);
@@ -786,7 +786,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev);
 * ttm_bo_device_init
 *
 * @bdev: A pointer to a struct ttm_bo_device to initialize.
- * @mem_global: A pointer to an initialized struct ttm_mem_global.
+ * @glob: A pointer to an initialized struct ttm_bo_global.
 * @driver: A pointer to a struct ttm_bo_driver set up by the caller.
 * @file_page_offset: Offset into the device address space that is available
 * for buffer data. This ensures compatibility with other users of the
diff --git a/include/drm/ttm/ttm_lock.h b/include/drm/ttm/ttm_lock.h
index 81ba0b0b891a..2e7f0c941b5d 100644
--- a/include/drm/ttm/ttm_lock.h
+++ b/include/drm/ttm/ttm_lock.h
@@ -51,7 +51,7 @@
 #include "ttm/ttm_object.h"
 #include <linux/wait.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /**
 * struct ttm_lock
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index b199170b3c2c..26c1f78d136f 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -41,7 +41,7 @@
 * @do_shrink: The callback function.
 *
 * Arguments to the do_shrink functions are intended to be passed using
- * inheritance. That is, the argument class derives from struct ttm_mem_srink,
+ * inheritance. That is, the argument class derives from struct ttm_mem_shrink,
 * and can be accessed using container_of().
 */
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h
index 0d9db099978b..e46054e5255b 100644
--- a/include/drm/ttm/ttm_object.h
+++ b/include/drm/ttm/ttm_object.h
@@ -111,7 +111,7 @@ struct ttm_object_device;
 *
 * @ref_obj_release: A function to be called when a reference object
 * with another ttm_ref_type than TTM_REF_USAGE is deleted.
- * this function may, for example, release a lock held by a user-space
+ * This function may, for example, release a lock held by a user-space
 * process.
 *
 * This struct is intended to be used as a base struct for objects that
@@ -172,7 +172,7 @@ extern struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file
 /**
 * ttm_base_object_unref
 *
- * @p_base: Pointer to a pointer referncing a struct ttm_base_object.
+ * @p_base: Pointer to a pointer referencing a struct ttm_base_object.
 *
 * Decrements the base object refcount and clears the pointer pointed to by
 * p_base.
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 8062890f725e..129de12353f1 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -32,7 +32,7 @@
 /**
 * Get count number of pages from pool to pages list.
 *
- * @pages: heado of empty linked list where pages are filled.
+ * @pages: head of empty linked list where pages are filled.
 * @flags: ttm flags for page allocation.
 * @cstate: ttm caching state for the page.
 * @count: number of pages to allocate.
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 01f636275057..619b5657af77 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -135,6 +135,7 @@ header-y += firewire-cdev.h
 header-y += firewire-constants.h
 header-y += flat.h
 header-y += fs.h
+header-y += fsl_hypervisor.h
 header-y += fuse.h
 header-y += futex.h
 header-y += gameport.h
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 7a8db4155281..2dcb72bff4b6 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -7,7 +7,7 @@
 #include <linux/uio.h>
 #include <linux/rcupdate.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define AIO_MAXSEGS             4
 #define AIO_KIOGRP_NR_ATOMIC    8
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 381f4cec8260..49a83ca900ba 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -220,7 +220,7 @@ struct atm_cirange {
 #include <linux/skbuff.h> /* struct sk_buff */
 #include <linux/uio.h>
 #include <net/sock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
diff --git a/include/linux/atomic.h b/include/linux/atomic.h
index bc6615d4132b..42b77b5446d2 100644
--- a/include/linux/atomic.h
+++ b/include/linux/atomic.h
@@ -1,8 +1,32 @@
+/* Atomic operations usable in machine independent code */
 #ifndef _LINUX_ATOMIC_H
 #define _LINUX_ATOMIC_H
 #include <asm/atomic.h>
 /**
+ * atomic_add_unless - add unless the number is already a given value
+ * @v: pointer of type atomic_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * Atomically adds @a to @v, so long as @v was not already @u.
+ * Returns non-zero if @v was not @u, and zero otherwise.
+ */
+static inline int atomic_add_unless(atomic_t *v, int a, int u)
+{
+        return __atomic_add_unless(v, a, u) != u;
+}
+/**
+ * atomic_inc_not_zero - increment unless the number is zero
+ * @v: pointer of type atomic_t
+ *
+ * Atomically increments @v by 1, so long as @v is non-zero.
+ * Returns non-zero if @v was non-zero, and zero otherwise.
+ */
+#define atomic_inc_not_zero(v)          atomic_add_unless((v), 1, 0)
+/**
 * atomic_inc_not_zero_hint - increment if not null
 * @v: pointer of type atomic_t
 * @hint: probable value of the atomic before the increment
@@ -73,4 +97,8 @@ static inline void atomic_or(int i, atomic_t *v)
 }
 #endif /* #ifndef CONFIG_ARCH_HAS_ATOMIC_OR */
+#include <asm-generic/atomic-long.h>
+#ifdef CONFIG_GENERIC_ATOMIC64
+#include <asm-generic/atomic64.h>
+#endif
 #endif /* _LINUX_ATOMIC_H */
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 96f4094b706d..3b2f9cb82986 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -16,7 +16,7 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/writeback.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct page;
 struct device;
@@ -40,6 +40,7 @@ typedef int (congested_fn)(void *, int);
 enum bdi_stat_item {
        BDI_RECLAIMABLE,
        BDI_WRITEBACK,
+        BDI_WRITTEN,
        NR_BDI_STAT_ITEMS
 };
@@ -57,6 +58,7 @@ struct bdi_writeback {
        struct list_head b_dirty;       /* dirty inodes */
        struct list_head b_io;          /* parked for writeback */
        struct list_head b_more_io;     /* parked for more writeback */
+        spinlock_t list_lock;           /* protects the b_* lists */
 };
 struct backing_dev_info {
@@ -71,6 +73,11 @@ struct backing_dev_info {
        struct percpu_counter bdi_stat[NR_BDI_STAT_ITEMS];
+        unsigned long bw_time_stamp;    /* last time write bw is updated */
+        unsigned long written_stamp;    /* pages written at bw_time_stamp */
+        unsigned long write_bandwidth;  /* the estimated write bandwidth */
+        unsigned long avg_write_bandwidth; /* further smoothed write bw */
        struct prop_local_percpu completions;
        int dirty_exceeded;
@@ -106,6 +113,7 @@ int bdi_writeback_thread(void *data);
 int bdi_has_dirty_io(struct backing_dev_info *bdi);
 void bdi_arm_supers_timer(void);
 void bdi_wakeup_thread_delayed(struct backing_dev_info *bdi);
+void bdi_lock_two(struct bdi_writeback *wb1, struct bdi_writeback *wb2);
 extern spinlock_t bdi_lock;
 extern struct list_head bdi_list;
diff --git a/include/linux/bit_spinlock.h b/include/linux/bit_spinlock.h
index 564d997e2168..ac4d9f8b52e9 100644
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
@@ -3,7 +3,7 @@
 #include <linux/kernel.h>
 #include <linux/preempt.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
 *  bit-based spin_lock()
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index dcafe0bf0005..3bac44cce142 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -144,6 +144,7 @@ extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order);
 extern void bitmap_release_region(unsigned long *bitmap, int pos, int order);
 extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order);
 extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits);
+extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits);
 #define BITMAP_LAST_WORD_MASK(nbits)                                    \
 (                                                                       \
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 503c8a6b3079..458f497738a4 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <linux/pagemap.h>
 #include <linux/wait.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #ifdef CONFIG_BLOCK
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 31d91a64838b..d7adf151d335 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -94,6 +94,7 @@ struct ceph_msg {
        bool more_to_follow;
        bool needs_out_seq;
        int front_max;
+        unsigned long ack_stamp;        /* tx: when we were acked */
        struct ceph_msgpool *pool;
 };
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 846bb1792572..8779405e15a8 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -438,16 +438,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
                                 struct compat_timespec __user *tsp,
                                 const compat_sigset_t __user *sigmask,
                                 compat_size_t sigsetsize);
-#if (defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE)) && \
-        !defined(CONFIG_NFSD_DEPRECATED)
-union compat_nfsctl_res;
-struct compat_nfsctl_arg;
-asmlinkage long compat_sys_nfsservctl(int cmd,
-                                      struct compat_nfsctl_arg __user *arg,
-                                      union compat_nfsctl_res __user *res);
-#else
 asmlinkage long compat_sys_nfsservctl(int cmd, void *notused, void *notused2);
-#endif
 asmlinkage long compat_sys_signalfd4(int ufd,
                                     const compat_sigset_t __user *sigmask,
                                     compat_size_t sigsetsize, int flags);
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 645778ad899b..3081c58d696e 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -42,7 +42,7 @@
 #include <linux/mutex.h>
 #include <linux/err.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define CONFIGFS_ITEM_NAME_LEN  20
diff --git a/include/linux/connector.h b/include/linux/connector.h
index f696bccd48cb..0c69ad825b39 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -75,7 +75,7 @@ struct cn_msg {
 #ifdef __KERNEL__
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/list.h>
 #include <linux/workqueue.h>
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 5f09323ee880..b1a635acf72a 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -70,6 +70,39 @@ enum {
        CPU_PRI_WORKQUEUE       = 5,
 };
+#define CPU_ONLINE              0x0002 /* CPU (unsigned)v is up */
+#define CPU_UP_PREPARE          0x0003 /* CPU (unsigned)v coming up */
+#define CPU_UP_CANCELED         0x0004 /* CPU (unsigned)v NOT coming up */
+#define CPU_DOWN_PREPARE        0x0005 /* CPU (unsigned)v going down */
+#define CPU_DOWN_FAILED         0x0006 /* CPU (unsigned)v NOT going down */
+#define CPU_DEAD                0x0007 /* CPU (unsigned)v dead */
+#define CPU_DYING               0x0008 /* CPU (unsigned)v not running any task,
+                                        * not handling interrupts, soon dead.
+                                        * Called on the dying cpu, interrupts
+                                        * are already disabled. Must not
+                                        * sleep, must not fail */
+#define CPU_POST_DEAD           0x0009 /* CPU (unsigned)v dead, cpu_hotplug
+                                        * lock is dropped */
+#define CPU_STARTING            0x000A /* CPU (unsigned)v soon running.
+                                        * Called on the new cpu, just before
+                                        * enabling interrupts. Must not sleep,
+                                        * must not fail */
+/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
+ * operation in progress
+ */
+#define CPU_TASKS_FROZEN        0x0010
+#define CPU_ONLINE_FROZEN       (CPU_ONLINE | CPU_TASKS_FROZEN)
+#define CPU_UP_PREPARE_FROZEN   (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
+#define CPU_UP_CANCELED_FROZEN  (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
+#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
+#define CPU_DOWN_FAILED_FROZEN  (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
+#define CPU_DEAD_FROZEN         (CPU_DEAD | CPU_TASKS_FROZEN)
+#define CPU_DYING_FROZEN        (CPU_DYING | CPU_TASKS_FROZEN)
+#define CPU_STARTING_FROZEN     (CPU_STARTING | CPU_TASKS_FROZEN)
 #ifdef CONFIG_SMP
 /* Need to know about CPUs going up/down? */
 #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 11be48e0d168..6216115c7789 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -324,11 +324,16 @@ static inline unsigned int cpufreq_get(unsigned int cpu)
 /* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */
 #ifdef CONFIG_CPU_FREQ
 unsigned int cpufreq_quick_get(unsigned int cpu);
+unsigned int cpufreq_quick_get_max(unsigned int cpu);
 #else
 static inline unsigned int cpufreq_quick_get(unsigned int cpu)
 {
        return 0;
 }
+static inline unsigned int cpufreq_quick_get_max(unsigned int cpu)
+{
+        return 0;
+}
 #endif
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index b24ac56477b4..4f7a63237471 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -617,6 +617,20 @@ static inline size_t cpumask_size(void)
 *        ... use 'tmpmask' like a normal struct cpumask * ...
 *
 *      free_cpumask_var(tmpmask);
+ *
+ *
+ * However, one notable exception is there. alloc_cpumask_var() allocates
+ * only nr_cpumask_bits bits (in the other hand, real cpumask_t always has
+ * NR_CPUS bits). Therefore you don't have to dereference cpumask_var_t.
+ *
+ *      cpumask_var_t tmpmask;
+ *      if (!alloc_cpumask_var(&tmpmask, GFP_KERNEL))
+ *              return -ENOMEM;
+ *
+ *      var = *tmpmask;
+ *
+ * This code makes NR_CPUS length memcopy and brings to a memory corruption.
+ * cpumask_copy() provide safe copy functionality.
 */
 #ifdef CONFIG_CPUMASK_OFFSTACK
 typedef struct cpumask *cpumask_var_t;
diff --git a/include/linux/cred.h b/include/linux/cred.h
index f240f2fa0197..48e82af1159b 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/key.h>
 #include <linux/selinux.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct user_struct;
 struct cred;
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index a6a7a1c83f54..e5e468e9133d 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -17,7 +17,7 @@
 #ifndef _LINUX_CRYPTO_H
 #define _LINUX_CRYPTO_H
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index 6fe2114f8ad2..c077aec3a6ff 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -11,6 +11,8 @@
 #ifndef _CS5535_H
 #define _CS5535_H
+#include <asm/msr.h>
 /* MSRs */
 #define MSR_GLIU_P2D_RO0        0x10000029
@@ -38,17 +40,75 @@
 #define MSR_MFGPT_NR            0x51400029
 #define MSR_MFGPT_SETUP         0x5140002B
+#define MSR_RTC_DOMA_OFFSET     0x51400055
+#define MSR_RTC_MONA_OFFSET     0x51400056
+#define MSR_RTC_CEN_OFFSET      0x51400057
 #define MSR_LX_SPARE_MSR        0x80000011      /* DC-specific */
 #define MSR_GX_GLD_MSR_CONFIG   0xC0002001
 #define MSR_GX_MSR_PADSEL       0xC0002011
+static inline int cs5535_pic_unreqz_select_high(unsigned int group,
+                                                unsigned int irq)
+{
+        uint32_t lo, hi;
+        rdmsr(MSR_PIC_ZSEL_HIGH, lo, hi);
+        lo &= ~(0xF << (group * 4));
+        lo |= (irq & 0xF) << (group * 4);
+        wrmsr(MSR_PIC_ZSEL_HIGH, lo, hi);
+        return 0;
+}
+/* PIC registers */
+#define CS5536_PIC_INT_SEL1     0x4d0
+#define CS5536_PIC_INT_SEL2     0x4d1
 /* resource sizes */
 #define LBAR_GPIO_SIZE          0xFF
 #define LBAR_MFGPT_SIZE         0x40
 #define LBAR_ACPI_SIZE          0x40
 #define LBAR_PMS_SIZE           0x80
+/*
+ * PMC registers (PMS block)
+ * It is only safe to access these registers as dword accesses.
+ * See CS5536 Specification Update erratas 17 & 18
+ */
+#define CS5536_PM_SCLK          0x10
+#define CS5536_PM_IN_SLPCTL     0x20
+#define CS5536_PM_WKXD          0x34
+#define CS5536_PM_WKD           0x30
+#define CS5536_PM_SSC           0x54
+/*
+ * PM registers (ACPI block)
+ * It is only safe to access these registers as dword accesses.
+ * See CS5536 Specification Update erratas 17 & 18
+ */
+#define CS5536_PM1_STS          0x00
+#define CS5536_PM1_EN           0x02
+#define CS5536_PM1_CNT          0x08
+#define CS5536_PM_GPE0_STS      0x18
+#define CS5536_PM_GPE0_EN       0x1c
+/* CS5536_PM1_STS bits */
+#define CS5536_WAK_FLAG         (1 << 15)
+#define CS5536_PWRBTN_FLAG      (1 << 8)
+/* CS5536_PM1_EN bits */
+#define CS5536_PM_PWRBTN        (1 << 8)
+#define CS5536_PM_RTC           (1 << 10)
+/* CS5536_PM_GPE0_STS bits */
+#define CS5536_GPIOM7_PME_FLAG  (1 << 31)
+#define CS5536_GPIOM6_PME_FLAG  (1 << 30)
+/* CS5536_PM_GPE0_EN bits */
+#define CS5536_GPIOM7_PME_EN    (1 << 31)
+#define CS5536_GPIOM6_PME_EN    (1 << 30)
 /* VSA2 magic values */
 #define VSA_VRC_INDEX           0xAC1C
 #define VSA_VRC_DATA            0xAC1E
diff --git a/include/linux/ctype.h b/include/linux/ctype.h
index a3d6ee0044f9..8acfe312f947 100644
--- a/include/linux/ctype.h
+++ b/include/linux/ctype.h
@@ -52,4 +52,13 @@ static inline unsigned char __toupper(unsigned char c)
 #define tolower(c) __tolower(c)
 #define toupper(c) __toupper(c)
+/*
+ * Fast implementation of tolower() for internal usage. Do not use in your
+ * code.
+ */
+static inline char _tolower(const char c)
+{
+        return c | 0x20;
+}
 #endif
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 3f22d8d6d8a3..d37d2a793099 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_DCACHE_H
 #define __LINUX_DCACHE_H
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/list.h>
 #include <linux/rculist.h>
 #include <linux/rculist_bl.h>
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 2833452ea01c..5033fb88c107 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -2,7 +2,7 @@
 #define __LINUX_DEBUG_LOCKING_H
 #include <linux/kernel.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/system.h>
 struct task_struct;
diff --git a/include/linux/device.h b/include/linux/device.h
index 160d4ddb2499..c20dfbfc49b4 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -22,7 +22,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/device.h>
 struct device;
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 1a167c48d84d..347fdc32177a 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -46,27 +46,6 @@ struct dma_map_ops {
 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-typedef u64 DMA_nnBIT_MASK __deprecated;
-/*
- * NOTE: do not use the below macros in new code and do not add new definitions
- * here.
- *
- * Instead, just open-code DMA_BIT_MASK(n) within your driver
- */
-#define DMA_64BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(64)
-#define DMA_48BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(48)
-#define DMA_47BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(47)
-#define DMA_40BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(40)
-#define DMA_39BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(39)
-#define DMA_35BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(35)
-#define DMA_32BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(32)
-#define DMA_31BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(31)
-#define DMA_30BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(30)
-#define DMA_29BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(29)
-#define DMA_28BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(28)
-#define DMA_24BIT_MASK  (DMA_nnBIT_MASK)DMA_BIT_MASK(24)
 #define DMA_MASK_NONE   0x0ULL
 static inline int valid_dma_direction(int dma_direction)
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 36c66443bdfd..4a73257b47d0 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -12,7 +12,7 @@
 #ifndef _LINUX_EDAC_H_
 #define _LINUX_EDAC_H_
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/sysdev.h>
 #define EDAC_OPSTATE_INVAL      -1
diff --git a/include/linux/eeprom_93xx46.h b/include/linux/eeprom_93xx46.h
new file mode 100644
index 000000000000..06791811e49d
--- /dev/null
+++ b/include/linux/eeprom_93xx46.h
@@ -0,0 +1,18 @@
+/*
+ * Module: eeprom_93xx46
+ * platform description for 93xx46 EEPROMs.
+ */
+struct eeprom_93xx46_platform_data {
+        unsigned char   flags;
+#define EE_ADDR8        0x01            /*  8 bit addr. cfg */
+#define EE_ADDR16       0x02            /* 16 bit addr. cfg */
+#define EE_READONLY     0x08            /* forbid writing */
+        /*
+         * optional hooks to control additional logic
+         * before and after spi transfer.
+         */
+        void (*prepare)(void *);
+        void (*finish)(void *);
+};
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 2dfa7076e8b6..53792bf36c71 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <linux/magic.h>
+#include <linux/fs.h>
 /*
 * The second extended filesystem constants/structures
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 0c473fd79acb..67a803aee619 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -418,12 +418,11 @@ struct ext3_inode {
 #define EXT2_MOUNT_DATA_FLAGS           EXT3_MOUNT_DATA_FLAGS
 #endif
-#define ext3_set_bit                    __test_and_set_bit_le
+#define ext3_set_bit                    __set_bit_le
 #define ext3_set_bit_atomic             ext2_set_bit_atomic
-#define ext3_clear_bit                  __test_and_clear_bit_le
+#define ext3_clear_bit                  __clear_bit_le
 #define ext3_clear_bit_atomic           ext2_clear_bit_atomic
 #define ext3_test_bit                   test_bit_le
-#define ext3_find_first_zero_bit        find_first_zero_bit_le
 #define ext3_find_next_zero_bit         find_next_zero_bit_le
 /*
@@ -913,7 +912,7 @@ extern void ext3_dirty_inode(struct inode *, int);
 extern int ext3_change_inode_journal_flag(struct inode *, int);
 extern int ext3_get_inode_loc(struct inode *, struct ext3_iloc *);
 extern int ext3_can_truncate(struct inode *inode);
-extern void ext3_truncate (struct inode *);
+extern void ext3_truncate(struct inode *inode);
 extern void ext3_set_inode_flags(struct inode *);
 extern void ext3_get_inode_flags(struct ext3_inode_info *);
 extern void ext3_set_aops(struct inode *inode);
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
index 7b64ad40e4ce..3ff060ac7810 100644
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@ -5,7 +5,7 @@
 #include <linux/types.h>
 #include <linux/debugfs.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
 * For explanation of the elements of this struct, see
@@ -27,23 +27,7 @@ struct fault_attr {
        unsigned long count;
 #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+        struct dentry *dir;
-        struct {
-                struct dentry *dir;
-                struct dentry *probability_file;
-                struct dentry *interval_file;
-                struct dentry *times_file;
-                struct dentry *space_file;
-                struct dentry *verbose_file;
-                struct dentry *task_filter_file;
-                struct dentry *stacktrace_depth_file;
-                struct dentry *require_start_file;
-                struct dentry *require_end_file;
-                struct dentry *reject_start_file;
-                struct dentry *reject_end_file;
-        } dentries;
 #endif
 };
@@ -57,7 +41,6 @@ struct fault_attr {
 #define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER
 int setup_fault_attr(struct fault_attr *attr, char *str);
-void should_fail_srandom(unsigned long entropy);
 bool should_fail(struct fault_attr *attr, ssize_t size);
 #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index df7e3cf82e97..82163c4b32c9 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
 * The default fd array needs to be at least BITS_PER_LONG,
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 9ee3f9fb0b4a..741956fa5bfd 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #ifdef __KERNEL__
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #endif
 /*
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 5e6f42789afe..84ccf8e04fa6 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -14,7 +14,7 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/byteorder.h>
 #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cc363fa7bb82..f23bcb77260c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1072,12 +1072,12 @@ struct file_lock_operations {
 };
 struct lock_manager_operations {
-        int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
+        int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
-        void (*fl_notify)(struct file_lock *);  /* unblock callback */
+        void (*lm_notify)(struct file_lock *);  /* unblock callback */
-        int (*fl_grant)(struct file_lock *, struct file_lock *, int);
+        int (*lm_grant)(struct file_lock *, struct file_lock *, int);
-        void (*fl_release_private)(struct file_lock *);
+        void (*lm_release_private)(struct file_lock *);
-        void (*fl_break)(struct file_lock *);
+        void (*lm_break)(struct file_lock *);
-        int (*fl_change)(struct file_lock **, int);
+        int (*lm_change)(struct file_lock **, int);
 };
 struct lock_manager {
diff --git a/include/linux/fsl_hypervisor.h b/include/linux/fsl_hypervisor.h
new file mode 100644
index 000000000000..1cebaeeeef57
--- /dev/null
+++ b/include/linux/fsl_hypervisor.h
@@ -0,0 +1,241 @@
+/*
+ * Freescale hypervisor ioctl and kernel interface
+ *
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc.
+ * Author: Timur Tabi <timur@freescale.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * This software is provided by Freescale Semiconductor "as is" and any
+ * express or implied warranties, including, but not limited to, the implied
+ * warranties of merchantability and fitness for a particular purpose are
+ * disclaimed. In no event shall Freescale Semiconductor be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential damages
+ * (including, but not limited to, procurement of substitute goods or services;
+ * loss of use, data, or profits; or business interruption) however caused and
+ * on any theory of liability, whether in contract, strict liability, or tort
+ * (including negligence or otherwise) arising in any way out of the use of this
+ * software, even if advised of the possibility of such damage.
+ *
+ * This file is used by the Freescale hypervisor management driver.  It can
+ * also be included by applications that need to communicate with the driver
+ * via the ioctl interface.
+ */
+#ifndef FSL_HYPERVISOR_H
+#define FSL_HYPERVISOR_H
+#include <linux/types.h>
+/**
+ * struct fsl_hv_ioctl_restart - restart a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to restart, or -1 for the
+ *             calling partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_RESTART
+ */
+struct fsl_hv_ioctl_restart {
+        __u32 ret;
+        __u32 partition;
+};
+/**
+ * struct fsl_hv_ioctl_status - get a partition's status
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to query, or -1 for the
+ *             calling partition
+ * @status: The returned status of the partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_GET_STATUS
+ *
+ * Values of 'status':
+ *    0 = Stopped
+ *    1 = Running
+ *    2 = Starting
+ *    3 = Stopping
+ */
+struct fsl_hv_ioctl_status {
+        __u32 ret;
+        __u32 partition;
+        __u32 status;
+};
+/**
+ * struct fsl_hv_ioctl_start - start a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to control
+ * @entry_point: The offset within the guest IMA to start execution
+ * @load: If non-zero, reload the partition's images before starting
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_START
+ */
+struct fsl_hv_ioctl_start {
+        __u32 ret;
+        __u32 partition;
+        __u32 entry_point;
+        __u32 load;
+};
+/**
+ * struct fsl_hv_ioctl_stop - stop a partition
+ * @ret: return error code from the hypervisor
+ * @partition: the ID of the partition to stop, or -1 for the calling
+ *             partition
+ *
+ * Used by FSL_HV_IOCTL_PARTITION_STOP
+ */
+struct fsl_hv_ioctl_stop {
+        __u32 ret;
+        __u32 partition;
+};
+/**
+ * struct fsl_hv_ioctl_memcpy - copy memory between partitions
+ * @ret: return error code from the hypervisor
+ * @source: the partition ID of the source partition, or -1 for this
+ *          partition
+ * @target: the partition ID of the target partition, or -1 for this
+ *          partition
+ * @reserved: reserved, must be set to 0
+ * @local_addr: user-space virtual address of a buffer in the local
+ *              partition
+ * @remote_addr: guest physical address of a buffer in the
+ *           remote partition
+ * @count: the number of bytes to copy.  Both the local and remote
+ *         buffers must be at least 'count' bytes long
+ *
+ * Used by FSL_HV_IOCTL_MEMCPY
+ *
+ * The 'local' partition is the partition that calls this ioctl.  The
+ * 'remote' partition is a different partition.  The data is copied from
+ * the 'source' paritition' to the 'target' partition.
+ *
+ * The buffer in the remote partition must be guest physically
+ * contiguous.
+ *
+ * This ioctl does not support copying memory between two remote
+ * partitions or within the same partition, so either 'source' or
+ * 'target' (but not both) must be -1.  In other words, either
+ *
+ *      source == local and target == remote
+ * or
+ *      source == remote and target == local
+ */
+struct fsl_hv_ioctl_memcpy {
+        __u32 ret;
+        __u32 source;
+        __u32 target;
+        __u32 reserved; /* padding to ensure local_vaddr is aligned */
+        __u64 local_vaddr;
+        __u64 remote_paddr;
+        __u64 count;
+};
+/**
+ * struct fsl_hv_ioctl_doorbell - ring a doorbell
+ * @ret: return error code from the hypervisor
+ * @doorbell: the handle of the doorbell to ring doorbell
+ *
+ * Used by FSL_HV_IOCTL_DOORBELL
+ */
+struct fsl_hv_ioctl_doorbell {
+        __u32 ret;
+        __u32 doorbell;
+};
+/**
+ * struct fsl_hv_ioctl_prop - get/set a device tree property
+ * @ret: return error code from the hypervisor
+ * @handle: handle of partition whose tree to access
+ * @path: virtual address of path name of node to access
+ * @propname: virtual address of name of property to access
+ * @propval: virtual address of property data buffer
+ * @proplen: Size of property data buffer
+ * @reserved: reserved, must be set to 0
+ *
+ * Used by FSL_HV_IOCTL_DOORBELL
+ */
+struct fsl_hv_ioctl_prop {
+        __u32 ret;
+        __u32 handle;
+        __u64 path;
+        __u64 propname;
+        __u64 propval;
+        __u32 proplen;
+        __u32 reserved; /* padding to ensure structure is aligned */
+};
+/* The ioctl type, documented in ioctl-number.txt */
+#define FSL_HV_IOCTL_TYPE       0xAF
+/* Restart another partition */
+#define FSL_HV_IOCTL_PARTITION_RESTART \
+        _IOWR(FSL_HV_IOCTL_TYPE, 1, struct fsl_hv_ioctl_restart)
+/* Get a partition's status */
+#define FSL_HV_IOCTL_PARTITION_GET_STATUS \
+        _IOWR(FSL_HV_IOCTL_TYPE, 2, struct fsl_hv_ioctl_status)
+/* Boot another partition */
+#define FSL_HV_IOCTL_PARTITION_START \
+        _IOWR(FSL_HV_IOCTL_TYPE, 3, struct fsl_hv_ioctl_start)
+/* Stop this or another partition */
+#define FSL_HV_IOCTL_PARTITION_STOP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 4, struct fsl_hv_ioctl_stop)
+/* Copy data from one partition to another */
+#define FSL_HV_IOCTL_MEMCPY \
+        _IOWR(FSL_HV_IOCTL_TYPE, 5, struct fsl_hv_ioctl_memcpy)
+/* Ring a doorbell */
+#define FSL_HV_IOCTL_DOORBELL \
+        _IOWR(FSL_HV_IOCTL_TYPE, 6, struct fsl_hv_ioctl_doorbell)
+/* Get a property from another guest's device tree */
+#define FSL_HV_IOCTL_GETPROP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 7, struct fsl_hv_ioctl_prop)
+/* Set a property in another guest's device tree */
+#define FSL_HV_IOCTL_SETPROP \
+        _IOWR(FSL_HV_IOCTL_TYPE, 8, struct fsl_hv_ioctl_prop)
+#ifdef __KERNEL__
+/**
+ * fsl_hv_event_register() - register a callback for failover events
+ * @nb: pointer to caller-supplied notifier_block structure
+ *
+ * This function is called by device drivers to register their callback
+ * functions for fail-over events.
+ *
+ * The caller should allocate a notifier_block object and initialize the
+ * 'priority' and 'notifier_call' fields.
+ */
+int fsl_hv_failover_register(struct notifier_block *nb);
+/**
+ * fsl_hv_event_unregister() - unregister a callback for failover events
+ * @nb: the same 'nb' used in previous fsl_hv_failover_register call
+ */
+int fsl_hv_failover_unregister(struct notifier_block *nb);
+#endif
+#endif
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 69ad89b50489..91d0e0a34ef3 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
 * IN_* from inotfy.h lines up EXACTLY with FS_*, this is so we can easily
diff --git a/include/linux/gsmmux.h b/include/linux/gsmmux.h
index 378de4195caf..c25e9477f7c3 100644
--- a/include/linux/gsmmux.h
+++ b/include/linux/gsmmux.h
@@ -21,5 +21,16 @@ struct gsm_config
 #define GSMIOC_GETCONF          _IOR('G', 0, struct gsm_config)
 #define GSMIOC_SETCONF          _IOW('G', 1, struct gsm_config)
+struct gsm_netconfig {
+        unsigned int adaption;  /* Adaption to use in network mode */
+        unsigned short protocol;/* Protocol to use - only ETH_P_IP supported */
+        unsigned short unused2;
+        char if_name[IFNAMSIZ]; /* interface name format string */
+        __u8 unused[28];        /* For future use */
+};
+#define GSMIOC_ENABLE_NET      _IOW('G', 2, struct gsm_netconfig)
+#define GSMIOC_DISABLE_NET     _IO('G', 3)
 #endif
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 59225ef27d15..19644e0016bd 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -231,6 +231,9 @@ struct hstate {
 struct huge_bootmem_page {
        struct list_head list;
        struct hstate *hstate;
+#ifdef CONFIG_HIGHMEM
+        phys_addr_t phys;
+#endif
 };
 struct page *alloc_huge_page_node(struct hstate *h, int nid);
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h
index 7472449cbb74..0aa0cbd676f7 100644
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
@@ -3,6 +3,33 @@
 #include <linux/platform_device.h>
+/*
+ * Version 2 of the I2C peripheral unit has a different register
+ * layout and extra registers.  The ID register in the V2 peripheral
+ * unit on the OMAP4430 reports the same ID as the V1 peripheral
+ * unit on the OMAP3530, so we must inform the driver which IP
+ * version we know it is running on from platform / cpu-specific
+ * code using these constants in the hwmod class definition.
+ */
+#define OMAP_I2C_IP_VERSION_1 1
+#define OMAP_I2C_IP_VERSION_2 2
+/* struct omap_i2c_bus_platform_data .flags meanings */
+#define OMAP_I2C_FLAG_NO_FIFO                   BIT(0)
+#define OMAP_I2C_FLAG_SIMPLE_CLOCK              BIT(1)
+#define OMAP_I2C_FLAG_16BIT_DATA_REG            BIT(2)
+#define OMAP_I2C_FLAG_RESET_REGS_POSTIDLE       BIT(3)
+#define OMAP_I2C_FLAG_APPLY_ERRATA_I207 BIT(4)
+#define OMAP_I2C_FLAG_ALWAYS_ARMXOR_CLK BIT(5)
+#define OMAP_I2C_FLAG_FORCE_19200_INT_CLK       BIT(6)
+/* how the CPU address bus must be translated for I2C unit access */
+#define OMAP_I2C_FLAG_BUS_SHIFT_NONE 0
+#define OMAP_I2C_FLAG_BUS_SHIFT_1               BIT(7)
+#define OMAP_I2C_FLAG_BUS_SHIFT_2               BIT(8)
+#define OMAP_I2C_FLAG_BUS_SHIFT__SHIFT 7
 struct omap_i2c_bus_platform_data {
        u32             clkrate;
        void            (*set_mpu_wkup_lat)(struct device *dev, long set);
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index ba4f88624fcd..114c0f6fc63d 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -657,28 +657,41 @@ struct twl4030_power_data {
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 extern int twl4030_remove_script(u8 flags);
-struct twl4030_codec_audio_data {
+struct twl4030_codec_data {
        unsigned int digimic_delay; /* in ms */
        unsigned int ramp_delay_value;
        unsigned int offset_cncl_path;
        unsigned int check_defaults:1;
        unsigned int reset_registers:1;
        unsigned int hs_extmute:1;
+        u16 hs_left_step;
+        u16 hs_right_step;
+        u16 hf_left_step;
+        u16 hf_right_step;
        void (*set_hs_extmute)(int mute);
 };
-struct twl4030_codec_vibra_data {
+struct twl4030_vibra_data {
        unsigned int    coexist;
+        /* twl6040 */
+        unsigned int vibldrv_res;       /* left driver resistance */
+        unsigned int vibrdrv_res;       /* right driver resistance */
+        unsigned int viblmotor_res;     /* left motor resistance */
+        unsigned int vibrmotor_res;     /* right motor resistance */
+        int vddvibl_uV;                 /* VDDVIBL volt, set 0 for fixed reg */
+        int vddvibr_uV;                 /* VDDVIBR volt, set 0 for fixed reg */
 };
-struct twl4030_codec_data {
+struct twl4030_audio_data {
        unsigned int    audio_mclk;
-        struct twl4030_codec_audio_data         *audio;
+        struct twl4030_codec_data *codec;
-        struct twl4030_codec_vibra_data         *vibra;
+        struct twl4030_vibra_data *vibra;
        /* twl6040 */
        int audpwron_gpio;      /* audio power-on gpio */
        int naudint_irq;        /* audio interrupt */
+        unsigned int irq_base;
 };
 struct twl4030_platform_data {
@@ -690,7 +703,7 @@ struct twl4030_platform_data {
        struct twl4030_keypad_data              *keypad;
        struct twl4030_usb_data                 *usb;
        struct twl4030_power_data               *power;
-        struct twl4030_codec_data               *codec;
+        struct twl4030_audio_data               *audio;
        /* Common LDO regulators for TWL4030/TWL6030 */
        struct regulator_init_data              *vdac;
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index f6efed0039ed..a103732b7588 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -17,7 +17,7 @@
 #include <linux/kref.h>
 #include <linux/workqueue.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <trace/events/irq.h>
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index e9bb22cba764..c2ebfe66177c 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -109,6 +109,36 @@ struct resource_list {
 /* PCI control bits.  Shares IORESOURCE_BITS with above PCI ROM.  */
 #define IORESOURCE_PCI_FIXED            (1<<4)  /* Do not move resource */
+/* helpers to define resources */
+#define DEFINE_RES_NAMED(_start, _size, _name, _flags)                  \
+        {                                                               \
+                .start = (_start),                                      \
+                .end = (_start) + (_size) - 1,                          \
+                .name = (_name),                                        \
+                .flags = (_flags),                                      \
+        }
+#define DEFINE_RES_IO_NAMED(_start, _size, _name)                       \
+        DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_IO)
+#define DEFINE_RES_IO(_start, _size)                                    \
+        DEFINE_RES_IO_NAMED((_start), (_size), NULL)
+#define DEFINE_RES_MEM_NAMED(_start, _size, _name)                      \
+        DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_MEM)
+#define DEFINE_RES_MEM(_start, _size)                                   \
+        DEFINE_RES_MEM_NAMED((_start), (_size), NULL)
+#define DEFINE_RES_IRQ_NAMED(_irq, _name)                               \
+        DEFINE_RES_NAMED((_irq), 1, (_name), IORESOURCE_IRQ)
+#define DEFINE_RES_IRQ(_irq)                                            \
+        DEFINE_RES_IRQ_NAMED((_irq), NULL)
+#define DEFINE_RES_DMA_NAMED(_dma, _name)                               \
+        DEFINE_RES_NAMED((_dma), 1, (_name), IORESOURCE_DMA)
+#define DEFINE_RES_DMA(_dma)                                            \
+        DEFINE_RES_DMA_NAMED((_dma), NULL)
 /* PC/ISA/whatever - the normal PC address spaces: IO and memory */
 extern struct resource ioport_resource;
 extern struct resource iomem_resource;
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index a6d1655f9607..8a297a5e794c 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -44,6 +44,11 @@ struct ipc_namespace {
        size_t          shm_ctlall;
        int             shm_ctlmni;
        int             shm_tot;
+        /*
+         * Defines whether IPC_RMID is forced for _all_ shm segments regardless
+         * of shmctl()
+         */
+        int             shm_rmid_forced;
        struct notifier_block ipcns_nb;
@@ -72,6 +77,7 @@ extern int register_ipcns_notifier(struct ipc_namespace *);
 extern int cond_register_ipcns_notifier(struct ipc_namespace *);
 extern void unregister_ipcns_notifier(struct ipc_namespace *);
 extern int ipcns_notify(unsigned long);
+extern void shm_destroy_orphaned(struct ipc_namespace *ns);
 #else /* CONFIG_SYSVIPC */
 static inline int register_ipcns_notifier(struct ipc_namespace *ns)
 { return 0; }
@@ -79,6 +85,7 @@ static inline int cond_register_ipcns_notifier(struct ipc_namespace *ns)
 { return 0; }
 static inline void unregister_ipcns_notifier(struct ipc_namespace *ns) { }
 static inline int ipcns_notify(unsigned long l) { return 0; }
+static inline void shm_destroy_orphaned(struct ipc_namespace *ns) {}
 #endif /* CONFIG_SYSVIPC */
 #ifdef CONFIG_POSIX_MQUEUE
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index e06965081ba5..e6a5e34bed4f 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -940,7 +940,6 @@ extern int	   journal_force_commit(journal_t *);
 */
 struct journal_head *journal_add_journal_head(struct buffer_head *bh);
 struct journal_head *journal_grab_journal_head(struct buffer_head *bh);
-void journal_remove_journal_head(struct buffer_head *bh);
 void journal_put_journal_head(struct journal_head *jh);
 /*
diff --git a/include/linux/journal-head.h b/include/linux/journal-head.h
index 44e95d0a721f..423cb6d78ee0 100644
--- a/include/linux/journal-head.h
+++ b/include/linux/journal-head.h
@@ -45,7 +45,7 @@ struct journal_head {
         * has been cowed
         * [jbd_lock_bh_state()]
         */
-        unsigned b_cow_tid;
+        tid_t b_cow_tid;
        /*
         * Copy of the buffer data frozen for writing to the log.
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 83e745f3ead7..66f23dc5e76a 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -54,7 +54,7 @@ extern void jump_label_apply_nops(struct module *mod);
 #else
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define JUMP_LABEL_INIT {ATOMIC_INIT(0)}
diff --git a/include/linux/kdb.h b/include/linux/kdb.h
index aadff7cc2b84..529d9a0c75a5 100644
--- a/include/linux/kdb.h
+++ b/include/linux/kdb.h
@@ -16,7 +16,7 @@
 #ifdef  CONFIG_KGDB_KDB
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define KDB_POLL_FUNC_MAX       5
 extern int kdb_poll_idx;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 567a6f7bbeed..9a43ad792cfc 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -646,29 +646,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
        (type *)( (char *)__mptr - offsetof(type,member) );})
-struct sysinfo;
-extern int do_sysinfo(struct sysinfo *info);
-#endif /* __KERNEL__ */
-#define SI_LOAD_SHIFT   16
-struct sysinfo {
-        long uptime;                    /* Seconds since boot */
-        unsigned long loads[3];         /* 1, 5, and 15 minute load averages */
-        unsigned long totalram;         /* Total usable main memory size */
-        unsigned long freeram;          /* Available memory size */
-        unsigned long sharedram;        /* Amount of shared memory */
-        unsigned long bufferram;        /* Memory used by buffers */
-        unsigned long totalswap;        /* Total swap space size */
-        unsigned long freeswap;         /* swap space still available */
-        unsigned short procs;           /* Number of current processes */
-        unsigned short pad;             /* explicit padding for m68k */
-        unsigned long totalhigh;        /* Total high memory size */
-        unsigned long freehigh;         /* Available high memory size */
-        unsigned int mem_unit;          /* Memory unit size in bytes */
-        char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
-};
 #ifdef __CHECKER__
 #define BUILD_BUG_ON_NOT_POWER_OF_2(n)
 #define BUILD_BUG_ON_ZERO(e) (0)
@@ -736,4 +713,27 @@ extern int __build_bug_on_failed;
 # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
 #endif
+struct sysinfo;
+extern int do_sysinfo(struct sysinfo *info);
+#endif /* __KERNEL__ */
+#define SI_LOAD_SHIFT   16
+struct sysinfo {
+        long uptime;                    /* Seconds since boot */
+        unsigned long loads[3];         /* 1, 5, and 15 minute load averages */
+        unsigned long totalram;         /* Total usable main memory size */
+        unsigned long freeram;          /* Available memory size */
+        unsigned long sharedram;        /* Amount of shared memory */
+        unsigned long bufferram;        /* Memory used by buffers */
+        unsigned long totalswap;        /* Total swap space size */
+        unsigned long freeswap;         /* swap space still available */
+        unsigned short procs;           /* Number of current processes */
+        unsigned short pad;             /* explicit padding for m68k */
+        unsigned long totalhigh;        /* Total high memory size */
+        unsigned long freehigh;         /* Available high memory size */
+        unsigned int mem_unit;          /* Memory unit size in bytes */
+        char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
+};
 #endif
diff --git a/include/linux/key.h b/include/linux/key.h
index 6ea4eebd3467..183a6af7715d 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -21,7 +21,7 @@
 #include <linux/rcupdate.h>
 #include <linux/sysctl.h>
 #include <linux/rwsem.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #ifdef __KERNEL__
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
index 10ca03d0a250..fa391835508d 100644
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
@@ -16,7 +16,7 @@
 #include <linux/serial_8250.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #ifdef CONFIG_HAVE_ARCH_KGDB
 #include <asm/kgdb.h>
 #endif
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 9229b64ee3aa..668729cc0fe9 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -25,7 +25,7 @@
 #include <linux/kobject_ns.h>
 #include <linux/kernel.h>
 #include <linux/wait.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define UEVENT_HELPER_PATH_LEN          256
 #define UEVENT_NUM_ENVP                 32      /* number of env pointers */
diff --git a/include/linux/led-lm3530.h b/include/linux/led-lm3530.h
index 58592fa67d24..8eb12357a110 100644
--- a/include/linux/led-lm3530.h
+++ b/include/linux/led-lm3530.h
@@ -84,6 +84,8 @@ enum lm3530_als_mode {
 * @brt_ramp_rise: rate of rise of led current
 * @als1_resistor_sel: internal resistance from ALS1 input to ground
 * @als2_resistor_sel: internal resistance from ALS2 input to ground
+ * @als_vmin: als input voltage calibrated for max brightness in mV
+ * @als_vmax: als input voltage calibrated for min brightness in mV
 * @brt_val: brightness value (0-255)
 */
 struct lm3530_platform_data {
@@ -101,6 +103,9 @@ struct lm3530_platform_data {
        u8 als1_resistor_sel;
        u8 als2_resistor_sel;
+        u32 als_vmin;
+        u32 als_vmax;
        u8 brt_val;
 };
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 50940da6adf3..b96600786913 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -39,6 +39,16 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
                                        struct mem_cgroup *mem_cont,
                                        int active, int file);
+struct memcg_scanrecord {
+        struct mem_cgroup *mem; /* scanend memory cgroup */
+        struct mem_cgroup *root; /* scan target hierarchy root */
+        int context;            /* scanning context (see memcontrol.c) */
+        unsigned long nr_scanned[2]; /* the number of scanned pages */
+        unsigned long nr_rotated[2]; /* the number of rotated pages */
+        unsigned long nr_freed[2]; /* the number of freed pages */
+        unsigned long elapsed; /* nsec of time elapsed while scanning */
+};
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 /*
 * All "charge" functions with gfp_mask should use GFP_KERNEL or
@@ -111,8 +121,7 @@ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg);
 int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg);
 int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
 unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg,
-                                                struct zone *zone,
+                                        int nid, int zid, unsigned int lrumask);
-                                                enum lru_list lru);
 struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
                                                      struct zone *zone);
 struct zone_reclaim_stat*
@@ -120,6 +129,15 @@ mem_cgroup_get_reclaim_stat_from_page(struct page *page);
 extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
                                        struct task_struct *p);
+extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,
+                                                  gfp_t gfp_mask, bool noswap,
+                                                  struct memcg_scanrecord *rec);
+extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
+                                                gfp_t gfp_mask, bool noswap,
+                                                struct zone *zone,
+                                                struct memcg_scanrecord *rec,
+                                                unsigned long *nr_scanned);
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 extern int do_swap_account;
 #endif
@@ -313,8 +331,8 @@ mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg)
 }
 static inline unsigned long
-mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, struct zone *zone,
+mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
-                             enum lru_list lru)
+                                unsigned int lru_mask)
 {
        return 0;
 }
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 8122018d3000..0b8e2a742600 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -68,12 +68,19 @@ static inline void zone_seqlock_init(struct zone *zone)
 extern int zone_grow_free_lists(struct zone *zone, unsigned long new_nr_pages);
 extern int zone_grow_waitqueues(struct zone *zone, unsigned long nr_pages);
 extern int add_one_highpage(struct page *page, int pfn, int bad_ppro);
-/* need some defines for these for archs that don't support it */
-extern void online_page(struct page *page);
 /* VM interface that may be used by firmware interface */
 extern int online_pages(unsigned long, unsigned long);
 extern void __offline_isolated_pages(unsigned long, unsigned long);
+typedef void (*online_page_callback_t)(struct page *page);
+extern int set_online_page_callback(online_page_callback_t callback);
+extern int restore_online_page_callback(online_page_callback_t callback);
+extern void __online_page_set_limits(struct page *page);
+extern void __online_page_increment_counters(struct page *page);
+extern void __online_page_free(struct page *page);
 #ifdef CONFIG_MEMORY_HOTREMOVE
 extern bool is_pageblock_removable_nolock(struct page *page);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
diff --git a/include/linux/mfd/pm8xxx/rtc.h b/include/linux/mfd/pm8xxx/rtc.h
new file mode 100644
index 000000000000..14f1983eaecc
--- /dev/null
+++ b/include/linux/mfd/pm8xxx/rtc.h
@@ -0,0 +1,25 @@
+/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef __RTC_PM8XXX_H__
+#define __RTC_PM8XXX_H__
+#define PM8XXX_RTC_DEV_NAME     "rtc-pm8xxx"
+/**
+ * struct pm8xxx_rtc_pdata - RTC driver platform data
+ * @rtc_write_enable: variable stating RTC write capability
+ */
+struct pm8xxx_rtc_platform_data {
+        bool rtc_write_enable;
+};
+#endif /* __RTC_PM8XXX_H__ */
diff --git a/include/linux/mfd/twl4030-codec.h b/include/linux/mfd/twl4030-audio.h
index 5cc16bbd1da1..3d22b72df076 100644
--- a/include/linux/mfd/twl4030-codec.h
+++ b/include/linux/mfd/twl4030-audio.h
@@ -1,5 +1,5 @@
 /*
- * MFD driver for twl4030 codec submodule
+ * MFD driver for twl4030 audio submodule
 *
 * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
 *
@@ -259,14 +259,14 @@
 #define TWL4030_VIBRA_DIR_SEL           0x20
 /* TWL4030 codec resource IDs */
-enum twl4030_codec_res {
+enum twl4030_audio_res {
-        TWL4030_CODEC_RES_POWER = 0,
+        TWL4030_AUDIO_RES_POWER = 0,
-        TWL4030_CODEC_RES_APLL,
+        TWL4030_AUDIO_RES_APLL,
-        TWL4030_CODEC_RES_MAX,
+        TWL4030_AUDIO_RES_MAX,
 };
-int twl4030_codec_disable_resource(enum twl4030_codec_res id);
+int twl4030_audio_disable_resource(enum twl4030_audio_res id);
-int twl4030_codec_enable_resource(enum twl4030_codec_res id);
+int twl4030_audio_enable_resource(enum twl4030_audio_res id);
-unsigned int twl4030_codec_get_mclk(void);
+unsigned int twl4030_audio_get_mclk(void);
 #endif  /* End of __TWL4030_CODEC_H__ */
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
new file mode 100644
index 000000000000..4c806f6d663e
--- /dev/null
+++ b/include/linux/mfd/twl6040.h
@@ -0,0 +1,228 @@
+/*
+ * MFD driver for twl6040
+ *
+ * Authors:     Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
+ *              Misael Lopez Cruz <misael.lopez@ti.com>
+ *
+ * Copyright:   (C) 2011 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 version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+#ifndef __TWL6040_CODEC_H__
+#define __TWL6040_CODEC_H__
+#include <linux/interrupt.h>
+#include <linux/mfd/core.h>
+#define TWL6040_REG_ASICID              0x01
+#define TWL6040_REG_ASICREV             0x02
+#define TWL6040_REG_INTID               0x03
+#define TWL6040_REG_INTMR               0x04
+#define TWL6040_REG_NCPCTL              0x05
+#define TWL6040_REG_LDOCTL              0x06
+#define TWL6040_REG_HPPLLCTL            0x07
+#define TWL6040_REG_LPPLLCTL            0x08
+#define TWL6040_REG_LPPLLDIV            0x09
+#define TWL6040_REG_AMICBCTL            0x0A
+#define TWL6040_REG_DMICBCTL            0x0B
+#define TWL6040_REG_MICLCTL             0x0C
+#define TWL6040_REG_MICRCTL             0x0D
+#define TWL6040_REG_MICGAIN             0x0E
+#define TWL6040_REG_LINEGAIN            0x0F
+#define TWL6040_REG_HSLCTL              0x10
+#define TWL6040_REG_HSRCTL              0x11
+#define TWL6040_REG_HSGAIN              0x12
+#define TWL6040_REG_EARCTL              0x13
+#define TWL6040_REG_HFLCTL              0x14
+#define TWL6040_REG_HFLGAIN             0x15
+#define TWL6040_REG_HFRCTL              0x16
+#define TWL6040_REG_HFRGAIN             0x17
+#define TWL6040_REG_VIBCTLL             0x18
+#define TWL6040_REG_VIBDATL             0x19
+#define TWL6040_REG_VIBCTLR             0x1A
+#define TWL6040_REG_VIBDATR             0x1B
+#define TWL6040_REG_HKCTL1              0x1C
+#define TWL6040_REG_HKCTL2              0x1D
+#define TWL6040_REG_GPOCTL              0x1E
+#define TWL6040_REG_ALB                 0x1F
+#define TWL6040_REG_DLB                 0x20
+#define TWL6040_REG_TRIM1               0x28
+#define TWL6040_REG_TRIM2               0x29
+#define TWL6040_REG_TRIM3               0x2A
+#define TWL6040_REG_HSOTRIM             0x2B
+#define TWL6040_REG_HFOTRIM             0x2C
+#define TWL6040_REG_ACCCTL              0x2D
+#define TWL6040_REG_STATUS              0x2E
+#define TWL6040_CACHEREGNUM             (TWL6040_REG_STATUS + 1)
+#define TWL6040_VIOREGNUM               18
+#define TWL6040_VDDREGNUM               21
+/* INTID (0x03) fields */
+#define TWL6040_THINT                   0x01
+#define TWL6040_PLUGINT                 0x02
+#define TWL6040_UNPLUGINT               0x04
+#define TWL6040_HOOKINT                 0x08
+#define TWL6040_HFINT                   0x10
+#define TWL6040_VIBINT                  0x20
+#define TWL6040_READYINT                0x40
+/* INTMR (0x04) fields */
+#define TWL6040_THMSK                   0x01
+#define TWL6040_PLUGMSK                 0x02
+#define TWL6040_HOOKMSK                 0x08
+#define TWL6040_HFMSK                   0x10
+#define TWL6040_VIBMSK                  0x20
+#define TWL6040_READYMSK                0x40
+#define TWL6040_ALLINT_MSK              0x7B
+/* NCPCTL (0x05) fields */
+#define TWL6040_NCPENA                  0x01
+#define TWL6040_NCPOPEN                 0x40
+/* LDOCTL (0x06) fields */
+#define TWL6040_LSLDOENA                0x01
+#define TWL6040_HSLDOENA                0x04
+#define TWL6040_REFENA                  0x40
+#define TWL6040_OSCENA                  0x80
+/* HPPLLCTL (0x07) fields */
+#define TWL6040_HPLLENA                 0x01
+#define TWL6040_HPLLRST                 0x02
+#define TWL6040_HPLLBP                  0x04
+#define TWL6040_HPLLSQRENA              0x08
+#define TWL6040_MCLK_12000KHZ           (0 << 5)
+#define TWL6040_MCLK_19200KHZ           (1 << 5)
+#define TWL6040_MCLK_26000KHZ           (2 << 5)
+#define TWL6040_MCLK_38400KHZ           (3 << 5)
+#define TWL6040_MCLK_MSK                0x60
+/* LPPLLCTL (0x08) fields */
+#define TWL6040_LPLLENA                 0x01
+#define TWL6040_LPLLRST                 0x02
+#define TWL6040_LPLLSEL                 0x04
+#define TWL6040_LPLLFIN                 0x08
+#define TWL6040_HPLLSEL                 0x10
+/* HSLCTL (0x10) fields */
+#define TWL6040_HSDACMODEL              0x02
+#define TWL6040_HSDRVMODEL              0x08
+/* HSRCTL (0x11) fields */
+#define TWL6040_HSDACMODER              0x02
+#define TWL6040_HSDRVMODER              0x08
+/* VIBCTLL (0x18) fields */
+#define TWL6040_VIBENAL                 0x01
+#define TWL6040_VIBCTRLL                0x04
+#define TWL6040_VIBCTRLLP               0x08
+#define TWL6040_VIBCTRLLN               0x10
+/* VIBDATL (0x19) fields */
+#define TWL6040_VIBDAT_MAX              0x64
+/* VIBCTLR (0x1A) fields */
+#define TWL6040_VIBENAR                 0x01
+#define TWL6040_VIBCTRLR                0x04
+#define TWL6040_VIBCTRLRP               0x08
+#define TWL6040_VIBCTRLRN               0x10
+/* GPOCTL (0x1E) fields */
+#define TWL6040_GPO1                    0x01
+#define TWL6040_GPO2                    0x02
+#define TWL6040_GPO3                    0x03
+/* ACCCTL (0x2D) fields */
+#define TWL6040_I2CSEL                  0x01
+#define TWL6040_RESETSPLIT              0x04
+#define TWL6040_INTCLRMODE              0x08
+/* STATUS (0x2E) fields */
+#define TWL6040_PLUGCOMP                0x02
+#define TWL6040_VIBLOCDET               0x10
+#define TWL6040_VIBROCDET               0x20
+#define TWL6040_TSHUTDET                0x40
+#define TWL6040_CELLS                   2
+#define TWL6040_REV_ES1_0               0x00
+#define TWL6040_REV_ES1_1               0x01
+#define TWL6040_REV_ES1_2               0x02
+#define TWL6040_IRQ_TH                  0
+#define TWL6040_IRQ_PLUG                1
+#define TWL6040_IRQ_HOOK                2
+#define TWL6040_IRQ_HF                  3
+#define TWL6040_IRQ_VIB                 4
+#define TWL6040_IRQ_READY               5
+/* PLL selection */
+#define TWL6040_SYSCLK_SEL_LPPLL        0
+#define TWL6040_SYSCLK_SEL_HPPLL        1
+struct twl6040 {
+        struct device *dev;
+        struct mutex mutex;
+        struct mutex io_mutex;
+        struct mutex irq_mutex;
+        struct mfd_cell cells[TWL6040_CELLS];
+        struct completion ready;
+        int audpwron;
+        int power_count;
+        int rev;
+        int pll;
+        unsigned int sysclk;
+        unsigned int irq;
+        unsigned int irq_base;
+        u8 irq_masks_cur;
+        u8 irq_masks_cache;
+};
+int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg);
+int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg,
+                      u8 val);
+int twl6040_set_bits(struct twl6040 *twl6040, unsigned int reg,
+                     u8 mask);
+int twl6040_clear_bits(struct twl6040 *twl6040, unsigned int reg,
+                       u8 mask);
+int twl6040_power(struct twl6040 *twl6040, int on);
+int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
+                    unsigned int freq_in, unsigned int freq_out);
+int twl6040_get_pll(struct twl6040 *twl6040);
+unsigned int twl6040_get_sysclk(struct twl6040 *twl6040);
+int twl6040_irq_init(struct twl6040 *twl6040);
+void twl6040_irq_exit(struct twl6040 *twl6040);
+#endif  /* End of __TWL6040_CODEC_H__ */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 387329e02303..53ef894bfa05 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -37,7 +37,7 @@
 #include <linux/completion.h>
 #include <linux/radix-tree.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define MAX_MSIX_P_PORT         17
 #define MAX_MSIX                64
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 8a45ad22a170..3172a1c0f08e 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -637,7 +637,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
 #define SECTIONS_MASK           ((1UL << SECTIONS_WIDTH) - 1)
 #define ZONEID_MASK             ((1UL << ZONEID_SHIFT) - 1)
-static inline enum zone_type page_zonenum(struct page *page)
+static inline enum zone_type page_zonenum(const struct page *page)
 {
        return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK;
 }
@@ -665,15 +665,15 @@ static inline int zone_to_nid(struct zone *zone)
 }
 #ifdef NODE_NOT_IN_PAGE_FLAGS
-extern int page_to_nid(struct page *page);
+extern int page_to_nid(const struct page *page);
 #else
-static inline int page_to_nid(struct page *page)
+static inline int page_to_nid(const struct page *page)
 {
        return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
 }
 #endif
-static inline struct zone *page_zone(struct page *page)
+static inline struct zone *page_zone(const struct page *page)
 {
        return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)];
 }
@@ -718,9 +718,9 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 */
 #include <linux/vmstat.h>
-static __always_inline void *lowmem_page_address(struct page *page)
+static __always_inline void *lowmem_page_address(const struct page *page)
 {
-        return __va(PFN_PHYS(page_to_pfn(page)));
+        return __va(PFN_PHYS(page_to_pfn((struct page *)page)));
 }
 #if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL)
@@ -911,6 +911,8 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
 * @pte_entry: if set, called for each non-empty PTE (4th-level) entry
 * @pte_hole: if set, called for each hole at all levels
 * @hugetlb_entry: if set, called for each hugetlb entry
+ *                 *Caution*: The caller must hold mmap_sem() if @hugetlb_entry
+ *                            is used.
 *
 * (see walk_page_range for more details)
 */
@@ -986,6 +988,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 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 fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
+                            unsigned long address, unsigned int fault_flags);
 extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
 extern void do_invalidatepage(struct page *page, unsigned long offset);
@@ -1409,8 +1413,7 @@ extern int do_munmap(struct mm_struct *, unsigned long, size_t);
 extern unsigned long do_brk(unsigned long, unsigned long);
-/* filemap.c */
+/* truncate.c */
-extern unsigned long page_unuse(struct page *);
 extern void truncate_inode_pages(struct address_space *, loff_t);
 extern void truncate_inode_pages_range(struct address_space *,
                                       loff_t lstart, loff_t lend);
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 9872d6ca58ae..8b74e9b1d0ad 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -14,7 +14,7 @@
 #include <linux/mm.h>
 #include <linux/percpu_counter.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 9f7c3ebcbbad..be1ac8d7789b 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -16,7 +16,7 @@
 #include <linux/nodemask.h>
 #include <linux/pageblock-flags.h>
 #include <generated/bounds.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/page.h>
 /* Free memory management - zoned buddy allocator.  */
@@ -158,6 +158,12 @@ static inline int is_unevictable_lru(enum lru_list l)
        return (l == LRU_UNEVICTABLE);
 }
+/* Mask used at gathering information at once (see memcontrol.c) */
+#define LRU_ALL_FILE (BIT(LRU_INACTIVE_FILE) | BIT(LRU_ACTIVE_FILE))
+#define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) | BIT(LRU_ACTIVE_ANON))
+#define LRU_ALL_EVICTABLE (LRU_ALL_FILE | LRU_ALL_ANON)
+#define LRU_ALL      ((1 << NR_LRU_LISTS) - 1)
 enum zone_watermarks {
        WMARK_MIN,
        WMARK_LOW,
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 604f122a2326..33fe53d78110 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -14,7 +14,7 @@
 #include <linux/nodemask.h>
 #include <linux/spinlock.h>
 #include <linux/seqlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct super_block;
 struct vfsmount;
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 7f87217e9d1f..9121595a8ebf 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -15,7 +15,7 @@
 #include <linux/linkage.h>
 #include <linux/lockdep.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
 * Simple, straightforward mutexes with strict semantics:
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 34f3abc6457a..2ed0b6cf11c5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -34,7 +34,7 @@
 #include <linux/pm_qos_params.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
@@ -1521,6 +1521,39 @@ struct packet_type {
 #include <linux/notifier.h>
+/* netdevice notifier chain. Please remember to update the rtnetlink
+ * notification exclusion list in rtnetlink_event() when adding new
+ * types.
+ */
+#define NETDEV_UP       0x0001  /* For now you can't veto a device up/down */
+#define NETDEV_DOWN     0x0002
+#define NETDEV_REBOOT   0x0003  /* Tell a protocol stack a network interface
+                                   detected a hardware crash and restarted
+                                   - we can use this eg to kick tcp sessions
+                                   once done */
+#define NETDEV_CHANGE   0x0004  /* Notify device state change */
+#define NETDEV_REGISTER 0x0005
+#define NETDEV_UNREGISTER       0x0006
+#define NETDEV_CHANGEMTU        0x0007
+#define NETDEV_CHANGEADDR       0x0008
+#define NETDEV_GOING_DOWN       0x0009
+#define NETDEV_CHANGENAME       0x000A
+#define NETDEV_FEAT_CHANGE      0x000B
+#define NETDEV_BONDING_FAILOVER 0x000C
+#define NETDEV_PRE_UP           0x000D
+#define NETDEV_PRE_TYPE_CHANGE  0x000E
+#define NETDEV_POST_TYPE_CHANGE 0x000F
+#define NETDEV_POST_INIT        0x0010
+#define NETDEV_UNREGISTER_BATCH 0x0011
+#define NETDEV_RELEASE          0x0012
+#define NETDEV_NOTIFY_PEERS     0x0013
+#define NETDEV_JOIN             0x0014
+extern int register_netdevice_notifier(struct notifier_block *nb);
+extern int unregister_netdevice_notifier(struct notifier_block *nb);
+extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 extern rwlock_t                         dev_base_lock;          /* Device list lock */
@@ -1603,12 +1636,9 @@ static inline void unregister_netdevice(struct net_device *dev)
 extern int              netdev_refcnt_read(const struct net_device *dev);
 extern void             free_netdev(struct net_device *dev);
 extern void             synchronize_net(void);
-extern int              register_netdevice_notifier(struct notifier_block *nb);
-extern int              unregister_netdevice_notifier(struct notifier_block *nb);
 extern int              init_dummy_netdev(struct net_device *dev);
 extern void             netdev_resync_ops(struct net_device *dev);
-extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *dev_get_by_index_rcu(struct net *net, int ifindex);
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 87694ca86914..08c444aa0411 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -7,7 +7,7 @@
 #include <linux/nfs_xdr.h>
 #include <linux/sunrpc/xprt.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct nfs4_session;
 struct nfs_iostats;
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 84058ec69390..8a31a20efe7e 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -133,8 +133,6 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
 int                     nfsd_export_init(void);
 void                    nfsd_export_shutdown(void);
 void                    nfsd_export_flush(void);
-void                    exp_readlock(void);
-void                    exp_readunlock(void);
 struct svc_export *     rqst_exp_get_by_name(struct svc_rqst *,
                                             struct path *);
 struct svc_export *     rqst_exp_parent(struct svc_rqst *,
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index dba35e413371..7afc36334d52 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -66,6 +66,8 @@
 * int num_online_nodes()               Number of online Nodes
 * int num_possible_nodes()             Number of all possible Nodes
 *
+ * int node_random(mask)                Random node with set bit in mask
+ *
 * int node_online(node)                Is some node online?
 * int node_possible(node)              Is some node possible?
 *
@@ -430,6 +432,7 @@ static inline void node_set_offline(int nid)
        node_clear_state(nid, N_ONLINE);
        nr_online_nodes = num_node_state(N_ONLINE);
 }
 #else
 static inline int node_state(int node, enum node_states state)
@@ -460,6 +463,16 @@ static inline int num_node_state(enum node_states state)
 #define node_set_online(node)      node_set_state((node), N_ONLINE)
 #define node_set_offline(node)     node_clear_state((node), N_ONLINE)
+#endif
+#if defined(CONFIG_NUMA) && (MAX_NUMNODES > 1)
+extern int node_random(const nodemask_t *maskp);
+#else
+static inline int node_random(const nodemask_t *mask)
+{
+        return 0;
+}
 #endif
 #define node_online_map         node_states[N_ONLINE]
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index c0688b0168b3..d65746efc954 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -185,80 +185,17 @@ static inline int notifier_to_errno(int ret)
 *      VC switch chains (for loadable kernel svgalib VC switch helpers) etc...
 */
 
-/* netdevice notifier chain. Please remember to update the rtnetlink
+/* CPU notfiers are defined in include/linux/cpu.h. */
- * notification exclusion list in rtnetlink_event() when adding new
- * types.
- */
-#define NETDEV_UP       0x0001  /* For now you can't veto a device up/down */
-#define NETDEV_DOWN     0x0002
-#define NETDEV_REBOOT   0x0003  /* Tell a protocol stack a network interface
-                                   detected a hardware crash and restarted
-                                   - we can use this eg to kick tcp sessions
-                                   once done */
-#define NETDEV_CHANGE   0x0004  /* Notify device state change */
-#define NETDEV_REGISTER 0x0005
-#define NETDEV_UNREGISTER       0x0006
-#define NETDEV_CHANGEMTU        0x0007
-#define NETDEV_CHANGEADDR       0x0008
-#define NETDEV_GOING_DOWN       0x0009
-#define NETDEV_CHANGENAME       0x000A
-#define NETDEV_FEAT_CHANGE      0x000B
-#define NETDEV_BONDING_FAILOVER 0x000C
-#define NETDEV_PRE_UP           0x000D
-#define NETDEV_PRE_TYPE_CHANGE  0x000E
-#define NETDEV_POST_TYPE_CHANGE 0x000F
-#define NETDEV_POST_INIT        0x0010
-#define NETDEV_UNREGISTER_BATCH 0x0011
-#define NETDEV_RELEASE          0x0012
-#define NETDEV_NOTIFY_PEERS     0x0013
-#define NETDEV_JOIN             0x0014
-#define SYS_DOWN        0x0001  /* Notify of system down */
-#define SYS_RESTART     SYS_DOWN
-#define SYS_HALT        0x0002  /* Notify of system halt */
-#define SYS_POWER_OFF   0x0003  /* Notify of system power off */
-#define NETLINK_URELEASE        0x0001  /* Unicast netlink socket released */
+/* netdevice notifiers are defined in include/linux/netdevice.h */
-#define CPU_ONLINE              0x0002 /* CPU (unsigned)v is up */
+/* reboot notifiers are defined in include/linux/reboot.h. */
-#define CPU_UP_PREPARE          0x0003 /* CPU (unsigned)v coming up */
-#define CPU_UP_CANCELED         0x0004 /* CPU (unsigned)v NOT coming up */
-#define CPU_DOWN_PREPARE        0x0005 /* CPU (unsigned)v going down */
-#define CPU_DOWN_FAILED         0x0006 /* CPU (unsigned)v NOT going down */
-#define CPU_DEAD                0x0007 /* CPU (unsigned)v dead */
-#define CPU_DYING               0x0008 /* CPU (unsigned)v not running any task,
-                                        * not handling interrupts, soon dead.
-                                        * Called on the dying cpu, interrupts
-                                        * are already disabled. Must not
-                                        * sleep, must not fail */
-#define CPU_POST_DEAD           0x0009 /* CPU (unsigned)v dead, cpu_hotplug
-                                        * lock is dropped */
-#define CPU_STARTING            0x000A /* CPU (unsigned)v soon running.
-                                        * Called on the new cpu, just before
-                                        * enabling interrupts. Must not sleep,
-                                        * must not fail */
-/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
+/* Hibernation and suspend events are defined in include/linux/suspend.h. */
- * operation in progress
- */
-#define CPU_TASKS_FROZEN        0x0010
-#define CPU_ONLINE_FROZEN       (CPU_ONLINE | CPU_TASKS_FROZEN)
+/* Virtual Terminal events are defined in include/linux/vt.h. */
-#define CPU_UP_PREPARE_FROZEN   (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
-#define CPU_UP_CANCELED_FROZEN  (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
-#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
-#define CPU_DOWN_FAILED_FROZEN  (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
-#define CPU_DEAD_FROZEN         (CPU_DEAD | CPU_TASKS_FROZEN)
-#define CPU_DYING_FROZEN        (CPU_DYING | CPU_TASKS_FROZEN)
-#define CPU_STARTING_FROZEN     (CPU_STARTING | CPU_TASKS_FROZEN)
-/* Hibernation and suspend events */
+#define NETLINK_URELEASE        0x0001  /* Unicast netlink socket released */
-#define PM_HIBERNATION_PREPARE  0x0001 /* Going to hibernate */
-#define PM_POST_HIBERNATION     0x0002 /* Hibernation finished */
-#define PM_SUSPEND_PREPARE      0x0003 /* Going to suspend the system */
-#define PM_POST_SUSPEND         0x0004 /* Suspend finished */
-#define PM_RESTORE_PREPARE      0x0005 /* Going to restore a saved image */
-#define PM_POST_RESTORE         0x0006 /* Restore failed */
 /* Console keyboard events.
 * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
@@ -271,12 +208,5 @@ static inline int notifier_to_errno(int ret)
 extern struct blocking_notifier_head reboot_notifier_list;
-/* Virtual Terminal events. */
-#define VT_ALLOCATE             0x0001 /* Console got allocated */
-#define VT_DEALLOCATE           0x0002 /* Console will be deallocated */
-#define VT_WRITE                0x0003 /* A char got output */
-#define VT_UPDATE               0x0004 /* A bigger update occurred */
-#define VT_PREWRITE             0x0005 /* A char is about to be written to the console */
 #endif /* __KERNEL__ */
 #endif /* _LINUX_NOTIFIER_H */
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 4952fb874ad3..13b7b02e599a 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -64,10 +64,6 @@ static inline void oom_killer_enable(void)
        oom_killer_disabled = false;
 }
-/* The badness from the OOM killer */
-extern unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
-                      const nodemask_t *nodemask, unsigned long uptime);
 extern struct task_struct *find_lock_task_mm(struct task_struct *p);
 /* sysctls */
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 7f5cfd3b37dd..49c8727eeb57 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/printk.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /* Each escaped entry is prefixed by ESCAPE_CODE
 * then one of the following codes, then the
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 6081493db68f..3e5a1b189a41 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -135,7 +135,7 @@ enum pageflags {
 * Macros to create function definitions for page flags
 */
 #define TESTPAGEFLAG(uname, lname)                                      \
-static inline int Page##uname(struct page *page)                        \
+static inline int Page##uname(const struct page *page)                  \
                        { return test_bit(PG_##lname, &page->flags); }
 #define SETPAGEFLAG(uname, lname)                                       \
@@ -173,7 +173,7 @@ static inline int __TestClearPage##uname(struct page *page)		\
        __SETPAGEFLAG(uname, lname)  __CLEARPAGEFLAG(uname, lname)
 #define PAGEFLAG_FALSE(uname)                                           \
-static inline int Page##uname(struct page *page)                        \
+static inline int Page##uname(const struct page *page)                  \
                        { return 0; }
 #define TESTSCFLAG(uname, lname)                                        \
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 8e38d4c140ff..cfaaa6949b8b 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -255,26 +255,24 @@ static inline struct page *grab_cache_page(struct address_space *mapping,
 extern struct page * grab_cache_page_nowait(struct address_space *mapping,
                                pgoff_t index);
 extern struct page * read_cache_page_async(struct address_space *mapping,
-                                pgoff_t index, filler_t *filler,
+                                pgoff_t index, filler_t *filler, void *data);
-                                void *data);
 extern struct page * read_cache_page(struct address_space *mapping,
-                                pgoff_t index, filler_t *filler,
+                                pgoff_t index, filler_t *filler, void *data);
-                                void *data);
 extern struct page * read_cache_page_gfp(struct address_space *mapping,
                                pgoff_t index, gfp_t gfp_mask);
 extern int read_cache_pages(struct address_space *mapping,
                struct list_head *pages, filler_t *filler, void *data);
 static inline struct page *read_mapping_page_async(
-                                                struct address_space *mapping,
+                                struct address_space *mapping,
-                                                     pgoff_t index, void *data)
+                                pgoff_t index, void *data)
 {
        filler_t *filler = (filler_t *)mapping->a_ops->readpage;
        return read_cache_page_async(mapping, index, filler, data);
 }
 static inline struct page *read_mapping_page(struct address_space *mapping,
-                                             pgoff_t index, void *data)
+                                pgoff_t index, void *data)
 {
        filler_t *filler = (filler_t *)mapping->a_ops->readpage;
        return read_cache_page(mapping, index, filler, data);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4e4203a96312..3a5626df37ce 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -49,7 +49,7 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/kobject.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/irqreturn.h>
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 74173c585afa..b00c4ec5056e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2832,7 +2832,11 @@
 #define PCI_DEVICE_ID_NETMOS_9845       0x9845
 #define PCI_DEVICE_ID_NETMOS_9855       0x9855
 #define PCI_DEVICE_ID_NETMOS_9865       0x9865
+#define PCI_DEVICE_ID_NETMOS_9900       0x9900
 #define PCI_DEVICE_ID_NETMOS_9901       0x9901
+#define PCI_DEVICE_ID_NETMOS_9904       0x9904
+#define PCI_DEVICE_ID_NETMOS_9912       0x9912
+#define PCI_DEVICE_ID_NETMOS_9922       0x9922
 #define PCI_VENDOR_ID_3COM_2            0xa727
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3f2711ccf910..245bafdafd5e 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -509,7 +509,7 @@ struct perf_guest_info_callbacks {
 #include <linux/cpu.h>
 #include <linux/irq_work.h>
 #include <linux/jump_label.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/local.h>
 #define PERF_MAX_STACK_DEPTH            255
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 7da5fa845959..ad5186354d92 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -26,7 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/mod_devicetable.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define PHY_BASIC_FEATURES      (SUPPORTED_10baseT_Half | \
                                 SUPPORTED_10baseT_Full | \
diff --git a/include/linux/platform_data/fsa9480.h b/include/linux/platform_data/fsa9480.h
new file mode 100644
index 000000000000..72dddcb4bed1
--- /dev/null
+++ b/include/linux/platform_data/fsa9480.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2010 Samsung Electronics
+ * Minkyu Kang <mk7.kang@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _FSA9480_H_
+#define _FSA9480_H_
+#define FSA9480_ATTACHED        1
+#define FSA9480_DETACHED        0
+struct fsa9480_platform_data {
+        void (*cfg_gpio) (void);
+        void (*usb_cb) (u8 attached);
+        void (*uart_cb) (u8 attached);
+        void (*charger_cb) (u8 attached);
+        void (*jig_cb) (u8 attached);
+        void (*reset_cb) (void);
+        void (*usb_power) (u8 on);
+        int wakeup;
+};
+#endif /* _FSA9480_H_ */
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index ede1a80e3358..27bb05aae70d 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -42,6 +42,7 @@ extern void platform_device_unregister(struct platform_device *);
 extern struct bus_type platform_bus_type;
 extern struct device platform_bus;
+extern void arch_setup_pdev_archdata(struct platform_device *);
 extern struct resource *platform_get_resource(struct platform_device *, unsigned int, unsigned int);
 extern int platform_get_irq(struct platform_device *, unsigned int);
 extern struct resource *platform_get_resource_byname(struct platform_device *, unsigned int, const char *);
diff --git a/include/linux/poison.h b/include/linux/poison.h
index 2110a81c5e2a..79159de0e341 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -40,6 +40,12 @@
 #define RED_INACTIVE    0x09F911029D74E35BULL   /* when obj is inactive */
 #define RED_ACTIVE      0xD84156C5635688C0ULL   /* when obj is active */
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+#define MEMBLOCK_INACTIVE       0x3a84fb0144c9e71bULL
+#else
+#define MEMBLOCK_INACTIVE       0x44c9e71bUL
+#endif
 #define SLUB_RED_INACTIVE       0xbb
 #define SLUB_RED_ACTIVE         0xcc
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index e7576cf9e32d..650af6deaf8f 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -5,7 +5,7 @@
 #include <linux/fs.h>
 #include <linux/spinlock.h>
 #include <linux/magic.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct net;
 struct completion;
diff --git a/include/linux/pti.h b/include/linux/pti.h
index 81af667bb2d5..b3ea01a3197e 100644
--- a/include/linux/pti.h
+++ b/include/linux/pti.h
@@ -36,7 +36,8 @@ struct pti_masterchannel {
 /* the following functions are defined in misc/pti.c */
 void pti_writedata(struct pti_masterchannel *mc, u8 *buf, int count);
-struct pti_masterchannel *pti_request_masterchannel(u8 type);
+struct pti_masterchannel *pti_request_masterchannel(u8 type,
+                                                    const char *thread_name);
 void pti_release_masterchannel(struct pti_masterchannel *mc);
 #endif /*PTI_H_*/
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 9a85412e0db6..cb7855699037 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -180,7 +180,7 @@ enum {
 #include <linux/dqblk_v1.h>
 #include <linux/dqblk_v2.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
 typedef long long qsize_t;      /* Type in which we store sizes */
@@ -415,13 +415,5 @@ struct quota_module_name {
        {QFMT_VFS_V0, "quota_v2"},\
        {0, NULL}}
-#else
-# /* nodep */ include <sys/cdefs.h>
-__BEGIN_DECLS
-long quotactl __P ((unsigned int, const char *, int, caddr_t));
-__END_DECLS
 #endif /* __KERNEL__ */
 #endif /* _QUOTA_ */
diff --git a/include/linux/ramoops.h b/include/linux/ramoops.h
index 0ae68a2c1212..484fef81cd3a 100644
--- a/include/linux/ramoops.h
+++ b/include/linux/ramoops.h
@@ -10,6 +10,8 @@
 struct ramoops_platform_data {
        unsigned long   mem_size;
        unsigned long   mem_address;
+        unsigned long   record_size;
+        int             dump_oops;
 };
 #endif
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 3005d5a7fce5..e0879a70e830 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -39,6 +39,11 @@
 #include <linux/notifier.h>
+#define SYS_DOWN        0x0001  /* Notify of system down */
+#define SYS_RESTART     SYS_DOWN
+#define SYS_HALT        0x0002  /* Notify of system halt */
+#define SYS_POWER_OFF   0x0003  /* Notify of system power off */
 extern int register_reboot_notifier(struct notifier_block *);
 extern int unregister_reboot_notifier(struct notifier_block *);
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index eca75df00fed..96d465f8d3e6 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -2332,7 +2332,9 @@ __u32 keyed_hash(const signed char *msg, int len);
 __u32 yura_hash(const signed char *msg, int len);
 __u32 r5_hash(const signed char *msg, int len);
+#define reiserfs_set_le_bit             __set_bit_le
 #define reiserfs_test_and_set_le_bit    __test_and_set_bit_le
+#define reiserfs_clear_le_bit           __clear_bit_le
 #define reiserfs_test_and_clear_le_bit  __test_and_clear_bit_le
 #define reiserfs_test_le_bit            test_bit_le
 #define reiserfs_find_next_zero_le_bit  find_next_zero_bit_le
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 77950dfa0a9e..6a6741440cb7 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -15,7 +15,7 @@
 #include <linux/spinlock.h>
 #include <asm/system.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct rw_semaphore;
diff --git a/include/linux/sem.h b/include/linux/sem.h
index f2961afa2f66..1feb2de2ee57 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -77,7 +77,7 @@ struct  seminfo {
 #define SEMUSZ  20              /* sizeof struct sem_undo */
 #ifdef __KERNEL__
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/rcupdate.h>
 #include <linux/cache.h>
diff --git a/include/linux/shm.h b/include/linux/shm.h
index eca6235a46c0..7d27ffde0190 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -106,6 +106,7 @@ struct shmid_kernel /* private to the kernel */
 #ifdef CONFIG_SYSVIPC
 long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
 extern int is_file_shm_hugepages(struct file *file);
+extern void exit_shm(struct task_struct *task);
 #else
 static inline long do_shmat(int shmid, char __user *shmaddr,
                                int shmflg, unsigned long *addr)
@@ -116,6 +117,9 @@ static inline int is_file_shm_hugepages(struct file *file)
 {
        return 0;
 }
+static inline void exit_shm(struct task_struct *task)
+{
+}
 #endif
 #endif /* __KERNEL__ */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a24218c9c84b..7b996ed86d5b 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -20,7 +20,7 @@
 #include <linux/time.h>
 #include <linux/cache.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/types.h>
 #include <linux/spinlock.h>
 #include <linux/net.h>
diff --git a/include/linux/sonet.h b/include/linux/sonet.h
index 67ad11fcf88b..de8832dd272b 100644
--- a/include/linux/sonet.h
+++ b/include/linux/sonet.h
@@ -58,7 +58,7 @@ struct sonet_stats {
 #ifdef __KERNEL__
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct k_sonet_stats {
 #define __HANDLE_ITEM(i) atomic_t i
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 0b22d51258e6..7df6c17b0281 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -384,7 +384,7 @@ static inline void assert_spin_locked(spinlock_t *lock)
 * Pull the atomic_t declaration:
 * (asm-mips/atomic.h needs above definitions)
 */
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /**
 * atomic_dec_and_lock - lock on reaching reference count zero
 * @atomic: the atomic counter
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 997c3b4c212b..26e5b613deda 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -88,5 +88,7 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
 extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
 extern void splice_shrink_spd(struct pipe_inode_info *,
                                struct splice_pipe_desc *);
+extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
+extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
 #endif
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 8521067ed4f7..febc4dbec2ca 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -15,7 +15,7 @@
 #include <linux/sunrpc/msg_prot.h>
 #include <linux/sunrpc/xdr.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/rcupdate.h>
 /* size of the nodename buffer */
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 8d2eef1a8582..5efd8cef389e 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -15,7 +15,7 @@
 #include <linux/kref.h>
 #include <linux/slab.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/proc_fs.h>
 /*
@@ -256,13 +256,4 @@ static inline time_t get_expiry(char **bpp)
        return rv - boot.tv_sec;
 }
-#ifdef CONFIG_NFSD_DEPRECATED
-static inline void sunrpc_invalidate(struct cache_head *h,
-                                     struct cache_detail *detail)
-{
-        h->expiry_time = seconds_since_boot() - 1;
-        detail->nextcheck = seconds_since_boot();
-}
-#endif /* CONFIG_NFSD_DEPRECATED */
 #endif /*  _LINUX_SUNRPC_CACHE_H_ */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index ea29330b78bd..2f1e5186e049 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -273,6 +273,7 @@ struct svc_rqst {
        /* Catering to nfsd */
        struct auth_domain *    rq_client;      /* RPC peer info */
        struct auth_domain *    rq_gssclient;   /* "gss/"-style peer info */
+        int                     rq_cachetype;
        struct svc_cacherep *   rq_cacherep;    /* cache info */
        int                     rq_splice_ok;   /* turned off in gss privacy
                                                 * to prevent encrypting page
diff --git a/include/linux/sunrpc/timer.h b/include/linux/sunrpc/timer.h
index a67fd734c73b..697d6e69d61f 100644
--- a/include/linux/sunrpc/timer.h
+++ b/include/linux/sunrpc/timer.h
@@ -9,7 +9,7 @@
 #ifndef _LINUX_SUNRPC_TIMER_H
 #define _LINUX_SUNRPC_TIMER_H
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct rpc_rtt {
        unsigned long timeo;    /* default timeout value */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index e1e3742733be..6bbcef22e105 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -268,6 +268,14 @@ static inline int hibernate(void) { return -ENOSYS; }
 static inline bool system_entering_hibernation(void) { return false; }
 #endif /* CONFIG_HIBERNATION */
+/* Hibernation and suspend events */
+#define PM_HIBERNATION_PREPARE  0x0001 /* Going to hibernate */
+#define PM_POST_HIBERNATION     0x0002 /* Hibernation finished */
+#define PM_SUSPEND_PREPARE      0x0003 /* Going to suspend the system */
+#define PM_POST_SUSPEND         0x0004 /* Suspend finished */
+#define PM_RESTORE_PREPARE      0x0005 /* Going to restore a saved image */
+#define PM_POST_RESTORE         0x0006 /* Restore failed */
 #ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);
 void restore_processor_state(void);
diff --git a/include/linux/swap.h b/include/linux/swap.h
index a273468f8285..14d62490922e 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -9,7 +9,7 @@
 #include <linux/sched.h>
 #include <linux/node.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/page.h>
 struct notifier_block;
@@ -251,14 +251,6 @@ static inline void lru_cache_add_file(struct page *page)
 /* linux/mm/vmscan.c */
 extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
                                        gfp_t gfp_mask, nodemask_t *mask);
-extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,
-                                                  gfp_t gfp_mask, bool noswap,
-                                                  unsigned int swappiness);
-extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
-                                                gfp_t gfp_mask, bool noswap,
-                                                unsigned int swappiness,
-                                                struct zone *zone,
-                                                unsigned long *nr_scanned);
 extern int __isolate_lru_page(struct page *page, int mode, int file);
 extern unsigned long shrink_all_memory(unsigned long nr_pages);
 extern int vm_swappiness;
@@ -299,7 +291,14 @@ static inline void scan_unevictable_unregister_node(struct node *node)
 extern int kswapd_run(int nid);
 extern void kswapd_stop(int nid);
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+extern int mem_cgroup_swappiness(struct mem_cgroup *mem);
+#else
+static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
+{
+        return vm_swappiness;
+}
+#endif
 #ifdef CONFIG_SWAP
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct page *);
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index e2696d76a599..d7d2f2158142 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -17,7 +17,7 @@
 #include <linux/list.h>
 #include <linux/lockdep.h>
 #include <linux/kobject_ns.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct kobject;
 struct module;
diff --git a/include/linux/tty.h b/include/linux/tty.h
index d6f05292e456..44bc0c5617e1 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -5,24 +5,6 @@
 * 'tty.h' defines some structures used by tty_io.c and some defines.
 */
-#ifdef __KERNEL__
-#include <linux/fs.h>
-#include <linux/major.h>
-#include <linux/termios.h>
-#include <linux/workqueue.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_ldisc.h>
-#include <linux/mutex.h>
-#include <asm/system.h>
-/*
- * (Note: the *_driver.minor_start values 1, 64, 128, 192 are
- * hardcoded at present.)
- */
-#define NR_UNIX98_PTY_DEFAULT   4096      /* Default maximum for Unix98 ptys */
-#define NR_UNIX98_PTY_MAX       (1 << MINORBITS) /* Absolute limit */
 #define NR_LDISCS               30
 /* line disciplines */
@@ -53,6 +35,25 @@
 #define N_TRACESINK     23      /* Trace data routing for MIPI P1149.7 */
 #define N_TRACEROUTER   24      /* Trace data routing for MIPI P1149.7 */
+#ifdef __KERNEL__
+#include <linux/fs.h>
+#include <linux/major.h>
+#include <linux/termios.h>
+#include <linux/workqueue.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_ldisc.h>
+#include <linux/mutex.h>
+#include <asm/system.h>
+/*
+ * (Note: the *_driver.minor_start values 1, 64, 128, 192 are
+ * hardcoded at present.)
+ */
+#define NR_UNIX98_PTY_DEFAULT   4096      /* Default maximum for Unix98 ptys */
+#define NR_UNIX98_PTY_MAX       (1 << MINORBITS) /* Absolute limit */
 /*
 * This character is the same as _POSIX_VDISABLE: it cannot be used as
 * a c_cc[] character, but indicates that a particular special character
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index b78cba466d3d..a316fba73518 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -59,6 +59,10 @@ struct usb_configuration;
 * @hs_descriptors: Table of high speed descriptors, using interface and
 *      string identifiers assigned during @bind().  If this pointer is null,
 *      the function will not be available at high speed.
+ * @ss_descriptors: Table of super speed descriptors, using interface and
+ *      string identifiers assigned during @bind(). If this
+ *      pointer is null after initiation, the function will not
+ *      be available at super speed.
 * @config: assigned when @usb_add_function() is called; this is the
 *      configuration with which this function is associated.
 * @bind: Before the gadget can register, all of its functions bind() to the
@@ -77,6 +81,10 @@ struct usb_configuration;
 * @setup: Used for interface-specific control requests.
 * @suspend: Notifies functions when the host stops sending USB traffic.
 * @resume: Notifies functions when the host restarts USB traffic.
+ * @get_status: Returns function status as a reply to
+ *      GetStatus() request when the recepient is Interface.
+ * @func_suspend: callback to be called when
+ *      SetFeature(FUNCTION_SUSPEND) is reseived
 *
 * A single USB function uses one or more interfaces, and should in most
 * cases support operation at both full and high speeds.  Each function is
@@ -106,6 +114,7 @@ struct usb_function {
        struct usb_gadget_strings       **strings;
        struct usb_descriptor_header    **descriptors;
        struct usb_descriptor_header    **hs_descriptors;
+        struct usb_descriptor_header    **ss_descriptors;
        struct usb_configuration        *config;
@@ -132,6 +141,10 @@ struct usb_function {
        void                    (*suspend)(struct usb_function *);
        void                    (*resume)(struct usb_function *);
+        /* USB 3.0 additions */
+        int                     (*get_status)(struct usb_function *);
+        int                     (*func_suspend)(struct usb_function *,
+                                                u8 suspend_opt);
        /* private: */
        /* internals */
        struct list_head                list;
@@ -145,20 +158,8 @@ int usb_function_activate(struct usb_function *);
 int usb_interface_id(struct usb_configuration *, struct usb_function *);
-/**
+int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
- * ep_choose - select descriptor endpoint at current device speed
+                        struct usb_ep *_ep);
- * @g: gadget, connected and running at some speed
- * @hs: descriptor to use for high speed operation
- * @fs: descriptor to use for full or low speed operation
- */
-static inline struct usb_endpoint_descriptor *
-ep_choose(struct usb_gadget *g, struct usb_endpoint_descriptor *hs,
-                struct usb_endpoint_descriptor *fs)
-{
-        if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
-                return hs;
-        return fs;
-}
 #define MAX_CONFIG_INTERFACES           16      /* arbitrary; max 255 */
@@ -231,6 +232,7 @@ struct usb_configuration {
        struct list_head        list;
        struct list_head        functions;
        u8                      next_interface_id;
+        unsigned                superspeed:1;
        unsigned                highspeed:1;
        unsigned                fullspeed:1;
        struct usb_function     *interface[MAX_CONFIG_INTERFACES];
@@ -252,6 +254,7 @@ int usb_add_config(struct usb_composite_dev *,
 *      identifiers.
 * @strings: tables of strings, keyed by identifiers assigned during bind()
 *      and language IDs provided in control requests
+ * @max_speed: Highest speed the driver supports.
 * @needs_serial: set to 1 if the gadget needs userspace to provide
 *      a serial number.  If one is not provided, warning will be printed.
 * @unbind: Reverses bind; called as a side effect of unregistering
@@ -279,6 +282,7 @@ struct usb_composite_driver {
        const char                              *iManufacturer;
        const struct usb_device_descriptor      *dev;
        struct usb_gadget_strings               **strings;
+        enum usb_device_speed                   max_speed;
        unsigned                needs_serial:1;
        int                     (*unbind)(struct usb_composite_dev *);
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index dd1571db55e7..087f4b931833 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -15,7 +15,13 @@
 #ifndef __LINUX_USB_GADGET_H
 #define __LINUX_USB_GADGET_H
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/list.h>
 #include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/usb/ch9.h>
 struct usb_ep;
@@ -27,6 +33,7 @@ struct usb_ep;
 *      field, and the usb controller needs one, it is responsible
 *      for mapping and unmapping the buffer.
 * @length: Length of that data
+ * @stream_id: The stream id, when USB3.0 bulk streams are being used
 * @no_interrupt: If true, hints that no completion irq is needed.
 *      Helpful sometimes with deep request queues that are handled
 *      directly by DMA controllers.
@@ -81,6 +88,7 @@ struct usb_request {
        unsigned                length;
        dma_addr_t              dma;
+        unsigned                stream_id:16;
        unsigned                no_interrupt:1;
        unsigned                zero:1;
        unsigned                short_not_ok:1;
@@ -131,8 +139,17 @@ struct usb_ep_ops {
 * @maxpacket:The maximum packet size used on this endpoint.  The initial
 *      value can sometimes be reduced (hardware allowing), according to
 *      the endpoint descriptor used to configure the endpoint.
- * @driver_data:for use by the gadget driver.  all other fields are
+ * @max_streams: The maximum number of streams supported
- *      read-only to gadget drivers.
+ *      by this EP (0 - 16, actual number is 2^n)
+ * @mult: multiplier, 'mult' value for SS Isoc EPs
+ * @maxburst: the maximum number of bursts supported by this EP (for usb3)
+ * @driver_data:for use by the gadget driver.
+ * @address: used to identify the endpoint when finding descriptor that
+ *      matches connection speed
+ * @desc: endpoint descriptor.  This pointer is set before the endpoint is
+ *      enabled and remains valid until the endpoint is disabled.
+ * @comp_desc: In case of SuperSpeed support, this is the endpoint companion
+ *      descriptor that is used to configure the endpoint
 *
 * the bus controller driver lists all the general purpose endpoints in
 * gadget->ep_list.  the control endpoint (gadget->ep0) is not in that list,
@@ -145,6 +162,12 @@ struct usb_ep {
        const struct usb_ep_ops *ops;
        struct list_head        ep_list;
        unsigned                maxpacket:16;
+        unsigned                max_streams:16;
+        unsigned                mult:2;
+        unsigned                maxburst:4;
+        u8                      address;
+        const struct usb_endpoint_descriptor    *desc;
+        const struct usb_ss_ep_comp_descriptor  *comp_desc;
 };
 /*-------------------------------------------------------------------------*/
@@ -153,11 +176,8 @@ struct usb_ep {
 * usb_ep_enable - configure endpoint, making it usable
 * @ep:the endpoint being configured.  may not be the endpoint named "ep0".
 *      drivers discover endpoints through the ep_list of a usb_gadget.
- * @desc:descriptor for desired behavior.  caller guarantees this pointer
- *      remains valid until the endpoint is disabled; the data byte order
- *      is little-endian (usb-standard).
 *
- * when configurations are set, or when interface settings change, the driver
+ * When configurations are set, or when interface settings change, the driver
 * will enable or disable the relevant endpoints.  while it is enabled, an
 * endpoint may be used for i/o until the driver receives a disconnect() from
 * the host or until the endpoint is disabled.
@@ -172,10 +192,9 @@ struct usb_ep {
 *
 * returns zero, or a negative error code.
 */
-static inline int usb_ep_enable(struct usb_ep *ep,
+static inline int usb_ep_enable(struct usb_ep *ep)
-                                const struct usb_endpoint_descriptor *desc)
 {
-        return ep->ops->enable(ep, desc);
+        return ep->ops->enable(ep, ep->desc);
 }
 /**
@@ -416,7 +435,16 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)
 /*-------------------------------------------------------------------------*/
+struct usb_dcd_config_params {
+        __u8  bU1devExitLat;    /* U1 Device exit Latency */
+#define USB_DEFULT_U1_DEV_EXIT_LAT      0x01    /* Less then 1 microsec */
+        __le16 bU2DevExitLat;   /* U2 Device exit Latency */
+#define USB_DEFULT_U2_DEV_EXIT_LAT      0x1F4   /* Less then 500 microsec */
+};
 struct usb_gadget;
+struct usb_gadget_driver;
 /* the rest of the api to the controller hardware: device operations,
 * which don't involve endpoints (or i/o).
@@ -430,6 +458,16 @@ struct usb_gadget_ops {
        int     (*pullup) (struct usb_gadget *, int is_on);
        int     (*ioctl)(struct usb_gadget *,
                                unsigned code, unsigned long param);
+        void    (*get_config_params)(struct usb_dcd_config_params *);
+        int     (*udc_start)(struct usb_gadget *,
+                        struct usb_gadget_driver *);
+        int     (*udc_stop)(struct usb_gadget *,
+                        struct usb_gadget_driver *);
+        /* Those two are deprecated */
+        int     (*start)(struct usb_gadget_driver *,
+                        int (*bind)(struct usb_gadget *));
+        int     (*stop)(struct usb_gadget_driver *);
 };
 /**
@@ -521,6 +559,24 @@ static inline int gadget_is_dualspeed(struct usb_gadget *g)
 }
 /**
+ * gadget_is_superspeed() - return true if the hardware handles
+ * supperspeed
+ * @g: controller that might support supper speed
+ */
+static inline int gadget_is_superspeed(struct usb_gadget *g)
+{
+#ifdef CONFIG_USB_GADGET_SUPERSPEED
+        /*
+         * runtime test would check "g->is_superspeed" ... that might be
+         * useful to work around hardware bugs, but is mostly pointless
+         */
+        return 1;
+#else
+        return 0;
+#endif
+}
+/**
 * gadget_is_otg - return true iff the hardware is OTG-ready
 * @g: controller that might have a Mini-AB connector
 *
@@ -821,6 +877,9 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
 */
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver);
+extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget);
+extern void usb_del_gadget_udc(struct usb_gadget *gadget);
 /*-------------------------------------------------------------------------*/
 /* utility to simplify dealing with string descriptors */
@@ -870,12 +929,6 @@ int usb_gadget_config_buf(const struct usb_config_descriptor *config,
 struct usb_descriptor_header **usb_copy_descriptors(
                struct usb_descriptor_header **);
-/* return copy of endpoint descriptor given original descriptor set */
-struct usb_endpoint_descriptor *usb_find_endpoint(
-        struct usb_descriptor_header **src,
-        struct usb_descriptor_header **copy,
-        struct usb_endpoint_descriptor *match);
 /**
 * usb_free_descriptors - free descriptors returned by usb_copy_descriptors()
 * @v: vector of descriptors
@@ -892,6 +945,11 @@ static inline void usb_free_descriptors(struct usb_descriptor_header **v)
 extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *,
                        struct usb_endpoint_descriptor *);
+extern struct usb_ep *usb_ep_autoconfig_ss(struct usb_gadget *,
+                        struct usb_endpoint_descriptor *,
+                        struct usb_ss_ep_comp_descriptor *);
 extern void usb_ep_autoconfig_reset(struct usb_gadget *);
 #endif /* __LINUX_USB_GADGET_H */
diff --git a/include/linux/usb/m66592.h b/include/linux/usb/m66592.h
index cda9625e7df0..a4ba31ab2fed 100644
--- a/include/linux/usb/m66592.h
+++ b/include/linux/usb/m66592.h
@@ -38,6 +38,8 @@ struct m66592_platdata {
        /* (external controller only) one = 3.3V, zero = 1.5V */
        unsigned        vif:1;
+        /* (external controller only) set one = WR0_N shorted to WR1_N */
+        unsigned        wr0_shorted_to_wr1:1;
 };
 #endif /* __LINUX_USB_M66592_H */
diff --git a/include/linux/usb/r8a66597.h b/include/linux/usb/r8a66597.h
index 26d216734057..b6b8660d0c68 100644
--- a/include/linux/usb/r8a66597.h
+++ b/include/linux/usb/r8a66597.h
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2009  Renesas Solutions Corp.
 *
- * Author : Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
+ * Author : Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,9 @@ struct r8a66597_platdata {
        /* This callback can control port power instead of DVSTCTR register. */
        void (*port_power)(int port, int power);
+        /* This parameter is for BUSWAIT */
+        u16             buswait;
        /* set one = on chip controller, set zero = external controller */
        unsigned        on_chip:1;
@@ -42,6 +45,9 @@ struct r8a66597_platdata {
        /* set one = big endian, set zero = little endian */
        unsigned        endian:1;
+        /* (external controller only) set one = WR0_N shorted to WR1_N */
+        unsigned        wr0_shorted_to_wr1:1;
 };
 /* Register definitions */
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 3a7f1d982dd6..8977431259c6 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -110,6 +110,23 @@ struct renesas_usbhs_driver_param {
         * delay time from notify_hotplug callback
         */
        int detection_delay;
+        /*
+         * option:
+         *
+         * dma id for dmaengine
+         */
+        int d0_tx_id;
+        int d0_rx_id;
+        int d1_tx_id;
+        int d1_rx_id;
+        /*
+         * option:
+         *
+         * pio <--> dma border.
+         */
+        int pio_dma_border; /* default is 64byte */
 };
 /*
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index bcd942fa611c..65efb92da996 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -6,7 +6,7 @@
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/vm_event_item.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 extern int sysctl_stat_interval;
diff --git a/include/linux/vt.h b/include/linux/vt.h
index d5dd0bc408fd..30a8dd9c83ff 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -86,6 +86,13 @@ struct vt_setactivate {
 #ifdef __KERNEL__
+/* Virtual Terminal events. */
+#define VT_ALLOCATE             0x0001 /* Console got allocated */
+#define VT_DEALLOCATE           0x0002 /* Console will be deallocated */
+#define VT_WRITE                0x0003 /* A char got output */
+#define VT_UPDATE               0x0004 /* A bigger update occurred */
+#define VT_PREWRITE             0x0005 /* A char is about to be written to the console */
 #ifdef CONFIG_VT_CONSOLE
 extern int vt_kmsg_redirect(int new);
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 4d05e14ea60c..c2164fad0083 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -137,7 +137,7 @@ int vty_init(const struct file_operations *console_fops);
 static inline bool vt_force_oops_output(struct vc_data *vc)
 {
-        if (oops_in_progress && vc->vc_panic_force_write)
+        if (oops_in_progress && vc->vc_panic_force_write  && panic_timeout >= 0)
                return true;
        return false;
 }
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 2be2887c6958..0d556deb497b 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -10,7 +10,7 @@
 #include <linux/bitops.h>
 #include <linux/lockdep.h>
 #include <linux/threads.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct workqueue_struct;
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 17e7ccc322a5..f1bfa12ea246 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -7,9 +7,39 @@
 #include <linux/sched.h>
 #include <linux/fs.h>
-struct backing_dev_info;
+/*
+ * The 1/4 region under the global dirty thresh is for smooth dirty throttling:
+ *
+ *      (thresh - thresh/DIRTY_FULL_SCOPE, thresh)
+ *
+ * The 1/16 region above the global dirty limit will be put to maximum pauses:
+ *
+ *      (limit, limit + limit/DIRTY_MAXPAUSE_AREA)
+ *
+ * The 1/16 region above the max-pause region, dirty exceeded bdi's will be put
+ * to loops:
+ *
+ *      (limit + limit/DIRTY_MAXPAUSE_AREA, limit + limit/DIRTY_PASSGOOD_AREA)
+ *
+ * Further beyond, all dirtier tasks will enter a loop waiting (possibly long
+ * time) for the dirty pages to drop, unless written enough pages.
+ *
+ * The global dirty threshold is normally equal to the global dirty limit,
+ * except when the system suddenly allocates a lot of anonymous memory and
+ * knocks down the global dirty threshold quickly, in which case the global
+ * dirty limit will follow down slowly to prevent livelocking all dirtier tasks.
+ */
+#define DIRTY_SCOPE             8
+#define DIRTY_FULL_SCOPE        (DIRTY_SCOPE / 2)
+#define DIRTY_MAXPAUSE_AREA             16
+#define DIRTY_PASSGOOD_AREA             8
-extern spinlock_t inode_wb_list_lock;
+/*
+ * 4MB minimal write chunk size
+ */
+#define MIN_WRITEBACK_PAGES     (4096UL >> (PAGE_CACHE_SHIFT - 10))
+struct backing_dev_info;
 /*
 * fs/fs-writeback.c
@@ -26,11 +56,6 @@ enum writeback_sync_modes {
 */
 struct writeback_control {
        enum writeback_sync_modes sync_mode;
-        unsigned long *older_than_this; /* If !NULL, only write back inodes
-                                           older than this */
-        unsigned long wb_start;         /* Time writeback_inodes_wb was
-                                           called. This is needed to avoid
-                                           extra jobs and livelock */
        long nr_to_write;               /* Write this many pages, and decrement
                                           this for each page written */
        long pages_skipped;             /* Pages which were not written */
@@ -43,13 +68,11 @@ struct writeback_control {
        loff_t range_start;
        loff_t range_end;
-        unsigned nonblocking:1;         /* Don't get stuck on request queues */
-        unsigned encountered_congestion:1; /* An output: a queue is full */
        unsigned for_kupdate:1;         /* A kupdate writeback */
        unsigned for_background:1;      /* A background writeback */
+        unsigned tagged_writepages:1;   /* tag-and-write to avoid livelock */
        unsigned for_reclaim:1;         /* Invoked from the page allocator */
        unsigned range_cyclic:1;        /* range_start is cyclic */
-        unsigned more_io:1;             /* more io to be dispatched */
 };
 /*
@@ -62,8 +85,7 @@ void writeback_inodes_sb_nr(struct super_block *, unsigned long nr);
 int writeback_inodes_sb_if_idle(struct super_block *);
 int writeback_inodes_sb_nr_if_idle(struct super_block *, unsigned long nr);
 void sync_inodes_sb(struct super_block *);
-void writeback_inodes_wb(struct bdi_writeback *wb,
+long writeback_inodes_wb(struct bdi_writeback *wb, long nr_pages);
-                struct writeback_control *wbc);
 long wb_do_writeback(struct bdi_writeback *wb, int force_wait);
 void wakeup_flusher_threads(long nr_pages);
@@ -94,6 +116,8 @@ static inline void laptop_sync_completion(void) { }
 #endif
 void throttle_vm_writeout(gfp_t gfp_mask);
+extern unsigned long global_dirty_limit;
 /* These are exported to sysctl. */
 extern int dirty_background_ratio;
 extern unsigned long dirty_background_bytes;
@@ -128,6 +152,13 @@ void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty);
 unsigned long bdi_dirty_limit(struct backing_dev_info *bdi,
                               unsigned long dirty);
+void __bdi_update_bandwidth(struct backing_dev_info *bdi,
+                            unsigned long thresh,
+                            unsigned long dirty,
+                            unsigned long bdi_thresh,
+                            unsigned long bdi_dirty,
+                            unsigned long start_time);
 void page_writeback_init(void);
 void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
                                        unsigned long nr_pages_dirtied);
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 206d22297ac3..94e09d361bb1 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -11,7 +11,7 @@
 #include <linux/timer.h>
 #include <linux/list.h>
 #include <linux/slab.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #define AX25_T1CLAMPLO                  1
 #define AX25_T1CLAMPHI                  (30 * HZ)
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index abd443604c9f..3b938743514b 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -41,7 +41,7 @@
 #include <linux/skbuff.h>
 #include <net/netlabel.h>
 #include <net/request_sock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /* known doi values */
 #define CIPSO_V4_DOI_UNKNOWN          0x00000000
diff --git a/include/net/flow.h b/include/net/flow.h
index c6d5fe5ec1bf..78113daadd63 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -8,7 +8,7 @@
 #define _NET_FLOW_H
 #include <linux/in6.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct flowi_common {
        int     flowic_oif;
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index e9c2ed8af864..808fc5f76b03 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -33,7 +33,7 @@
 #include <net/tcp_states.h>
 #include <net/netns/hash.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/byteorder.h>
 /* This is for all connections with a full identity, no wildcards.
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 17404b5388a7..f1a770977c4f 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -28,7 +28,7 @@
 #include <net/tcp_states.h>
 #include <net/timewait_sock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct inet_hashinfo;
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 4233e6f9841d..78c83e62218f 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -13,7 +13,7 @@
 #include <linux/spinlock.h>
 #include <linux/rtnetlink.h>
 #include <net/ipv6.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct inetpeer_addr_base {
        union {
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index b1370c4015b6..1aaf915656f3 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -13,7 +13,7 @@
 #include <linux/sysctl.h>               /* for ctl_path */
 #include <linux/list.h>                 /* for struct list_head */
 #include <linux/spinlock.h>             /* for struct rwlock_t */
-#include <asm/atomic.h>                 /* for struct atomic_t */
+#include <linux/atomic.h>                 /* for struct atomic_t */
 #include <linux/compiler.h>
 #include <linux/timer.h>
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index 848cce1bb7a5..b95bbb083ee8 100644
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -26,7 +26,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
 #include <linux/ieee80211.h>
diff --git a/include/net/llc.h b/include/net/llc.h
index 5503b74ab170..226c846cab08 100644
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -20,7 +20,7 @@
 #include <linux/hash.h>
 #include <linux/jhash.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct net_device;
 struct packet_type;
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4ba8521490ba..2720884287c3 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -16,7 +16,7 @@
 *              - Add neighbour cache statistics like rtstat
 */
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/rcupdate.h>
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 1ab1aec209ac..3bb6fa0eace0 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -4,7 +4,7 @@
 #ifndef __NET_NET_NAMESPACE_H
 #define __NET_NET_NAMESPACE_H
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/workqueue.h>
 #include <linux/list.h>
 #include <linux/sysctl.h>
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 5d4f8e586e32..0b7f05e4a927 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -16,7 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/compiler.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/netfilter/nf_conntrack_tcp.h>
 #include <linux/netfilter/nf_conntrack_dccp.h>
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 9db401a8b4d9..f21a16ee3705 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -38,7 +38,7 @@
 #include <linux/in6.h>
 #include <net/netlink.h>
 #include <net/request_sock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct cipso_v4_doi;
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 341eb089349e..0249399e51a7 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -3,7 +3,7 @@
 #include <linux/list.h>
 #include <linux/list_nulls.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct ctl_table_header;
 struct nf_conntrack_ecache;
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 31d7ea2e1d2a..f7d9c3fc06fd 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -60,7 +60,7 @@
 #include <linux/in6.h>          /* We get struct in6_addr     */
 #include <linux/ipv6.h>
 #include <asm/param.h>          /* We get MAXHOSTNAMELEN.     */
-#include <asm/atomic.h>         /* This gets us atomic counters.  */
+#include <linux/atomic.h>               /* This gets us atomic counters.  */
 #include <linux/skbuff.h>       /* We need sk_buff_head. */
 #include <linux/workqueue.h>    /* We need tq_struct.    */
 #include <linux/sctp.h>         /* We need sctp* header structs.  */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 7b82080eb02c..3bbbd78e1439 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -26,7 +26,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <pcmcia/ss.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 /*
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index 1082afaed158..d44a56388a3e 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -38,7 +38,7 @@
 #include <linux/completion.h>
 #include <linux/compiler.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_mad.h>
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index bf4306aea169..228be3e220d9 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -49,7 +49,7 @@
 #include <linux/scatterlist.h>
 #include <linux/workqueue.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/uaccess.h>
 extern struct workqueue_struct *ib_wq;
diff --git a/include/rxrpc/types.h b/include/rxrpc/types.h
index 327a5fc4719c..30d48f6da228 100644
--- a/include/rxrpc/types.h
+++ b/include/rxrpc/types.h
@@ -17,7 +17,7 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 typedef uint32_t        rxrpc_seq_t;    /* Rx message sequence number */
 typedef uint32_t        rxrpc_serial_t; /* Rx message serial number */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index dd82e02ddde3..d371c3ca90c3 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -7,7 +7,7 @@
 #include <linux/workqueue.h>
 #include <linux/blkdev.h>
 #include <scsi/scsi.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 struct request_queue;
 struct scsi_cmnd;
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 4114129f0794..b31702ac15be 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -284,7 +284,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
                __field(        long,   pages_skipped           )
                __field(        loff_t, range_start             )
                __field(        loff_t, range_end               )
-                __field(        char,   nonblocking             )
                __field(        char,   for_kupdate             )
                __field(        char,   for_reclaim             )
                __field(        char,   range_cyclic            )
@@ -299,7 +298,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
                __entry->pages_skipped  = wbc->pages_skipped;
                __entry->range_start    = wbc->range_start;
                __entry->range_end      = wbc->range_end;
-                __entry->nonblocking    = wbc->nonblocking;
                __entry->for_kupdate    = wbc->for_kupdate;
                __entry->for_reclaim    = wbc->for_reclaim;
                __entry->range_cyclic   = wbc->range_cyclic;
@@ -310,13 +308,13 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
        TP_printk("root = %llu(%s), ino = %lu, page_index = %lu, "
                  "nr_to_write = %ld, pages_skipped = %ld, range_start = %llu, "
-                  "range_end = %llu, nonblocking = %d, for_kupdate = %d, "
+                  "range_end = %llu, for_kupdate = %d, "
                  "for_reclaim = %d, range_cyclic = %d, writeback_index = %lu",
                  show_root_type(__entry->root_objectid),
                  (unsigned long)__entry->ino, __entry->index,
                  __entry->nr_to_write, __entry->pages_skipped,
                  __entry->range_start, __entry->range_end,
-                  __entry->nonblocking, __entry->for_kupdate,
+                  __entry->for_kupdate,
                  __entry->for_reclaim, __entry->range_cyclic,
                  (unsigned long)__entry->writeback_index)
 );
diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h
new file mode 100644
index 000000000000..7b53c0573dc9
--- /dev/null
+++ b/include/trace/events/ext3.h
@@ -0,0 +1,864 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM ext3
+#if !defined(_TRACE_EXT3_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_EXT3_H
+#include <linux/tracepoint.h>
+TRACE_EVENT(ext3_free_inode,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        umode_t, mode                   )
+                __field(        uid_t,  uid                     )
+                __field(        gid_t,  gid                     )
+                __field(        blkcnt_t, blocks                )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->mode   = inode->i_mode;
+                __entry->uid    = inode->i_uid;
+                __entry->gid    = inode->i_gid;
+                __entry->blocks = inode->i_blocks;
+        ),
+        TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode, __entry->uid, __entry->gid,
+                  (unsigned long) __entry->blocks)
+);
+TRACE_EVENT(ext3_request_inode,
+        TP_PROTO(struct inode *dir, int mode),
+        TP_ARGS(dir, mode),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  dir                     )
+                __field(        umode_t, mode                   )
+        ),
+        TP_fast_assign(
+                __entry->dev    = dir->i_sb->s_dev;
+                __entry->dir    = dir->i_ino;
+                __entry->mode   = mode;
+        ),
+        TP_printk("dev %d,%d dir %lu mode 0%o",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->dir, __entry->mode)
+);
+TRACE_EVENT(ext3_allocate_inode,
+        TP_PROTO(struct inode *inode, struct inode *dir, int mode),
+        TP_ARGS(inode, dir, mode),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        ino_t,  dir                     )
+                __field(        umode_t, mode                   )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->dir    = dir->i_ino;
+                __entry->mode   = mode;
+        ),
+        TP_printk("dev %d,%d ino %lu dir %lu mode 0%o",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long) __entry->dir, __entry->mode)
+);
+TRACE_EVENT(ext3_evict_inode,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        int,    nlink                   )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->nlink  = inode->i_nlink;
+        ),
+        TP_printk("dev %d,%d ino %lu nlink %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, __entry->nlink)
+);
+TRACE_EVENT(ext3_drop_inode,
+        TP_PROTO(struct inode *inode, int drop),
+        TP_ARGS(inode, drop),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        int,    drop                    )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->drop   = drop;
+        ),
+        TP_printk("dev %d,%d ino %lu drop %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, __entry->drop)
+);
+TRACE_EVENT(ext3_mark_inode_dirty,
+        TP_PROTO(struct inode *inode, unsigned long IP),
+        TP_ARGS(inode, IP),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(unsigned long,  ip                      )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->ip     = IP;
+        ),
+        TP_printk("dev %d,%d ino %lu caller %pF",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, (void *)__entry->ip)
+);
+TRACE_EVENT(ext3_write_begin,
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int flags),
+        TP_ARGS(inode, pos, len, flags),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned int, len               )
+                __field(        unsigned int, flags             )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = pos;
+                __entry->len    = len;
+                __entry->flags  = flags;
+        ),
+        TP_printk("dev %d,%d ino %lu pos %llu len %u flags %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len,
+                  __entry->flags)
+);
+DECLARE_EVENT_CLASS(ext3__write_end,
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                        unsigned int copied),
+        TP_ARGS(inode, pos, len, copied),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned int, len               )
+                __field(        unsigned int, copied            )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = pos;
+                __entry->len    = len;
+                __entry->copied = copied;
+        ),
+        TP_printk("dev %d,%d ino %lu pos %llu len %u copied %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len,
+                  __entry->copied)
+);
+DEFINE_EVENT(ext3__write_end, ext3_ordered_write_end,
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int copied),
+        TP_ARGS(inode, pos, len, copied)
+);
+DEFINE_EVENT(ext3__write_end, ext3_writeback_write_end,
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int copied),
+        TP_ARGS(inode, pos, len, copied)
+);
+DEFINE_EVENT(ext3__write_end, ext3_journalled_write_end,
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int copied),
+        TP_ARGS(inode, pos, len, copied)
+);
+DECLARE_EVENT_CLASS(ext3__page_op,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        pgoff_t, index                  )
+        ),
+        TP_fast_assign(
+                __entry->index  = page->index;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu page_index %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, __entry->index)
+);
+DEFINE_EVENT(ext3__page_op, ext3_ordered_writepage,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+);
+DEFINE_EVENT(ext3__page_op, ext3_writeback_writepage,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+);
+DEFINE_EVENT(ext3__page_op, ext3_journalled_writepage,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+);
+DEFINE_EVENT(ext3__page_op, ext3_readpage,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+);
+DEFINE_EVENT(ext3__page_op, ext3_releasepage,
+        TP_PROTO(struct page *page),
+        TP_ARGS(page)
+);
+TRACE_EVENT(ext3_invalidatepage,
+        TP_PROTO(struct page *page, unsigned long offset),
+        TP_ARGS(page, offset),
+        TP_STRUCT__entry(
+                __field(        pgoff_t, index                  )
+                __field(        unsigned long, offset           )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->index  = page->index;
+                __entry->offset = offset;
+                __entry->ino    = page->mapping->host->i_ino;
+                __entry->dev    = page->mapping->host->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->index, __entry->offset)
+);
+TRACE_EVENT(ext3_discard_blocks,
+        TP_PROTO(struct super_block *sb, unsigned long blk,
+                        unsigned long count),
+        TP_ARGS(sb, blk, count),
+        TP_STRUCT__entry(
+                __field(        dev_t,          dev             )
+                __field(        unsigned long,  blk             )
+                __field(        unsigned long,  count           )
+        ),
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->blk    = blk;
+                __entry->count  = count;
+        ),
+        TP_printk("dev %d,%d blk %lu count %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->blk, __entry->count)
+);
+TRACE_EVENT(ext3_request_blocks,
+        TP_PROTO(struct inode *inode, unsigned long goal,
+                 unsigned long count),
+        TP_ARGS(inode, goal, count),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        unsigned long, count            )
+                __field(        unsigned long,  goal            )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->count  = count;
+                __entry->goal   = goal;
+        ),
+        TP_printk("dev %d,%d ino %lu count %lu goal %lu ",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->count, __entry->goal)
+);
+TRACE_EVENT(ext3_allocate_blocks,
+        TP_PROTO(struct inode *inode, unsigned long goal,
+                 unsigned long count, unsigned long block),
+        TP_ARGS(inode, goal, count, block),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        unsigned long,  block           )
+                __field(        unsigned long, count            )
+                __field(        unsigned long,  goal            )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->block  = block;
+                __entry->count  = count;
+                __entry->goal   = goal;
+        ),
+        TP_printk("dev %d,%d ino %lu count %lu block %lu goal %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                   __entry->count, __entry->block,
+                  __entry->goal)
+);
+TRACE_EVENT(ext3_free_blocks,
+        TP_PROTO(struct inode *inode, unsigned long block,
+                 unsigned long count),
+        TP_ARGS(inode, block, count),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        umode_t, mode                   )
+                __field(        unsigned long,  block           )
+                __field(        unsigned long,  count           )
+        ),
+        TP_fast_assign(
+                __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
+                __entry->mode           = inode->i_mode;
+                __entry->block          = block;
+                __entry->count          = count;
+        ),
+        TP_printk("dev %d,%d ino %lu mode 0%o block %lu count %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode, __entry->block, __entry->count)
+);
+TRACE_EVENT(ext3_sync_file_enter,
+        TP_PROTO(struct file *file, int datasync),
+        TP_ARGS(file, datasync),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        ino_t,  parent                  )
+                __field(        int,    datasync                )
+        ),
+        TP_fast_assign(
+                struct dentry *dentry = file->f_path.dentry;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->datasync       = datasync;
+                __entry->parent         = dentry->d_parent->d_inode->i_ino;
+        ),
+        TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long) __entry->parent, __entry->datasync)
+);
+TRACE_EVENT(ext3_sync_file_exit,
+        TP_PROTO(struct inode *inode, int ret),
+        TP_ARGS(inode, ret),
+        TP_STRUCT__entry(
+                __field(        int,    ret                     )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->ret            = ret;
+                __entry->ino            = inode->i_ino;
+                __entry->dev            = inode->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->ret)
+);
+TRACE_EVENT(ext3_sync_fs,
+        TP_PROTO(struct super_block *sb, int wait),
+        TP_ARGS(sb, wait),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        int,    wait                    )
+        ),
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->wait   = wait;
+        ),
+        TP_printk("dev %d,%d wait %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->wait)
+);
+TRACE_EVENT(ext3_rsv_window_add,
+        TP_PROTO(struct super_block *sb,
+                 struct ext3_reserve_window_node *rsv_node),
+        TP_ARGS(sb, rsv_node),
+        TP_STRUCT__entry(
+                __field(        unsigned long,  start           )
+                __field(        unsigned long,  end             )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->start  = rsv_node->rsv_window._rsv_start;
+                __entry->end    = rsv_node->rsv_window._rsv_end;
+        ),
+        TP_printk("dev %d,%d start %lu end %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->start, __entry->end)
+);
+TRACE_EVENT(ext3_discard_reservation,
+        TP_PROTO(struct inode *inode,
+                 struct ext3_reserve_window_node *rsv_node),
+        TP_ARGS(inode, rsv_node),
+        TP_STRUCT__entry(
+                __field(        unsigned long,  start           )
+                __field(        unsigned long,  end             )
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->start  = rsv_node->rsv_window._rsv_start;
+                __entry->end    = rsv_node->rsv_window._rsv_end;
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu start %lu end %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long)__entry->ino, __entry->start,
+                  __entry->end)
+);
+TRACE_EVENT(ext3_alloc_new_reservation,
+        TP_PROTO(struct super_block *sb, unsigned long goal),
+        TP_ARGS(sb, goal),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        unsigned long,  goal            )
+        ),
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->goal   = goal;
+        ),
+        TP_printk("dev %d,%d goal %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->goal)
+);
+TRACE_EVENT(ext3_reserved,
+        TP_PROTO(struct super_block *sb, unsigned long block,
+                 struct ext3_reserve_window_node *rsv_node),
+        TP_ARGS(sb, block, rsv_node),
+        TP_STRUCT__entry(
+                __field(        unsigned long,  block           )
+                __field(        unsigned long,  start           )
+                __field(        unsigned long,  end             )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->block  = block;
+                __entry->start  = rsv_node->rsv_window._rsv_start;
+                __entry->end    = rsv_node->rsv_window._rsv_end;
+                __entry->dev    = sb->s_dev;
+        ),
+        TP_printk("dev %d,%d block %lu, start %lu end %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->block, __entry->start, __entry->end)
+);
+TRACE_EVENT(ext3_forget,
+        TP_PROTO(struct inode *inode, int is_metadata, unsigned long block),
+        TP_ARGS(inode, is_metadata, block),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        umode_t, mode                   )
+                __field(        int,    is_metadata             )
+                __field(        unsigned long,  block           )
+        ),
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->mode   = inode->i_mode;
+                __entry->is_metadata = is_metadata;
+                __entry->block  = block;
+        ),
+        TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->mode, __entry->is_metadata, __entry->block)
+);
+TRACE_EVENT(ext3_read_block_bitmap,
+        TP_PROTO(struct super_block *sb, unsigned int group),
+        TP_ARGS(sb, group),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        __u32,  group                   )
+        ),
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->group  = group;
+        ),
+        TP_printk("dev %d,%d group %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->group)
+);
+TRACE_EVENT(ext3_direct_IO_enter,
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
+        TP_ARGS(inode, offset, len, rw),
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned long,  len             )
+                __field(        int,    rw                      )
+        ),
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+        ),
+        TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len,
+                  __entry->rw)
+);
+TRACE_EVENT(ext3_direct_IO_exit,
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
+                 int rw, int ret),
+        TP_ARGS(inode, offset, len, rw, ret),
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        loff_t, pos                     )
+                __field(        unsigned long,  len             )
+                __field(        int,    rw                      )
+                __field(        int,    ret                     )
+        ),
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+                __entry->ret    = ret;
+        ),
+        TP_printk("dev %d,%d ino %lu pos %llu len %lu rw %d ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long) __entry->pos, __entry->len,
+                  __entry->rw, __entry->ret)
+);
+TRACE_EVENT(ext3_unlink_enter,
+        TP_PROTO(struct inode *parent, struct dentry *dentry),
+        TP_ARGS(parent, dentry),
+        TP_STRUCT__entry(
+                __field(        ino_t,  parent                  )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, size                    )
+                __field(        dev_t,  dev                     )
+        ),
+        TP_fast_assign(
+                __entry->parent         = parent->i_ino;
+                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->size           = dentry->d_inode->i_size;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu size %lld parent %ld",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  (unsigned long long)__entry->size,
+                  (unsigned long) __entry->parent)
+);
+TRACE_EVENT(ext3_unlink_exit,
+        TP_PROTO(struct dentry *dentry, int ret),
+        TP_ARGS(dentry, ret),
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino                     )
+                __field(        dev_t,  dev                     )
+                __field(        int,    ret                     )
+        ),
+        TP_fast_assign(
+                __entry->ino            = dentry->d_inode->i_ino;
+                __entry->dev            = dentry->d_inode->i_sb->s_dev;
+                __entry->ret            = ret;
+        ),
+        TP_printk("dev %d,%d ino %lu ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->ret)
+);
+DECLARE_EVENT_CLASS(ext3__truncate,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode),
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        blkcnt_t,       blocks          )
+        ),
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->blocks = inode->i_blocks;
+        ),
+        TP_printk("dev %d,%d ino %lu blocks %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino, (unsigned long) __entry->blocks)
+);
+DEFINE_EVENT(ext3__truncate, ext3_truncate_enter,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode)
+);
+DEFINE_EVENT(ext3__truncate, ext3_truncate_exit,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode)
+);
+TRACE_EVENT(ext3_get_blocks_enter,
+        TP_PROTO(struct inode *inode, unsigned long lblk,
+                 unsigned long len, int create),
+        TP_ARGS(inode, lblk, len, create),
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        unsigned long,  lblk            )
+                __field(        unsigned long,  len             )
+                __field(        int,            create          )
+        ),
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->lblk   = lblk;
+                __entry->len    = len;
+                __entry->create = create;
+        ),
+        TP_printk("dev %d,%d ino %lu lblk %lu len %lu create %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                  __entry->lblk, __entry->len, __entry->create)
+);
+TRACE_EVENT(ext3_get_blocks_exit,
+        TP_PROTO(struct inode *inode, unsigned long lblk,
+                 unsigned long pblk, unsigned long len, int ret),
+        TP_ARGS(inode, lblk, pblk, len, ret),
+        TP_STRUCT__entry(
+                __field(        ino_t,          ino             )
+                __field(        dev_t,          dev             )
+                __field(        unsigned long,  lblk            )
+                __field(        unsigned long,  pblk            )
+                __field(        unsigned long,  len             )
+                __field(        int,            ret             )
+        ),
+        TP_fast_assign(
+                __entry->ino    = inode->i_ino;
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->lblk   = lblk;
+                __entry->pblk   = pblk;
+                __entry->len    = len;
+                __entry->ret    = ret;
+        ),
+        TP_printk("dev %d,%d ino %lu lblk %lu pblk %lu len %lu ret %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino,
+                   __entry->lblk, __entry->pblk,
+                  __entry->len, __entry->ret)
+);
+TRACE_EVENT(ext3_load_inode,
+        TP_PROTO(struct inode *inode),
+        TP_ARGS(inode),
+        TP_STRUCT__entry(
+                __field(        ino_t,  ino             )
+                __field(        dev_t,  dev             )
+        ),
+        TP_fast_assign(
+                __entry->ino            = inode->i_ino;
+                __entry->dev            = inode->i_sb->s_dev;
+        ),
+        TP_printk("dev %d,%d ino %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  (unsigned long) __entry->ino)
+);
+#endif /* _TRACE_EXT3_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 5ce2b2f5f524..6363193a3418 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -380,7 +380,6 @@ TRACE_EVENT(ext4_da_writepages_result,
                __field(        int,    pages_written           )
                __field(        long,   pages_skipped           )
                __field(        int,    sync_mode               )
-                __field(        char,   more_io                 )       
                __field(       pgoff_t, writeback_index         )
        ),
@@ -391,16 +390,15 @@ TRACE_EVENT(ext4_da_writepages_result,
                __entry->pages_written  = pages_written;
                __entry->pages_skipped  = wbc->pages_skipped;
                __entry->sync_mode      = wbc->sync_mode;
-                __entry->more_io        = wbc->more_io;
                __entry->writeback_index = inode->i_mapping->writeback_index;
        ),
        TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                  " more_io %d sync_mode %d writeback_index %lu",
+                  "sync_mode %d writeback_index %lu",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long) __entry->ino, __entry->ret,
                  __entry->pages_written, __entry->pages_skipped,
-                  __entry->more_io, __entry->sync_mode,
+                  __entry->sync_mode,
                  (unsigned long) __entry->writeback_index)
 );
diff --git a/include/trace/events/jbd.h b/include/trace/events/jbd.h
new file mode 100644
index 000000000000..aff64d82d713
--- /dev/null
+++ b/include/trace/events/jbd.h
@@ -0,0 +1,203 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM jbd
+#if !defined(_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_JBD_H
+#include <linux/jbd.h>
+#include <linux/tracepoint.h>
+TRACE_EVENT(jbd_checkpoint,
+        TP_PROTO(journal_t *journal, int result),
+        TP_ARGS(journal, result),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        int,    result                  )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->result         = result;
+        ),
+        TP_printk("dev %d,%d result %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->result)
+);
+DECLARE_EVENT_CLASS(jbd_commit,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        char,   sync_commit             )
+                __field(        int,    transaction             )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->sync_commit = commit_transaction->t_synchronous_commit;
+                __entry->transaction    = commit_transaction->t_tid;
+        ),
+        TP_printk("dev %d,%d transaction %d sync %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->transaction, __entry->sync_commit)
+);
+DEFINE_EVENT(jbd_commit, jbd_start_commit,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction)
+);
+DEFINE_EVENT(jbd_commit, jbd_commit_locking,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction)
+);
+DEFINE_EVENT(jbd_commit, jbd_commit_flushing,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction)
+);
+DEFINE_EVENT(jbd_commit, jbd_commit_logging,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction)
+);
+TRACE_EVENT(jbd_drop_transaction,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        char,   sync_commit             )
+                __field(        int,    transaction             )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->sync_commit = commit_transaction->t_synchronous_commit;
+                __entry->transaction    = commit_transaction->t_tid;
+        ),
+        TP_printk("dev %d,%d transaction %d sync %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->transaction, __entry->sync_commit)
+);
+TRACE_EVENT(jbd_end_commit,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        char,   sync_commit             )
+                __field(        int,    transaction             )
+                __field(        int,    head                    )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->sync_commit = commit_transaction->t_synchronous_commit;
+                __entry->transaction    = commit_transaction->t_tid;
+                __entry->head           = journal->j_tail_sequence;
+        ),
+        TP_printk("dev %d,%d transaction %d sync %d head %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->transaction, __entry->sync_commit, __entry->head)
+);
+TRACE_EVENT(jbd_do_submit_data,
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
+        TP_ARGS(journal, commit_transaction),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        char,   sync_commit             )
+                __field(        int,    transaction             )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->sync_commit = commit_transaction->t_synchronous_commit;
+                __entry->transaction    = commit_transaction->t_tid;
+        ),
+        TP_printk("dev %d,%d transaction %d sync %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                   __entry->transaction, __entry->sync_commit)
+);
+TRACE_EVENT(jbd_cleanup_journal_tail,
+        TP_PROTO(journal_t *journal, tid_t first_tid,
+                 unsigned long block_nr, unsigned long freed),
+        TP_ARGS(journal, first_tid, block_nr, freed),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        tid_t,  tail_sequence           )
+                __field(        tid_t,  first_tid               )
+                __field(unsigned long,  block_nr                )
+                __field(unsigned long,  freed                   )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->tail_sequence  = journal->j_tail_sequence;
+                __entry->first_tid      = first_tid;
+                __entry->block_nr       = block_nr;
+                __entry->freed          = freed;
+        ),
+        TP_printk("dev %d,%d from %u to %u offset %lu freed %lu",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->tail_sequence, __entry->first_tid,
+                  __entry->block_nr, __entry->freed)
+);
+TRACE_EVENT(jbd_update_superblock_end,
+        TP_PROTO(journal_t *journal, int wait),
+        TP_ARGS(journal, wait),
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        int,    wait                    )
+        ),
+        TP_fast_assign(
+                __entry->dev            = journal->j_fs_dev->bd_dev;
+                __entry->wait           = wait;
+        ),
+        TP_printk("dev %d,%d wait %d",
+                  MAJOR(__entry->dev), MINOR(__entry->dev),
+                   __entry->wait)
+);
+#endif /* _TRACE_JBD_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 4e249b927eaa..6bca4cc0063c 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -8,6 +8,19 @@
 #include <linux/device.h>
 #include <linux/writeback.h>
+#define show_inode_state(state)                                 \
+        __print_flags(state, "|",                               \
+                {I_DIRTY_SYNC,          "I_DIRTY_SYNC"},        \
+                {I_DIRTY_DATASYNC,      "I_DIRTY_DATASYNC"},    \
+                {I_DIRTY_PAGES,         "I_DIRTY_PAGES"},       \
+                {I_NEW,                 "I_NEW"},               \
+                {I_WILL_FREE,           "I_WILL_FREE"},         \
+                {I_FREEING,             "I_FREEING"},           \
+                {I_CLEAR,               "I_CLEAR"},             \
+                {I_SYNC,                "I_SYNC"},              \
+                {I_REFERENCED,          "I_REFERENCED"}         \
+        )
 struct wb_writeback_work;
 DECLARE_EVENT_CLASS(writeback_work_class,
@@ -49,6 +62,9 @@ DEFINE_EVENT(writeback_work_class, name, \
 DEFINE_WRITEBACK_WORK_EVENT(writeback_nothread);
 DEFINE_WRITEBACK_WORK_EVENT(writeback_queue);
 DEFINE_WRITEBACK_WORK_EVENT(writeback_exec);
+DEFINE_WRITEBACK_WORK_EVENT(writeback_start);
+DEFINE_WRITEBACK_WORK_EVENT(writeback_written);
+DEFINE_WRITEBACK_WORK_EVENT(writeback_wait);
 TRACE_EVENT(writeback_pages_written,
        TP_PROTO(long pages_written),
@@ -88,6 +104,30 @@ DEFINE_WRITEBACK_EVENT(writeback_bdi_register);
 DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister);
 DEFINE_WRITEBACK_EVENT(writeback_thread_start);
 DEFINE_WRITEBACK_EVENT(writeback_thread_stop);
+DEFINE_WRITEBACK_EVENT(balance_dirty_start);
+DEFINE_WRITEBACK_EVENT(balance_dirty_wait);
+TRACE_EVENT(balance_dirty_written,
+        TP_PROTO(struct backing_dev_info *bdi, int written),
+        TP_ARGS(bdi, written),
+        TP_STRUCT__entry(
+                __array(char,   name, 32)
+                __field(int,    written)
+        ),
+        TP_fast_assign(
+                strncpy(__entry->name, dev_name(bdi->dev), 32);
+                __entry->written = written;
+        ),
+        TP_printk("bdi %s written %d",
+                  __entry->name,
+                  __entry->written
+        )
+);
 DECLARE_EVENT_CLASS(wbc_class,
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
@@ -101,8 +141,6 @@ DECLARE_EVENT_CLASS(wbc_class,
                __field(int, for_background)
                __field(int, for_reclaim)
                __field(int, range_cyclic)
-                __field(int, more_io)
-                __field(unsigned long, older_than_this)
                __field(long, range_start)
                __field(long, range_end)
        ),
@@ -116,15 +154,12 @@ DECLARE_EVENT_CLASS(wbc_class,
                __entry->for_background = wbc->for_background;
                __entry->for_reclaim    = wbc->for_reclaim;
                __entry->range_cyclic   = wbc->range_cyclic;
-                __entry->more_io        = wbc->more_io;
-                __entry->older_than_this = wbc->older_than_this ?
-                                                *wbc->older_than_this : 0;
                __entry->range_start    = (long)wbc->range_start;
                __entry->range_end      = (long)wbc->range_end;
        ),
        TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d "
-                "bgrd=%d reclm=%d cyclic=%d more=%d older=0x%lx "
+                "bgrd=%d reclm=%d cyclic=%d "
                "start=0x%lx end=0x%lx",
                __entry->name,
                __entry->nr_to_write,
@@ -134,8 +169,6 @@ DECLARE_EVENT_CLASS(wbc_class,
                __entry->for_background,
                __entry->for_reclaim,
                __entry->range_cyclic,
-                __entry->more_io,
-                __entry->older_than_this,
                __entry->range_start,
                __entry->range_end)
 )
@@ -144,14 +177,79 @@ DECLARE_EVENT_CLASS(wbc_class,
 DEFINE_EVENT(wbc_class, name, \
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), \
        TP_ARGS(wbc, bdi))
-DEFINE_WBC_EVENT(wbc_writeback_start);
-DEFINE_WBC_EVENT(wbc_writeback_written);
-DEFINE_WBC_EVENT(wbc_writeback_wait);
-DEFINE_WBC_EVENT(wbc_balance_dirty_start);
-DEFINE_WBC_EVENT(wbc_balance_dirty_written);
-DEFINE_WBC_EVENT(wbc_balance_dirty_wait);
 DEFINE_WBC_EVENT(wbc_writepage);
+TRACE_EVENT(writeback_queue_io,
+        TP_PROTO(struct bdi_writeback *wb,
+                 unsigned long *older_than_this,
+                 int moved),
+        TP_ARGS(wb, older_than_this, moved),
+        TP_STRUCT__entry(
+                __array(char,           name, 32)
+                __field(unsigned long,  older)
+                __field(long,           age)
+                __field(int,            moved)
+        ),
+        TP_fast_assign(
+                strncpy(__entry->name, dev_name(wb->bdi->dev), 32);
+                __entry->older  = older_than_this ?  *older_than_this : 0;
+                __entry->age    = older_than_this ?
+                                  (jiffies - *older_than_this) * 1000 / HZ : -1;
+                __entry->moved  = moved;
+        ),
+        TP_printk("bdi %s: older=%lu age=%ld enqueue=%d",
+                __entry->name,
+                __entry->older, /* older_than_this in jiffies */
+                __entry->age,   /* older_than_this in relative milliseconds */
+                __entry->moved)
+);
+TRACE_EVENT(global_dirty_state,
+        TP_PROTO(unsigned long background_thresh,
+                 unsigned long dirty_thresh
+        ),
+        TP_ARGS(background_thresh,
+                dirty_thresh
+        ),
+        TP_STRUCT__entry(
+                __field(unsigned long,  nr_dirty)
+                __field(unsigned long,  nr_writeback)
+                __field(unsigned long,  nr_unstable)
+                __field(unsigned long,  background_thresh)
+                __field(unsigned long,  dirty_thresh)
+                __field(unsigned long,  dirty_limit)
+                __field(unsigned long,  nr_dirtied)
+                __field(unsigned long,  nr_written)
+        ),
+        TP_fast_assign(
+                __entry->nr_dirty       = global_page_state(NR_FILE_DIRTY);
+                __entry->nr_writeback   = global_page_state(NR_WRITEBACK);
+                __entry->nr_unstable    = global_page_state(NR_UNSTABLE_NFS);
+                __entry->nr_dirtied     = global_page_state(NR_DIRTIED);
+                __entry->nr_written     = global_page_state(NR_WRITTEN);
+                __entry->background_thresh = background_thresh;
+                __entry->dirty_thresh   = dirty_thresh;
+                __entry->dirty_limit = global_dirty_limit;
+        ),
+        TP_printk("dirty=%lu writeback=%lu unstable=%lu "
+                  "bg_thresh=%lu thresh=%lu limit=%lu "
+                  "dirtied=%lu written=%lu",
+                  __entry->nr_dirty,
+                  __entry->nr_writeback,
+                  __entry->nr_unstable,
+                  __entry->background_thresh,
+                  __entry->dirty_thresh,
+                  __entry->dirty_limit,
+                  __entry->nr_dirtied,
+                  __entry->nr_written
+        )
+);
 DECLARE_EVENT_CLASS(writeback_congest_waited_template,
        TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
@@ -187,6 +285,63 @@ DEFINE_EVENT(writeback_congest_waited_template, writeback_wait_iff_congested,
        TP_ARGS(usec_timeout, usec_delayed)
 );
+DECLARE_EVENT_CLASS(writeback_single_inode_template,
+        TP_PROTO(struct inode *inode,
+                 struct writeback_control *wbc,
+                 unsigned long nr_to_write
+        ),
+        TP_ARGS(inode, wbc, nr_to_write),
+        TP_STRUCT__entry(
+                __array(char, name, 32)
+                __field(unsigned long, ino)
+                __field(unsigned long, state)
+                __field(unsigned long, age)
+                __field(unsigned long, writeback_index)
+                __field(long, nr_to_write)
+                __field(unsigned long, wrote)
+        ),
+        TP_fast_assign(
+                strncpy(__entry->name,
+                        dev_name(inode->i_mapping->backing_dev_info->dev), 32);
+                __entry->ino            = inode->i_ino;
+                __entry->state          = inode->i_state;
+                __entry->age            = (jiffies - inode->dirtied_when) *
+                                                                1000 / HZ;
+                __entry->writeback_index = inode->i_mapping->writeback_index;
+                __entry->nr_to_write    = nr_to_write;
+                __entry->wrote          = nr_to_write - wbc->nr_to_write;
+        ),
+        TP_printk("bdi %s: ino=%lu state=%s age=%lu "
+                  "index=%lu to_write=%ld wrote=%lu",
+                  __entry->name,
+                  __entry->ino,
+                  show_inode_state(__entry->state),
+                  __entry->age,
+                  __entry->writeback_index,
+                  __entry->nr_to_write,
+                  __entry->wrote
+        )
+);
+DEFINE_EVENT(writeback_single_inode_template, writeback_single_inode_requeue,
+        TP_PROTO(struct inode *inode,
+                 struct writeback_control *wbc,
+                 unsigned long nr_to_write),
+        TP_ARGS(inode, wbc, nr_to_write)
+);
+DEFINE_EVENT(writeback_single_inode_template, writeback_single_inode,
+        TP_PROTO(struct inode *inode,
+                 struct writeback_control *wbc,
+                 unsigned long nr_to_write),
+        TP_ARGS(inode, wbc, nr_to_write)
+);
 #endif /* _TRACE_WRITEBACK_H */
 /* This part must be outside protection */
diff --git a/include/xen/balloon.h b/include/xen/balloon.h
index 4076ed72afbd..76f7538bb339 100644
--- a/include/xen/balloon.h
+++ b/include/xen/balloon.h
@@ -15,6 +15,10 @@ struct balloon_stats {
        unsigned long max_schedule_delay;
        unsigned long retry_count;
        unsigned long max_retry_count;
+#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
+        unsigned long hotplug_pages;
+        unsigned long balloon_hotplug;
+#endif
 };
 extern struct balloon_stats balloon_stats;