45 files changed, 336 insertions, 199 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 327f60658d94..59391250d51c 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -250,6 +250,8 @@ unifdef-y += isdn.h
 unifdef-y += isdnif.h
 unifdef-y += isdn_divertif.h
 unifdef-y += isdn_ppp.h
+unifdef-y += ivtv.h
+unifdef-y += ivtvfb.h
 unifdef-y += joystick.h
 unifdef-y += kdev_t.h
 unifdef-y += kd.h
@@ -295,7 +297,6 @@ unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
 unifdef-y += personality.h
-unifdef-y += pim.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 1c622e2b0504..1ce19c1ef0e9 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -46,18 +46,48 @@ enum {
        ATA_MAX_SECTORS_TAPE    = 65535,
        ATA_ID_WORDS            = 256,
+        ATA_ID_CONFIG           = 0,
+        ATA_ID_CYLS             = 1,
+        ATA_ID_HEADS            = 3,
+        ATA_ID_SECTORS          = 6,
        ATA_ID_SERNO            = 10,
+        ATA_ID_BUF_SIZE         = 21,
        ATA_ID_FW_REV           = 23,
        ATA_ID_PROD             = 27,
+        ATA_ID_MAX_MULTSECT     = 47,
+        ATA_ID_DWORD_IO         = 48,
+        ATA_ID_CAPABILITY       = 49,
        ATA_ID_OLD_PIO_MODES    = 51,
+        ATA_ID_OLD_DMA_MODES    = 52,
        ATA_ID_FIELD_VALID      = 53,
+        ATA_ID_CUR_CYLS         = 54,
+        ATA_ID_CUR_HEADS        = 55,
+        ATA_ID_CUR_SECTORS      = 56,
+        ATA_ID_MULTSECT         = 59,
+        ATA_ID_LBA_CAPACITY     = 60,
+        ATA_ID_SWDMA_MODES      = 62,
        ATA_ID_MWDMA_MODES      = 63,
        ATA_ID_PIO_MODES        = 64,
        ATA_ID_EIDE_DMA_MIN     = 65,
+        ATA_ID_EIDE_DMA_TIME    = 66,
        ATA_ID_EIDE_PIO         = 67,
        ATA_ID_EIDE_PIO_IORDY   = 68,
-        ATA_ID_UDMA_MODES       = 88,
+        ATA_ID_QUEUE_DEPTH      = 75,
        ATA_ID_MAJOR_VER        = 80,
+        ATA_ID_COMMAND_SET_1    = 82,
+        ATA_ID_COMMAND_SET_2    = 83,
+        ATA_ID_CFSSE            = 84,
+        ATA_ID_CFS_ENABLE_1     = 85,
+        ATA_ID_CFS_ENABLE_2     = 86,
+        ATA_ID_CSF_DEFAULT      = 87,
+        ATA_ID_UDMA_MODES       = 88,
+        ATA_ID_HW_CONFIG        = 93,
+        ATA_ID_SPG              = 98,
+        ATA_ID_LBA_CAPACITY_2   = 100,
+        ATA_ID_LAST_LUN         = 126,
+        ATA_ID_DLF              = 128,
+        ATA_ID_CSFO             = 129,
+        ATA_ID_CFA_POWER        = 160,
        ATA_ID_PIO4             = (1 << 1),
        ATA_ID_SERNO_LEN        = 20,
@@ -123,13 +153,26 @@ enum {
        ATA_BUSY                = (1 << 7),     /* BSY status bit */
        ATA_DRDY                = (1 << 6),     /* device ready */
        ATA_DF                  = (1 << 5),     /* device fault */
+        ATA_DSC                 = (1 << 4),     /* drive seek complete */
        ATA_DRQ                 = (1 << 3),     /* data request i/o */
+        ATA_CORR                = (1 << 2),     /* corrected data error */
+        ATA_IDX                 = (1 << 1),     /* index */
        ATA_ERR                 = (1 << 0),     /* have an error */
        ATA_SRST                = (1 << 2),     /* software reset */
        ATA_ICRC                = (1 << 7),     /* interface CRC error */
+        ATA_BBK                 = ATA_ICRC,     /* pre-EIDE: block marked bad */
        ATA_UNC                 = (1 << 6),     /* uncorrectable media error */
+        ATA_MC                  = (1 << 5),     /* media changed */
        ATA_IDNF                = (1 << 4),     /* ID not found */
+        ATA_MCR                 = (1 << 3),     /* media change requested */
        ATA_ABORTED             = (1 << 2),     /* command aborted */
+        ATA_TRK0NF              = (1 << 1),     /* track 0 not found */
+        ATA_AMNF                = (1 << 0),     /* address mark not found */
+        ATAPI_LFS               = 0xF0,         /* last failed sense */
+        ATAPI_EOM               = ATA_TRK0NF,   /* end of media */
+        ATAPI_ILI               = ATA_AMNF,     /* illegal length indication */
+        ATAPI_IO                = (1 << 1),
+        ATAPI_COD               = (1 << 0),
        /* ATA command block registers */
        ATA_REG_DATA            = 0x00,
@@ -192,6 +235,13 @@ enum {
        ATA_CMD_PMP_WRITE       = 0xE8,
        ATA_CMD_CONF_OVERLAY    = 0xB1,
        ATA_CMD_SEC_FREEZE_LOCK = 0xF5,
+        ATA_CMD_SMART           = 0xB0,
+        ATA_CMD_MEDIA_LOCK      = 0xDE,
+        ATA_CMD_MEDIA_UNLOCK    = 0xDF,
+        /* marked obsolete in the ATA/ATAPI-7 spec */
+        ATA_CMD_RESTORE         = 0x10,
+        /* EXABYTE specific */
+        ATA_EXABYTE_ENABLE_NEST = 0xF0,
        /* READ_LOG_EXT pages */
        ATA_LOG_SATA_NCQ        = 0x10,
@@ -232,6 +282,10 @@ enum {
        SETFEATURES_WC_ON       = 0x02, /* Enable write cache */
        SETFEATURES_WC_OFF      = 0x82, /* Disable write cache */
+        /* Enable/Disable Automatic Acoustic Management */
+        SETFEATURES_AAM_ON      = 0x42,
+        SETFEATURES_AAM_OFF     = 0xC2,
        SETFEATURES_SPINUP      = 0x07, /* Spin-up drive */
        SETFEATURES_SATA_ENABLE = 0x10, /* Enable use of SATA feature */
@@ -254,6 +308,15 @@ enum {
        ATA_DCO_IDENTIFY        = 0xC2,
        ATA_DCO_SET             = 0xC3,
+        /* feature values for SMART */
+        ATA_SMART_ENABLE        = 0xD8,
+        ATA_SMART_READ_VALUES   = 0xD0,
+        ATA_SMART_READ_THRESHOLDS = 0xD1,
+        /* password used in LBA Mid / LBA High for executing SMART commands */
+        ATA_SMART_LBAM_PASS     = 0x4F,
+        ATA_SMART_LBAH_PASS     = 0xC2,
        /* ATAPI stuff */
        ATAPI_PKT_DMA           = (1 << 0),
        ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir:
@@ -438,17 +501,17 @@ static inline int ata_is_data(u8 prot)
 /*
 * id tests
 */
-#define ata_id_is_ata(id)       (((id)[0] & (1 << 15)) == 0)
+#define ata_id_is_ata(id)       (((id)[ATA_ID_CONFIG] & (1 << 15)) == 0)
-#define ata_id_has_lba(id)      ((id)[49] & (1 << 9))
+#define ata_id_has_lba(id)      ((id)[ATA_ID_CAPABILITY] & (1 << 9))
-#define ata_id_has_dma(id)      ((id)[49] & (1 << 8))
+#define ata_id_has_dma(id)      ((id)[ATA_ID_CAPABILITY] & (1 << 8))
 #define ata_id_has_ncq(id)      ((id)[76] & (1 << 8))
-#define ata_id_queue_depth(id)  (((id)[75] & 0x1f) + 1)
+#define ata_id_queue_depth(id)  (((id)[ATA_ID_QUEUE_DEPTH] & 0x1f) + 1)
-#define ata_id_removeable(id)   ((id)[0] & (1 << 7))
+#define ata_id_removeable(id)   ((id)[ATA_ID_CONFIG] & (1 << 7))
 #define ata_id_has_atapi_AN(id) \
        ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \
          ((id)[78] & (1 << 5)) )
-#define ata_id_iordy_disable(id) ((id)[49] & (1 << 10))
+#define ata_id_iordy_disable(id) ((id)[ATA_ID_CAPABILITY] & (1 << 10))
-#define ata_id_has_iordy(id) ((id)[49] & (1 << 11))
+#define ata_id_has_iordy(id) ((id)[ATA_ID_CAPABILITY] & (1 << 11))
 #define ata_id_u32(id,n)        \
        (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)]))
 #define ata_id_u64(id,n)        \
@@ -457,7 +520,7 @@ static inline int ata_is_data(u8 prot)
          ((u64) (id)[(n) + 1] << 16) | \
          ((u64) (id)[(n) + 0]) )
