168 files changed, 1698 insertions, 517 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 12e9a2957caf..2124c063a7ef 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -41,6 +41,7 @@ header-y += baycom.h
 header-y += bfs_fs.h
 header-y += blkpg.h
 header-y += bpqether.h
+header-y += bsg.h
 header-y += can.h
 header-y += cdk.h
 header-y += chio.h
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fba8051fb297..6fce2fc2d124 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -131,22 +131,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity);
 */
 void acpi_unregister_gsi (u32 gsi);
-struct acpi_prt_entry {
-        struct list_head        node;
-        struct acpi_pci_id      id;
-        u8                      pin;
-        struct {
-                acpi_handle             handle;
-                u32                     index;
-        }                       link;
-        u32                     irq;
-};
-struct acpi_prt_list {
-        int                     count;
-        struct list_head        entries;
-};
 struct pci_dev;
 int acpi_pci_irq_enable (struct pci_dev *dev);
@@ -270,6 +254,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,
 #ifdef CONFIG_PM_SLEEP
 void __init acpi_no_s4_hw_signature(void);
 void __init acpi_old_suspend_ordering(void);
+void __init acpi_s4_no_nvs(void);
 #endif /* CONFIG_PM_SLEEP */
 #else   /* CONFIG_ACPI */
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index c8fdb6e658e1..110c600c885f 100644
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -52,7 +52,6 @@
 #ifndef __KERNEL__
 #include <linux/types.h>
-#include <asm/types.h>
 struct agp_version {
        __u16 major;
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
index 9e0172931315..2c8731664180 100644
--- a/include/linux/aio_abi.h
+++ b/include/linux/aio_abi.h
@@ -27,6 +27,7 @@
 #ifndef __LINUX__AIO_ABI_H
 #define __LINUX__AIO_ABI_H
+#include <linux/types.h>
 #include <asm/byteorder.h>
 typedef unsigned long   aio_context_t;
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h
index 0f50d4cc4360..45f6297821bd 100644
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
@@ -59,9 +59,7 @@ enum async_tx_flags {
 };
 #ifdef CONFIG_DMA_ENGINE
-void async_tx_issue_pending_all(void);
+#define async_tx_issue_pending_all dma_issue_pending_all
-enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
-void async_tx_run_dependencies(struct dma_async_tx_descriptor *tx);
 #ifdef CONFIG_ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 #include <asm/async_tx.h>
 #else
@@ -77,19 +75,6 @@ static inline void async_tx_issue_pending_all(void)
        do { } while (0);
 }
-static inline enum dma_status
-dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
-{
-        return DMA_SUCCESS;
-}
-static inline void
-async_tx_run_dependencies(struct dma_async_tx_descriptor *tx,
-        struct dma_chan *host_chan)
-{
-        do { } while (0);
-}
 static inline struct dma_chan *
 async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,
        enum dma_transaction_type tx_type, struct page **dst, int dst_count,
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index e9ebac2e2ecc..d34c187432ed 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_ATALK_H__
 #define __LINUX_ATALK_H__
+#include <linux/types.h>
 #include <asm/byteorder.h>
 /*
diff --git a/include/linux/atm_idt77105.h b/include/linux/atm_idt77105.h
index 05621cf20709..8b724000aa50 100644
--- a/include/linux/atm_idt77105.h
+++ b/include/linux/atm_idt77105.h
@@ -7,7 +7,7 @@
 #ifndef LINUX_ATM_IDT77105_H
 #define LINUX_ATM_IDT77105_H
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/atmioc.h>
 #include <linux/atmdev.h>
diff --git a/include/linux/atmbr2684.h b/include/linux/atmbr2684.h
index 52bf72affbba..fdb2629b6189 100644
--- a/include/linux/atmbr2684.h
+++ b/include/linux/atmbr2684.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_ATMBR2684_H
 #define _LINUX_ATMBR2684_H
+#include <linux/types.h>
 #include <linux/atm.h>
 #include <linux/if.h>           /* For IFNAMSIZ */
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 2a2213eefd85..2f1f95737acb 100644
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -3,7 +3,7 @@
 #define ATMEL_MCI_MAX_NR_SLOTS  2
-struct dma_slave;
+#include <linux/dw_dmac.h>
 /**
 * struct mci_slot_pdata - board-specific per-slot configuration
@@ -28,11 +28,11 @@ struct mci_slot_pdata {
 /**
 * struct mci_platform_data - board-specific MMC/SDcard configuration
- * @dma_slave: DMA slave interface to use in data transfers, or NULL.
+ * @dma_slave: DMA slave interface to use in data transfers.
 * @slot: Per-slot configuration data.
 */
 struct mci_platform_data {
-        struct dma_slave        *dma_slave;
+        struct dw_dma_slave     dma_slave;
        struct mci_slot_pdata   slot[ATMEL_MCI_MAX_NR_SLOTS];
 };
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
index 55fa478bd639..8b49ac48a5b7 100644
--- a/include/linux/auto_fs4.h
+++ b/include/linux/auto_fs4.h
@@ -12,6 +12,7 @@
 #define _LINUX_AUTO_FS4_H
 /* Include common v3 definitions */