-#define ata_id_cdb_intr(id)     (((id)[0] & 0x60) == 0x20)
+#define ata_id_cdb_intr(id)     (((id)[ATA_ID_CONFIG] & 0x60) == 0x20)
 static inline bool ata_id_has_hipm(const u16 *id)
 {
@@ -482,75 +545,75 @@ static inline bool ata_id_has_dipm(const u16 *id)
 static inline int ata_id_has_fua(const u16 *id)
 {
-        if ((id[84] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)
                return 0;
-        return id[84] & (1 << 6);
+        return id[ATA_ID_CFSSE] & (1 << 6);
 }
 static inline int ata_id_has_flush(const u16 *id)
 {
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
-        return id[83] & (1 << 12);
+        return id[ATA_ID_COMMAND_SET_2] & (1 << 12);
 }
 static inline int ata_id_has_flush_ext(const u16 *id)
 {
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
-        return id[83] & (1 << 13);
+        return id[ATA_ID_COMMAND_SET_2] & (1 << 13);
 }
 static inline int ata_id_has_lba48(const u16 *id)
 {
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
-        if (!ata_id_u64(id, 100))
+        if (!ata_id_u64(id, ATA_ID_LBA_CAPACITY_2))
                return 0;
-        return id[83] & (1 << 10);
+        return id[ATA_ID_COMMAND_SET_2] & (1 << 10);
 }
 static inline int ata_id_hpa_enabled(const u16 *id)
 {
        /* Yes children, word 83 valid bits cover word 82 data */
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
        /* And 87 covers 85-87 */
-        if ((id[87] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
                return 0;
        /* Check command sets enabled as well as supported */
-        if ((id[85] & ( 1 << 10)) == 0)
+        if ((id[ATA_ID_CFS_ENABLE_1] & (1 << 10)) == 0)
                return 0;
-        return id[82] & (1 << 10);
+        return id[ATA_ID_COMMAND_SET_1] & (1 << 10);
 }
 static inline int ata_id_has_wcache(const u16 *id)
 {
        /* Yes children, word 83 valid bits cover word 82 data */
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
-        return id[82] & (1 << 5);
+        return id[ATA_ID_COMMAND_SET_1] & (1 << 5);
 }
 static inline int ata_id_has_pm(const u16 *id)
 {
-        if ((id[83] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
                return 0;
-        return id[82] & (1 << 3);
+        return id[ATA_ID_COMMAND_SET_1] & (1 << 3);
 }
 static inline int ata_id_rahead_enabled(const u16 *id)
 {
-        if ((id[87] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
                return 0;
-        return id[85] & (1 << 6);
+        return id[ATA_ID_CFS_ENABLE_1] & (1 << 6);
 }
 static inline int ata_id_wcache_enabled(const u16 *id)
 {
-        if ((id[87] & 0xC000) != 0x4000)
+        if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
                return 0;
-        return id[85] & (1 << 5);
+        return id[ATA_ID_CFS_ENABLE_1] & (1 << 5);
 }
 /**
@@ -581,7 +644,7 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 static inline int ata_id_is_sata(const u16 *id)
 {
-        return ata_id_major_version(id) >= 5 && id[93] == 0;
+        return ata_id_major_version(id) >= 5 && id[ATA_ID_HW_CONFIG] == 0;
 }
 static inline int ata_id_has_tpm(const u16 *id)
@@ -599,7 +662,7 @@ static inline int ata_id_has_dword_io(const u16 *id)
        /* ATA 8 reuses this flag for "trusted" computing */
        if (ata_id_major_version(id) > 7)
                return 0;
-        if (id[48] & (1 << 0))
+        if (id[ATA_ID_DWORD_IO] & (1 << 0))
                return 1;
        return 0;
 }
@@ -608,22 +671,22 @@ static inline int ata_id_current_chs_valid(const u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
           has not been issued to the device then the values of
-           id[54] to id[56] are vendor specific. */
+           id[ATA_ID_CUR_CYLS] to id[ATA_ID_CUR_SECTORS] are vendor specific. */
-        return (id[53] & 0x01) && /* Current translation valid */
+        return (id[ATA_ID_FIELD_VALID] & 1) && /* Current translation valid */
-                id[54] &&  /* cylinders in current translation */
+                id[ATA_ID_CUR_CYLS] &&  /* cylinders in current translation */
-                id[55] &&  /* heads in current translation */
+                id[ATA_ID_CUR_HEADS] &&  /* heads in current translation */
-                id[55] <= 16 &&
+                id[ATA_ID_CUR_HEADS] <= 16 &&
-                id[56];    /* sectors in current translation */
+                id[ATA_ID_CUR_SECTORS];    /* sectors in current translation */
 }
 static inline int ata_id_is_cfa(const u16 *id)
 {
-        u16 v = id[0];
+        if (id[ATA_ID_CONFIG] == 0x848A)        /* Standard CF */
-        if (v == 0x848A)        /* Standard CF */
                return 1;
        /* Could be CF hiding as standard ATA */
-        if (ata_id_major_version(id) >= 3 &&  id[82] != 0xFFFF &&
+        if (ata_id_major_version(id) >= 3 &&
-                        (id[82] & ( 1 << 2)))
+            id[ATA_ID_COMMAND_SET_1] != 0xFFFF &&
+           (id[ATA_ID_COMMAND_SET_1] & (1 << 2)))
                return 1;
        return 0;
 }
@@ -632,21 +695,21 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 {
        if (ata_id_is_sata(dev_id))
                return 0;       /* SATA */
-        if ((dev_id[93] & 0xE000) == 0x6000)
+        if ((dev_id[ATA_ID_HW_CONFIG] & 0xE000) == 0x6000)
                return 0;       /* 80 wire */
        return 1;
 }
 static inline int ata_drive_40wire_relaxed(const u16 *dev_id)
 {
-        if ((dev_id[93] & 0x2000) == 0x2000)
+        if ((dev_id[ATA_ID_HW_CONFIG] & 0x2000) == 0x2000)
                return 0;       /* 80 wire */
        return 1;
 }
 static inline int atapi_cdb_len(const u16 *dev_id)
 {
-        u16 tmp = dev_id[0] & 0x3;
+        u16 tmp = dev_id[ATA_ID_CONFIG] & 0x3;
        switch (tmp) {
        case 0:         return 12;
        case 1:         return 16;
@@ -656,7 +719,7 @@ static inline int atapi_cdb_len(const u16 *dev_id)
 static inline int atapi_command_packet_set(const u16 *dev_id)
 {
-        return (dev_id[0] >> 8) & 0x1f;
+        return (dev_id[ATA_ID_CONFIG] >> 8) & 0x1f;
 }
 static inline int atapi_id_dmadir(const u16 *dev_id)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e61f22be4d0e..44710d7e7bff 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -280,6 +280,15 @@ struct blk_queue_tag {
        atomic_t refcnt;                /* map can be shared */
 };
+#define BLK_SCSI_MAX_CMDS       (256)
+#define BLK_SCSI_CMD_PER_LONG   (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
+struct blk_cmd_filter {
+        unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
+        unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
+        struct kobject kobj;
+};
 struct request_queue
 {
        /*
@@ -398,6 +407,7 @@ struct request_queue
 #if defined(CONFIG_BLK_DEV_BSG)
        struct bsg_class_device bsg_dev;
 #endif
+        struct blk_cmd_filter cmd_filter;
 };
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
@@ -807,8 +817,6 @@ extern void blk_put_queue(struct request_queue *);
 /*
 * tag stuff
 */
-#define blk_queue_tag_depth(q)          ((q)->queue_tags->busy)
-#define blk_queue_tag_queue(q)          ((q)->queue_tags->busy < (q)->queue_tags->max_depth)
 #define blk_rq_tagged(rq)               ((rq)->cmd_flags & REQ_QUEUED)
 extern int blk_queue_start_tag(struct request_queue *, struct request *);
 extern struct request *blk_queue_find_tag(struct request_queue *, int);
@@ -833,11 +841,11 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *);
 /*
 * command filter functions
 */
-extern int blk_verify_command(struct file *file, unsigned char *cmd);
+extern int blk_verify_command(struct blk_cmd_filter *filter,
-extern int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter,
+                              unsigned char *cmd, int has_write_perm);
-                                         unsigned char *cmd, mode_t *f_mode);
 extern int blk_register_filter(struct gendisk *disk);
 extern void blk_unregister_filter(struct gendisk *disk);
+extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter);
 #define MAX_PHYS_SEGMENTS 128
 #define MAX_HW_SEGMENTS 128
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 02673846d205..9d1fe30b6f6c 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -503,8 +503,19 @@ extern const kernel_cap_t __cap_init_eff_set;
 kernel_cap_t cap_set_effective(const kernel_cap_t pE_new);
-int capable(int cap);
+/**
-int __capable(struct task_struct *t, int cap);
+ * has_capability - Determine if a task has a superior capability available
+ * @t: The task in question
+ * @cap: The capability to be tested for
+ *
+ * Return true if the specified task has the given superior capability
+ * currently in effect, false if not.
+ *
+ * Note that this does not set PF_SUPERPRIV on the task.
+ */
+#define has_capability(t, cap) (security_capable((t), (cap)) == 0)
+extern int capable(int cap);
 #endif /* __KERNEL__ */
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 57faa60de9bd..02ef8835999c 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -49,6 +49,8 @@ extern unsigned long wait_for_completion_timeout(struct completion *x,
                                                   unsigned long timeout);
 extern unsigned long wait_for_completion_interruptible_timeout(
                        struct completion *x, unsigned long timeout);
+extern bool try_wait_for_completion(struct completion *x);
+extern bool completion_done(struct completion *x);
 extern void complete(struct completion *);
 extern void complete_all(struct completion *);
@@ -56,48 +58,4 @@ extern void complete_all(struct completion *);
 #define INIT_COMPLETION(x)      ((x).done = 0)
-/**
- *      try_wait_for_completion - try to decrement a completion without blocking
- *      @x:     completion structure
- *
- *      Returns: 0 if a decrement cannot be done without blocking
- *               1 if a decrement succeeded.
- *
- *      If a completion is being used as a counting completion,
- *      attempt to decrement the counter without blocking. This
- *      enables us to avoid waiting if the resource the completion
- *      is protecting is not available.
- */
-static inline bool try_wait_for_completion(struct completion *x)
-{
-        int ret = 1;
-        spin_lock_irq(&x->wait.lock);
-        if (!x->done)
-                ret = 0;
-        else
-                x->done--;
-        spin_unlock_irq(&x->wait.lock);
-        return ret;
-}
-/**
- *      completion_done - Test to see if a completion has any waiters
- *      @x:     completion structure
- *
- *      Returns: 0 if there are waiters (wait_for_completion() in progress)
- *               1 if there are no waiters.
- *
- */
-static inline bool completion_done(struct completion *x)
-{
-        int ret = 1;
-        spin_lock_irq(&x->wait.lock);
-        if (!x->done)
-                ret = 0;
-        spin_unlock_irq(&x->wait.lock);
-        return ret;
-}
 #endif
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 07aa198f19ed..efba1de629ac 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -230,7 +230,7 @@ extern void d_delete(struct dentry *);
 extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
 extern struct dentry * d_alloc_anon(struct inode *);
 extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
-extern struct dentry * d_add_ci(struct inode *, struct dentry *, struct qstr *);
+extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);
 extern void shrink_dcache_sb(struct super_block *);
 extern void shrink_dcache_parent(struct dentry *);
 extern void shrink_dcache_for_umount(struct super_block *);
diff --git a/include/linux/device.h b/include/linux/device.h
index d24a47f80f9c..4d8372d135df 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -358,6 +358,7 @@ struct device {
        struct kobject kobj;
        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
+        const char              *init_name; /* initial name of the device */
        struct device_type      *type;
        unsigned                uevent_suppress:1;
@@ -406,7 +407,7 @@ struct device {
 /* Get the wakeup routines, which depend on struct device */
 #include <linux/pm_wakeup.h>
-static inline const char *dev_name(struct device *dev)
+static inline const char *dev_name(const struct device *dev)
 {
        /* will be changed into kobject_name(&dev->kobj) in the near future */
        return dev->bus_id;
@@ -518,7 +519,7 @@ extern void device_shutdown(void);
 extern void sysdev_shutdown(void);
 /* debugging and troubleshooting/diagnostic helpers. */
-extern const char *dev_driver_string(struct device *dev);
+extern const char *dev_driver_string(const struct device *dev);
 #define dev_printk(level, dev, format, arg...)  \
        printk(level "%s %s: " format , dev_driver_string(dev) , \
               dev_name(dev) , ## arg)
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index f5abd1306638..27e772cefb6a 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -35,6 +35,27 @@ enum fid_type {
        FILEID_INO32_GEN_PARENT = 2,
        /*
+         * 64 bit object ID, 64 bit root object ID,
+         * 32 bit generation number.
+         */
+        FILEID_BTRFS_WITHOUT_PARENT = 0x4d,
+        /*
+         * 64 bit object ID, 64 bit root object ID,
+         * 32 bit generation number,
+         * 64 bit parent object ID, 32 bit parent generation.
+         */
+        FILEID_BTRFS_WITH_PARENT = 0x4e,
+        /*
+         * 64 bit object ID, 64 bit root object ID,
+         * 32 bit generation number,
+         * 64 bit parent object ID, 32 bit parent generation,
+         * 64 bit parent root object ID.
+         */
+        FILEID_BTRFS_WITH_PARENT_ROOT = 0x4f,
+        /*
         * 32 bit block number, 16 bit partition reference,
         * 16 bit unused, 32 bit generation number.
         */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3b8870e32afd..531ccd5f5960 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -976,6 +976,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
 /* drivers/video/fb_defio.c */
 extern void fb_deferred_io_init(struct fb_info *info);
+extern void fb_deferred_io_open(struct fb_info *info,
+                                struct inode *inode,
+                                struct file *file);
 extern void fb_deferred_io_cleanup(struct fb_info *info);
 extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
                                int datasync);
diff --git a/include/linux/fs_uart_pd.h b/include/linux/fs_uart_pd.h
index 809bb9ffc788..36b61ff39277 100644
--- a/include/linux/fs_uart_pd.h
+++ b/include/linux/fs_uart_pd.h
@@ -12,7 +12,6 @@
 #ifndef FS_UART_PD_H
 #define FS_UART_PD_H
-#include <linux/version.h>
 #include <asm/types.h>
 enum fs_uart_id {
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index f368d041e02d..bb384068272e 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -98,6 +98,27 @@ static inline void tracer_disable(void)
 #endif
 }
+/* Ftrace disable/restore without lock. Some synchronization mechanism
+ * must be used to prevent ftrace_enabled to be changed between
+ * disable/restore. */
+static inline int __ftrace_enabled_save(void)
+{
+#ifdef CONFIG_FTRACE
+        int saved_ftrace_enabled = ftrace_enabled;
+        ftrace_enabled = 0;
+        return saved_ftrace_enabled;
+#else
+        return 0;
+#endif
+}
+static inline void __ftrace_enabled_restore(int enabled)
+{
+#ifdef CONFIG_FTRACE
+        ftrace_enabled = enabled;
+#endif
+}
 #ifdef CONFIG_FRAME_POINTER
 /* TODO: need to fix this for ARM */
 # define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 118216f1bd3c..be4f5e5bfe06 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -110,15 +110,6 @@ struct hd_struct {
 #define GENHD_FL_SUPPRESS_PARTITION_INFO        32
 #define GENHD_FL_FAIL                           64
-#define BLK_SCSI_MAX_CMDS       (256)
-#define BLK_SCSI_CMD_PER_LONG   (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
-struct blk_scsi_cmd_filter {
-        unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
-        unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
-        struct kobject kobj;
-};
 struct gendisk {
        int major;                      /* major number of driver */
        int first_minor;
@@ -128,7 +119,6 @@ struct gendisk {
        struct hd_struct **part;        /* [indexed by minor] */
        struct block_device_operations *fops;
        struct request_queue *queue;
-        struct blk_scsi_cmd_filter cmd_filter;
        void *private_data;
        sector_t capacity;
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 08be0d21864c..06115128047f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
 /**
 * struct i2c_driver - represent an I2C device driver
+ * @id: Unique driver ID (optional)
 * @class: What kind of i2c device we instantiate (for detect)
+ * @attach_adapter: Callback for bus addition (for legacy drivers)
+ * @detach_adapter: Callback for bus removal (for legacy drivers)
+ * @detach_client: Callback for device removal (for legacy drivers)
+ * @probe: Callback for device binding (new-style drivers)
+ * @remove: Callback for device unbinding (new-style drivers)
+ * @shutdown: Callback for device shutdown
+ * @suspend: Callback for device suspend
+ * @resume: Callback for device resume
+ * @command: Callback for bus-wide signaling (optional)
+ * @driver: Device driver model driver
+ * @id_table: List of I2C devices supported by this driver
 * @detect: Callback for device detection
 * @address_data: The I2C addresses to probe, ignore or force (for detect)
 * @clients: List of detected clients we created (for i2c-core use only)
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 87c12ed96954..1524829f73f2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1111,7 +1111,6 @@ void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 int ide_pci_set_master(struct pci_dev *, const char *);
 unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *);
-extern const struct ide_dma_ops sff_dma_ops;
 int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *);
 int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *);
 #else
@@ -1275,6 +1274,7 @@ extern int __ide_dma_end(ide_drive_t *);
 int ide_dma_test_irq(ide_drive_t *);
 extern void ide_dma_lost_irq(ide_drive_t *);
 extern void ide_dma_timeout(ide_drive_t *);
+extern const struct ide_dma_ops sff_dma_ops;
 #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
 #else
@@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id)
 static inline int hwif_to_node(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
+        return hwif->dev ? dev_to_node(hwif->dev) : -1;
-        return hwif->dev ? pcibus_to_node(dev->bus) : -1;
 }
 static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 4c6307ad9fdb..8529f57ba263 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -45,6 +45,7 @@
 #define TUNGETFEATURES _IOR('T', 207, unsigned int)
 #define TUNSETOFFLOAD  _IOW('T', 208, unsigned int)
 #define TUNSETTXFILTER _IOW('T', 209, unsigned int)
+#define TUNGETIFF      _IOR('T', 210, unsigned int)
 /* TUNSETIFF ifr flags */
 #define IFF_TUN         0x0001
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 22d2115458c6..8d3b7a9afd17 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -109,6 +109,7 @@ extern struct resource iomem_resource;
 extern int request_resource(struct resource *root, struct resource *new);
 extern int release_resource(struct resource *new);
 extern int insert_resource(struct resource *parent, struct resource *new);
+extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new);
 extern int allocate_resource(struct resource *root, struct resource *new,
                             resource_size_t size, resource_size_t min,
                             resource_size_t max, resource_size_t align,
diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
index 794b8daa9378..17ca64b5a66c 100644
--- a/include/linux/ivtv.h
+++ b/include/linux/ivtv.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTV_H__
 #define __LINUX_IVTV_H__
-#ifdef __KERNEL__
+#include <linux/compiler.h>
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
 #include <linux/types.h>
 /* ivtv knows several distinct output modes: MPEG streaming,
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
index e980ba62ddcc..e20af47b59ad 100644
--- a/include/linux/ivtvfb.h
+++ b/include/linux/ivtvfb.h
@@ -21,11 +21,7 @@
 #ifndef __LINUX_IVTVFB_H__
 #define __LINUX_IVTVFB_H__
-#ifdef __KERNEL__
+#include <linux/compiler.h>
-#include <linux/compiler.h> /* need __user */
-#else
-#define __user
-#endif
 #include <linux/types.h>
 /* Framebuffer external API */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 32110cede64f..17f76fc05173 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -25,8 +25,8 @@
 #error KEXEC_CONTROL_MEMORY_LIMIT not defined
 #endif
-#ifndef KEXEC_CONTROL_CODE_SIZE
+#ifndef KEXEC_CONTROL_PAGE_SIZE
-#error KEXEC_CONTROL_CODE_SIZE not defined
+#error KEXEC_CONTROL_PAGE_SIZE not defined
 #endif
 #ifndef KEXEC_ARCH
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 69511f74f912..70a30651cd12 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -320,12 +320,12 @@ struct kvm_trace_rec {
                struct {
                        __u64 cycle_u64;
                        __u32 extra_u32[KVM_TRC_EXTRA_MAX];
-                } cycle;
+                } __attribute__((packed)) cycle;
                struct {
                        __u32 extra_u32[KVM_TRC_EXTRA_MAX];
                } nocycle;
        } u;
-} __attribute__((packed));
+};
 #define KVMIO 0xAE
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 06b80337303b..225bfc5bd9ec 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -163,6 +163,7 @@ enum {
        ATA_DEV_NONE            = 9,    /* no device */
        /* struct ata_link flags */
+        ATA_LFLAG_NO_HRST       = (1 << 1), /* avoid hardreset */
        ATA_LFLAG_NO_SRST       = (1 << 2), /* avoid softreset */
        ATA_LFLAG_ASSUME_ATA    = (1 << 3), /* assume ATA class */
        ATA_LFLAG_ASSUME_SEMB   = (1 << 4), /* assume SEMB class */
@@ -646,6 +647,7 @@ struct ata_link {
        unsigned int            flags;          /* ATA_LFLAG_xxx */
+        u32                     saved_scontrol; /* SControl on probe */
        unsigned int            hw_sata_spd_limit;
        unsigned int            sata_spd_limit;
        unsigned int            sata_spd;       /* current SATA PHY speed */
@@ -1427,6 +1429,28 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
        return from_jiffies + msecs_to_jiffies(timeout_msecs);
 }
+/* Don't open code these in drivers as there are traps. Firstly the range may
+   change in future hardware and specs, secondly 0xFF means 'no DMA' but is
+   > UDMA_0. Dyma ddreigiau */
+static inline int ata_using_mwdma(struct ata_device *adev)
+{
+        if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4)
+                return 1;
+        return 0;
+}
+static inline int ata_using_udma(struct ata_device *adev)
+{
+        if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
+                return 1;
+        return 0;
+}
+static inline int ata_dma_enabled(struct ata_device *adev)
+{
+        return (adev->dma_mode == 0xFF ? 0 : 1);
+}
 /**************************************************************************
 * PMP - drivers/ata/libata-pmp.c
diff --git a/include/linux/mm.h b/include/linux/mm.h
index fa651609b65d..72a15dc26bbf 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -73,7 +73,7 @@ extern unsigned int kobjsize(const void *objp);
 #endif
 /*
- * vm_flags..
+ * vm_flags in vm_area_struct, see mm_types.h.
 */
 #define VM_READ         0x00000001      /* currently active flags */
 #define VM_WRITE        0x00000002
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 386edbe2cb4e..bf334138c7c1 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -113,7 +113,7 @@ struct vm_area_struct {
        struct vm_area_struct *vm_next;
        pgprot_t vm_page_prot;          /* Access permissions of this VMA. */
-        unsigned long vm_flags;         /* Flags, listed below. */
+        unsigned long vm_flags;         /* Flags, see mm.h. */
        struct rb_node vm_rb;
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 07112ee9293a..8a455694d682 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -6,7 +6,6 @@
 #ifdef __KERNEL__
 #include <linux/in.h>
 #endif
-#include <linux/pim.h>
 /*
 *      Based on the MROUTING 3.5 defines primarily to keep
@@ -130,6 +129,7 @@ struct igmpmsg
 */
 #ifdef __KERNEL__
+#include <linux/pim.h>
 #include <net/sock.h>
 #ifdef CONFIG_IP_MROUTE
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 5cf50473a10f..6f4c180179e2 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -115,6 +115,7 @@ struct sioc_mif_req6
 #ifdef __KERNEL__
+#include <linux/pim.h>
 #include <linux/skbuff.h>       /* for struct sk_buff_head */
 #ifdef CONFIG_IPV6_MROUTE
diff --git a/include/linux/net.h b/include/linux/net.h
index 4a9a30f2d68f..6dc14a240042 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -18,16 +18,9 @@
 #ifndef _LINUX_NET_H
 #define _LINUX_NET_H
-#include <linux/wait.h>
 #include <linux/socket.h>
-#include <linux/fcntl.h>        /* For O_CLOEXEC and O_NONBLOCK */
 #include <asm/socket.h>
-struct poll_table_struct;
-struct pipe_inode_info;
-struct inode;
-struct net;
 #define NPROTO          AF_MAX
 #define SYS_SOCKET      1               /* sys_socket(2)                */
@@ -62,6 +55,13 @@ typedef enum {
 #ifdef __KERNEL__
 #include <linux/stringify.h>
 #include <linux/random.h>
+#include <linux/wait.h>
+#include <linux/fcntl.h>        /* For O_CLOEXEC and O_NONBLOCK */
+struct poll_table_struct;
+struct pipe_inode_info;
+struct inode;
+struct net;
 #define SOCK_ASYNC_NOSPACE      0
 #define SOCK_ASYNC_WAITDATA     1
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 3ba25065fa96..8837928fbf33 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -57,6 +57,15 @@ static inline acpi_status pcie_osc_support_set(u32 flags)
 {
        return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);
 }
+static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
+{
+        /* Find root host bridge */
+        while (pdev->bus->self)
+                pdev = pdev->bus->self;
+        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus),
+                        pdev->bus->number);
+}
 #else
 #if !defined(AE_ERROR)
 typedef u32             acpi_status;
@@ -66,6 +75,8 @@ static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {return AE_ERROR;}
 static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} 
 static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}
+static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
+{ return NULL; }
 #endif
 #endif  /* _PCI_ACPI_H_ */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9ec2bcce8e83..f1624b396754 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2428,6 +2428,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3     0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4     0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5     0x3a60
+#define PCI_DEVICE_ID_INTEL_PCH_0       0x3b10
+#define PCI_DEVICE_ID_INTEL_PCH_1       0x3b11
+#define PCI_DEVICE_ID_INTEL_PCH_2       0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB    0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16     0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21     0x65f5
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 22921ac4cfd9..d7e98ff8021e 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -161,4 +161,13 @@ pid_t pid_vnr(struct pid *pid);
                        }                                               \
        } while (0)
+#define do_each_pid_thread(pid, type, task)                             \
+        do_each_pid_task(pid, type, task) {                             \
+                struct task_struct *tg___ = task;                       \
+                do {
+#define while_each_pid_thread(pid, type, task)                          \
+                } while_each_thread(tg___, task);                       \
+                task = tg___;                                           \
+        } while_each_pid_task(pid, type, task)
 #endif /* _LINUX_PID_H */
diff --git a/include/linux/pim.h b/include/linux/pim.h
index 236ffd317394..1ba0661561a4 100644
--- a/include/linux/pim.h
+++ b/include/linux/pim.h
@@ -3,22 +3,6 @@
 #include <asm/byteorder.h>
-#ifndef __KERNEL__
-struct pim {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8    pim_type:4,             /* PIM message type */
-                pim_ver:4;              /* PIM version */
-#elif defined(__BIG_ENDIAN_BITFIELD)
-        __u8    pim_ver:4;              /* PIM version */
-                pim_type:4;             /* PIM message type */
-#endif
-        __u8    pim_rsv;                /* Reserved */
-        __be16  pim_cksum;              /* Checksum */
-};
-#define PIM_MINLEN              8
-#endif
 /* Message types - V1 */
 #define PIM_V1_VERSION          __constant_htonl(0x10000000)
 #define PIM_V1_REGISTER         1
@@ -27,7 +11,6 @@ struct pim {
 #define PIM_VERSION             2
 #define PIM_REGISTER            1
-#if defined(__KERNEL__)
 #define PIM_NULL_REGISTER       __constant_htonl(0x40000000)
 /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
@@ -42,4 +25,3 @@ struct pimreghdr
 struct sk_buff;
 extern int pim_rcv_v1(struct sk_buff *);
 #endif
-#endif
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h
index 39b66713a0bb..bd466439c588 100644
--- a/include/linux/quicklist.h
+++ b/include/linux/quicklist.h
@@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *),
 unsigned long quicklist_total_size(void);
+#else
+static inline unsigned long quicklist_total_size(void)
+{
+        return 0;
+}
 #endif
 #endif /* LINUX_QUICKLIST_H */
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index b93b541cf111..988e55fe649b 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -59,6 +59,7 @@ extern void machine_crash_shutdown(struct pt_regs *);
 * Architecture independent implemenations of sys_reboot commands.
 */
+extern void kernel_restart_prepare(char *cmd);
 extern void kernel_restart(char *cmd);
 extern void kernel_halt(void);
 extern void kernel_power_off(void);
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 69407f85e10b..fed6f5e0b411 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -102,7 +102,7 @@ int try_to_unmap(struct page *, int ignore_refs);
 * Called from mm/filemap_xip.c to unmap empty zero page
 */
 pte_t *page_check_address(struct page *, struct mm_struct *,
-                                unsigned long, spinlock_t **);
+                                unsigned long, spinlock_t **, int);
 /*
 * Used by swapoff to help locate where page is expected in vma.
diff --git a/include/linux/security.h b/include/linux/security.h
index fd96e7f8a6f9..80c4d002864c 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -46,8 +46,8 @@ struct audit_krule;
 */
 extern int cap_capable(struct task_struct *tsk, int cap);
 extern int cap_settime(struct timespec *ts, struct timezone *tz);
-extern int cap_ptrace(struct task_struct *parent, struct task_struct *child,
+extern int cap_ptrace_may_access(struct task_struct *child, unsigned int mode);
-                      unsigned int mode);
+extern int cap_ptrace_traceme(struct task_struct *parent);
 extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
 extern int cap_capset_check(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
 extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
@@ -1157,17 +1157,24 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @alter contains the flag indicating whether changes are to be made.
 *      Return 0 if permission is granted.
 *
- * @ptrace:
+ * @ptrace_may_access:
- *      Check permission before allowing the @parent process to trace the
+ *      Check permission before allowing the current process to trace the
 *      @child process.
 *      Security modules may also want to perform a process tracing check
 *      during an execve in the set_security or apply_creds hooks of
 *      binprm_security_ops if the process is being traced and its security
 *      attributes would be changed by the execve.
- *      @parent contains the task_struct structure for parent process.
+ *      @child contains the task_struct structure for the target process.
- *      @child contains the task_struct structure for child process.
 *      @mode contains the PTRACE_MODE flags indicating the form of access.
 *      Return 0 if permission is granted.
+ * @ptrace_traceme:
+ *      Check that the @parent process has sufficient permission to trace the
+ *      current process before allowing the current process to present itself
+ *      to the @parent process for tracing.
+ *      The parent process will still have to undergo the ptrace_may_access
+ *      checks before it is allowed to trace this one.
+ *      @parent contains the task_struct structure for debugger process.
+ *      Return 0 if permission is granted.
 * @capget:
 *      Get the @effective, @inheritable, and @permitted capability sets for
 *      the @target process.  The hook may also perform permission checking to
@@ -1287,8 +1294,8 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 struct security_operations {
        char name[SECURITY_NAME_MAX + 1];
-        int (*ptrace) (struct task_struct *parent, struct task_struct *child,
+        int (*ptrace_may_access) (struct task_struct *child, unsigned int mode);
-                       unsigned int mode);
+        int (*ptrace_traceme) (struct task_struct *parent);
        int (*capget) (struct task_struct *target,
                       kernel_cap_t *effective,
                       kernel_cap_t *inheritable, kernel_cap_t *permitted);
@@ -1560,8 +1567,8 @@ extern struct dentry *securityfs_create_dir(const char *name, struct dentry *par
 extern void securityfs_remove(struct dentry *dentry);
 /* Security operations */
-int security_ptrace(struct task_struct *parent, struct task_struct *child,
+int security_ptrace_may_access(struct task_struct *child, unsigned int mode);
-                    unsigned int mode);
+int security_ptrace_traceme(struct task_struct *parent);
 int security_capget(struct task_struct *target,
                    kernel_cap_t *effective,
                    kernel_cap_t *inheritable,
@@ -1742,11 +1749,15 @@ static inline int security_init(void)
        return 0;
 }
-static inline int security_ptrace(struct task_struct *parent,
+static inline int security_ptrace_may_access(struct task_struct *child,
-                                  struct task_struct *child,
+                                             unsigned int mode)
-                                  unsigned int mode)
+{
+        return cap_ptrace_may_access(child, mode);
+}
+static inline int security_ptrace_traceme(struct task_struct *parent)
 {
-        return cap_ptrace(parent, child, mode);
+        return cap_ptrace_traceme(parent);
 }
 static inline int security_capget(struct task_struct *target,
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 358661c9990e..909923717830 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1452,6 +1452,10 @@ extern int	       skb_copy_datagram_iovec(const struct sk_buff *from,
 extern int             skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
                                                        int hlen,
                                                        struct iovec *iov);
+extern int             skb_copy_datagram_from_iovec(struct sk_buff *skb,
+                                                    int offset,
+                                                    struct iovec *from,
+                                                    int len);
 extern void            skb_free_datagram(struct sock *sk, struct sk_buff *skb);
 extern int             skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
                                         unsigned int flags);
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index f1cb0ba6d715..faf1519b5adc 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -3,16 +3,13 @@
 /* "Bogolock": stop the entire machine, disable interrupts.  This is a
   very heavy lock, which is equivalent to grabbing every spinlock
   (and more).  So the "read" side to such a lock is anything which
-   diables preeempt. */
+   disables preeempt. */
 #include <linux/cpu.h>
 #include <linux/cpumask.h>
 #include <asm/system.h>
 #if defined(CONFIG_STOP_MACHINE) && defined(CONFIG_SMP)
-/* Deprecated, but useful for transition. */
-#define ALL_CPUS ~0U
 /**
 * stop_machine: freeze the machine on all CPUs and run this function
 * @fn: the function to run
@@ -50,18 +47,4 @@ static inline int stop_machine(int (*fn)(void *), void *data,
        return ret;
 }
 #endif /* CONFIG_SMP */
-static inline int __deprecated stop_machine_run(int (*fn)(void *), void *data,
-                                                unsigned int cpu)
-{
-        /* If they don't care which cpu fn runs on, just pick one. */
-        if (cpu == NR_CPUS)
-                return stop_machine(fn, data, NULL);
-        else if (cpu == ~0U)
-                return stop_machine(fn, data, &cpu_possible_map);
-        else {
-                cpumask_t cpus = cpumask_of_cpu(cpu);
-                return stop_machine(fn, data, &cpus);
-        }
-}
 #endif /* _LINUX_STOP_MACHINE */
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index ef2e3a20bf3b..dc05b54bd3a3 100644
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -143,7 +143,6 @@ struct svcxprt_rdma {
        unsigned long        sc_flags;
        struct list_head     sc_dto_q;          /* DTO tasklet I/O pending Q */
        struct list_head     sc_read_complete_q;
-        spinlock_t           sc_read_complete_lock;
        struct work_struct   sc_work;
 };
 /* sc_flags */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index c63435095970..2ce8207686e2 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -217,11 +217,11 @@ struct platform_hibernation_ops {
 #ifdef CONFIG_HIBERNATION
 /* kernel/power/snapshot.c */
 extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
-static inline void register_nosave_region(unsigned long b, unsigned long e)
+static inline void __init register_nosave_region(unsigned long b, unsigned long e)
 {
        __register_nosave_region(b, e, 0);
 }
-static inline void register_nosave_region_late(unsigned long b, unsigned long e)
+static inline void __init register_nosave_region_late(unsigned long b, unsigned long e)
 {
        __register_nosave_region(b, e, 1);
 }
diff --git a/include/linux/tick.h b/include/linux/tick.h
index d3c02695dc5d..8cf8cfe2cc97 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -74,10 +74,13 @@ extern struct tick_device *tick_get_device(int cpu);
 extern int tick_init_highres(void);
 extern int tick_program_event(ktime_t expires, int force);
 extern void tick_setup_sched_timer(void);
+# endif
+# if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS
 extern void tick_cancel_sched_timer(int cpu);
 # else
 static inline void tick_cancel_sched_timer(int cpu) { }
-# endif /* HIGHRES */
+# endif
 # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 extern struct tick_device *tick_get_broadcast_device(void);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index e3579cb086e0..0cbec74ec086 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -331,6 +331,8 @@ extern int tty_write_room(struct tty_struct *tty);
 extern void tty_driver_flush_buffer(struct tty_struct *tty);
 extern void tty_throttle(struct tty_struct *tty);
 extern void tty_unthrottle(struct tty_struct *tty);
+extern int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
+                                                struct winsize *ws);
 extern int is_current_pgrp_orphaned(void);
 extern struct pid *tty_get_pgrp(struct tty_struct *tty);
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index e1065ac0d922..16d27944c321 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -168,6 +168,18 @@
 *
 *      Optional: If not provided then the write method is called under
 *      the atomic write lock to keep it serialized with the ldisc.
+ *
+ * int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty,
+ *                              unsigned int rows, unsigned int cols);
+ *
+ *      Called when a termios request is issued which changes the
+ *      requested terminal geometry.
+ *
+ *      Optional: the default action is to update the termios structure
+ *      without error. This is usually the correct behaviour. Drivers should
+ *      not force errors here if they are not resizable objects (eg a serial
+ *      line). See tty_do_resize() if you need to wrap the standard method
+ *      in your own logic - the usual case.
 */
 #include <linux/fs.h>
@@ -206,6 +218,8 @@ struct tty_operations {
        int (*tiocmget)(struct tty_struct *tty, struct file *file);
        int (*tiocmset)(struct tty_struct *tty, struct file *file,
                        unsigned int set, unsigned int clear);
+        int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty,
+                                struct winsize *ws);
 #ifdef CONFIG_CONSOLE_POLL
        int (*poll_init)(struct tty_driver *driver, int line, char *options);
        int (*poll_get_char)(struct tty_driver *driver, int line);
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 0924cd9c30f6..94ac74aba6b6 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -110,6 +110,8 @@ enum usb_interface_condition {
 * @sysfs_files_created: sysfs attributes exist
 * @needs_remote_wakeup: flag set when the driver requires remote-wakeup
 *      capability during autosuspend.
+ * @needs_altsetting0: flag set when a set-interface request for altsetting 0
+ *      has been deferred.
 * @needs_binding: flag set when the driver should be re-probed or unbound
 *      following a reset or suspend operation it doesn't support.
 * @dev: driver model's view of this device
@@ -162,6 +164,7 @@ struct usb_interface {
        unsigned is_active:1;           /* the interface is not suspended */
        unsigned sysfs_files_created:1; /* the sysfs attributes exist */
        unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */
+        unsigned needs_altsetting0:1;   /* switch to altsetting 0 is pending */
        unsigned needs_binding:1;       /* needs delayed unbind/rebind */
        struct device dev;              /* interface specific device info */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index e466bd54a50e..e65a6bed4e3e 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -55,13 +55,13 @@
 */
 #ifndef __LINUX_VIDEODEV2_H
 #define __LINUX_VIDEODEV2_H
 #ifdef __KERNEL__
 #include <linux/time.h>     /* need struct timeval */
-#include <linux/compiler.h> /* need __user */
 #else
-#define __user
 #include <sys/time.h>
 #endif
+#include <linux/compiler.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 364789aae9f3..328eb4022727 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -4,9 +4,9 @@
 #include <linux/spinlock.h>
 #include <asm/page.h>           /* pgprot_t */
-struct vm_area_struct;
+struct vm_area_struct;          /* vma defining user mapping in mm_types.h */
-/* bits in vm_struct->flags */
+/* bits in flags of vmalloc's vm_struct below */
 #define VM_IOREMAP      0x00000001      /* ioremap() and friends */
 #define VM_ALLOC        0x00000002      /* vmalloc() */
 #define VM_MAP          0x00000004      /* vmap()ed pages */
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 1c78d56c57e5..1cbd0a7db4e6 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -35,7 +35,6 @@ extern int fg_console, last_console, want_console;
 int vc_allocate(unsigned int console);
 int vc_cons_allocated(unsigned int console);
 int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines);
-int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines);
 void vc_deallocate(unsigned int console);
 void reset_palette(struct vc_data *vc);
 void do_blank_screen(int entering_gfx);