+#include <linux/types.h>
 #include <linux/auto_fs.h>
 /* autofs v4 definitions */
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 1ee9488ca2e4..79ca2da81c87 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -31,6 +31,10 @@ struct backlight_device;
 struct fb_info;
 struct backlight_ops {
+        unsigned int options;
+#define BL_CORE_SUSPENDRESUME   (1 << 0)
        /* Notify the backlight driver some property has changed */
        int (*update_status)(struct backlight_device *);
        /* Return the current backlight brightness (accounting for power,
@@ -51,7 +55,19 @@ struct backlight_properties {
           modes; 4: full off), see FB_BLANK_XXX */
        int power;
        /* FB Blanking active? (values as for power) */
+        /* Due to be removed, please use (state & BL_CORE_FBBLANK) */
        int fb_blank;
+        /* Flags used to signal drivers of state changes */
+        /* Upper 4 bits are reserved for driver internal use */
+        unsigned int state;
+#define BL_CORE_SUSPENDED       (1 << 0)        /* backlight is suspended */
+#define BL_CORE_FBBLANK         (1 << 1)        /* backlight is under an fb blank event */
+#define BL_CORE_DRIVER4         (1 << 28)       /* reserved for driver specific use */
+#define BL_CORE_DRIVER3         (1 << 29)       /* reserved for driver specific use */
+#define BL_CORE_DRIVER2         (1 << 30)       /* reserved for driver specific use */
+#define BL_CORE_DRIVER1         (1 << 31)       /* reserved for driver specific use */
 };
 struct backlight_device {
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h
index 8ed6dfdcd783..1c0b355aa515 100644
--- a/include/linux/bfs_fs.h
+++ b/include/linux/bfs_fs.h
@@ -6,6 +6,8 @@
 #ifndef _LINUX_BFS_FS_H
 #define _LINUX_BFS_FS_H
+#include <linux/types.h>
 #define BFS_BSIZE_BITS          9
 #define BFS_BSIZE               (1<<BFS_BSIZE_BITS)
@@ -17,7 +19,6 @@
 #define BFS_VDIR 2L
 #define BFS_VREG 1L
 /* BFS inode layout on disk */
 struct bfs_inode {
        __le16 i_ino;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 18462c5b8fff..0942765cf8c0 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -144,7 +144,7 @@ struct bio {
 * bit 1 -- rw-ahead when set
 * bit 2 -- barrier
 *      Insert a serialization point in the IO queue, forcing previously
- *      submitted IO to be completed before this oen is issued.
+ *      submitted IO to be completed before this one is issued.
 * bit 3 -- synchronous I/O hint: the block layer will unplug immediately
 *      Note that this does NOT indicate that the IO itself is sync, just
 *      that the block layer will not postpone issue of this IO by plugging.
@@ -163,12 +163,33 @@ struct bio {
 #define BIO_RW          0       /* Must match RW in req flags (blkdev.h) */
 #define BIO_RW_AHEAD    1       /* Must match FAILFAST in req flags */
 #define BIO_RW_BARRIER  2
-#define BIO_RW_SYNC     3
+#define BIO_RW_SYNCIO   3
-#define BIO_RW_META     4
+#define BIO_RW_UNPLUG   4
-#define BIO_RW_DISCARD  5
+#define BIO_RW_META     5
-#define BIO_RW_FAILFAST_DEV             6
+#define BIO_RW_DISCARD  6
-#define BIO_RW_FAILFAST_TRANSPORT       7
+#define BIO_RW_FAILFAST_DEV             7
-#define BIO_RW_FAILFAST_DRIVER          8
+#define BIO_RW_FAILFAST_TRANSPORT       8
+#define BIO_RW_FAILFAST_DRIVER          9
+#define BIO_RW_SYNC     (BIO_RW_SYNCIO | BIO_RW_UNPLUG)
+#define bio_rw_flagged(bio, flag)       ((bio)->bi_rw & (1 << (flag)))
+/*
+ * Old defines, these should eventually be replaced by direct usage of
+ * bio_rw_flagged()
+ */
+#define bio_barrier(bio)        bio_rw_flagged(bio, BIO_RW_BARRIER)
+#define bio_sync(bio)           bio_rw_flagged(bio, BIO_RW_SYNCIO)
+#define bio_unplug(bio)         bio_rw_flagged(bio, BIO_RW_UNPLUG)
+#define bio_failfast_dev(bio)   bio_rw_flagged(bio, BIO_RW_FAILFAST_DEV)
+#define bio_failfast_transport(bio)     \
+                bio_rw_flagged(bio, BIO_RW_FAILFAST_TRANSPORT)
+#define bio_failfast_driver(bio)        \
+                bio_rw_flagged(bio, BIO_RW_FAILFAST_DRIVER)
+#define bio_rw_ahead(bio)       bio_rw_flagged(bio, BIO_RW_AHEAD)
+#define bio_rw_meta(bio)        bio_rw_flagged(bio, BIO_RW_META)
+#define bio_discard(bio)        bio_rw_flagged(bio, BIO_RW_DISCARD)
 /*
 * upper 16 bits of bi_rw define the io priority of this bio
@@ -193,15 +214,6 @@ struct bio {
 #define bio_offset(bio)         bio_iovec((bio))->bv_offset
 #define bio_segments(bio)       ((bio)->bi_vcnt - (bio)->bi_idx)
 #define bio_sectors(bio)        ((bio)->bi_size >> 9)
-#define bio_barrier(bio)        ((bio)->bi_rw & (1 << BIO_RW_BARRIER))
-#define bio_sync(bio)           ((bio)->bi_rw & (1 << BIO_RW_SYNC))
-#define bio_failfast_dev(bio)   ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_DEV))
-#define bio_failfast_transport(bio)     \
-        ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_TRANSPORT))
-#define bio_failfast_driver(bio) ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_DRIVER))
-#define bio_rw_ahead(bio)       ((bio)->bi_rw & (1 << BIO_RW_AHEAD))
-#define bio_rw_meta(bio)        ((bio)->bi_rw & (1 << BIO_RW_META))
-#define bio_discard(bio)        ((bio)->bi_rw & (1 << BIO_RW_DISCARD))
 #define bio_empty_barrier(bio)  (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio))
 static inline unsigned int bio_cur_sectors(struct bio *bio)
@@ -312,7 +324,6 @@ struct bio_integrity_payload {
        void                    *bip_buf;       /* generated integrity data */
        bio_end_io_t            *bip_end_io;    /* saved I/O completion fn */
-        int                     bip_error;      /* saved I/O error */
        unsigned int            bip_size;
        unsigned short          bip_pool;       /* pool the ivec came from */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 044467ef7b11..d08c4b8219a6 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -108,6 +108,7 @@ enum rq_flag_bits {
        __REQ_RW_META,          /* metadata io request */
        __REQ_COPY_USER,        /* contains copies of user pages */
        __REQ_INTEGRITY,        /* integrity metadata has been remapped */
+        __REQ_UNPLUG,           /* unplug queue on submission */
        __REQ_NR_BITS,          /* stops here */
 };
@@ -134,6 +135,7 @@ enum rq_flag_bits {
 #define REQ_RW_META     (1 << __REQ_RW_META)
 #define REQ_COPY_USER   (1 << __REQ_COPY_USER)
 #define REQ_INTEGRITY   (1 << __REQ_INTEGRITY)
+#define REQ_UNPLUG      (1 << __REQ_UNPLUG)
 #define BLK_MAX_CDB     16
@@ -449,6 +451,11 @@ struct request_queue
 #define QUEUE_FLAG_STACKABLE   13       /* supports request stacking */
 #define QUEUE_FLAG_NONROT      14       /* non-rotational device (SSD) */
 #define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
+#define QUEUE_FLAG_IO_STAT     15       /* do IO stats */
+#define QUEUE_FLAG_DEFAULT      ((1 << QUEUE_FLAG_IO_STAT) |            \
+                                 (1 << QUEUE_FLAG_CLUSTER) |            \
+                                  1 << QUEUE_FLAG_STACKABLE)
 static inline int queue_is_locked(struct request_queue *q)
 {
@@ -565,6 +572,7 @@ enum {
 #define blk_queue_stopped(q)    test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
 #define blk_queue_nomerges(q)   test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
 #define blk_queue_nonrot(q)     test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)
+#define blk_queue_io_stat(q)    test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags)
 #define blk_queue_flushing(q)   ((q)->ordseq)
 #define blk_queue_stackable(q)  \
        test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags)
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 1dba3493d520..25379cba2370 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -1,6 +1,7 @@
 #ifndef BLKTRACE_H
 #define BLKTRACE_H
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/blkdev.h>
 #include <linux/relay.h>
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 8605f8a74df9..bd7ac793be19 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -171,7 +171,7 @@ void __wait_on_buffer(struct buffer_head *);
 wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
 int fsync_bdev(struct block_device *);
 struct super_block *freeze_bdev(struct block_device *);
-void thaw_bdev(struct block_device *, struct super_block *);
+int thaw_bdev(struct block_device *, struct super_block *);
 int fsync_super(struct super_block *);
 int fsync_no_super(struct block_device *);
 struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block,
@@ -346,6 +346,15 @@ static inline int remove_inode_buffers(struct inode *inode) { return 1; }
 static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
 static inline void invalidate_bdev(struct block_device *bdev) {}
+static inline struct super_block *freeze_bdev(struct block_device *sb)
+{
+        return NULL;
+}
+static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)
+{
+        return 0;
+}
 #endif /* CONFIG_BLOCK */
 #endif /* _LINUX_BUFFER_HEAD_H */
diff --git a/include/linux/can/bcm.h b/include/linux/can/bcm.h
index 7f293273c444..1432b278c52d 100644
--- a/include/linux/can/bcm.h
+++ b/include/linux/can/bcm.h
@@ -14,6 +14,8 @@
 #ifndef CAN_BCM_H
 #define CAN_BCM_H
+#include <linux/types.h>
 /**
 * struct bcm_msg_head - head of messages to/from the broadcast manager
 * @opcode:    opcode, see enum below.
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 02bdb768d43b..1b9872556131 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct {
 #define VFS_CAP_U32             VFS_CAP_U32_2
 #define VFS_CAP_REVISION        VFS_CAP_REVISION_2
-#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
-extern int file_caps_enabled;
-#endif
 struct vfs_cap_data {
        __le32 magic_etc;            /* Little endian */
        struct {
@@ -96,6 +92,10 @@ struct vfs_cap_data {
 #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
 #define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+extern int file_caps_enabled;
+#endif
 typedef struct kernel_cap_struct {
        __u32 cap[_KERNEL_CAPABILITY_U32S];
 } kernel_cap_t;
diff --git a/include/linux/capi.h b/include/linux/capi.h
index fdebaaa9f66e..65100d6cb89b 100644
--- a/include/linux/capi.h
+++ b/include/linux/capi.h
@@ -12,7 +12,7 @@
 #ifndef __LINUX_CAPI_H__
 #define __LINUX_CAPI_H__
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/ioctl.h>
 #ifndef __KERNEL__
 #include <linux/kernelcapi.h>
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 0b49e08d3cb0..78e904796622 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -11,6 +11,7 @@
 #ifndef _LINUX_CDROM_H
 #define _LINUX_CDROM_H
+#include <linux/types.h>
 #include <asm/byteorder.h>
 /*******************************************************
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index e267e62827bb..e4e8e117d27d 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -99,6 +99,7 @@ static inline bool css_tryget(struct cgroup_subsys_state *css)
        while (!atomic_inc_not_zero(&css->refcnt)) {
                if (test_bit(CSS_REMOVED, &css->flags))
                        return false;
+                cpu_relax();
        }
        return true;
 }
diff --git a/include/linux/cgroupstats.h b/include/linux/cgroupstats.h
index 4f53abf6855d..3753c33160d1 100644
--- a/include/linux/cgroupstats.h
+++ b/include/linux/cgroupstats.h
@@ -15,6 +15,7 @@
 #ifndef _LINUX_CGROUPSTATS_H
 #define _LINUX_CGROUPSTATS_H
+#include <linux/types.h>
 #include <linux/taskstats.h>
 /*
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index cea153697ec7..3a1dbba4d3ae 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -36,6 +36,7 @@ enum clock_event_nofitiers {
        CLOCK_EVT_NOTIFY_BROADCAST_EXIT,
        CLOCK_EVT_NOTIFY_SUSPEND,
        CLOCK_EVT_NOTIFY_RESUME,
+        CLOCK_EVT_NOTIFY_CPU_DYING,
        CLOCK_EVT_NOTIFY_CPU_DEAD,
 };
diff --git a/include/linux/compat.h b/include/linux/compat.h
index e88f3ecf38b4..3fd2194ff573 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -280,5 +280,18 @@ asmlinkage long compat_sys_timerfd_settime(int ufd, int flags,
 asmlinkage long compat_sys_timerfd_gettime(int ufd,
                                   struct compat_itimerspec __user *otmr);
+asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page,
+                                      __u32 __user *pages,
+                                      const int __user *nodes,
+                                      int __user *status,
+                                      int flags);
+asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
+                                     struct compat_timeval __user *t);
+asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
+                                      struct compat_stat __user *statbuf,
+                                      int flag);
+asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
+                                  int flags, int mode);
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index af40f8eb86f0..1514d534deeb 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -11,9 +11,19 @@
 /* The "volatile" is due to gcc bugs */
 #define barrier() __asm__ __volatile__("": : :"memory")
-/* This macro obfuscates arithmetic on a variable address so that gcc
-   shouldn't recognize the original var, and make assumptions about it */
 /*
+ * This macro obfuscates arithmetic on a variable address so that gcc
+ * shouldn't recognize the original var, and make assumptions about it.
+ *
+ * This is needed because the C standard makes it undefined to do
+ * pointer arithmetic on "objects" outside their boundaries and the
+ * gcc optimizers assume this is the case. In particular they
+ * assume such arithmetic does not wrap.
+ *
+ * A miscompilation has been observed because of this on PPC.
+ * To work around it we hide the relationship of the pointer and the object
+ * using this macro.
+ *
 * Versions of the ppc64 compiler before 4.1 had a bug where use of
 * RELOC_HIDE could trash r30. The bug can be worked around by changing
 * the inline assembly constraint from =g to =r, in this particular
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 5c7f9468f753..34f2789d9b9b 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -22,7 +22,7 @@
 #ifndef __CONNECTOR_H
 #define __CONNECTOR_H
-#include <asm/types.h>
+#include <linux/types.h>
 #define CN_IDX_CONNECTOR                0xffffffff
 #define CN_VAL_CONNECTOR                0xffffffff
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 484b3abf61bb..384b38d3e8e2 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -80,8 +80,8 @@ struct cpufreq_real_policy {
 };
 struct cpufreq_policy {
-        cpumask_t               cpus;   /* CPUs requiring sw coordination */
+        cpumask_var_t           cpus;   /* CPUs requiring sw coordination */
-        cpumask_t               related_cpus; /* CPUs with any coordination */
+        cpumask_var_t           related_cpus; /* CPUs with any coordination */
        unsigned int            shared_type; /* ANY or ALL affected CPUs
                                                should set cpufreq */
        unsigned int            cpu;    /* cpu nr of registered CPU */
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 2d3d1e04ba92..d06fbf286346 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -150,8 +150,6 @@ struct CYZ_BOOT_CTRL {
 *      architectures and compilers.
 */
-#include <asm/types.h>
 typedef __u64  ucdouble;                /* 64 bits, unsigned */
 typedef __u32  uclong;                  /* 32 bits, unsigned */
 typedef __u16  ucshort;         /* 16 bits, unsigned */
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 23936b16426b..af0e01d4c663 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -162,6 +162,13 @@ static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode,
        return ERR_PTR(-ENODEV);
 }
+static inline struct dentry *debugfs_create_size_t(const char *name, mode_t mode,
+                                     struct dentry *parent,
+                                     size_t *value)
+{
+        return ERR_PTR(-ENODEV);
+}
 static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode,
                                                 struct dentry *parent,
                                                 u32 *value)
diff --git a/include/linux/device.h b/include/linux/device.h
index 7d9da4b4993f..45e5b1921fbb 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -28,7 +28,6 @@
 #define BUS_ID_SIZE             20
 struct device;
-struct device_private;
 struct device_driver;
 struct driver_private;
 struct class;
@@ -366,10 +365,12 @@ struct device_dma_parameters {
 };
 struct device {
+        struct klist            klist_children;
+        struct klist_node       knode_parent;   /* node in sibling list */
+        struct klist_node       knode_driver;
+        struct klist_node       knode_bus;
        struct device           *parent;
-        struct device_private   *p;
        struct kobject kobj;
        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
        unsigned                uevent_suppress:1;
diff --git a/include/linux/dio.h b/include/linux/dio.h
index 1e65ebc2a3db..b2dd31ca1710 100644
--- a/include/linux/dio.h
+++ b/include/linux/dio.h
@@ -241,7 +241,7 @@ struct dio_driver {
 extern int dio_find(int deviceid);
 extern unsigned long dio_scodetophysaddr(int scode);
-extern void dio_create_sysfs_dev_files(struct dio_dev *);
+extern int dio_create_sysfs_dev_files(struct dio_dev *);
 /* New-style probing */
 extern int dio_register_driver(struct dio_driver *);
diff --git a/include/linux/dlm_plock.h b/include/linux/dlm_plock.h
index 18d5fdbceb74..2dd21243104f 100644
--- a/include/linux/dlm_plock.h
+++ b/include/linux/dlm_plock.h
@@ -9,6 +9,8 @@
 #ifndef __DLM_PLOCK_DOT_H__
 #define __DLM_PLOCK_DOT_H__
+#include <linux/types.h>
 #define DLM_PLOCK_MISC_NAME             "dlm_plock"
 #define DLM_PLOCK_VERSION_MAJOR 1
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index adb0b084eb5a..3e0f64c335c8 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -29,32 +29,6 @@
 #include <linux/dma-mapping.h>
 /**
- * enum dma_state - resource PNP/power management state
- * @DMA_RESOURCE_SUSPEND: DMA device going into low power state
- * @DMA_RESOURCE_RESUME: DMA device returning to full power
- * @DMA_RESOURCE_AVAILABLE: DMA device available to the system
- * @DMA_RESOURCE_REMOVED: DMA device removed from the system
- */
-enum dma_state {
-        DMA_RESOURCE_SUSPEND,
-        DMA_RESOURCE_RESUME,
-        DMA_RESOURCE_AVAILABLE,
-        DMA_RESOURCE_REMOVED,
-};
-/**
- * enum dma_state_client - state of the channel in the client
- * @DMA_ACK: client would like to use, or was using this channel
- * @DMA_DUP: client has already seen this channel, or is not using this channel
- * @DMA_NAK: client does not want to see any more channels
- */
-enum dma_state_client {
-        DMA_ACK,
-        DMA_DUP,
-        DMA_NAK,
-};
-/**
 * typedef dma_cookie_t - an opaque DMA cookie
 *
 * if dma_cookie_t is >0 it's a DMA request cookie, <0 it's an error code
@@ -89,23 +63,13 @@ enum dma_transaction_type {
        DMA_MEMSET,
        DMA_MEMCPY_CRC32C,
        DMA_INTERRUPT,
+        DMA_PRIVATE,
        DMA_SLAVE,
 };
 /* last transaction type for creation of the capabilities mask */
 #define DMA_TX_TYPE_END (DMA_SLAVE + 1)
-/**
- * enum dma_slave_width - DMA slave register access width.
- * @DMA_SLAVE_WIDTH_8BIT: Do 8-bit slave register accesses
- * @DMA_SLAVE_WIDTH_16BIT: Do 16-bit slave register accesses
- * @DMA_SLAVE_WIDTH_32BIT: Do 32-bit slave register accesses
- */
-enum dma_slave_width {
-        DMA_SLAVE_WIDTH_8BIT,
-        DMA_SLAVE_WIDTH_16BIT,
-        DMA_SLAVE_WIDTH_32BIT,
-};
 /**
 * enum dma_ctrl_flags - DMA flags to augment operation preparation,
@@ -132,32 +96,6 @@ enum dma_ctrl_flags {
 typedef struct { DECLARE_BITMAP(bits, DMA_TX_TYPE_END); } dma_cap_mask_t;
 /**
- * struct dma_slave - Information about a DMA slave
- * @dev: device acting as DMA slave
- * @dma_dev: required DMA master device. If non-NULL, the client can not be
- *      bound to other masters than this.
- * @tx_reg: physical address of data register used for
- *      memory-to-peripheral transfers
- * @rx_reg: physical address of data register used for
- *      peripheral-to-memory transfers
- * @reg_width: peripheral register width
- *
- * If dma_dev is non-NULL, the client can not be bound to other DMA
- * masters than the one corresponding to this device. The DMA master
- * driver may use this to determine if there is controller-specific
- * data wrapped around this struct. Drivers of platform code that sets
- * the dma_dev field must therefore make sure to use an appropriate
- * controller-specific dma slave structure wrapping this struct.
- */
-struct dma_slave {
-        struct device           *dev;
-        struct device           *dma_dev;
-        dma_addr_t              tx_reg;
-        dma_addr_t              rx_reg;
-        enum dma_slave_width    reg_width;
-};
-/**
 * struct dma_chan_percpu - the per-CPU part of struct dma_chan
 * @refcount: local_t used for open-coded "bigref" counting
 * @memcpy_count: transaction counter
@@ -165,7 +103,6 @@ struct dma_slave {
 */
 struct dma_chan_percpu {
-        local_t refcount;
        /* stats */
        unsigned long memcpy_count;
        unsigned long bytes_transferred;
@@ -176,13 +113,14 @@ struct dma_chan_percpu {
 * @device: ptr to the dma device who supplies this channel, always !%NULL
 * @cookie: last cookie value returned to client
 * @chan_id: channel ID for sysfs
- * @class_dev: class device for sysfs
+ * @dev: class device for sysfs
 * @refcount: kref, used in "bigref" slow-mode
 * @slow_ref: indicates that the DMA channel is free
 * @rcu: the DMA channel's RCU head
 * @device_node: used to add this to the device chan list
 * @local: per-cpu pointer to a struct dma_chan_percpu
 * @client-count: how many clients are using this channel
+ * @table_count: number of appearances in the mem-to-mem allocation table
 */
 struct dma_chan {
        struct dma_device *device;
@@ -190,73 +128,47 @@ struct dma_chan {
        /* sysfs */
        int chan_id;
-        struct device dev;
+        struct dma_chan_dev *dev;
-        struct kref refcount;
-        int slow_ref;
-        struct rcu_head rcu;
        struct list_head device_node;
        struct dma_chan_percpu *local;
        int client_count;
+        int table_count;
 };
-#define to_dma_chan(p) container_of(p, struct dma_chan, dev)
+/**
+ * struct dma_chan_dev - relate sysfs device node to backing channel device
-void dma_chan_cleanup(struct kref *kref);
+ * @chan - driver channel device
+ * @device - sysfs device
-static inline void dma_chan_get(struct dma_chan *chan)
+ * @dev_id - parent dma_device dev_id
-{
+ * @idr_ref - reference count to gate release of dma_device dev_id
-        if (unlikely(chan->slow_ref))
+ */
-                kref_get(&chan->refcount);
+struct dma_chan_dev {
-        else {
+        struct dma_chan *chan;
-                local_inc(&(per_cpu_ptr(chan->local, get_cpu())->refcount));
+        struct device device;
-                put_cpu();
+        int dev_id;
-        }
+        atomic_t *idr_ref;
-}
+};
-static inline void dma_chan_put(struct dma_chan *chan)
+static inline const char *dma_chan_name(struct dma_chan *chan)
 {
-        if (unlikely(chan->slow_ref))
+        return dev_name(&chan->dev->device);
-                kref_put(&chan->refcount, dma_chan_cleanup);
-        else {
-                local_dec(&(per_cpu_ptr(chan->local, get_cpu())->refcount));
-                put_cpu();
-        }
 }
-/*
+void dma_chan_cleanup(struct kref *kref);
- * typedef dma_event_callback - function pointer to a DMA event callback
- * For each channel added to the system this routine is called for each client.
- * If the client would like to use the channel it returns '1' to signal (ack)
- * the dmaengine core to take out a reference on the channel and its
- * corresponding device.  A client must not 'ack' an available channel more
- * than once.  When a channel is removed all clients are notified.  If a client
- * is using the channel it must 'ack' the removal.  A client must not 'ack' a
- * removed channel more than once.
- * @client - 'this' pointer for the client context
- * @chan - channel to be acted upon
- * @state - available or removed
- */
-struct dma_client;
-typedef enum dma_state_client (*dma_event_callback) (struct dma_client *client,
-                struct dma_chan *chan, enum dma_state state);
 /**
- * struct dma_client - info on the entity making use of DMA services
+ * typedef dma_filter_fn - callback filter for dma_request_channel
- * @event_callback: func ptr to call when something happens
+ * @chan: channel to be reviewed
- * @cap_mask: only return channels that satisfy the requested capabilities
+ * @filter_param: opaque parameter passed through dma_request_channel
- *  a value of zero corresponds to any capability
+ *
- * @slave: data for preparing slave transfer. Must be non-NULL iff the
+ * When this optional parameter is specified in a call to dma_request_channel a
- *  DMA_SLAVE capability is requested.
+ * suitable channel is passed to this routine for further dispositioning before
- * @global_node: list_head for global dma_client_list
+ * being returned.  Where 'suitable' indicates a non-busy channel that
+ * satisfies the given capability mask.  It returns 'true' to indicate that the
+ * channel is suitable.
 */
-struct dma_client {
+typedef bool (*dma_filter_fn)(struct dma_chan *chan, void *filter_param);
-        dma_event_callback      event_callback;
-        dma_cap_mask_t          cap_mask;
-        struct dma_slave        *slave;
-        struct list_head        global_node;
-};
 typedef void (*dma_async_tx_callback)(void *dma_async_param);
 /**
@@ -323,14 +235,10 @@ struct dma_device {
        dma_cap_mask_t  cap_mask;
        int max_xor;
-        struct kref refcount;
-        struct completion done;
        int dev_id;
        struct device *dev;
-        int (*device_alloc_chan_resources)(struct dma_chan *chan,
+        int (*device_alloc_chan_resources)(struct dma_chan *chan);
-                        struct dma_client *client);
        void (*device_free_chan_resources)(struct dma_chan *chan);
        struct dma_async_tx_descriptor *(*device_prep_dma_memcpy)(
@@ -362,9 +270,18 @@ struct dma_device {
 /* --- public DMA engine API --- */
-void dma_async_client_register(struct dma_client *client);
+#ifdef CONFIG_DMA_ENGINE
-void dma_async_client_unregister(struct dma_client *client);
+void dmaengine_get(void);
-void dma_async_client_chan_request(struct dma_client *client);
+void dmaengine_put(void);
+#else
+static inline void dmaengine_get(void)
+{
+}
+static inline void dmaengine_put(void)
+{
+}
+#endif
 dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan,
        void *dest, void *src, size_t len);
 dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan,
@@ -380,6 +297,11 @@ static inline void async_tx_ack(struct dma_async_tx_descriptor *tx)
        tx->flags |= DMA_CTRL_ACK;
 }
+static inline void async_tx_clear_ack(struct dma_async_tx_descriptor *tx)
+{
+        tx->flags &= ~DMA_CTRL_ACK;
+}
 static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx)
 {
        return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK;
@@ -406,6 +328,12 @@ __dma_cap_set(enum dma_transaction_type tx_type, dma_cap_mask_t *dstp)
        set_bit(tx_type, dstp->bits);
 }
+#define dma_cap_zero(mask) __dma_cap_zero(&(mask))
+static inline void __dma_cap_zero(dma_cap_mask_t *dstp)
+{
+        bitmap_zero(dstp->bits, DMA_TX_TYPE_END);
+}
 #define dma_has_cap(tx, mask) __dma_has_cap((tx), &(mask))
 static inline int
 __dma_has_cap(enum dma_transaction_type tx_type, dma_cap_mask_t *srcp)
@@ -475,11 +403,29 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
 }
 enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
+#ifdef CONFIG_DMA_ENGINE
+enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
+void dma_issue_pending_all(void);
+#else
+static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
+{
+        return DMA_SUCCESS;
+}
+static inline void dma_issue_pending_all(void)
+{
+        do { } while (0);
+}
+#endif
 /* --- DMA device --- */
 int dma_async_device_register(struct dma_device *device);
 void dma_async_device_unregister(struct dma_device *device);
+void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
+struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
+struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param);
+void dma_release_channel(struct dma_chan *chan);
 /* --- Helper iov-locking functions --- */
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index 34161907b2f8..d741b9ceb0e0 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -38,6 +38,7 @@ struct dmi_device {
 #ifdef CONFIG_DMI
 extern int dmi_check_system(const struct dmi_system_id *list);
+const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list);
 extern const char * dmi_get_system_info(int field);
 extern const struct dmi_device * dmi_find_device(int type, const char *name,
        const struct dmi_device *from);
@@ -64,6 +65,8 @@ static inline int dmi_walk(void (*decode)(const struct dmi_header *))
        { return -1; }
 static inline bool dmi_match(enum dmi_field f, const char *str)
        { return false; }
+static inline const struct dmi_system_id *
+        dmi_first_match(const struct dmi_system_id *list) { return NULL; }
 #endif
diff --git a/include/linux/dn.h b/include/linux/dn.h
index 02bba040fcfb..fe9990823193 100644
--- a/include/linux/dn.h
+++ b/include/linux/dn.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_DN_H
 #define _LINUX_DN_H
+#include <linux/types.h>
 /*
        DECnet Data Structures and Constants
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
index 89412e18f571..bb0df2aaebfa 100644
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -24,12 +24,7 @@
 #ifndef _DVBAUDIO_H_
 #define _DVBAUDIO_H_
-#ifdef __KERNEL__
 #include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
 typedef enum {
        AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index 402fb7a8d922..fef943738a24 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -24,7 +24,7 @@
 #ifndef _DVBDMX_H_
 #define _DVBDMX_H_
-#include <asm/types.h>
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/time.h>
 #else
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 55026b1a40bd..51c8d2d49e42 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -26,8 +26,7 @@
 #ifndef _DVBFRONTEND_H_
 #define _DVBFRONTEND_H_
-#include <asm/types.h>
+#include <linux/types.h>
 typedef enum fe_type {
        FE_QPSK,
diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h
index 5be474bf0d2b..f451e7eb0b0b 100644
--- a/include/linux/dvb/net.h
+++ b/include/linux/dvb/net.h
@@ -24,8 +24,7 @@
 #ifndef _DVBNET_H_
 #define _DVBNET_H_
-#include <asm/types.h>
+#include <linux/types.h>
 struct dvb_net_if {
        __u16 pid;
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 50839fe9e39e..bd49c3ebf916 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -24,17 +24,14 @@
 #ifndef _DVBVIDEO_H_
 #define _DVBVIDEO_H_
-#include <linux/compiler.h>
-#ifdef __KERNEL__
 #include <linux/types.h>
+#ifdef __KERNEL__
+#include <linux/compiler.h>
 #else
-#include <asm/types.h>
 #include <stdint.h>
 #include <time.h>
 #endif
 typedef enum {
        VIDEO_FORMAT_4_3,     /* Select 4:3 format */
        VIDEO_FORMAT_16_9,    /* Select 16:9 format. */
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 04d217b442bf..d797dde247f7 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -22,14 +22,34 @@ struct dw_dma_platform_data {
 };
 /**
+ * enum dw_dma_slave_width - DMA slave register access width.
+ * @DMA_SLAVE_WIDTH_8BIT: Do 8-bit slave register accesses
+ * @DMA_SLAVE_WIDTH_16BIT: Do 16-bit slave register accesses
+ * @DMA_SLAVE_WIDTH_32BIT: Do 32-bit slave register accesses
+ */
+enum dw_dma_slave_width {
+        DW_DMA_SLAVE_WIDTH_8BIT,
+        DW_DMA_SLAVE_WIDTH_16BIT,
+        DW_DMA_SLAVE_WIDTH_32BIT,
+};
+/**
 * struct dw_dma_slave - Controller-specific information about a slave
- * @slave: Generic information about the slave
+ *
- * @ctl_lo: Platform-specific initializer for the CTL_LO register
+ * @dma_dev: required DMA master device
+ * @tx_reg: physical address of data register used for
+ *      memory-to-peripheral transfers
+ * @rx_reg: physical address of data register used for
+ *      peripheral-to-memory transfers
+ * @reg_width: peripheral register width
 * @cfg_hi: Platform-specific initializer for the CFG_HI register
 * @cfg_lo: Platform-specific initializer for the CFG_LO register
 */
 struct dw_dma_slave {
-        struct dma_slave        slave;
+        struct device           *dma_dev;
+        dma_addr_t              tx_reg;
+        dma_addr_t              rx_reg;
+        enum dw_dma_slave_width reg_width;
        u32                     cfg_hi;
        u32                     cfg_lo;
 };
@@ -54,9 +74,4 @@ struct dw_dma_slave {
 #define DWC_CFGL_HS_DST_POL     (1 << 18)       /* dst handshake active low */
 #define DWC_CFGL_HS_SRC_POL     (1 << 19)       /* src handshake active low */
-static inline struct dw_dma_slave *to_dw_dma_slave(struct dma_slave *slave)
-{
-        return container_of(slave, struct dw_dma_slave, slave);
-}
 #endif /* DW_DMAC_H */
diff --git a/include/linux/edd.h b/include/linux/edd.h
index 5d747c5cd0fe..4cbd0fe9df08 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -30,6 +30,8 @@
 #ifndef _LINUX_EDD_H
 #define _LINUX_EDD_H
+#include <linux/types.h>
 #define EDDNR 0x1e9             /* addr of number of edd_info structs at EDDBUF
                                   in boot_params - treat this as 1 byte  */
 #define EDDBUF  0xd00           /* addr of edd_info structs in boot_params */
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h
index ff1945e37790..a01be90c58cc 100644
--- a/include/linux/efs_fs_sb.h
+++ b/include/linux/efs_fs_sb.h
@@ -9,6 +9,7 @@
 #ifndef __EFS_FS_SB_H__
 #define __EFS_FS_SB_H__
+#include <linux/types.h>
 #include <linux/magic.h>
 /* EFS superblock magic numbers */
diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h
index 9f5b7456bff3..7cd2e80cebc8 100644
--- a/include/linux/elf-fdpic.h
+++ b/include/linux/elf-fdpic.h
@@ -58,11 +58,13 @@ struct elf_fdpic_params {
 #define ELF_FDPIC_FLAG_PRESENT          0x80000000      /* T if this object is present */
 };
+#ifdef __KERNEL__
 #ifdef CONFIG_MMU
 extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
                                      struct elf_fdpic_params *interp_params,
                                      unsigned long *start_stack,
                                      unsigned long *start_brk);
 #endif
+#endif /* __KERNEL__ */
 #endif /* _LINUX_ELF_FDPIC_H */
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 0b61ca41a044..45a937be6d38 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -377,6 +377,7 @@ typedef struct elf64_note {
  Elf64_Word n_type;    /* Content type */
 } Elf64_Nhdr;
+#ifdef __KERNEL__
 #if ELF_CLASS == ELFCLASS32
 extern Elf32_Dyn _DYNAMIC [];
@@ -404,5 +405,5 @@ static inline int elf_coredump_extra_notes_write(struct file *file,
 extern int elf_coredump_extra_notes_size(void);
 extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
 #endif
+#endif /* __KERNEL__ */
 #endif /* _LINUX_ELF_H */
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 92f8d4fab32b..ceb1454b6977 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
+#include <linux/types.h>
 struct sock_extended_err
 {
        __u32   ee_errno;       
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 1ee63df5be92..818fe21257e8 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -1,7 +1,7 @@
 #ifndef _LINUX_FB_H
 #define _LINUX_FB_H
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/i2c.h>
 struct dentry;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 0b87b29f4797..6022f44043f2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -234,6 +234,8 @@ struct inodes_stat_t {
 #define BMAP_IOCTL 1            /* obsolete - kept for compatibility */
 #define FIBMAP     _IO(0x00,1)  /* bmap access */
 #define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
+#define FIFREEZE        _IOWR('X', 119, int)    /* Freeze */
+#define FITHAW          _IOWR('X', 120, int)    /* Thaw */
 #define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
 #define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
@@ -591,6 +593,11 @@ struct block_device {
         * care to not mess up bd_private for that case.
         */
        unsigned long           bd_private;
+        /* The counter of freeze processes */
+        int                     bd_fsfreeze_count;
+        /* Mutex for freeze */
+        struct mutex            bd_fsfreeze_mutex;
 };
 /*
@@ -1377,8 +1384,8 @@ struct super_operations {
        void (*put_super) (struct super_block *);
        void (*write_super) (struct super_block *);
        int (*sync_fs)(struct super_block *sb, int wait);
-        void (*write_super_lockfs) (struct super_block *);
+        int (*freeze_fs) (struct super_block *);
-        void (*unlockfs) (struct super_block *);
+        int (*unfreeze_fs) (struct super_block *);
        int (*statfs) (struct dentry *, struct kstatfs *);
        int (*remount_fs) (struct super_block *, int *, char *);
        void (*clear_inode) (struct inode *);
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 7da02c93002b..b834ef6d59fa 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_GENERIC_NETLINK_H
 #define __LINUX_GENERIC_NETLINK_H
+#include <linux/types.h>
 #include <linux/netlink.h>
 #define GENL_NAMSIZ     16      /* length of family name */
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 14d0df0b5749..c56b4bce56d0 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -10,6 +10,8 @@
 #ifndef __GFS2_ONDISK_DOT_H__
 #define __GFS2_ONDISK_DOT_H__
+#include <linux/types.h>
 #define GFS2_MAGIC              0x01161970
 #define GFS2_BASIC_BLOCK        512
 #define GFS2_BASIC_BLOCK_SHIFT  9
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 81aa84d60c6b..fa8ee9cef7be 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...)
                __FILE__ , ## arg)
 #endif /* HID_FF */
+#ifdef __KERNEL__
 #ifdef CONFIG_HID_COMPAT
 #define HID_COMPAT_LOAD_DRIVER(name)    \
 /* prototype to avoid sparse warning */ \
@@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name)
        extern void hid_compat_##name(void);    \
        hid_compat_##name();                    \
 } while (0)
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index c760ae0eb6a1..bb6f58baf319 100644
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -27,6 +27,8 @@
 * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
 */
+#include <linux/types.h>
 /*
 * The event structure itself
 */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 01d67ba9e985..1ffc23bc5d1e 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -40,9 +40,7 @@
 #define I2C_DRIVERID_SAA7185B   13      /* video encoder                */
 #define I2C_DRIVERID_SAA7110    22      /* video decoder                */
 #define I2C_DRIVERID_SAA5249    24      /* SAA5249 and compatibles      */
-#define I2C_DRIVERID_PCF8583    25      /* real time clock              */
 #define I2C_DRIVERID_TDA7432    27      /* Stereo sound processor       */
-#define I2C_DRIVERID_TVMIXER    28      /* Mixer driver for tv cards    */
 #define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
 #define I2C_DRIVERID_TDA9875    32      /* TV sound decoder chip        */
 #define I2C_DRIVERID_BT819      40     /* video decoder                 */
@@ -54,7 +52,6 @@
 #define I2C_DRIVERID_SAA7191    57      /* video decoder                */
 #define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
 #define I2C_DRIVERID_OVCAMCHIP  61      /* OmniVision CMOS image sens.  */
-#define I2C_DRIVERID_MAX6900    63      /* MAX6900 real-time clock      */
 #define I2C_DRIVERID_SAA6752HS  67      /* MPEG2 encoder                */
 #define I2C_DRIVERID_TVEEPROM   68      /* TV EEPROM                    */
 #define I2C_DRIVERID_WM8775     69      /* wm8775 audio processor       */
@@ -62,23 +59,16 @@
 #define I2C_DRIVERID_CX25840    71      /* cx2584x video encoder        */
 #define I2C_DRIVERID_SAA7127    72      /* saa7127 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
-#define I2C_DRIVERID_AKITAIOEXP 74      /* IO Expander on Sharp SL-C1000 */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
 #define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
 #define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
 #define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
 #define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
 #define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
-#define I2C_DRIVERID_DS1672     81      /* Dallas/Maxim DS1672 RTC      */
 #define I2C_DRIVERID_BT866      85      /* Conexant bt866 video encoder */
 #define I2C_DRIVERID_KS0127     86      /* Samsung ks0127 video decoder */
 #define I2C_DRIVERID_TLV320AIC23B 87    /* TI TLV320AIC23B audio codec  */
-#define I2C_DRIVERID_WM8731     89      /* Wolfson WM8731 audio codec */
-#define I2C_DRIVERID_WM8750     90      /* Wolfson WM8750 audio codec */
-#define I2C_DRIVERID_WM8753     91      /* Wolfson WM8753 audio codec */
-#define I2C_DRIVERID_LM4857     92      /* LM4857 Audio Amplifier */
 #define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
-#define I2C_DRIVERID_CS4270     94      /* Cirrus Logic 4270 audio codec */
 #define I2C_DRIVERID_M52790     95      /* Mitsubishi M52790SP/FP AV switch */
 #define I2C_DRIVERID_CS5345     96      /* cs5345 audio processor       */
@@ -89,74 +79,23 @@
 */
 /* --- Bit algorithm adapters                                           */
-#define I2C_HW_B_LP             0x010000 /* Parallel port Philips style */
 #define I2C_HW_B_BT848          0x010005 /* BT848 video boards */
-#define I2C_HW_B_VIA            0x010007 /* Via vt82c586b */
-#define I2C_HW_B_HYDRA          0x010008 /* Apple Hydra Mac I/O */
-#define I2C_HW_B_I810           0x01000a /* Intel I810 */
-#define I2C_HW_B_VOO            0x01000b /* 3dfx Voodoo 3 / Banshee */
-#define I2C_HW_B_SCX200         0x01000e /* Nat'l Semi SCx200 I2C */
 #define I2C_HW_B_RIVA           0x010010 /* Riva based graphics cards */
-#define I2C_HW_B_IOC            0x010011 /* IOC bit-wiggling */
-#define I2C_HW_B_IXP2000        0x010016 /* GPIO on IXP2000 systems */
 #define I2C_HW_B_ZR36067        0x010019 /* Zoran-36057/36067 based boards */
-#define I2C_HW_B_PCILYNX        0x01001a /* TI PCILynx I2C adapter */
 #define I2C_HW_B_CX2388x        0x01001b /* connexant 2388x based tv cards */
-#define I2C_HW_B_NVIDIA         0x01001c /* nvidia framebuffer driver */
-#define I2C_HW_B_SAVAGE         0x01001d /* savage framebuffer driver */
-#define I2C_HW_B_RADEON         0x01001e /* radeon framebuffer driver */
 #define I2C_HW_B_EM28XX         0x01001f /* em28xx video capture cards */
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
-#define I2C_HW_B_INTELFB        0x010021 /* intel framebuffer driver */
 #define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828         0x010023 /* auvitek au0828 usb bridge */
-/* --- PCF 8584 based algorithms                                        */
-#define I2C_HW_P_ELEK           0x020002 /* Elektor ISA Bus inteface card */
-/* --- PCA 9564 based algorithms */
-#define I2C_HW_A_ISA            0x1a0000 /* generic ISA Bus interface card */
-/* --- PowerPC on-chip adapters                                         */
-#define I2C_HW_OCP              0x120000 /* IBM on-chip I2C adapter */
-/* --- Broadcom SiByte adapters                                         */
-#define I2C_HW_SIBYTE           0x150000
 /* --- SGI adapters                                                     */
 #define I2C_HW_SGI_VINO         0x160000
-/* --- XSCALE on-chip adapters                          */
-#define I2C_HW_IOP3XX           0x140000
-/* --- Au1550 PSC adapters adapters                                     */
-#define I2C_HW_AU1550_PSC       0x1b0000
 /* --- SMBus only adapters                                              */
-#define I2C_HW_SMBUS_PIIX4      0x040000
-#define I2C_HW_SMBUS_ALI15X3    0x040001
-#define I2C_HW_SMBUS_VIA2       0x040002
-#define I2C_HW_SMBUS_I801       0x040004
-#define I2C_HW_SMBUS_AMD756     0x040005
-#define I2C_HW_SMBUS_SIS5595    0x040006
-#define I2C_HW_SMBUS_ALI1535    0x040007
-#define I2C_HW_SMBUS_SIS630     0x040008
-#define I2C_HW_SMBUS_SIS96X     0x040009
-#define I2C_HW_SMBUS_AMD8111    0x04000a
-#define I2C_HW_SMBUS_SCX200     0x04000b
-#define I2C_HW_SMBUS_NFORCE2    0x04000c
 #define I2C_HW_SMBUS_W9968CF    0x04000d
 #define I2C_HW_SMBUS_OV511      0x04000e /* OV511(+) USB 1.1 webcam ICs */
 #define I2C_HW_SMBUS_OV518      0x04000f /* OV518(+) USB 1.1 webcam ICs */
 #define I2C_HW_SMBUS_CAFE       0x040012 /* Marvell 88ALP01 "CAFE" cam  */
-#define I2C_HW_SMBUS_ALI1563    0x040013
-/* --- MCP107 adapter */
-#define I2C_HW_MPC107           0x0d0000
-/* --- Embedded adapters */
-#define I2C_HW_MV64XXX          0x190000
-#define I2C_HW_BLACKFIN         0x190001 /* ADI Blackfin I2C TWI driver */
 /* --- Miscellaneous adapters */
 #define I2C_HW_SAA7146          0x060000 /* SAA7146 video decoder bus */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 20873d402467..fcfbfea3af72 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -151,7 +151,7 @@ struct i2c_driver {
         * has been dynamically allocated by the driver in the function above,
         * it must be freed here.  (LEGACY I2C DRIVERS ONLY)
         */
-        int (*detach_client)(struct i2c_client *);
+        int (*detach_client)(struct i2c_client *) __deprecated;
        /* Standard driver model interfaces, for "new style" i2c drivers.
         * With the driver model, device enumeration is NEVER done by drivers;
@@ -429,8 +429,10 @@ static inline int i2c_add_driver(struct i2c_driver *driver)
        return i2c_register_driver(THIS_MODULE, driver);
 }
-extern int i2c_attach_client(struct i2c_client *);
+/* These are deprecated, your driver should use the standard .probe()
-extern int i2c_detach_client(struct i2c_client *);
+ * and .remove() methods instead. */
+extern int __deprecated i2c_attach_client(struct i2c_client *);
+extern int __deprecated i2c_detach_client(struct i2c_client *);
 extern struct i2c_client *i2c_use_client(struct i2c_client *client);
 extern void i2c_release_client(struct i2c_client *client);
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index a93a8dd33118..10d701eec484 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_ICMPV6_H
 #define _LINUX_ICMPV6_H
+#include <linux/types.h>
 #include <asm/byteorder.h>
 struct icmp6hdr {
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3644f6323384..194da5a4b0d6 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -871,7 +871,7 @@ struct ide_host {
        ide_hwif_t      *cur_port;      /* for hosts requiring serialization */
        /* used for hosts requiring serialization */
-        volatile long   host_busy;
+        volatile unsigned long  host_busy;
 };
 #define IDE_HOST_BUSY 0
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index 43f3bedaafd3..a60c821be44c 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_IF_ADDR_H
 #define __LINUX_IF_ADDR_H
+#include <linux/types.h>
 #include <linux/netlink.h>
 struct ifaddrmsg
diff --git a/include/linux/if_addrlabel.h b/include/linux/if_addrlabel.h
index 9fe79c95dd28..89571f65d6de 100644
--- a/include/linux/if_addrlabel.h
+++ b/include/linux/if_addrlabel.h
@@ -10,6 +10,8 @@
 #ifndef __LINUX_IF_ADDRLABEL_H
 #define __LINUX_IF_ADDRLABEL_H
+#include <linux/types.h>
 struct ifaddrlblmsg
 {
        __u8            ifal_family;            /* Address family */
diff --git a/include/linux/if_fc.h b/include/linux/if_fc.h
index 376a34ea4723..6ed7f1bf35c8 100644
--- a/include/linux/if_fc.h
+++ b/include/linux/if_fc.h
@@ -20,6 +20,7 @@
 #ifndef _LINUX_IF_FC_H
 #define _LINUX_IF_FC_H
+#include <linux/types.h>
 #define FC_ALEN 6               /* Octets in one ethernet addr   */
 #define FC_HLEN   (sizeof(struct fch_hdr)+sizeof(struct fcllc))
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 5c34240de746..60e16a551dd6 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -26,8 +26,6 @@
 #include <linux/if.h>
-#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
 /* Structures and constants associated with the DLCI device driver */
 struct dlci_add
@@ -127,6 +125,8 @@ struct frad_conf
 #ifdef __KERNEL__
+#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
 /* these are the fields of an RFC 1490 header */
 struct frhdr
 {
@@ -190,12 +190,10 @@ struct frad_local
   int               buffer;            /* current buffer for S508 firmware */
 };
-#endif /* __KERNEL__ */
 #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
-#ifdef __KERNEL__
 extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
-#endif
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h
index f0f23516bb59..4a7c9940b080 100644
--- a/include/linux/if_hippi.h
+++ b/include/linux/if_hippi.h
@@ -22,6 +22,7 @@
 #ifndef _LINUX_IF_HIPPI_H
 #define _LINUX_IF_HIPPI_H
+#include <linux/types.h>
 #include <asm/byteorder.h>
 /*
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index f9032c88716a..176c5182c515 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_IF_LINK_H
 #define _LINUX_IF_LINK_H
+#include <linux/types.h>
 #include <linux/netlink.h>
 /* The struct should be in sync with struct net_device_stats */
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index c3b1f8562709..fcef103aa3f6 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -33,6 +33,7 @@
 #ifndef _IF_PPP_H_
 #define _IF_PPP_H_
+#include <linux/types.h>
 #include <linux/compiler.h>
 /*
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index a7d6a2234b31..c7a66882b6d0 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -15,7 +15,7 @@
 #ifndef __LINUX_IF_PPPOL2TP_H
 #define __LINUX_IF_PPPOL2TP_H
-#include <asm/types.h>
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/in.h>
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 6fb7f1788570..30c88b2245ff 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -17,7 +17,7 @@
 #define __LINUX_IF_PPPOX_H
-#include <asm/types.h>
+#include <linux/types.h>
 #include <asm/byteorder.h>
 #ifdef  __KERNEL__
diff --git a/include/linux/if_strip.h b/include/linux/if_strip.h
index fb5c5c98442f..6526a6235832 100644
--- a/include/linux/if_strip.h
+++ b/include/linux/if_strip.h
@@ -18,6 +18,8 @@
 #ifndef __LINUX_STRIP_H
 #define __LINUX_STRIP_H
+#include <linux/types.h>
 typedef struct {
    __u8 c[6];
 } MetricomAddress;
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
index 5bcec8b2c5e2..fc23aeb0f201 100644
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
@@ -19,6 +19,7 @@
 #ifndef _LINUX_IF_TR_H
 #define _LINUX_IF_TR_H
+#include <linux/types.h>
 #include <asm/byteorder.h>      /* For __be16 */
 /* IEEE 802.5 Token-Ring magic constants.  The frame sizes omit the preamble
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index f734a0ba0698..92fbd8cbd68f 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -16,6 +16,7 @@
 #ifndef _LINUX_IGMP_H
 #define _LINUX_IGMP_H
+#include <linux/types.h>
 #include <asm/byteorder.h>
 /*
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 6e8bc548635a..bc8c49022084 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -1,6 +1,8 @@
 #ifndef _INET_DIAG_H_
 #define _INET_DIAG_H_ 1
+#include <linux/types.h>
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 2f3c2d4ef73b..ea0ea1a4c36f 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -48,6 +48,12 @@ extern struct fs_struct init_fs;
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
        .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
        .rlim           = INIT_RLIMITS,                                 \
+        .cputime        = { .totals = {                                 \
+                .utime = cputime_zero,                                  \
+                .stime = cputime_zero,                                  \
+                .sum_exec_runtime = 0,                                  \
+                .lock = __SPIN_LOCK_UNLOCKED(sig.cputime.totals.lock),  \
+        }, },                                                           \
 }
 extern struct nsproxy init_nsproxy;
diff --git a/include/linux/input.h b/include/linux/input.h
index 9a6355f74db2..1249a0c20a38 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -16,7 +16,7 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <asm/types.h>
+#include <linux/types.h>
 #endif
 /*
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index f6bb2ca8e3ba..32e4b2f72294 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -143,7 +143,8 @@ static inline unsigned long resource_type(struct resource *res)
 extern struct resource * __request_region(struct resource *,
                                        resource_size_t start,
-                                        resource_size_t n, const char *name, int relaxed);
+                                        resource_size_t n,
+                                        const char *name, int flags);
 /* Compatibility cruft */
 #define release_region(start,n) __release_region(&ioport_resource, (start), (n))
diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 1e7cc4af40de..acb9ad684d63 100644
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -1,6 +1,8 @@
 #ifndef _IP6_TUNNEL_H
 #define _IP6_TUNNEL_H
+#include <linux/types.h>
 #define IPV6_TLV_TNL_ENCAP_LIMIT 4
 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 0b816cae533e..476d9464ac82 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -1,6 +1,7 @@
 #ifndef _IPV6_H
 #define _IPV6_H
+#include <linux/types.h>
 #include <linux/in6.h>
 #include <asm/byteorder.h>
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index b323ff577967..1e7d8af2defe 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -13,6 +13,8 @@
 #ifndef _LINUX_IPV6_ROUTE_H
 #define _LINUX_IPV6_ROUTE_H
+#include <linux/types.h>
 #define RTF_DEFAULT     0x00010000      /* default - learned via ND     */
 #define RTF_ALLONLINK   0x00020000      /* (deprecated and will be removed)
                                           fallback, no routers on link */
diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index eb19b4ea84f4..aabb1d294025 100644
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
@@ -1,5 +1,6 @@
 #ifndef _IPX_H_
 #define _IPX_H_
+#include <linux/types.h>
 #include <linux/sockios.h>
 #include <linux/socket.h>
 #define IPX_NODE_LEN    6
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 28f88ecba344..00bdad0e8515 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -25,6 +25,8 @@
 #ifndef KERNEL_IRDA_H
 #define KERNEL_IRDA_H
+#include <linux/types.h>
 /* Please do *not* add any #include in this file, this file is
 * included as-is in user space.
 * Please fix the calling file to properly included needed files before
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 6384b19efe64..64246dce5663 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -614,6 +614,8 @@ struct transaction_s
 * @j_wbufsize: maximum number of buffer_heads allowed in j_wbuf, the
 *      number that will fit in j_blocksize
 * @j_last_sync_writer: most recent pid which did a synchronous write
+ * @j_average_commit_time: the average amount of time in nanoseconds it
+ *      takes to commit a transaction to the disk.
 * @j_private: An opaque pointer to fs-private information.
 */
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index b45109c61fba..b28b37eb11c6 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -308,7 +308,8 @@ void buffer_assertion_failure(struct buffer_head *bh);
                int val = (expr);                                            \
                if (!val) {                                                  \
                        printk(KERN_ERR                                      \
-                                "EXT3-fs unexpected failure: %s;\n",# expr); \
+                               "JBD2 unexpected failure: %s: %s;\n",         \
+                               __func__, #expr);                             \
                        printk(KERN_ERR why "\n");                           \
                }                                                            \
                val;                                                         \
diff --git a/include/linux/joystick.h b/include/linux/joystick.h
index b5e051295a67..9e20c29c1e14 100644
--- a/include/linux/joystick.h
+++ b/include/linux/joystick.h
@@ -27,7 +27,7 @@
 * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
 */
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/input.h>
 /*
diff --git a/include/linux/klist.h b/include/linux/klist.h
index d5a27af9dba5..e91a4e59b771 100644
--- a/include/linux/klist.h
+++ b/include/linux/klist.h
@@ -22,7 +22,7 @@ struct klist {
        struct list_head        k_list;
        void                    (*get)(struct klist_node *);
        void                    (*put)(struct klist_node *);
-};
+} __attribute__ ((aligned (4)));
 #define KLIST_INIT(_name, _get, _put)                                   \
        { .k_lock       = __SPIN_LOCK_UNLOCKED(_name.k_lock),           \
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index d6ea19e314bb..32851eef48f0 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -49,6 +49,13 @@
 /* Attach to insert probes on any functions which should be ignored*/
 #define __kprobes       __attribute__((__section__(".kprobes.text"))) notrace
+#else /* CONFIG_KPROBES */
+typedef int kprobe_opcode_t;
+struct arch_specific_insn {
+        int dummy;
+};
+#define __kprobes       notrace
+#endif /* CONFIG_KPROBES */
 struct kprobe;
 struct pt_regs;
@@ -131,23 +138,6 @@ struct jprobe {
 /* For backward compatibility with old code using JPROBE_ENTRY() */
 #define JPROBE_ENTRY(handler)   (handler)
-DECLARE_PER_CPU(struct kprobe *, current_kprobe);
-DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
-#ifdef CONFIG_KRETPROBES
-extern void arch_prepare_kretprobe(struct kretprobe_instance *ri,
-                                   struct pt_regs *regs);
-extern int arch_trampoline_kprobe(struct kprobe *p);
-#else /* CONFIG_KRETPROBES */
-static inline void arch_prepare_kretprobe(struct kretprobe *rp,
-                                        struct pt_regs *regs)
-{
-}
-static inline int arch_trampoline_kprobe(struct kprobe *p)
-{
-        return 0;
-}
-#endif /* CONFIG_KRETPROBES */
 /*
 * Function-return probe -
 * Note:
@@ -188,6 +178,25 @@ struct kprobe_blackpoint {
        unsigned long range;
 };
+#ifdef CONFIG_KPROBES
+DECLARE_PER_CPU(struct kprobe *, current_kprobe);
+DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
+#ifdef CONFIG_KRETPROBES
+extern void arch_prepare_kretprobe(struct kretprobe_instance *ri,
+                                   struct pt_regs *regs);
+extern int arch_trampoline_kprobe(struct kprobe *p);
+#else /* CONFIG_KRETPROBES */
+static inline void arch_prepare_kretprobe(struct kretprobe *rp,
+                                        struct pt_regs *regs)
+{
+}
+static inline int arch_trampoline_kprobe(struct kprobe *p)
+{
+        return 0;
+}
+#endif /* CONFIG_KRETPROBES */
 extern struct kretprobe_blackpoint kretprobe_blacklist[];
 static inline void kretprobe_assert(struct kretprobe_instance *ri,
@@ -264,10 +273,6 @@ void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
 #else /* CONFIG_KPROBES */
-#define __kprobes       notrace
-struct jprobe;
-struct kretprobe;
 static inline struct kprobe *get_kprobe(void *addr)
 {
        return NULL;
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 35525ac63337..5715f1907601 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -7,7 +7,7 @@
 * Note: you must update KVM_API_VERSION if you change this interface.
 */
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/ioctl.h>
 #include <asm/kvm.h>
diff --git a/include/linux/leds-pca9532.h b/include/linux/leds-pca9532.h
index 81b4207deb95..96eea90f01a8 100644
--- a/include/linux/leds-pca9532.h
+++ b/include/linux/leds-pca9532.h
@@ -15,6 +15,7 @@
 #define __LINUX_PCA9532_H
 #include <linux/leds.h>
+#include <linux/workqueue.h>
 enum pca9532_state {
        PCA9532_OFF  = 0x0,
@@ -31,6 +32,7 @@ struct pca9532_led {
        struct i2c_client *client;
        char *name;
        struct led_classdev ldev;
+       struct work_struct work;
        enum pca9532_type type;
        enum pca9532_state state;
 };
diff --git a/include/linux/leds.h b/include/linux/leds.h
index d3a73f5a48c3..24489da701e3 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -32,7 +32,10 @@ struct led_classdev {
        int                      brightness;
        int                      flags;
+        /* Lower 16 bits reflect status */
 #define LED_SUSPENDED           (1 << 0)
+        /* Upper 16 bits reflect control information */
+#define LED_CORE_SUSPENDRESUME  (1 << 16)
        /* Set LED brightness level */
        /* Must not sleep, use a workqueue if needed */
@@ -62,7 +65,7 @@ struct led_classdev {
 extern int led_classdev_register(struct device *parent,
                                 struct led_classdev *led_cdev);
-extern void led_classdev_unregister(struct led_classdev *lcd);
+extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 4f7c8fb4d3fe..bca3ba25f52a 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -187,6 +187,8 @@ enum {
        ATA_FLAG_PIO_POLLING    = (1 << 9), /* use polling PIO if LLD
                                             * doesn't handle PIO interrupts */
        ATA_FLAG_NCQ            = (1 << 10), /* host supports NCQ */
+        ATA_FLAG_NO_POWEROFF_SPINDOWN = (1 << 11), /* don't spindown before poweroff */
+        ATA_FLAG_NO_HIBERNATE_SPINDOWN = (1 << 12), /* don't spindown before hibernation */
        ATA_FLAG_DEBUGMSG       = (1 << 13),
        ATA_FLAG_IGN_SIMPLEX    = (1 << 15), /* ignore SIMPLEX */
        ATA_FLAG_NO_IORDY       = (1 << 16), /* controller lacks iordy */
@@ -239,6 +241,7 @@ enum {
        /* host set flags */
        ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
        ATA_HOST_STARTED        = (1 << 1),     /* Host started */
+        ATA_HOST_PARALLEL_SCAN  = (1 << 2),     /* Ports on this host can be scanned in parallel */
        /* bits 24:31 of host->flags are reserved for LLD specific flags */
@@ -400,12 +403,14 @@ enum {
                                  ATA_TIMING_CYC8B,
        ATA_TIMING_ACTIVE       = (1 << 4),
        ATA_TIMING_RECOVER      = (1 << 5),
-        ATA_TIMING_CYCLE        = (1 << 6),
+        ATA_TIMING_DMACK_HOLD   = (1 << 6),
-        ATA_TIMING_UDMA         = (1 << 7),
+        ATA_TIMING_CYCLE        = (1 << 7),
+        ATA_TIMING_UDMA         = (1 << 8),
        ATA_TIMING_ALL          = ATA_TIMING_SETUP | ATA_TIMING_ACT8B |
                                  ATA_TIMING_REC8B | ATA_TIMING_CYC8B |
                                  ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER |
-                                  ATA_TIMING_CYCLE | ATA_TIMING_UDMA,
+                                  ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE |
+                                  ATA_TIMING_UDMA,
 };
 enum ata_xfer_mask {
@@ -865,6 +870,7 @@ struct ata_timing {
        unsigned short cyc8b;           /* t0 for 8-bit I/O */
        unsigned short active;          /* t2 or tD */
        unsigned short recover;         /* t2i or tK */
+        unsigned short dmack_hold;      /* tj */
        unsigned short cycle;           /* t0 */
        unsigned short udma;            /* t2CYCTYP/2 */
 };
@@ -926,6 +932,8 @@ extern void ata_host_init(struct ata_host *, struct device *,
 extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
+extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev,
+                            int cmd, void __user *arg);
 extern void ata_sas_port_destroy(struct ata_port *);
 extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
                                           struct ata_port_info *, struct Scsi_Host *);
diff --git a/include/linux/loop.h b/include/linux/loop.h
index 46169a7b559b..6ffd6db5bb0d 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -80,7 +80,7 @@ enum {
 };
 #include <asm/posix_types.h>    /* for __kernel_old_dev_t */
-#include <asm/types.h>          /* for __u64 */
+#include <linux/types.h>        /* for __u64 */
 /* Backwards compatibility version */
 struct loop_info {
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index e794dfb87504..97ffdc1d3442 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -57,20 +57,21 @@
 #define FLG_L2DATA              14      /* channel use L2 DATA primitivs */
 #define FLG_ORIGIN              15      /* channel is on origin site */
 /* channel specific stuff */
+#define FLG_FILLEMPTY           16      /* fill fifo on first frame (empty) */
 /* arcofi specific */
-#define FLG_ARCOFI_TIMER        16
+#define FLG_ARCOFI_TIMER        17
-#define FLG_ARCOFI_ERROR        17
+#define FLG_ARCOFI_ERROR        18
 /* isar specific */
-#define FLG_INITIALIZED         16
+#define FLG_INITIALIZED         17
-#define FLG_DLEETX              17
+#define FLG_DLEETX              18
-#define FLG_LASTDLE             18
+#define FLG_LASTDLE             19
-#define FLG_FIRST               19
+#define FLG_FIRST               20
-#define FLG_LASTDATA            20
+#define FLG_LASTDATA            21
-#define FLG_NMD_DATA            21
+#define FLG_NMD_DATA            22
-#define FLG_FTI_RUN             22
+#define FLG_FTI_RUN             23
-#define FLG_LL_OK               23
+#define FLG_LL_OK               24
-#define FLG_LL_CONN             24
+#define FLG_LL_CONN             25
-#define FLG_DTMFSEND            25
+#define FLG_DTMFSEND            26
 /* workq events */
 #define FLG_RECVQUEUE           30
@@ -183,6 +184,7 @@ extern void	queue_ch_frame(struct mISDNchannel *, u_int,
 extern int      dchannel_senddata(struct dchannel *, struct sk_buff *);
 extern int      bchannel_senddata(struct bchannel *, struct sk_buff *);
 extern void     recv_Dchannel(struct dchannel *);
+extern void     recv_Echannel(struct dchannel *, struct dchannel *);
 extern void     recv_Bchannel(struct bchannel *);
 extern void     recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
 extern void     recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 8f2d60da04e7..5da3d95b27f1 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -36,8 +36,8 @@
 *              - should be incremented on every checkin
 */
 #define MISDN_MAJOR_VERSION     1
-#define MISDN_MINOR_VERSION     0
+#define MISDN_MINOR_VERSION     1
-#define MISDN_RELEASE           19
+#define MISDN_RELEASE           20
 /* primitives for information exchange
 * generell format
@@ -80,6 +80,7 @@
 #define PH_DEACTIVATE_IND       0x0202
 #define PH_DEACTIVATE_CNF       0x4202
 #define PH_DATA_IND             0x2002
+#define PH_DATA_E_IND           0x3002
 #define MPH_ACTIVATE_IND        0x0502
 #define MPH_DEACTIVATE_IND      0x0602
 #define MPH_INFORMATION_IND     0x0702
@@ -199,6 +200,18 @@
 #define ISDN_P_NT_S0            0x02
 #define ISDN_P_TE_E1            0x03
 #define ISDN_P_NT_E1            0x04
+#define ISDN_P_TE_UP0           0x05
+#define ISDN_P_NT_UP0           0x06
+#define IS_ISDN_P_TE(p) ((p == ISDN_P_TE_S0) || (p == ISDN_P_TE_E1) || \
+                                (p == ISDN_P_TE_UP0) || (p == ISDN_P_LAPD_TE))
+#define IS_ISDN_P_NT(p) ((p == ISDN_P_NT_S0) || (p == ISDN_P_NT_E1) || \
+                                (p == ISDN_P_NT_UP0) || (p == ISDN_P_LAPD_NT))
+#define IS_ISDN_P_S0(p) ((p == ISDN_P_TE_S0) || (p == ISDN_P_NT_S0))
+#define IS_ISDN_P_E1(p) ((p == ISDN_P_TE_E1) || (p == ISDN_P_NT_E1))
+#define IS_ISDN_P_UP0(p) ((p == ISDN_P_TE_UP0) || (p == ISDN_P_NT_UP0))
 #define ISDN_P_LAPD_TE          0x10
 #define ISDN_P_LAPD_NT          0x11
@@ -255,16 +268,6 @@ struct sockaddr_mISDN {
        unsigned char   tei;
 };
-/* timer device ioctl */
-#define IMADDTIMER      _IOR('I', 64, int)
-#define IMDELTIMER      _IOR('I', 65, int)
-/* socket ioctls */
-#define IMGETVERSION    _IOR('I', 66, int)
-#define IMGETCOUNT      _IOR('I', 67, int)
-#define IMGETDEVINFO    _IOR('I', 68, int)
-#define IMCTRLREQ       _IOR('I', 69, int)
-#define IMCLEAR_L2      _IOR('I', 70, int)
 struct mISDNversion {
        unsigned char   major;
        unsigned char   minor;
@@ -281,6 +284,40 @@ struct mISDN_devinfo {
        char                    name[MISDN_MAX_IDLEN];
 };
+struct mISDN_devrename {
+        u_int                   id;
+        char                    name[MISDN_MAX_IDLEN]; /* new name */
+};
+/* MPH_INFORMATION_REQ payload */
+struct ph_info_ch {
+        __u32 protocol;
+        __u64 Flags;
+};
+struct ph_info_dch {
+        struct ph_info_ch ch;
+        __u16 state;
+        __u16 num_bch;
+};
+struct ph_info {
+        struct ph_info_dch dch;
+        struct ph_info_ch  bch[];
+};
+/* timer device ioctl */
+#define IMADDTIMER      _IOR('I', 64, int)
+#define IMDELTIMER      _IOR('I', 65, int)
+/* socket ioctls */
+#define IMGETVERSION    _IOR('I', 66, int)
+#define IMGETCOUNT      _IOR('I', 67, int)
+#define IMGETDEVINFO    _IOR('I', 68, int)
+#define IMCTRLREQ       _IOR('I', 69, int)
+#define IMCLEAR_L2      _IOR('I', 70, int)
+#define IMSETDEVNAME    _IOR('I', 71, struct mISDN_devrename)
 static inline int
 test_channelmap(u_int nr, u_char *map)
 {
@@ -312,6 +349,8 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_SETPEER              0x0040
 #define MISDN_CTRL_UNSETPEER            0x0080
 #define MISDN_CTRL_RX_OFF               0x0100
+#define MISDN_CTRL_FILL_EMPTY           0x0200
+#define MISDN_CTRL_GETPEER              0x0400
 #define MISDN_CTRL_HW_FEATURES_OP       0x2000
 #define MISDN_CTRL_HW_FEATURES          0x2001
 #define MISDN_CTRL_HFC_OP               0x4000
@@ -362,6 +401,7 @@ struct mISDN_ctrl_req {
 #define DEBUG_L2_TEI            0x00100000
 #define DEBUG_L2_TEIFSM         0x00200000
 #define DEBUG_TIMER             0x01000000
+#define DEBUG_CLOCK             0x02000000
 #define mISDN_HEAD_P(s)         ((struct mISDNhead *)&s->cb[0])
 #define mISDN_HEAD_PRIM(s)      (((struct mISDNhead *)&s->cb[0])->prim)
@@ -375,6 +415,7 @@ struct mISDN_ctrl_req {
 struct mISDNchannel;
 struct mISDNdevice;
 struct mISDNstack;
+struct mISDNclock;
 struct channel_req {
        u_int                   protocol;
@@ -423,7 +464,6 @@ struct mISDN_sock {
 struct mISDNdevice {
        struct mISDNchannel     D;
        u_int                   id;
-        char                    name[MISDN_MAX_IDLEN];
        u_int                   Dprotocols;
        u_int                   Bprotocols;
        u_int                   nrbchan;
@@ -452,6 +492,16 @@ struct mISDNstack {
 #endif
 };
+typedef int     (clockctl_func_t)(void *, int);
+struct  mISDNclock {
+        struct list_head        list;
+        char                    name[64];
+        int                     pri;
+        clockctl_func_t         *ctl;
+        void                    *priv;
+};
 /* global alloc/queue functions */
 static inline struct sk_buff *
@@ -498,12 +548,26 @@ _queue_data(struct mISDNchannel *ch, u_int prim,
 /* global register/unregister functions */
-extern int      mISDN_register_device(struct mISDNdevice *, char *name);
+extern int      mISDN_register_device(struct mISDNdevice *,
+                                        struct device *parent, char *name);
 extern void     mISDN_unregister_device(struct mISDNdevice *);
 extern int      mISDN_register_Bprotocol(struct Bprotocol *);
 extern void     mISDN_unregister_Bprotocol(struct Bprotocol *);
+extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *,
+                                                void *);
+extern void     mISDN_unregister_clock(struct mISDNclock *);
+static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
+{
+        if (dev)
+                return dev_get_drvdata(dev);
+        else
+                return NULL;
+}
 extern void     set_channel_address(struct mISDNchannel *, u_int, u_int);
+extern void     mISDN_clock_update(struct mISDNclock *, int, struct timeval *);
+extern unsigned short mISDN_clock_get(void);
 #endif /* __KERNEL__ */
 #endif /* mISDNIF_H */
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 439f6f3cb0c4..0b4df7eba852 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -10,11 +10,13 @@
 #define SYSFS_MAGIC             0x62656572
 #define SECURITYFS_MAGIC        0x73636673
 #define TMPFS_MAGIC             0x01021994
+#define SQUASHFS_MAGIC          0x73717368
 #define EFS_SUPER_MAGIC         0x414A53
 #define EXT2_SUPER_MAGIC        0xEF53
 #define EXT3_SUPER_MAGIC        0xEF53
 #define XENFS_SUPER_MAGIC       0xabba1974
 #define EXT4_SUPER_MAGIC        0xEF53
+#define BTRFS_SUPER_MAGIC       0x9123683E
 #define HPFS_SUPER_MAGIC        0xf995e849
 #define ISOFS_SUPER_MAGIC       0x9660
 #define JFFS2_SUPER_MAGIC       0x72b6
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h
index ae5b09493062..404f678e734b 100644
--- a/include/linux/matroxfb.h
+++ b/include/linux/matroxfb.h
@@ -2,7 +2,7 @@
 #define __LINUX_MATROXFB_H__
 #include <asm/ioctl.h>
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/videodev2.h>
 struct matroxioc_output_mode {
diff --git a/include/linux/memstick.h b/include/linux/memstick.h
index d0c37e682234..690c35a9d4cc 100644
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
@@ -100,8 +100,8 @@ struct mspro_param_register {
 #define MEMSTICK_SYS_PAR8   0x40
 #define MEMSTICK_SYS_SERIAL 0x80
-        unsigned short data_count;
+        __be16 data_count;
-        unsigned int   data_address;
+        __be32 data_address;
        unsigned char  tpc_param;
 } __attribute__((packed));
diff --git a/include/linux/mfd/pcf50633/adc.h b/include/linux/mfd/pcf50633/adc.h
new file mode 100644
index 000000000000..56669b4183ad
--- /dev/null
+++ b/include/linux/mfd/pcf50633/adc.h
@@ -0,0 +1,72 @@
+/*
+ * adc.h  -- Driver for NXP PCF50633 ADC
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_MFD_PCF50633_ADC_H
+#define __LINUX_MFD_PCF50633_ADC_H
+#include <linux/mfd/pcf50633/core.h>
+#include <linux/platform_device.h>
+/* ADC Registers */
+#define PCF50633_REG_ADCC3              0x52
+#define PCF50633_REG_ADCC2              0x53
+#define PCF50633_REG_ADCC1              0x54
+#define PCF50633_REG_ADCS1              0x55
+#define PCF50633_REG_ADCS2              0x56
+#define PCF50633_REG_ADCS3              0x57
+#define PCF50633_ADCC1_ADCSTART         0x01
+#define PCF50633_ADCC1_RES_10BIT        0x02
+#define PCF50633_ADCC1_AVERAGE_NO       0x00
+#define PCF50633_ADCC1_AVERAGE_4        0x04
+#define PCF50633_ADCC1_AVERAGE_8        0x08
+#define PCF50633_ADCC1_AVERAGE_16       0x0c
+#define PCF50633_ADCC1_MUX_BATSNS_RES   0x00
+#define PCF50633_ADCC1_MUX_BATSNS_SUBTR 0x10
+#define PCF50633_ADCC1_MUX_ADCIN2_RES   0x20
+#define PCF50633_ADCC1_MUX_ADCIN2_SUBTR 0x30
+#define PCF50633_ADCC1_MUX_BATTEMP      0x60
+#define PCF50633_ADCC1_MUX_ADCIN1       0x70
+#define PCF50633_ADCC1_AVERAGE_MASK     0x0c
+#define PCF50633_ADCC1_ADCMUX_MASK      0xf0
+#define PCF50633_ADCC2_RATIO_NONE       0x00
+#define PCF50633_ADCC2_RATIO_BATTEMP    0x01
+#define PCF50633_ADCC2_RATIO_ADCIN1     0x02
+#define PCF50633_ADCC2_RATIO_BOTH       0x03
+#define PCF50633_ADCC2_RATIOSETTL_100US 0x04
+#define PCF50633_ADCC3_ACCSW_EN         0x01
+#define PCF50633_ADCC3_NTCSW_EN         0x04
+#define PCF50633_ADCC3_RES_DIV_TWO      0x10
+#define PCF50633_ADCC3_RES_DIV_THREE    0x00
+#define PCF50633_ADCS3_REF_NTCSW        0x00
+#define PCF50633_ADCS3_REF_ACCSW        0x10
+#define PCF50633_ADCS3_REF_2V0          0x20
+#define PCF50633_ADCS3_REF_VISA         0x30
+#define PCF50633_ADCS3_REF_2V0_2        0x70
+#define PCF50633_ADCS3_ADCRDY           0x80
+#define PCF50633_ADCS3_ADCDAT1L_MASK    0x03
+#define PCF50633_ADCS3_ADCDAT2L_MASK    0x0c
+#define PCF50633_ADCS3_ADCDAT2L_SHIFT   2
+#define PCF50633_ASCS3_REF_MASK         0x70
+extern int
+pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg,
+                void (*callback)(struct pcf50633 *, void *, int),
+                void *callback_param);
+extern int
+pcf50633_adc_sync_read(struct pcf50633 *pcf, int mux, int avg);
+#endif /* __LINUX_PCF50633_ADC_H */
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
new file mode 100644
index 000000000000..4455b212d75a
--- /dev/null
+++ b/include/linux/mfd/pcf50633/core.h
@@ -0,0 +1,218 @@
+/*
+ * core.h  -- Core driver for NXP PCF50633
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_MFD_PCF50633_CORE_H
+#define __LINUX_MFD_PCF50633_CORE_H
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/power_supply.h>
+struct pcf50633;
+#define PCF50633_NUM_REGULATORS 11
+struct pcf50633_platform_data {
+        struct regulator_init_data reg_init_data[PCF50633_NUM_REGULATORS];
+        char **batteries;
+        int num_batteries;
+        /* Callbacks */
+        void (*probe_done)(struct pcf50633 *);
+        void (*mbc_event_callback)(struct pcf50633 *, int);
+        void (*regulator_registered)(struct pcf50633 *, int);
+        void (*force_shutdown)(struct pcf50633 *);
+        u8 resumers[5];
+};
+struct pcf50633_subdev_pdata {
+        struct pcf50633 *pcf;
+};
+struct pcf50633_irq {
+        void (*handler) (int, void *);
+        void *data;
+};
+int pcf50633_register_irq(struct pcf50633 *pcf, int irq,
+                        void (*handler) (int, void *), void *data);
+int pcf50633_free_irq(struct pcf50633 *pcf, int irq);
+int pcf50633_irq_mask(struct pcf50633 *pcf, int irq);
+int pcf50633_irq_unmask(struct pcf50633 *pcf, int irq);
+int pcf50633_irq_mask_get(struct pcf50633 *pcf, int irq);
+int pcf50633_read_block(struct pcf50633 *, u8 reg,
+                                        int nr_regs, u8 *data);
+int pcf50633_write_block(struct pcf50633 *pcf, u8 reg,
+                                        int nr_regs, u8 *data);
+u8 pcf50633_reg_read(struct pcf50633 *, u8 reg);
+int pcf50633_reg_write(struct pcf50633 *pcf, u8 reg, u8 val);
+int pcf50633_reg_set_bit_mask(struct pcf50633 *pcf, u8 reg, u8 mask, u8 val);
+int pcf50633_reg_clear_bits(struct pcf50633 *pcf, u8 reg, u8 bits);
+/* Interrupt registers */
+#define PCF50633_REG_INT1       0x02
+#define PCF50633_REG_INT2       0x03
+#define PCF50633_REG_INT3       0x04
+#define PCF50633_REG_INT4       0x05
+#define PCF50633_REG_INT5       0x06
+#define PCF50633_REG_INT1M      0x07
+#define PCF50633_REG_INT2M      0x08
+#define PCF50633_REG_INT3M      0x09
+#define PCF50633_REG_INT4M      0x0a
+#define PCF50633_REG_INT5M      0x0b
+enum {
+        /* Chip IRQs */
+        PCF50633_IRQ_ADPINS,
+        PCF50633_IRQ_ADPREM,
+        PCF50633_IRQ_USBINS,
+        PCF50633_IRQ_USBREM,
+        PCF50633_IRQ_RESERVED1,
+        PCF50633_IRQ_RESERVED2,
+        PCF50633_IRQ_ALARM,
+        PCF50633_IRQ_SECOND,
+        PCF50633_IRQ_ONKEYR,
+        PCF50633_IRQ_ONKEYF,
+        PCF50633_IRQ_EXTON1R,
+        PCF50633_IRQ_EXTON1F,
+        PCF50633_IRQ_EXTON2R,
+        PCF50633_IRQ_EXTON2F,
+        PCF50633_IRQ_EXTON3R,
+        PCF50633_IRQ_EXTON3F,
+        PCF50633_IRQ_BATFULL,
+        PCF50633_IRQ_CHGHALT,
+        PCF50633_IRQ_THLIMON,
+        PCF50633_IRQ_THLIMOFF,
+        PCF50633_IRQ_USBLIMON,
+        PCF50633_IRQ_USBLIMOFF,
+        PCF50633_IRQ_ADCRDY,
+        PCF50633_IRQ_ONKEY1S,
+        PCF50633_IRQ_LOWSYS,
+        PCF50633_IRQ_LOWBAT,
+        PCF50633_IRQ_HIGHTMP,
+        PCF50633_IRQ_AUTOPWRFAIL,
+        PCF50633_IRQ_DWN1PWRFAIL,
+        PCF50633_IRQ_DWN2PWRFAIL,
+        PCF50633_IRQ_LEDPWRFAIL,
+        PCF50633_IRQ_LEDOVP,
+        PCF50633_IRQ_LDO1PWRFAIL,
+        PCF50633_IRQ_LDO2PWRFAIL,
+        PCF50633_IRQ_LDO3PWRFAIL,
+        PCF50633_IRQ_LDO4PWRFAIL,
+        PCF50633_IRQ_LDO5PWRFAIL,
+        PCF50633_IRQ_LDO6PWRFAIL,
+        PCF50633_IRQ_HCLDOPWRFAIL,
+        PCF50633_IRQ_HCLDOOVL,
+        /* Always last */
+        PCF50633_NUM_IRQ,
+};
+struct pcf50633 {
+        struct device *dev;
+        struct i2c_client *i2c_client;
+        struct pcf50633_platform_data *pdata;
+        int irq;
+        struct pcf50633_irq irq_handler[PCF50633_NUM_IRQ];
+        struct work_struct irq_work;
+        struct mutex lock;
+        u8 mask_regs[5];
+        u8 suspend_irq_masks[5];
+        u8 resume_reason[5];
+        int is_suspended;
+        int onkey1s_held;
+        struct platform_device *rtc_pdev;
+        struct platform_device *mbc_pdev;
+        struct platform_device *adc_pdev;
+        struct platform_device *input_pdev;
+        struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS];
+};
+enum pcf50633_reg_int1 {
+        PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
+        PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
+        PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
+        PCF50633_INT1_USBREM    = 0x08, /* USB removed */
+        /* reserved */
+        PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
+        PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
+};
+enum pcf50633_reg_int2 {
+        PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
+        PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
+        PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
+        PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
+        PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
+        PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
+        PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
+        PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
+};
+enum pcf50633_reg_int3 {
+        PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
+        PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
+        PCF50633_INT3_THLIMON   = 0x04,
+        PCF50633_INT3_THLIMOFF  = 0x08,
+        PCF50633_INT3_USBLIMON  = 0x10,
+        PCF50633_INT3_USBLIMOFF = 0x20,
+        PCF50633_INT3_ADCRDY    = 0x40, /* ADC result ready */
+        PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
+};
+enum pcf50633_reg_int4 {
+        PCF50633_INT4_LOWSYS            = 0x01,
+        PCF50633_INT4_LOWBAT            = 0x02,
+        PCF50633_INT4_HIGHTMP           = 0x04,
+        PCF50633_INT4_AUTOPWRFAIL       = 0x08,
+        PCF50633_INT4_DWN1PWRFAIL       = 0x10,
+        PCF50633_INT4_DWN2PWRFAIL       = 0x20,
+        PCF50633_INT4_LEDPWRFAIL        = 0x40,
+        PCF50633_INT4_LEDOVP            = 0x80,
+};
+enum pcf50633_reg_int5 {
+        PCF50633_INT5_LDO1PWRFAIL       = 0x01,
+        PCF50633_INT5_LDO2PWRFAIL       = 0x02,
+        PCF50633_INT5_LDO3PWRFAIL       = 0x04,
+        PCF50633_INT5_LDO4PWRFAIL       = 0x08,
+        PCF50633_INT5_LDO5PWRFAIL       = 0x10,
+        PCF50633_INT5_LDO6PWRFAIL       = 0x20,
+        PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
+        PCF50633_INT5_HCLDOOVL          = 0x80,
+};
+/* misc. registers */
+#define PCF50633_REG_OOCSHDWN   0x0c
+/* LED registers */
+#define PCF50633_REG_LEDOUT 0x28
+#define PCF50633_REG_LEDENA 0x29
+#define PCF50633_REG_LEDCTL 0x2a
+#define PCF50633_REG_LEDDIM 0x2b
+#endif
diff --git a/include/linux/mfd/pcf50633/gpio.h b/include/linux/mfd/pcf50633/gpio.h
new file mode 100644
index 000000000000..a42b845efc54
--- /dev/null
+++ b/include/linux/mfd/pcf50633/gpio.h
@@ -0,0 +1,52 @@
+/*
+ * gpio.h -- GPIO driver for NXP PCF50633
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_MFD_PCF50633_GPIO_H
+#define __LINUX_MFD_PCF50633_GPIO_H
+#include <linux/mfd/pcf50633/core.h>
+#define PCF50633_GPIO1          1
+#define PCF50633_GPIO2          2
+#define PCF50633_GPIO3          3
+#define PCF50633_GPO            4
+#define PCF50633_REG_GPIO1CFG   0x14
+#define PCF50633_REG_GPIO2CFG   0x15
+#define PCF50633_REG_GPIO3CFG   0x16
+#define PCF50633_REG_GPOCFG     0x17
+#define PCF50633_GPOCFG_GPOSEL_MASK     0x07
+enum pcf50633_reg_gpocfg {
+        PCF50633_GPOCFG_GPOSEL_0        = 0x00,
+        PCF50633_GPOCFG_GPOSEL_LED_NFET = 0x01,
+        PCF50633_GPOCFG_GPOSEL_SYSxOK   = 0x02,
+        PCF50633_GPOCFG_GPOSEL_CLK32K   = 0x03,
+        PCF50633_GPOCFG_GPOSEL_ADAPUSB  = 0x04,
+        PCF50633_GPOCFG_GPOSEL_USBxOK   = 0x05,
+        PCF50633_GPOCFG_GPOSEL_ACTPH4   = 0x06,
+        PCF50633_GPOCFG_GPOSEL_1        = 0x07,
+        PCF50633_GPOCFG_GPOSEL_INVERSE  = 0x08,
+};
+int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val);
+u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio);
+int pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert);
+int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio);
+int pcf50633_gpio_power_supply_set(struct pcf50633 *,
+                                        int gpio, int regulator, int on);
+#endif /* __LINUX_MFD_PCF50633_GPIO_H */
diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h
new file mode 100644
index 000000000000..6e17619b773a
--- /dev/null
+++ b/include/linux/mfd/pcf50633/mbc.h
@@ -0,0 +1,134 @@
+/*
+ * mbc.h  -- Driver for NXP PCF50633 Main Battery Charger
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_MFD_PCF50633_MBC_H
+#define __LINUX_MFD_PCF50633_MBC_H
+#include <linux/mfd/pcf50633/core.h>
+#include <linux/platform_device.h>
+#define PCF50633_REG_MBCC1      0x43
+#define PCF50633_REG_MBCC2      0x44
+#define PCF50633_REG_MBCC3      0x45
+#define PCF50633_REG_MBCC4      0x46
+#define PCF50633_REG_MBCC5      0x47
+#define PCF50633_REG_MBCC6      0x48
+#define PCF50633_REG_MBCC7      0x49
+#define PCF50633_REG_MBCC8      0x4a
+#define PCF50633_REG_MBCS1      0x4b
+#define PCF50633_REG_MBCS2      0x4c
+#define PCF50633_REG_MBCS3      0x4d
+enum pcf50633_reg_mbcc1 {
+        PCF50633_MBCC1_CHGENA           = 0x01, /* Charger enable */
+        PCF50633_MBCC1_AUTOSTOP         = 0x02,
+        PCF50633_MBCC1_AUTORES          = 0x04, /* automatic resume */
+        PCF50633_MBCC1_RESUME           = 0x08, /* explicit resume cmd */
+        PCF50633_MBCC1_RESTART          = 0x10, /* restart charging */
+        PCF50633_MBCC1_PREWDTIME_60M    = 0x20, /* max. precharging time */
+        PCF50633_MBCC1_WDTIME_1H        = 0x00,
+        PCF50633_MBCC1_WDTIME_2H        = 0x40,
+        PCF50633_MBCC1_WDTIME_4H        = 0x80,
+        PCF50633_MBCC1_WDTIME_6H        = 0xc0,
+};
+#define PCF50633_MBCC1_WDTIME_MASK        0xc0
+enum pcf50633_reg_mbcc2 {
+        PCF50633_MBCC2_VBATCOND_2V7     = 0x00,
+        PCF50633_MBCC2_VBATCOND_2V85    = 0x01,
+        PCF50633_MBCC2_VBATCOND_3V0     = 0x02,
+        PCF50633_MBCC2_VBATCOND_3V15    = 0x03,
+        PCF50633_MBCC2_VMAX_4V          = 0x00,
+        PCF50633_MBCC2_VMAX_4V20        = 0x28,
+        PCF50633_MBCC2_VRESDEBTIME_64S  = 0x80, /* debounce time (32/64sec) */
+};
+enum pcf50633_reg_mbcc7 {
+        PCF50633_MBCC7_USB_100mA        = 0x00,
+        PCF50633_MBCC7_USB_500mA        = 0x01,
+        PCF50633_MBCC7_USB_1000mA       = 0x02,
+        PCF50633_MBCC7_USB_SUSPEND      = 0x03,
+        PCF50633_MBCC7_BATTEMP_EN       = 0x04,
+        PCF50633_MBCC7_BATSYSIMAX_1A6   = 0x00,
+        PCF50633_MBCC7_BATSYSIMAX_1A8   = 0x40,
+        PCF50633_MBCC7_BATSYSIMAX_2A0   = 0x80,
+        PCF50633_MBCC7_BATSYSIMAX_2A2   = 0xc0,
+};
+#define PCF50633_MBCC7_USB_MASK 0x03
+enum pcf50633_reg_mbcc8 {
+        PCF50633_MBCC8_USBENASUS        = 0x10,
+};
+enum pcf50633_reg_mbcs1 {
+        PCF50633_MBCS1_USBPRES          = 0x01,
+        PCF50633_MBCS1_USBOK            = 0x02,
+        PCF50633_MBCS1_ADAPTPRES        = 0x04,
+        PCF50633_MBCS1_ADAPTOK          = 0x08,
+        PCF50633_MBCS1_TBAT_OK          = 0x00,
+        PCF50633_MBCS1_TBAT_ABOVE       = 0x10,
+        PCF50633_MBCS1_TBAT_BELOW       = 0x20,
+        PCF50633_MBCS1_TBAT_UNDEF       = 0x30,
+        PCF50633_MBCS1_PREWDTEXP        = 0x40,
+        PCF50633_MBCS1_WDTEXP           = 0x80,
+};
+enum pcf50633_reg_mbcs2_mbcmod {
+        PCF50633_MBCS2_MBC_PLAY         = 0x00,
+        PCF50633_MBCS2_MBC_USB_PRE      = 0x01,
+        PCF50633_MBCS2_MBC_USB_PRE_WAIT = 0x02,
+        PCF50633_MBCS2_MBC_USB_FAST     = 0x03,
+        PCF50633_MBCS2_MBC_USB_FAST_WAIT = 0x04,
+        PCF50633_MBCS2_MBC_USB_SUSPEND  = 0x05,
+        PCF50633_MBCS2_MBC_ADP_PRE      = 0x06,
+        PCF50633_MBCS2_MBC_ADP_PRE_WAIT = 0x07,
+        PCF50633_MBCS2_MBC_ADP_FAST     = 0x08,
+        PCF50633_MBCS2_MBC_ADP_FAST_WAIT = 0x09,
+        PCF50633_MBCS2_MBC_BAT_FULL     = 0x0a,
+        PCF50633_MBCS2_MBC_HALT         = 0x0b,
+};
+#define PCF50633_MBCS2_MBC_MASK         0x0f
+enum pcf50633_reg_mbcs2_chgstat {
+        PCF50633_MBCS2_CHGS_NONE        = 0x00,
+        PCF50633_MBCS2_CHGS_ADAPTER     = 0x10,
+        PCF50633_MBCS2_CHGS_USB         = 0x20,
+        PCF50633_MBCS2_CHGS_BOTH        = 0x30,
+};
+#define PCF50633_MBCS2_RESSTAT_AUTO     0x40
+enum pcf50633_reg_mbcs3 {
+        PCF50633_MBCS3_USBLIM_PLAY      = 0x01,
+        PCF50633_MBCS3_USBLIM_CGH       = 0x02,
+        PCF50633_MBCS3_TLIM_PLAY        = 0x04,
+        PCF50633_MBCS3_TLIM_CHG         = 0x08,
+        PCF50633_MBCS3_ILIM             = 0x10, /* 1: Ibat > Icutoff */
+        PCF50633_MBCS3_VLIM             = 0x20, /* 1: Vbat == Vmax */
+        PCF50633_MBCS3_VBATSTAT         = 0x40, /* 1: Vbat > Vbatcond */
+        PCF50633_MBCS3_VRES             = 0x80, /* 1: Vbat > Vth(RES) */
+};
+#define PCF50633_MBCC2_VBATCOND_MASK      0x03
+#define PCF50633_MBCC2_VMAX_MASK          0x3c
+/* Charger status */
+#define PCF50633_MBC_USB_ONLINE         0x01
+#define PCF50633_MBC_USB_ACTIVE         0x02
+#define PCF50633_MBC_ADAPTER_ONLINE     0x04
+#define PCF50633_MBC_ADAPTER_ACTIVE     0x08
+int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma);
+int pcf50633_mbc_get_status(struct pcf50633 *);
+void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status);
+#endif
diff --git a/include/linux/mfd/pcf50633/pmic.h b/include/linux/mfd/pcf50633/pmic.h
new file mode 100644
index 000000000000..2d3dbe53b235
--- /dev/null
+++ b/include/linux/mfd/pcf50633/pmic.h
@@ -0,0 +1,67 @@
+#ifndef __LINUX_MFD_PCF50633_PMIC_H
+#define __LINUX_MFD_PCF50633_PMIC_H
+#include <linux/mfd/pcf50633/core.h>
+#include <linux/platform_device.h>
+#define PCF50633_REG_AUTOOUT    0x1a
+#define PCF50633_REG_AUTOENA    0x1b
+#define PCF50633_REG_AUTOCTL    0x1c
+#define PCF50633_REG_AUTOMXC    0x1d
+#define PCF50633_REG_DOWN1OUT   0x1e
+#define PCF50633_REG_DOWN1ENA   0x1f
+#define PCF50633_REG_DOWN1CTL   0x20
+#define PCF50633_REG_DOWN1MXC   0x21
+#define PCF50633_REG_DOWN2OUT   0x22
+#define PCF50633_REG_DOWN2ENA   0x23
+#define PCF50633_REG_DOWN2CTL   0x24
+#define PCF50633_REG_DOWN2MXC   0x25
+#define PCF50633_REG_MEMLDOOUT  0x26
+#define PCF50633_REG_MEMLDOENA  0x27
+#define PCF50633_REG_LDO1OUT    0x2d
+#define PCF50633_REG_LDO1ENA    0x2e
+#define PCF50633_REG_LDO2OUT    0x2f
+#define PCF50633_REG_LDO2ENA    0x30
+#define PCF50633_REG_LDO3OUT    0x31
+#define PCF50633_REG_LDO3ENA    0x32
+#define PCF50633_REG_LDO4OUT    0x33
+#define PCF50633_REG_LDO4ENA    0x34
+#define PCF50633_REG_LDO5OUT    0x35
+#define PCF50633_REG_LDO5ENA    0x36
+#define PCF50633_REG_LDO6OUT    0x37
+#define PCF50633_REG_LDO6ENA    0x38
+#define PCF50633_REG_HCLDOOUT   0x39
+#define PCF50633_REG_HCLDOENA   0x3a
+#define PCF50633_REG_HCLDOOVL   0x40
+enum pcf50633_regulator_enable {
+        PCF50633_REGULATOR_ON           = 0x01,
+        PCF50633_REGULATOR_ON_GPIO1     = 0x02,
+        PCF50633_REGULATOR_ON_GPIO2     = 0x04,
+        PCF50633_REGULATOR_ON_GPIO3     = 0x08,
+};
+#define PCF50633_REGULATOR_ON_MASK      0x0f
+enum pcf50633_regulator_phase {
+        PCF50633_REGULATOR_ACTPH1       = 0x00,
+        PCF50633_REGULATOR_ACTPH2       = 0x10,
+        PCF50633_REGULATOR_ACTPH3       = 0x20,
+        PCF50633_REGULATOR_ACTPH4       = 0x30,
+};
+#define PCF50633_REGULATOR_ACTPH_MASK   0x30
+enum pcf50633_regulator_id {
+        PCF50633_REGULATOR_AUTO,
+        PCF50633_REGULATOR_DOWN1,
+        PCF50633_REGULATOR_DOWN2,
+        PCF50633_REGULATOR_LDO1,
+        PCF50633_REGULATOR_LDO2,
+        PCF50633_REGULATOR_LDO3,
+        PCF50633_REGULATOR_LDO4,
+        PCF50633_REGULATOR_LDO5,
+        PCF50633_REGULATOR_LDO6,
+        PCF50633_REGULATOR_HCLDO,
+        PCF50633_REGULATOR_MEMLDO,
+};
+#endif
diff --git a/include/linux/mfd/wm8350/pmic.h b/include/linux/mfd/wm8350/pmic.h
index 96acbfc8aa12..be3264e286e0 100644
--- a/include/linux/mfd/wm8350/pmic.h
+++ b/include/linux/mfd/wm8350/pmic.h
@@ -13,6 +13,10 @@
 #ifndef __LINUX_MFD_WM8350_PMIC_H
 #define __LINUX_MFD_WM8350_PMIC_H
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/regulator/machine.h>
 /*
 * Register values.
 */
@@ -700,6 +704,33 @@ struct wm8350;
 struct platform_device;
 struct regulator_init_data;
+/*
+ * WM8350 LED platform data
+ */
+struct wm8350_led_platform_data {
+        const char *name;
+        const char *default_trigger;
+        int max_uA;
+};
+struct wm8350_led {
+        struct platform_device *pdev;
+        struct mutex mutex;
+        struct work_struct work;
+        spinlock_t value_lock;
+        enum led_brightness value;
+        struct led_classdev cdev;
+        int max_uA_index;
+        int enabled;
+        struct regulator *isink;
+        struct regulator_consumer_supply isink_consumer;
+        struct regulator_init_data isink_init;
+        struct regulator *dcdc;
+        struct regulator_consumer_supply dcdc_consumer;
+        struct regulator_init_data dcdc_init;
+};
 struct wm8350_pmic {
        /* Number of regulators of each type on this device */
        int max_dcdc;
@@ -717,10 +748,15 @@ struct wm8350_pmic {
        /* regulator devices */
        struct platform_device *pdev[NUM_WM8350_REGULATORS];
+        /* LED devices */
+        struct wm8350_led led[2];
 };
 int wm8350_register_regulator(struct wm8350 *wm8350, int reg,
                              struct regulator_init_data *initdata);
+int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink,
+                        struct wm8350_led_platform_data *pdata);
 /*
 * Additional DCDC control not supported via regulator API
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h
index 0e39745f5111..13fe09e0576a 100644
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_MINIX_FS_H
 #define _LINUX_MINIX_FS_H
+#include <linux/types.h>
 #include <linux/magic.h>
 /*
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4a3d28c86443..e8ddc98b8405 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -56,19 +56,9 @@ extern unsigned long mmap_min_addr;
 extern struct kmem_cache *vm_area_cachep;
-/*
- * This struct defines the per-mm list of VMAs for uClinux. If CONFIG_MMU is
- * disabled, then there's a single shared list of VMAs maintained by the
- * system, and mm's subscribe to these individually
- */
-struct vm_list_struct {
-        struct vm_list_struct   *next;
-        struct vm_area_struct   *vma;
-};
 #ifndef CONFIG_MMU
-extern struct rb_root nommu_vma_tree;
+extern struct rb_root nommu_region_tree;
-extern struct rw_semaphore nommu_vma_sem;
+extern struct rw_semaphore nommu_region_sem;
 extern unsigned int kobjsize(const void *objp);
 #endif
@@ -270,7 +260,6 @@ static inline int put_page_testzero(struct page *page)
 */
 static inline int get_page_unless_zero(struct page *page)
 {
-        VM_BUG_ON(PageTail(page));
        return atomic_inc_not_zero(&page->_count);
 }
@@ -1061,6 +1050,7 @@ extern void memmap_init_zone(unsigned long, int, unsigned long,
                                unsigned long, enum memmap_context);
 extern void setup_per_zone_pages_min(void);
 extern void mem_init(void);
+extern void __init mmap_init(void);
 extern void show_mem(void);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
@@ -1072,6 +1062,9 @@ extern void setup_per_cpu_pageset(void);
 static inline void setup_per_cpu_pageset(void) {}
 #endif
+/* nommu.c */
+extern atomic_t mmap_pages_allocated;
 /* prio_tree.c */
 void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old);
 void vma_prio_tree_insert(struct vm_area_struct *, struct prio_tree_root *);
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 9cfc9b627fdd..92915e81443f 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -97,6 +97,23 @@ struct page {
 };
 /*
+ * A region containing a mapping of a non-memory backed file under NOMMU
+ * conditions.  These are held in a global tree and are pinned by the VMAs that
+ * map parts of them.
+ */
+struct vm_region {
+        struct rb_node  vm_rb;          /* link in global region tree */
+        unsigned long   vm_flags;       /* VMA vm_flags */
+        unsigned long   vm_start;       /* start address of region */
+        unsigned long   vm_end;         /* region initialised to here */
+        unsigned long   vm_top;         /* region allocated to here */
+        unsigned long   vm_pgoff;       /* the offset in vm_file corresponding to vm_start */
+        struct file     *vm_file;       /* the backing file or NULL */
+        atomic_t        vm_usage;       /* region usage count */
+};
+/*
 * This struct defines a memory VMM memory area. There is one of these
 * per VM-area/task.  A VM area is any part of the process virtual memory
 * space that has a special rule for the page-fault handlers (ie a shared
@@ -152,7 +169,7 @@ struct vm_area_struct {
        unsigned long vm_truncate_count;/* truncate_count or restart_addr */
 #ifndef CONFIG_MMU
-        atomic_t vm_usage;              /* refcount (VMAs shared if !MMU) */
+        struct vm_region *vm_region;    /* NOMMU mapping region */
 #endif
 #ifdef CONFIG_NUMA
        struct mempolicy *vm_policy;    /* NUMA policy for the VMA */
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 97b91d1abb43..fde86671f48f 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -443,6 +443,13 @@ struct dmi_system_id {
        struct dmi_strmatch matches[4];
        void *driver_data;
 };
+/*
+ * struct dmi_device_id appears during expansion of
+ * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
+ * but this is enough for gcc 3.4.6 to error out:
+ *      error: storage size of '__mod_dmi_device_table' isn't known
+ */
+#define dmi_device_id dmi_system_id
 #endif
 #define DMI_MATCH(a, b) { a, b }
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index e0a9b207920d..ce38f1caa5e1 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_MSDOS_FS_H
 #define _LINUX_MSDOS_FS_H
+#include <linux/types.h>
 #include <linux/magic.h>
 #include <asm/byteorder.h>
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 00e2b575021f..88d3d8fbf9f2 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -520,6 +520,7 @@ struct cfi_fixup {
 #define CFI_MFR_AMD 0x0001
 #define CFI_MFR_ATMEL 0x001F
+#define CFI_MFR_SAMSUNG 0x00EC
 #define CFI_MFR_ST  0x0020      /* STMicroelectronics */
 void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
diff --git a/include/linux/mtd/ftl.h b/include/linux/mtd/ftl.h
index 0be442f881dd..0555f7a0b9ed 100644
--- a/include/linux/mtd/ftl.h
+++ b/include/linux/mtd/ftl.h
@@ -32,25 +32,25 @@
 #define _LINUX_FTL_H
 typedef struct erase_unit_header_t {
-    u_int8_t    LinkTargetTuple[5];
+    uint8_t     LinkTargetTuple[5];
-    u_int8_t    DataOrgTuple[10];
+    uint8_t     DataOrgTuple[10];
-    u_int8_t    NumTransferUnits;
+    uint8_t     NumTransferUnits;
-    u_int32_t   EraseCount;
+    uint32_t    EraseCount;
-    u_int16_t   LogicalEUN;
+    uint16_t    LogicalEUN;
-    u_int8_t    BlockSize;
+    uint8_t     BlockSize;
-    u_int8_t    EraseUnitSize;
+    uint8_t     EraseUnitSize;
-    u_int16_t   FirstPhysicalEUN;
+    uint16_t    FirstPhysicalEUN;
-    u_int16_t   NumEraseUnits;
+    uint16_t    NumEraseUnits;
-    u_int32_t   FormattedSize;
+    uint32_t    FormattedSize;
-    u_int32_t   FirstVMAddress;
+    uint32_t    FirstVMAddress;
-    u_int16_t   NumVMPages;
+    uint16_t    NumVMPages;
-    u_int8_t    Flags;
+    uint8_t     Flags;
-    u_int8_t    Code;
+    uint8_t     Code;
-    u_int32_t   SerialNumber;
+    uint32_t    SerialNumber;
-    u_int32_t   AltEUHOffset;
+    uint32_t    AltEUHOffset;
-    u_int32_t   BAMOffset;
+    uint32_t    BAMOffset;
-    u_int8_t    Reserved[12];
+    uint8_t     Reserved[12];
-    u_int8_t    EndTuple[2];
+    uint8_t     EndTuple[2];
 } erase_unit_header_t;
 /* Flags in erase_unit_header_t */
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index aa30244492c6..b981b8772217 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -223,6 +223,7 @@ struct map_info {
           must leave it enabled. */
        void (*set_vpp)(struct map_info *, int);
+        unsigned long pfow_base;
        unsigned long map_priv_1;
        unsigned long map_priv_2;
        void *fldrv_priv;
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 64433eb411d7..3aa5d77c2cdb 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -15,6 +15,8 @@
 #include <linux/mtd/compatmac.h>
 #include <mtd/mtd-abi.h>
+#include <asm/div64.h>
 #define MTD_CHAR_MAJOR 90
 #define MTD_BLOCK_MAJOR 31
 #define MAX_MTD_DEVICES 32
@@ -25,20 +27,20 @@
 #define MTD_ERASE_DONE          0x08
 #define MTD_ERASE_FAILED        0x10
-#define MTD_FAIL_ADDR_UNKNOWN 0xffffffff
+#define MTD_FAIL_ADDR_UNKNOWN -1LL
 /* If the erase fails, fail_addr might indicate exactly which block failed.  If
   fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level or was not
   specific to any particular block. */
 struct erase_info {
        struct mtd_info *mtd;
-        u_int32_t addr;
+        uint64_t addr;
-        u_int32_t len;
+        uint64_t len;
-        u_int32_t fail_addr;
+        uint64_t fail_addr;
        u_long time;
        u_long retries;
-        u_int dev;
+        unsigned dev;
-        u_int cell;
+        unsigned cell;
        void (*callback) (struct erase_info *self);
        u_long priv;
        u_char state;
@@ -46,9 +48,9 @@ struct erase_info {
 };
 struct mtd_erase_region_info {
-        u_int32_t offset;                       /* At which this region starts, from the beginning of the MTD */
+        uint64_t offset;                        /* At which this region starts, from the beginning of the MTD */
-        u_int32_t erasesize;            /* For this region */
+        uint32_t erasesize;             /* For this region */
-        u_int32_t numblocks;            /* Number of blocks of erasesize in this region */
+        uint32_t numblocks;             /* Number of blocks of erasesize in this region */
        unsigned long *lockmap;         /* If keeping bitmap of locks */
 };
@@ -100,14 +102,14 @@ struct mtd_oob_ops {
 struct mtd_info {
        u_char type;
-        u_int32_t flags;
+        uint32_t flags;
-        u_int32_t size;  // Total size of the MTD
+        uint64_t size;   // Total size of the MTD
        /* "Major" erase size for the device. Naïve users may take this
         * to be the only erase size available, or may use the more detailed
         * information below if they desire
         */
-        u_int32_t erasesize;
+        uint32_t erasesize;
        /* Minimal writable flash unit size. In case of NOR flash it is 1 (even
         * though individual bits can be cleared), in case of NAND flash it is
         * one NAND page (or half, or one-fourths of it), in case of ECC-ed NOR
@@ -115,10 +117,20 @@ struct mtd_info {
         * Any driver registering a struct mtd_info must ensure a writesize of
         * 1 or larger.
         */
-        u_int32_t writesize;
+        uint32_t writesize;
+        uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
+        uint32_t oobavail;  // Available OOB bytes per block
-        u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)
+        /*
-        u_int32_t oobavail;  // Available OOB bytes per block
+         * If erasesize is a power of 2 then the shift is stored in
+         * erasesize_shift otherwise erasesize_shift is zero. Ditto writesize.
+         */
+        unsigned int erasesize_shift;
+        unsigned int writesize_shift;
+        /* Masks based on erasesize_shift and writesize_shift */
+        unsigned int erasesize_mask;
+        unsigned int writesize_mask;
        // Kernel-only stuff starts here.
        const char *name;
@@ -190,8 +202,8 @@ struct mtd_info {
        void (*sync) (struct mtd_info *mtd);
        /* Chip-supported device locking */
-        int (*lock) (struct mtd_info *mtd, loff_t ofs, size_t len);
+        int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
-        int (*unlock) (struct mtd_info *mtd, loff_t ofs, size_t len);
+        int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
        /* Power Management functions */
        int (*suspend) (struct mtd_info *mtd);
@@ -221,6 +233,35 @@ struct mtd_info {
        void (*put_device) (struct mtd_info *mtd);
 };
+static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->erasesize_shift)
+                return sz >> mtd->erasesize_shift;
+        do_div(sz, mtd->erasesize);
+        return sz;
+}
+static inline uint32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->erasesize_shift)
+                return sz & mtd->erasesize_mask;
+        return do_div(sz, mtd->erasesize);
+}
+static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->writesize_shift)
+                return sz >> mtd->writesize_shift;
+        do_div(sz, mtd->writesize);
+        return sz;
+}
+static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->writesize_shift)
+                return sz & mtd->writesize_mask;
+        return do_div(sz, mtd->writesize);
+}
        /* Kernel-side ioctl definitions */
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 733d3f3b4eb8..db5b63da2a7e 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -335,17 +335,12 @@ struct nand_buffers {
 * @erase_cmd:          [INTERN] erase command write function, selectable due to AND support
 * @scan_bbt:           [REPLACEABLE] function to scan bad block table
 * @chip_delay:         [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR)
- * @wq:                 [INTERN] wait queue to sleep on if a NAND operation is in progress
 * @state:              [INTERN] the current state of the NAND device
 * @oob_poi:            poison value buffer
 * @page_shift:         [INTERN] number of address bits in a page (column address bits)
 * @phys_erase_shift:   [INTERN] number of address bits in a physical eraseblock
 * @bbt_erase_shift:    [INTERN] number of address bits in a bbt entry
 * @chip_shift:         [INTERN] number of address bits in one chip
- * @datbuf:             [INTERN] internal buffer for one page + oob
- * @oobbuf:             [INTERN] oob buffer for one eraseblock
- * @oobdirty:           [INTERN] indicates that oob_buf must be reinitialized
- * @data_poi:           [INTERN] pointer to a data buffer
 * @options:            [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about
 *                      special functionality. See the defines for further explanation
 * @badblockpos:        [INTERN] position of the bad block marker in the oob area
@@ -399,7 +394,7 @@ struct nand_chip {
        int             bbt_erase_shift;
        int             chip_shift;
        int             numchips;
-        unsigned long   chipsize;
+        uint64_t        chipsize;
        int             pagemask;
        int             pagebuf;
        int             subpagesize;
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index c92b4d439609..a45dd831b3f8 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -36,9 +36,9 @@
 struct mtd_partition {
        char *name;                     /* identifier string */
-        u_int32_t size;                 /* partition size */
+        uint64_t size;                  /* partition size */
-        u_int32_t offset;               /* offset within the master MTD space */
+        uint64_t offset;                /* offset within the master MTD space */
-        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
+        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */
 };
diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h
new file mode 100644
index 000000000000..b730d4f84655
--- /dev/null
+++ b/include/linux/mtd/pfow.h
@@ -0,0 +1,159 @@
+/* Primary function overlay window definitions
+ * and service functions used by LPDDR chips
+ */
+#ifndef __LINUX_MTD_PFOW_H
+#define __LINUX_MTD_PFOW_H
+#include <linux/mtd/qinfo.h>
+/* PFOW registers addressing */
+/* Address of symbol "P" */
+#define PFOW_QUERY_STRING_P                     0x0000
+/* Address of symbol "F" */
+#define PFOW_QUERY_STRING_F                     0x0002
+/* Address of symbol "O" */
+#define PFOW_QUERY_STRING_O                     0x0004
+/* Address of symbol "W" */
+#define PFOW_QUERY_STRING_W                     0x0006
+/* Identification info for LPDDR chip */
+#define PFOW_MANUFACTURER_ID                    0x0020
+#define PFOW_DEVICE_ID                          0x0022
+/* Address in PFOW where prog buffer can can be found */
+#define PFOW_PROGRAM_BUFFER_OFFSET              0x0040
+/* Size of program buffer in words */
+#define PFOW_PROGRAM_BUFFER_SIZE                0x0042
+/* Address command code register */
+#define PFOW_COMMAND_CODE                       0x0080
+/* command data register */
+#define PFOW_COMMAND_DATA                       0x0084
+/* command address register lower address bits */
+#define PFOW_COMMAND_ADDRESS_L                  0x0088
+/* command address register upper address bits */
+#define PFOW_COMMAND_ADDRESS_H                  0x008a
+/* number of bytes to be proggrammed lower address bits */
+#define PFOW_DATA_COUNT_L                       0x0090
+/* number of bytes to be proggrammed higher address bits */
+#define PFOW_DATA_COUNT_H                       0x0092
+/* command execution register, the only possible value is 0x01 */
+#define PFOW_COMMAND_EXECUTE                    0x00c0
+/* 0x01 should be written at this address to clear buffer */
+#define PFOW_CLEAR_PROGRAM_BUFFER               0x00c4
+/* device program/erase suspend register */
+#define PFOW_PROGRAM_ERASE_SUSPEND              0x00c8
+/* device status register */
+#define PFOW_DSR                                0x00cc
+/* LPDDR memory device command codes */
+/* They are possible values of PFOW command code register */
+#define LPDDR_WORD_PROGRAM              0x0041
+#define LPDDR_BUFF_PROGRAM              0x00E9
+#define LPDDR_BLOCK_ERASE               0x0020
+#define LPDDR_LOCK_BLOCK                0x0061
+#define LPDDR_UNLOCK_BLOCK              0x0062
+#define LPDDR_READ_BLOCK_LOCK_STATUS    0x0065
+#define LPDDR_INFO_QUERY                0x0098
+#define LPDDR_READ_OTP                  0x0097
+#define LPDDR_PROG_OTP                  0x00C0
+#define LPDDR_RESUME                    0x00D0
+/* Defines possible value of PFOW command execution register */
+#define LPDDR_START_EXECUTION                   0x0001
+/* Defines possible value of PFOW program/erase suspend register */
+#define LPDDR_SUSPEND                           0x0001
+/* Possible values of PFOW device status register */
+/* access R - read; RC read & clearable */
+#define DSR_DPS                 (1<<1) /* RC; device protect status
+                                        * 0 - not protected 1 - locked */
+#define DSR_PSS                 (1<<2) /* R; program suspend status;
+                                        * 0-prog in progress/completed,
+                                        * 1- prog suspended */
+#define DSR_VPPS                (1<<3) /* RC; 0-Vpp OK, * 1-Vpp low */
+#define DSR_PROGRAM_STATUS      (1<<4) /* RC; 0-successful, 1-error */
+#define DSR_ERASE_STATUS        (1<<5) /* RC; erase or blank check status;
+                                        * 0-success erase/blank check,
+                                        * 1 blank check error */
+#define DSR_ESS                 (1<<6) /* R; erase suspend status;
+                                        * 0-erase in progress/complete,
+                                        * 1 erase suspended */
+#define DSR_READY_STATUS        (1<<7) /* R; Device status
+                                        * 0-busy,
+                                        * 1-ready */
+#define DSR_RPS                 (0x3<<8) /* RC;  region program status
+                                        * 00 - Success,
+                                        * 01-re-program attempt in region with
+                                        * object mode data,
+                                        * 10-object mode program w attempt in
+                                        * region with control mode data
+                                        * 11-attempt to program invalid half
+                                        * with 0x41 command */
+#define DSR_AOS                 (1<<12) /* RC; 1- AO related failure */
+#define DSR_AVAILABLE           (1<<15) /* R; Device availbility
+                                        * 1 - Device available
+                                        * 0 - not available */
+/* The superset of all possible error bits in DSR */
+#define DSR_ERR                 0x133A
+static inline void send_pfow_command(struct map_info *map,
+                                unsigned long cmd_code, unsigned long adr,
+                                unsigned long len, map_word *datum)
+{
+        int bits_per_chip = map_bankwidth(map) * 8;
+        int chipnum;
+        struct lpddr_private *lpddr = map->fldrv_priv;
+        chipnum = adr >> lpddr->chipshift;
+        map_write(map, CMD(cmd_code), map->pfow_base + PFOW_COMMAND_CODE);
+        map_write(map, CMD(adr & ((1<<bits_per_chip) - 1)),
+                                map->pfow_base + PFOW_COMMAND_ADDRESS_L);
+        map_write(map, CMD(adr>>bits_per_chip),
+                                map->pfow_base + PFOW_COMMAND_ADDRESS_H);
+        if (len) {
+                map_write(map, CMD(len & ((1<<bits_per_chip) - 1)),
+                                        map->pfow_base + PFOW_DATA_COUNT_L);
+                map_write(map, CMD(len>>bits_per_chip),
+                                        map->pfow_base + PFOW_DATA_COUNT_H);
+        }
+        if (datum)
+                map_write(map, *datum, map->pfow_base + PFOW_COMMAND_DATA);
+        /* Command execution start */
+        map_write(map, CMD(LPDDR_START_EXECUTION),
+                        map->pfow_base + PFOW_COMMAND_EXECUTE);
+}
+static inline void print_drs_error(unsigned dsr)
+{
+        int prog_status = (dsr & DSR_RPS) >> 8;
+        if (!(dsr & DSR_AVAILABLE))
+                printk(KERN_NOTICE"DSR.15: (0) Device not Available\n");
+        if (prog_status & 0x03)
+                printk(KERN_NOTICE"DSR.9,8: (11) Attempt to program invalid "
+                                                "half with 41h command\n");
+        else if (prog_status & 0x02)
+                printk(KERN_NOTICE"DSR.9,8: (10) Object Mode Program attempt "
+                                        "in region with Control Mode data\n");
+        else if (prog_status &  0x01)
+                printk(KERN_NOTICE"DSR.9,8: (01) Program attempt in region "
+                                                "with Object Mode data\n");
+        if (!(dsr & DSR_READY_STATUS))
+                printk(KERN_NOTICE"DSR.7: (0) Device is Busy\n");
+        if (dsr & DSR_ESS)
+                printk(KERN_NOTICE"DSR.6: (1) Erase Suspended\n");
+        if (dsr & DSR_ERASE_STATUS)
+                printk(KERN_NOTICE"DSR.5: (1) Erase/Blank check error\n");
+        if (dsr & DSR_PROGRAM_STATUS)
+                printk(KERN_NOTICE"DSR.4: (1) Program Error\n");
+        if (dsr & DSR_VPPS)
+                printk(KERN_NOTICE"DSR.3: (1) Vpp low detect, operation "
+                                        "aborted\n");
+        if (dsr & DSR_PSS)
+                printk(KERN_NOTICE"DSR.2: (1) Program suspended\n");
+        if (dsr & DSR_DPS)
+                printk(KERN_NOTICE"DSR.1: (1) Aborted Erase/Program attempt "
+                                        "on locked block\n");
+}
+#endif /* __LINUX_MTD_PFOW_H */
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
index c8e63a5ee72e..76f7cabf07d3 100644
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -24,6 +24,7 @@ struct physmap_flash_data {
        unsigned int            width;
        void                    (*set_vpp)(struct map_info *, int);
        unsigned int            nr_parts;
+        unsigned int            pfow_base;
        struct mtd_partition    *parts;
 };
diff --git a/include/linux/mtd/qinfo.h b/include/linux/mtd/qinfo.h
new file mode 100644
index 000000000000..7b3d487d8b3f
--- /dev/null
+++ b/include/linux/mtd/qinfo.h
@@ -0,0 +1,91 @@
+#ifndef __LINUX_MTD_QINFO_H
+#define __LINUX_MTD_QINFO_H
+#include <linux/mtd/map.h>
+#include <linux/wait.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/flashchip.h>
+#include <linux/mtd/partitions.h>
+/* lpddr_private describes lpddr flash chip in memory map
+ * @ManufactId - Chip Manufacture ID
+ * @DevId - Chip Device ID
+ * @qinfo - pointer to qinfo records describing the chip
+ * @numchips - number of chips including virual RWW partitions
+ * @chipshift - Chip/partiton size 2^chipshift
+ * @chips - per-chip data structure
+ */
+struct lpddr_private {
+        uint16_t ManufactId;
+        uint16_t DevId;
+        struct qinfo_chip *qinfo;
+        int numchips;
+        unsigned long chipshift;
+        struct flchip chips[0];
+};
+/* qinfo_query_info structure contains request information for
+ * each qinfo record
+ * @major - major number of qinfo record
+ * @major - minor number of qinfo record
+ * @id_str - descriptive string to access the record
+ * @desc - detailed description for the qinfo record
+ */
+struct qinfo_query_info {
+        uint8_t major;
+        uint8_t minor;
+        char *id_str;
+        char *desc;
+};
+/*
+ * qinfo_chip structure contains necessary qinfo records data
+ * @DevSizeShift - Device size 2^n bytes
+ * @BufSizeShift - Program buffer size 2^n bytes
+ * @TotalBlocksNum - Total number of blocks
+ * @UniformBlockSizeShift - Uniform block size 2^UniformBlockSizeShift bytes
+ * @HWPartsNum - Number of hardware partitions
+ * @SuspEraseSupp - Suspend erase supported
+ * @SingleWordProgTime - Single word program 2^SingleWordProgTime u-sec
+ * @ProgBufferTime - Program buffer write 2^ProgBufferTime u-sec
+ * @BlockEraseTime - Block erase 2^BlockEraseTime m-sec
+ */
+struct qinfo_chip {
+        /* General device info */
+        uint16_t DevSizeShift;
+        uint16_t BufSizeShift;
+        /* Erase block information */
+        uint16_t TotalBlocksNum;
+        uint16_t UniformBlockSizeShift;
+        /* Partition information */
+        uint16_t HWPartsNum;
+        /* Optional features */
+        uint16_t SuspEraseSupp;
+        /* Operation typical time */
+        uint16_t SingleWordProgTime;
+        uint16_t ProgBufferTime;
+        uint16_t BlockEraseTime;
+};
+/* defines for fixup usage */
+#define LPDDR_MFR_ANY           0xffff
+#define LPDDR_ID_ANY            0xffff
+#define NUMONYX_MFGR_ID         0x0089
+#define R18_DEVICE_ID_1G        0x893c
+static inline map_word lpddr_build_cmd(u_long cmd, struct map_info *map)
+{
+        map_word val = { {0} };
+        val.x[0] = cmd;
+        return val;
+}
+#define CMD(x) lpddr_build_cmd(x, map)
+#define CMDVAL(cmd) cmd.x[0]
+struct mtd_info *lpddr_cmdset(struct map_info *);
+#endif
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
new file mode 100644
index 000000000000..25f4d2a845c1
--- /dev/null
+++ b/include/linux/mtd/sharpsl.h
@@ -0,0 +1,20 @@
+/*
+ * SharpSL NAND support
+ *
+ * Copyright (C) 2008 Dmitry Baryshkov
+ *
+ * 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.
+ */
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+struct sharpsl_nand_platform_data {
+        struct nand_bbt_descr   *badblock_pattern;
+        struct nand_ecclayout   *ecc_layout;
+        struct mtd_partition    *partitions;
+        unsigned int            nr_partitions;
+};
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index bd3bbf668cdb..8730d5dae1bc 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_NEIGHBOUR_H
 #define __LINUX_NEIGHBOUR_H
+#include <linux/types.h>
 #include <linux/netlink.h>
 struct ndmsg
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 114091be8872..ec54785d34f9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -467,7 +467,7 @@ struct netdev_queue {
 *     This function is called when network device transistions to the down
 *     state.
 *
- * int (*ndo_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
+ * int (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev);
 *      Called when a packet needs to be transmitted.
 *      Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED,
 *      Required can not be NULL.
@@ -795,6 +795,7 @@ struct net_device
               NETREG_UNREGISTERING,    /* called unregister_netdevice */
               NETREG_UNREGISTERED,     /* completed unregister todo */
               NETREG_RELEASED,         /* called free_netdev */
+               NETREG_DUMMY,            /* dummy device for NAPI poll */
        } reg_state;
        /* Called from unregister, can be used to call free_netdev */
@@ -1077,6 +1078,8 @@ 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 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);
@@ -1125,9 +1128,6 @@ struct softnet_data
        struct sk_buff          *completion_queue;
        struct napi_struct      backlog;
-#ifdef CONFIG_NET_DMA
-        struct dma_chan         *net_dma;
-#endif
 };
 DECLARE_PER_CPU(struct softnet_data,softnet_data);
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index e52ce475d19f..c7ee8744d26b 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -270,6 +270,7 @@ struct xt_match
        struct list_head list;
        const char name[XT_FUNCTION_MAXNAMELEN-1];
+        u_int8_t revision;
        /* Return true or false: return FALSE and set *hotdrop = 1 to
           force immediate packet drop. */
@@ -302,7 +303,6 @@ struct xt_match
        unsigned short proto;
        unsigned short family;
-        u_int8_t revision;
 };
 /* Registration hooks for targets. */
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index f3fd83e46bab..8f5345275393 100644
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -5,6 +5,7 @@
 #ifndef _XT_CONNTRACK_H
 #define _XT_CONNTRACK_H
+#include <linux/types.h>
 #include <linux/netfilter/nf_conntrack_tuple_common.h>
 #define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 15a9f3b7289a..91a1c24e0cbf 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -37,6 +37,8 @@
 #ifndef NFS_IDMAP_H
 #define NFS_IDMAP_H
+#include <linux/types.h>
 /* XXX from bits/utmp.h  */
 #define IDMAP_NAMESZ  128
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 5431512b2757..bcd0201589f8 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -10,9 +10,8 @@
 #ifndef NFSD_EXPORT_H
 #define NFSD_EXPORT_H
-#include <asm/types.h>
-#ifdef __KERNEL__
 # include <linux/types.h>
+#ifdef __KERNEL__
 # include <linux/in.h>
 #endif
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index b2e093870bc6..fa317f6c154b 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -14,9 +14,8 @@
 #ifndef _LINUX_NFSD_FH_H
 #define _LINUX_NFSD_FH_H
-#include <asm/types.h>
-#ifdef __KERNEL__
 # include <linux/types.h>
+#ifdef __KERNEL__
 # include <linux/string.h>
 # include <linux/fs.h>
 #endif
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 4e439765b705..7a3b565b898f 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -9,9 +9,8 @@
 #ifndef NFSD_SYSCALL_H
 #define NFSD_SYSCALL_H
-#include <asm/types.h>
-#ifdef __KERNEL__
 # include <linux/types.h>
+#ifdef __KERNEL__
 # include <linux/in.h>
 #endif 
 #include <linux/posix_types.h>
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index c4355076d1a5..7382af374731 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -12,6 +12,7 @@
 #ifndef LINUX_NUBUS_H
 #define LINUX_NUBUS_H
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <asm/nubus.h>
 #endif
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h
index bd2a870ec296..34974b5a76f7 100644
--- a/include/linux/of_i2c.h
+++ b/include/linux/of_i2c.h
@@ -17,4 +17,7 @@
 void of_register_i2c_devices(struct i2c_adapter *adap,
                             struct device_node *adap_node);
+/* must call put_device() when done with returned i2c_client device */
+struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);
 #endif /* __LINUX_OF_I2C_H */
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 1ce9fe572e51..1d9518bc4c58 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -164,4 +164,22 @@ void oprofile_put_buff(unsigned long *buf, unsigned int start,
 unsigned long oprofile_get_cpu_buffer_size(void);
 void oprofile_cpu_buffer_inc_smpl_lost(void);
 
+/* cpu buffer functions */
+struct op_sample;
+struct op_entry {
+        struct ring_buffer_event *event;
+        struct op_sample *sample;
+        unsigned long irq_flags;
+        unsigned long size;
+        unsigned long *data;
+};
+void oprofile_write_reserve(struct op_entry *entry,
+                            struct pt_regs * const regs,
+                            unsigned long pc, int code, int size);
+int oprofile_add_data(struct op_entry *entry, unsigned long val);
+int oprofile_write_commit(struct op_entry *entry);
 #endif /* OPROFILE_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 80f8b8b65fde..48890cf3f96e 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -117,6 +117,10 @@ typedef int __bitwise pci_power_t;
 #define PCI_UNKNOWN     ((pci_power_t __force) 5)
 #define PCI_POWER_ERROR ((pci_power_t __force) -1)
+#define PCI_PM_D2_DELAY 200
+#define PCI_PM_D3_WAIT  10
+#define PCI_PM_BUS_WAIT 50
 /** The pci_channel state describes connectivity between the CPU and
 *  the pci device.  If some PCI bus between here and the pci device
 *  has crashed or locked up, this info is reflected here.
@@ -252,6 +256,7 @@ struct pci_dev {
        unsigned int    ari_enabled:1;  /* ARI forwarding */
        unsigned int    is_managed:1;
        unsigned int    is_pcie:1;
+        unsigned int    state_saved:1;
        pci_dev_flags_t dev_flags;
        atomic_t        enable_cnt;     /* pci_enable_device has been called */
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index f7cc204fab07..20998746518e 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -223,7 +223,6 @@ struct hotplug_params {
 #ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
 extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
                                struct hotplug_params *hpp);
 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index d543365518ab..febc10ed3858 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1357,6 +1357,7 @@
 #define PCI_DEVICE_ID_VIA_8783_0        0x3208
 #define PCI_DEVICE_ID_VIA_8237          0x3227
 #define PCI_DEVICE_ID_VIA_8251          0x3287
+#define PCI_DEVICE_ID_VIA_8261          0x3402
 #define PCI_DEVICE_ID_VIA_8237A         0x3337
 #define PCI_DEVICE_ID_VIA_8237S         0x3372
 #define PCI_DEVICE_ID_VIA_SATA_EIDE     0x5324
@@ -1366,10 +1367,13 @@
 #define PCI_DEVICE_ID_VIA_CX700         0x8324
 #define PCI_DEVICE_ID_VIA_CX700_IDE     0x0581
 #define PCI_DEVICE_ID_VIA_VX800         0x8353
+#define PCI_DEVICE_ID_VIA_VX855         0x8409
 #define PCI_DEVICE_ID_VIA_8371_1        0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
 #define PCI_DEVICE_ID_VIA_838X_1        0xB188
 #define PCI_DEVICE_ID_VIA_83_87XX_1     0xB198
+#define PCI_DEVICE_ID_VIA_C409_IDE      0XC409
+#define PCI_DEVICE_ID_VIA_ANON          0xFFFF
 #define PCI_VENDOR_ID_SIEMENS           0x110A
 #define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
@@ -2174,6 +2178,7 @@
 #define PCI_DEVICE_ID_RDC_R6040         0x6040
 #define PCI_DEVICE_ID_RDC_R6060         0x6060
 #define PCI_DEVICE_ID_RDC_R6061         0x6061
+#define PCI_DEVICE_ID_RDC_D1010         0x1010
 #define PCI_VENDOR_ID_LENOVO            0x17aa
diff --git a/include/linux/phantom.h b/include/linux/phantom.h
index 02268c54c250..94dd6645c60a 100644
--- a/include/linux/phantom.h
+++ b/include/linux/phantom.h
@@ -10,7 +10,7 @@
 #ifndef __PHANTOM_H
 #define __PHANTOM_H
-#include <asm/types.h>
+#include <linux/types.h>
 /* PHN_(G/S)ET_REG param */
 struct phm_reg {
diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 4157faa857b6..ee5e3c9e2bca 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -23,6 +23,8 @@
 #ifndef LINUX_PHONET_H
 #define LINUX_PHONET_H
+#include <linux/types.h>
 /* Automatic protocol selection */
 #define PN_PROTO_TRANSPORT      0
 /* Phonet datagram socket */
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index e6aa8482ad7a..3c842edff388 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_PKT_CLS_H
 #define __LINUX_PKT_CLS_H
+#include <linux/types.h>
 #include <linux/pkt_sched.h>
 /* I think i could have done better macros ; for now this is stolen from
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index e3f133adba78..b2648e8e4987 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_PKT_SCHED_H
 #define __LINUX_PKT_SCHED_H
+#include <linux/types.h>
 /* Logical priority bands not depending on specific packet scheduler.
   Every scheduler will map them to real traffic classes, if it has
   no more precise mechanism to classify packets.
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 6e8adc77522c..1c866bda2018 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -25,6 +25,8 @@
 * OR MODIFICATIONS.
 */
+#include <linux/types.h>
 /*
 *  ==FILEVERSION 20000114==
 *
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 21b781a3350f..0b35b3a1be05 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -24,10 +24,8 @@ void sync_dquots(struct super_block *sb, int type);
 int dquot_initialize(struct inode *inode, int type);
 int dquot_drop(struct inode *inode);
-int dquot_drop_locked(struct inode *inode);
 struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
 void dqput(struct dquot *dquot);
-int dquot_is_cached(struct super_block *sb, unsigned int id, int type);
 int dquot_scan_active(struct super_block *sb,
                      int (*fn)(struct dquot *dquot, unsigned long priv),
                      unsigned long priv);
diff --git a/include/linux/radeonfb.h b/include/linux/radeonfb.h
index 5bd8975ed78e..8c4bbdecc44f 100644
--- a/include/linux/radeonfb.h
+++ b/include/linux/radeonfb.h
@@ -2,7 +2,7 @@
 #define __LINUX_RADEONFB_H__
 #include <asm/ioctl.h>
-#include <asm/types.h>
+#include <linux/types.h>
 #define ATY_RADEON_LCD_ON       0x00000001
 #define ATY_RADEON_CRT_ON       0x00000002
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 9491026afe66..6ba830fa8538 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -15,6 +15,8 @@
 #ifndef _MD_P_H
 #define _MD_P_H
+#include <linux/types.h>
 /*
 * RAID superblock.
 *
diff --git a/include/linux/random.h b/include/linux/random.h
index 407ea3646f8f..25d02fe5c9b5 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -7,6 +7,7 @@
 #ifndef _LINUX_RANDOM_H
 #define _LINUX_RANDOM_H
+#include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/irqnr.h>
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 344bc3495ddb..9c295411d01f 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -140,10 +140,10 @@ extern void rb_insert_color(struct rb_node *, struct rb_root *);
 extern void rb_erase(struct rb_node *, struct rb_root *);
 /* Find logical next and previous nodes in a tree */
-extern struct rb_node *rb_next(struct rb_node *);
+extern struct rb_node *rb_next(const struct rb_node *);
-extern struct rb_node *rb_prev(struct rb_node *);
+extern struct rb_node *rb_prev(const struct rb_node *);
-extern struct rb_node *rb_first(struct rb_root *);
+extern struct rb_node *rb_first(const struct rb_root *);
-extern struct rb_node *rb_last(struct rb_root *);
+extern struct rb_node *rb_last(const struct rb_root *);
 /* Fast replacement of a single node without remove/rebalance/add/rebalance */
 extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, 
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index dede0a2cfc45..4c5bcf6ca7e8 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -9,7 +9,7 @@
 *
 * Author: Pavel Emelianov <xemul@openvz.org>
 *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
 * info about what this counter is.
 */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index e88f7058b3a1..1e5f6730ff31 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_RTNETLINK_H
 #define __LINUX_RTNETLINK_H
+#include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/if_link.h>
 #include <linux/if_addr.h>
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4cae9b81a1f8..5a7c76388731 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -293,6 +293,9 @@ extern void sched_show_task(struct task_struct *p);
 extern void softlockup_tick(void);
 extern void touch_softlockup_watchdog(void);
 extern void touch_all_softlockup_watchdogs(void);
+extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write,
+                                    struct file *filp, void __user *buffer,
+                                    size_t *lenp, loff_t *ppos);
 extern unsigned int  softlockup_panic;
 extern unsigned long sysctl_hung_task_check_count;
 extern unsigned long sysctl_hung_task_timeout_secs;
@@ -450,6 +453,7 @@ struct task_cputime {
        cputime_t utime;
        cputime_t stime;
        unsigned long long sum_exec_runtime;
+        spinlock_t lock;
 };
 /* Alternate field names when used to cache expirations. */
 #define prof_exp        stime
@@ -465,7 +469,7 @@ struct task_cputime {
 * used for thread group CPU clock calculations.
 */
 struct thread_group_cputime {
-        struct task_cputime *totals;
+        struct task_cputime totals;
 };
 /*
@@ -626,7 +630,6 @@ struct user_struct {
        atomic_t inotify_devs;  /* How many inotify devs does this user have opened? */
 #endif
 #ifdef CONFIG_EPOLL
-        atomic_t epoll_devs;    /* The number of epoll descriptors currently open */
        atomic_t epoll_watches; /* The number of file descriptors currently watched */
 #endif
 #ifdef CONFIG_POSIX_MQUEUE
@@ -2180,24 +2183,30 @@ static inline int spin_needbreak(spinlock_t *lock)
 * Thread group CPU time accounting.
 */
-extern int thread_group_cputime_alloc(struct task_struct *);
+static inline
-extern void thread_group_cputime(struct task_struct *, struct task_cputime *);
+void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)
-static inline void thread_group_cputime_init(struct signal_struct *sig)
 {
-        sig->cputime.totals = NULL;
+        struct task_cputime *totals = &tsk->signal->cputime.totals;
+        unsigned long flags;
+        spin_lock_irqsave(&totals->lock, flags);
+        *times = *totals;
+        spin_unlock_irqrestore(&totals->lock, flags);
 }
-static inline int thread_group_cputime_clone_thread(struct task_struct *curr)
+static inline void thread_group_cputime_init(struct signal_struct *sig)
 {
-        if (curr->signal->cputime.totals)
+        sig->cputime.totals = (struct task_cputime){
-                return 0;
+                .utime = cputime_zero,
-        return thread_group_cputime_alloc(curr);
+                .stime = cputime_zero,
+                .sum_exec_runtime = 0,
+        };
+        spin_lock_init(&sig->cputime.totals.lock);
 }
 static inline void thread_group_cputime_free(struct signal_struct *sig)
 {
-        free_percpu(sig->cputime.totals);
 }
 /*
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index bef0c46d4713..b363b916c909 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -8,6 +8,7 @@
 #ifndef _LINUX_SIGNALFD_H
 #define _LINUX_SIGNALFD_H
+#include <linux/types.h>
 /* For O_CLOEXEC and O_NONBLOCK */
 #include <linux/fcntl.h>
diff --git a/include/linux/smp.h b/include/linux/smp.h
index b82466968101..715196b09d67 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -24,6 +24,9 @@ struct call_single_data {
 /* total number of cpus in this system (may exceed NR_CPUS) */
 extern unsigned int total_cpus;
+int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
+                                int wait);
 #ifdef CONFIG_SMP
 #include <linux/preempt.h>
@@ -79,8 +82,6 @@ smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
        return 0;
 }
-int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
-                                int wait);
 void __smp_call_function_single(int cpuid, struct call_single_data *data);
 /*
@@ -140,14 +141,6 @@ static inline int up_smp_call_function(void (*func)(void *), void *info)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                      1
 #define smp_prepare_boot_cpu()                  do {} while (0)
-#define smp_call_function_single(cpuid, func, info, wait) \
-({ \
-        WARN_ON(cpuid != 0);    \
-        local_irq_disable();    \
-        (func)(info);           \
-        local_irq_enable();     \
-        0;                      \
-})
 #define smp_call_function_mask(mask, func, info, wait) \
                        (up_smp_call_function(func, info))
 #define smp_call_function_many(mask, func, info, wait) \
diff --git a/include/linux/sound.h b/include/linux/sound.h
index 9e2a94feed6b..44dcf0570432 100644
--- a/include/linux/sound.h
+++ b/include/linux/sound.h
@@ -25,6 +25,7 @@
 #define SND_DEV_AMIDI           13      /* Like /dev/midi (obsolete) */
 #define SND_DEV_ADMMIDI         14      /* Like /dev/dmmidi (onsolete) */
+#ifdef __KERNEL__
 /*
 *      Sound core interface functions
 */
@@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit);
 extern void unregister_sound_mixer(int unit);
 extern void unregister_sound_midi(int unit);
 extern void unregister_sound_dsp(int unit);
+#endif /* __KERNEL__ */
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h
index c93ef9d42a01..95251ccd5a07 100644
--- a/include/linux/spi/spidev.h
+++ b/include/linux/spi/spidev.h
@@ -22,6 +22,7 @@
 #ifndef SPIDEV_H
 #define SPIDEV_H
+#include <linux/types.h>
 /* User space versions of kernel symbols for SPI clocking modes,
 * matching <linux/spi/spi.h>
diff --git a/include/linux/spi/tdo24m.h b/include/linux/spi/tdo24m.h
new file mode 100644
index 000000000000..7572d4e1fe76
--- /dev/null
+++ b/include/linux/spi/tdo24m.h
@@ -0,0 +1,13 @@
+#ifndef __TDO24M_H__
+#define __TDO24M_H__
+enum tdo24m_model {
+        TDO24M,
+        TDO35S,
+};
+struct tdo24m_platform_data {
+        enum tdo24m_model model;
+};
+#endif /* __TDO24M_H__ */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 2ce8207686e2..c7d9bb1832ba 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -232,6 +232,12 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
 extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
 extern int hibernate(void);
+extern int hibernate_nvs_register(unsigned long start, unsigned long size);
+extern int hibernate_nvs_alloc(void);
+extern void hibernate_nvs_free(void);
+extern void hibernate_nvs_save(void);
+extern void hibernate_nvs_restore(void);
+extern bool system_entering_hibernation(void);
 #else /* CONFIG_HIBERNATION */
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
@@ -239,6 +245,15 @@ static inline void swsusp_unset_page_free(struct page *p) {}
 static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
 static inline int hibernate(void) { return -ENOSYS; }
+static inline int hibernate_nvs_register(unsigned long a, unsigned long b)
+{
+        return 0;
+}
+static inline int hibernate_nvs_alloc(void) { return 0; }
+static inline void hibernate_nvs_free(void) {}
+static inline void hibernate_nvs_save(void) {}
+static inline void hibernate_nvs_restore(void) {}
+static inline bool system_entering_hibernation(void) { return false; }
 #endif /* CONFIG_HIBERNATION */
 #ifdef CONFIG_PM_SLEEP
diff --git a/include/linux/swab.h b/include/linux/swab.h
index be5284d4a053..ea0c02fd5163 100644
--- a/include/linux/swab.h
+++ b/include/linux/swab.h
@@ -3,7 +3,7 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
-#include <asm/byteorder.h>
+#include <asm/swab.h>
 /*
 * casts are necessary for constants, because we never know how for sure
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index c844a229acc9..99b8bdb17b2b 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -13,6 +13,8 @@
 #define _SYNCLINK_H_
 #define SYNCLINK_H_VERSION 3.6
+#include <linux/types.h>
 #define BIT0    0x0001
 #define BIT1    0x0002
 #define BIT2    0x0004
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 18d0a243a7b3..0eda02ff2414 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -54,6 +54,7 @@ struct compat_stat;
 struct compat_timeval;
 struct robust_list_head;
 struct getcpu_cache;
+struct old_linux_dirent;
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -65,6 +66,79 @@ struct getcpu_cache;
 #include <linux/quota.h>
 #include <linux/key.h>
+#define __SC_DECL1(t1, a1)      t1 a1
+#define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
+#define __SC_DECL3(t3, a3, ...) t3 a3, __SC_DECL2(__VA_ARGS__)
+#define __SC_DECL4(t4, a4, ...) t4 a4, __SC_DECL3(__VA_ARGS__)
+#define __SC_DECL5(t5, a5, ...) t5 a5, __SC_DECL4(__VA_ARGS__)
+#define __SC_DECL6(t6, a6, ...) t6 a6, __SC_DECL5(__VA_ARGS__)
+#define __SC_LONG1(t1, a1)      long a1
+#define __SC_LONG2(t2, a2, ...) long a2, __SC_LONG1(__VA_ARGS__)
+#define __SC_LONG3(t3, a3, ...) long a3, __SC_LONG2(__VA_ARGS__)
+#define __SC_LONG4(t4, a4, ...) long a4, __SC_LONG3(__VA_ARGS__)
+#define __SC_LONG5(t5, a5, ...) long a5, __SC_LONG4(__VA_ARGS__)
+#define __SC_LONG6(t6, a6, ...) long a6, __SC_LONG5(__VA_ARGS__)
+#define __SC_CAST1(t1, a1)      (t1) a1
+#define __SC_CAST2(t2, a2, ...) (t2) a2, __SC_CAST1(__VA_ARGS__)
+#define __SC_CAST3(t3, a3, ...) (t3) a3, __SC_CAST2(__VA_ARGS__)
+#define __SC_CAST4(t4, a4, ...) (t4) a4, __SC_CAST3(__VA_ARGS__)
+#define __SC_CAST5(t5, a5, ...) (t5) a5, __SC_CAST4(__VA_ARGS__)
+#define __SC_CAST6(t6, a6, ...) (t6) a6, __SC_CAST5(__VA_ARGS__)
+#define __SC_TEST(type)         BUILD_BUG_ON(sizeof(type) > sizeof(long))
+#define __SC_TEST1(t1, a1)      __SC_TEST(t1)
+#define __SC_TEST2(t2, a2, ...) __SC_TEST(t2); __SC_TEST1(__VA_ARGS__)
+#define __SC_TEST3(t3, a3, ...) __SC_TEST(t3); __SC_TEST2(__VA_ARGS__)
+#define __SC_TEST4(t4, a4, ...) __SC_TEST(t4); __SC_TEST3(__VA_ARGS__)
+#define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)
+#define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
+#define SYSCALL_DEFINE0(name)   asmlinkage long sys_##name(void)
+#define SYSCALL_DEFINE1(...)    SYSCALL_DEFINEx(1, __VA_ARGS__)
+#define SYSCALL_DEFINE2(...)    SYSCALL_DEFINEx(2, __VA_ARGS__)
+#define SYSCALL_DEFINE3(...)    SYSCALL_DEFINEx(3, __VA_ARGS__)
+#define SYSCALL_DEFINE4(...)    SYSCALL_DEFINEx(4, __VA_ARGS__)
+#define SYSCALL_DEFINE5(...)    SYSCALL_DEFINEx(5, __VA_ARGS__)
+#define SYSCALL_DEFINE6(...)    SYSCALL_DEFINEx(6, __VA_ARGS__)
+#ifdef CONFIG_PPC64
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"      \
+             "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
+#else
+#ifdef CONFIG_ALPHA
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ( #alias " = " #name "\n\t.globl " #alias)
+#else
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ("\t.globl " #alias "\n\t.set " #alias ", " #name)
+#endif
+#endif
+#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
+#define SYSCALL_DEFINE(name) static inline long SYSC_##name
+#define SYSCALL_DEFINEx(x, name, ...)                                   \
+        asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__));          \
+        static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__));      \
+        asmlinkage long SyS_##name(__SC_LONG##x(__VA_ARGS__))           \
+        {                                                               \
+                __SC_TEST##x(__VA_ARGS__);                              \
+                return (long) SYSC_##name(__SC_CAST##x(__VA_ARGS__));   \
+        }                                                               \
+        SYSCALL_ALIAS(sys_##name, SyS_##name);                          \
+        static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__))
+#else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
+#define SYSCALL_DEFINE(name) asmlinkage long sys_##name
+#define SYSCALL_DEFINEx(x, name, ...)                                   \
+        asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__))
+#endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
 asmlinkage long sys_time(time_t __user *tloc);
 asmlinkage long sys_stime(time_t __user *tptr);
 asmlinkage long sys_gettimeofday(struct timeval __user *tv,
@@ -77,7 +151,7 @@ asmlinkage long sys_times(struct tms __user *tbuf);
 asmlinkage long sys_gettid(void);
 asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp);
-asmlinkage unsigned long sys_alarm(unsigned int seconds);
+asmlinkage long sys_alarm(unsigned int seconds);
 asmlinkage long sys_getpid(void);
 asmlinkage long sys_getppid(void);
 asmlinkage long sys_getuid(void);
@@ -166,7 +240,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
                                unsigned long flags);
 asmlinkage long sys_exit(int error_code);
-asmlinkage void sys_exit_group(int error_code);
+asmlinkage long sys_exit_group(int error_code);
 asmlinkage long sys_wait4(pid_t pid, int __user *stat_addr,
                                int options, struct rusage __user *ru);
 asmlinkage long sys_waitid(int which, pid_t pid,
@@ -196,7 +270,7 @@ asmlinkage long sys_tkill(int pid, int sig);
 asmlinkage long sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo);
 asmlinkage long sys_sgetmask(void);
 asmlinkage long sys_ssetmask(int newmask);
-asmlinkage unsigned long sys_signal(int sig, __sighandler_t handler);
+asmlinkage long sys_signal(int sig, __sighandler_t handler);
 asmlinkage long sys_pause(void);
 asmlinkage long sys_sync(void);
@@ -246,29 +320,29 @@ asmlinkage long sys_lsetxattr(const char __user *path, const char __user *name,
                              const void __user *value, size_t size, int flags);
 asmlinkage long sys_fsetxattr(int fd, const char __user *name,
                              const void __user *value, size_t size, int flags);
-asmlinkage ssize_t sys_getxattr(const char __user *path, const char __user *name,
+asmlinkage long sys_getxattr(const char __user *path, const char __user *name,
-                                void __user *value, size_t size);
+                             void __user *value, size_t size);
-asmlinkage ssize_t sys_lgetxattr(const char __user *path, const char __user *name,
+asmlinkage long sys_lgetxattr(const char __user *path, const char __user *name,
-                                void __user *value, size_t size);
+                              void __user *value, size_t size);
-asmlinkage ssize_t sys_fgetxattr(int fd, const char __user *name,
+asmlinkage long sys_fgetxattr(int fd, const char __user *name,
-                                void __user *value, size_t size);
+                              void __user *value, size_t size);
-asmlinkage ssize_t sys_listxattr(const char __user *path, char __user *list,
+asmlinkage long sys_listxattr(const char __user *path, char __user *list,
-                                size_t size);
+                              size_t size);
-asmlinkage ssize_t sys_llistxattr(const char __user *path, char __user *list,
+asmlinkage long sys_llistxattr(const char __user *path, char __user *list,
-                                size_t size);
+                               size_t size);
-asmlinkage ssize_t sys_flistxattr(int fd, char __user *list, size_t size);
+asmlinkage long sys_flistxattr(int fd, char __user *list, size_t size);
 asmlinkage long sys_removexattr(const char __user *path,
                                const char __user *name);
 asmlinkage long sys_lremovexattr(const char __user *path,
                                 const char __user *name);
 asmlinkage long sys_fremovexattr(int fd, const char __user *name);
-asmlinkage unsigned long sys_brk(unsigned long brk);
+asmlinkage long sys_brk(unsigned long brk);
 asmlinkage long sys_mprotect(unsigned long start, size_t len,
                                unsigned long prot);
-asmlinkage unsigned long sys_mremap(unsigned long addr,
+asmlinkage long sys_mremap(unsigned long addr,
-                                unsigned long old_len, unsigned long new_len,
+                           unsigned long old_len, unsigned long new_len,
-                                unsigned long flags, unsigned long new_addr);
+                           unsigned long flags, unsigned long new_addr);
 asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                        unsigned long prot, unsigned long pgoff,
                        unsigned long flags);
@@ -321,10 +395,10 @@ asmlinkage long sys_io_submit(aio_context_t, long,
                                struct iocb __user * __user *);
 asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb,
                              struct io_event __user *result);
-asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd,
+asmlinkage long sys_sendfile(int out_fd, int in_fd,
-                                off_t __user *offset, size_t count);
+                             off_t __user *offset, size_t count);
-asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd,
+asmlinkage long sys_sendfile64(int out_fd, int in_fd,
-                                loff_t __user *offset, size_t count);
+                               loff_t __user *offset, size_t count);
 asmlinkage long sys_readlink(const char __user *path,
                                char __user *buf, int bufsiz);
 asmlinkage long sys_creat(const char __user *pathname, int mode);
@@ -368,26 +442,25 @@ asmlinkage long sys_utime(char __user *filename,
                                struct utimbuf __user *times);
 asmlinkage long sys_utimes(char __user *filename,
                                struct timeval __user *utimes);
-asmlinkage off_t sys_lseek(unsigned int fd, off_t offset,
+asmlinkage long sys_lseek(unsigned int fd, off_t offset,
-                                unsigned int origin);
+                          unsigned int origin);
 asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high,
                        unsigned long offset_low, loff_t __user *result,
                        unsigned int origin);
-asmlinkage ssize_t sys_read(unsigned int fd, char __user *buf,
+asmlinkage long sys_read(unsigned int fd, char __user *buf, size_t count);
-                                size_t count);
+asmlinkage long sys_readahead(int fd, loff_t offset, size_t count);
-asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count);
+asmlinkage long sys_readv(unsigned long fd,
-asmlinkage ssize_t sys_readv(unsigned long fd,
+                          const struct iovec __user *vec,
-                                const struct iovec __user *vec,
+                          unsigned long vlen);
-                                unsigned long vlen);
+asmlinkage long sys_write(unsigned int fd, const char __user *buf,
-asmlinkage ssize_t sys_write(unsigned int fd, const char __user *buf,
+                          size_t count);
-                                size_t count);
+asmlinkage long sys_writev(unsigned long fd,
-asmlinkage ssize_t sys_writev(unsigned long fd,
+                           const struct iovec __user *vec,
-                                const struct iovec __user *vec,
+                           unsigned long vlen);
-                                unsigned long vlen);
+asmlinkage long sys_pread64(unsigned int fd, char __user *buf,
-asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
+                            size_t count, loff_t pos);
-                                size_t count, loff_t pos);
+asmlinkage long sys_pwrite64(unsigned int fd, const char __user *buf,
-asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char __user *buf,
+                             size_t count, loff_t pos);
-                                size_t count, loff_t pos);
 asmlinkage long sys_getcwd(char __user *buf, unsigned long size);
 asmlinkage long sys_mkdir(const char __user *pathname, int mode);
 asmlinkage long sys_chdir(const char __user *filename);
@@ -476,7 +549,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
 asmlinkage long sys_mq_open(const char __user *name, int oflag, mode_t mode, struct mq_attr __user *attr);
 asmlinkage long sys_mq_unlink(const char __user *name);
 asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec __user *abs_timeout);
-asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct timespec __user *abs_timeout);
+asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct timespec __user *abs_timeout);
 asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification);
 asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat);
@@ -530,11 +603,6 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
                                const int __user *nodes,
                                int __user *status,
                                int flags);
-asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page,
-                                __u32 __user *pages,
-                                const int __user *nodes,
-                                int __user *status,
-                                int flags);
 asmlinkage long sys_mbind(unsigned long start, unsigned long len,
                                unsigned long mode,
                                unsigned long __user *nmask,
@@ -583,13 +651,6 @@ asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *bu
                               int bufsiz);
 asmlinkage long sys_utimensat(int dfd, char __user *filename,
                                struct timespec __user *utimes, int flags);
-asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
-                                     struct compat_timeval __user *t);
-asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
-                                      struct compat_stat __user *statbuf,
-                                      int flag);
-asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
-                                   int flags, int mode);
 asmlinkage long sys_unshare(unsigned long unshare_flags);
 asmlinkage long sys_splice(int fd_in, loff_t __user *off_in,
@@ -621,6 +682,15 @@ asmlinkage long sys_timerfd_gettime(int ufd, struct itimerspec __user *otmr);
 asmlinkage long sys_eventfd(unsigned int count);
 asmlinkage long sys_eventfd2(unsigned int count, int flags);
 asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);
+asmlinkage long sys_old_readdir(unsigned int, struct old_linux_dirent __user *, unsigned int);
+asmlinkage long sys_pselect6(int, fd_set __user *, fd_set __user *,
+                             fd_set __user *, struct timespec __user *,
+                             void __user *);
+asmlinkage long sys_ppoll(struct pollfd __user *, unsigned int,
+                          struct timespec __user *, const sigset_t __user *,
+                          size_t);
+asmlinkage long sys_pipe2(int __user *, int);
+asmlinkage long sys_pipe(int __user *);
 int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 18269e956a71..341dddb55090 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -16,6 +16,8 @@
 #ifndef _LINUX_TASKSTATS_H
 #define _LINUX_TASKSTATS_H
+#include <linux/types.h>
 /* Format for per-task data returned to userland when
 *      - a task exits
 *      - listener requests stats for a task
diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h
index 23a03eb630db..e895c0a39629 100644
--- a/include/linux/tc_act/tc_gact.h
+++ b/include/linux/tc_act/tc_gact.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_GACT_H
 #define __LINUX_TC_GACT_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 #define TCA_ACT_GACT 5
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 71d63409d568..0a99ab60d610 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_MIR_H
 #define __LINUX_TC_MIR_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 #define TCA_ACT_MIRRED 8
diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h
index 83e56e32e8e0..54ce9064115a 100644
--- a/include/linux/tc_act/tc_pedit.h
+++ b/include/linux/tc_act/tc_pedit.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_PED_H
 #define __LINUX_TC_PED_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 #define TCA_ACT_PEDIT 7
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h
index c7f4d43618fd..38e7f7b25ec2 100644
--- a/include/linux/tc_ematch/tc_em_cmp.h
+++ b/include/linux/tc_ematch/tc_em_cmp.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_EM_CMP_H
 #define __LINUX_TC_EM_CMP_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 struct tcf_em_cmp
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index c50d2ba5caf0..dcfb733fa1f6 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_EM_META_H
 #define __LINUX_TC_EM_META_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 enum
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h
index f19d1f58ec9d..9ed8c2e58488 100644
--- a/include/linux/tc_ematch/tc_em_nbyte.h
+++ b/include/linux/tc_ematch/tc_em_nbyte.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_EM_NBYTE_H
 #define __LINUX_TC_EM_NBYTE_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 struct tcf_em_nbyte
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h
index 7cd43e99c7f5..d12a73a225fc 100644
--- a/include/linux/tc_ematch/tc_em_text.h
+++ b/include/linux/tc_ematch/tc_em_text.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_TC_EM_TEXT_H
 #define __LINUX_TC_EM_TEXT_H
+#include <linux/types.h>
 #include <linux/pkt_cls.h>
 #define TC_EM_TEXT_ALGOSIZ      16
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 85ee9be9361e..88079fd60235 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -418,6 +418,8 @@ struct usb_tt;
 * @autosuspend_disabled: autosuspend disabled by the user
 * @autoresume_disabled: autoresume disabled by the user
 * @skip_sys_resume: skip the next system resume
+ * @wusb_dev: if this is a Wireless USB device, link to the WUSB
+ *      specific data for the device.
 *
 * Notes:
 * Usbcore drivers should not set usbdev->state directly.  Instead use
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index 18a729343ffa..3c86ed25a04c 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -9,6 +9,8 @@
 #ifndef __LINUX_USB_CDC_H
 #define __LINUX_USB_CDC_H
+#include <linux/types.h>
 #define USB_CDC_SUBCLASS_ACM                    0x02
 #define USB_CDC_SUBCLASS_ETHERNET               0x06
 #define USB_CDC_SUBCLASS_WHCM                   0x08
diff --git a/include/linux/usb/gadgetfs.h b/include/linux/usb/gadgetfs.h
index ea45f265ec05..612102e4d75e 100644
--- a/include/linux/usb/gadgetfs.h
+++ b/include/linux/usb/gadgetfs.h
@@ -18,7 +18,7 @@
 #ifndef __LINUX_USB_GADGETFS_H
 #define __LINUX_USB_GADGETFS_H
-#include <asm/types.h>
+#include <linux/types.h>
 #include <asm/ioctl.h>
 #include <linux/usb/ch9.h>
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index ba09fe88adda..7d3822243074 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct net_device *net);
 #define devdbg(usbnet, fmt, arg...) \
        printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg)
 #else
-#define devdbg(usbnet, fmt, arg...) do {} while(0)
+#define devdbg(usbnet, fmt, arg...) \
+        ({ if (0) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , \
+                ## arg); 0; })
 #endif
 #define deverr(usbnet, fmt, arg...) \
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
index 121e26da2c18..e26c0c86a6ea 100644
--- a/include/linux/video_decoder.h
+++ b/include/linux/video_decoder.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_VIDEO_DECODER_H
 #define _LINUX_VIDEO_DECODER_H
+#include <linux/types.h>
 #define HAVE_VIDEO_DECODER 1
 struct video_decoder_capability { /* this name is too long */
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h
index 4b0e6907a7b4..b7b6423bbb8a 100644
--- a/include/linux/video_encoder.h
+++ b/include/linux/video_encoder.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_VIDEO_ENCODER_H
 #define _LINUX_VIDEO_ENCODER_H
+#include <linux/types.h>
 struct video_encoder_capability { /* this name is too long */
        __u32   flags;
 #define VIDEO_ENCODER_PAL       1       /* can encode PAL signal */
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 15a653d41132..837f392fbe97 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_VIDEODEV_H
 #define __LINUX_VIDEODEV_H
+#include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/videodev2.h>
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index c1aef85243bf..94c56d29869d 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -2,6 +2,7 @@
 #define _LINUX_VIRTIO_BLK_H
 /* This header is BSD licensed so anyone can use the definitions to implement
 * compatible drivers/servers. */
+#include <linux/types.h>
 #include <linux/virtio_config.h>
 /* The ID for virtio_block */
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index 7615ffcdd555..dc161115ae35 100644
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -1,5 +1,6 @@
 #ifndef _LINUX_VIRTIO_CONSOLE_H
 #define _LINUX_VIRTIO_CONSOLE_H
+#include <linux/types.h>
 #include <linux/virtio_config.h>
 /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
 * anyone can use the definitions to implement compatible drivers/servers. */
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 5cdd0aa8bde9..3efa86c3ecb3 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -2,6 +2,7 @@
 #define _LINUX_VIRTIO_NET_H
 /* This header is BSD licensed so anyone can use the definitions to implement
 * compatible drivers/servers. */
+#include <linux/types.h>
 #include <linux/virtio_config.h>
 /* The ID for virtio_net */
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index b36291130f22..3cd51e579ab1 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -118,12 +118,24 @@ struct execute_work {
                init_timer(&(_work)->timer);                    \
        } while (0)
+#define INIT_DELAYED_WORK_ON_STACK(_work, _func)                \
+        do {                                                    \
+                INIT_WORK(&(_work)->work, (_func));             \
+                init_timer_on_stack(&(_work)->timer);           \
+        } while (0)
 #define INIT_DELAYED_WORK_DEFERRABLE(_work, _func)                      \
        do {                                                    \
                INIT_WORK(&(_work)->work, (_func));             \
                init_timer_deferrable(&(_work)->timer);         \
        } while (0)
+#define INIT_DELAYED_WORK_ON_STACK(_work, _func)                \
+        do {                                                    \
+                INIT_WORK(&(_work)->work, (_func));             \
+                init_timer_on_stack(&(_work)->timer);           \
+        } while (0)
 /**
 * work_pending - Find out whether a work item is currently pending
 * @work: The work item in question