71 files changed, 2628 insertions, 945 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index aeaf7cd41dc7..4db89e98535d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -191,14 +191,12 @@ acpi_evaluate_object(acpi_handle object,
                     struct acpi_object_list *parameter_objects,
                     struct acpi_buffer *return_object_buffer);
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_evaluate_object_typed(acpi_handle object,
                           acpi_string pathname,
                           struct acpi_object_list *external_params,
                           struct acpi_buffer *return_buffer,
                           acpi_object_type return_type);
-#endif
 acpi_status
 acpi_get_object_info(acpi_handle handle, struct acpi_buffer *return_buffer);
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 6617c9f8f2ca..cb79b7a208e1 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -29,6 +29,8 @@
 #ifndef __LINUX_ATA_H__
 #define __LINUX_ATA_H__
+#include <linux/kernel.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -91,6 +93,7 @@ enum {
        ATA_ID_CFA_POWER        = 160,
        ATA_ID_CFA_KEY_MGMT     = 162,
        ATA_ID_CFA_MODES        = 163,
+        ATA_ID_DATA_SET_MGMT    = 169,
        ATA_ID_ROT_SPEED        = 217,
        ATA_ID_PIO4             = (1 << 1),
@@ -248,6 +251,7 @@ enum {
        ATA_CMD_SMART           = 0xB0,
        ATA_CMD_MEDIA_LOCK      = 0xDE,
        ATA_CMD_MEDIA_UNLOCK    = 0xDF,
+        ATA_CMD_DSM             = 0x06,
        /* marked obsolete in the ATA/ATAPI-7 spec */
        ATA_CMD_RESTORE         = 0x10,
@@ -321,6 +325,9 @@ enum {
        ATA_SMART_READ_VALUES   = 0xD0,
        ATA_SMART_READ_THRESHOLDS = 0xD1,
+        /* feature values for Data Set Management */
+        ATA_DSM_TRIM            = 0x01,
        /* password used in LBA Mid / LBA High for executing SMART commands */
        ATA_SMART_LBAM_PASS     = 0x4F,
        ATA_SMART_LBAH_PASS     = 0xC2,
@@ -723,6 +730,14 @@ static inline int ata_id_has_unload(const u16 *id)
        return 0;
 }
+static inline int ata_id_has_trim(const u16 *id)
+{
+        if (ata_id_major_version(id) >= 7 &&
+            (id[ATA_ID_DATA_SET_MGMT] & 1))
+                return 1;
+        return 0;
+}
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -863,6 +878,32 @@ static inline void ata_id_to_hd_driveid(u16 *id)
 #endif
 }
+/*
+ * Write up to 'max' LBA Range Entries to the buffer that will cover the
+ * extent from sector to sector + count.  This is used for TRIM and for
+ * ADD LBA(S) TO NV CACHE PINNED SET.
+ */
+static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
+                                                u64 sector, unsigned long count)
+{
+        __le64 *buffer = _buffer;
+        unsigned i = 0;
+        while (i < max) {
+                u64 entry = sector |
+                        ((u64)(count > 0xffff ? 0xffff : count) << 48);
+                buffer[i++] = __cpu_to_le64(entry);
+                if (count <= 0xffff)
+                        break;
+                count -= 0xffff;
+                sector += 0xffff;
+        }
+        max = ALIGN(i * 8, 512);
+        memset(buffer + i, 0, max - i * 8);
+        return max;
+}
 static inline int is_multi_taskfile(struct ata_taskfile *tf)
 {
        return (tf->command == ATA_CMD_READ_MULTI) ||
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index bee52abb8a4d..0ec2c594868e 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -24,8 +24,8 @@ struct dentry;
 */
 enum bdi_state {
        BDI_pdflush,            /* A pdflush thread is working this device */
-        BDI_write_congested,    /* The write queue is getting full */
+        BDI_async_congested,    /* The async (write) queue is getting full */
-        BDI_read_congested,     /* The read queue is getting full */
+        BDI_sync_congested,     /* The sync queue is getting full */
        BDI_unused,             /* Available bits start here */
 };
@@ -215,18 +215,18 @@ static inline int bdi_congested(struct backing_dev_info *bdi, int bdi_bits)
 static inline int bdi_read_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_read_congested);
+        return bdi_congested(bdi, 1 << BDI_sync_congested);
 }
 static inline int bdi_write_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, 1 << BDI_write_congested);
+        return bdi_congested(bdi, 1 << BDI_async_congested);
 }
 static inline int bdi_rw_congested(struct backing_dev_info *bdi)
 {
-        return bdi_congested(bdi, (1 << BDI_read_congested)|
+        return bdi_congested(bdi, (1 << BDI_sync_congested) |
-                                  (1 << BDI_write_congested));
+                                  (1 << BDI_async_congested));
 }
 void clear_bdi_congested(struct backing_dev_info *bdi, int rw);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index b05b1d4d17d2..b900d2c67d29 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -145,20 +145,21 @@ struct bio {
 * bit 2 -- barrier
 *      Insert a serialization point in the IO queue, forcing previously
 *      submitted IO to be completed before this one is issued.
- * bit 3 -- synchronous I/O hint: the block layer will unplug immediately
+ * bit 3 -- synchronous I/O hint.
- *      Note that this does NOT indicate that the IO itself is sync, just
+ * bit 4 -- Unplug the device immediately after submitting this bio.
- *      that the block layer will not postpone issue of this IO by plugging.
+ * bit 5 -- metadata request
- * bit 4 -- metadata request
 *      Used for tracing to differentiate metadata and data IO. May also
 *      get some preferential treatment in the IO scheduler
- * bit 5 -- discard sectors
+ * bit 6 -- discard sectors
 *      Informs the lower level device that this range of sectors is no longer
 *      used by the file system and may thus be freed by the device. Used
 *      for flash based storage.
- * bit 6 -- fail fast device errors
+ * bit 7 -- fail fast device errors
- * bit 7 -- fail fast transport errors
+ * bit 8 -- fail fast transport errors
- * bit 8 -- fail fast driver errors
+ * bit 9 -- fail fast driver errors
 *      Don't want driver retries for any fast fail whatever the reason.
+ * bit 10 -- Tell the IO scheduler not to wait for more requests after this
+        one has been submitted, even if it is a SYNC request.
 */
 #define BIO_RW          0       /* Must match RW in req flags (blkdev.h) */
 #define BIO_RW_AHEAD    1       /* Must match FAILFAST in req flags */
@@ -170,6 +171,7 @@ struct bio {
 #define BIO_RW_FAILFAST_DEV             7
 #define BIO_RW_FAILFAST_TRANSPORT       8
 #define BIO_RW_FAILFAST_DRIVER          9
+#define BIO_RW_NOIDLE   10
 #define bio_rw_flagged(bio, flag)       ((bio)->bi_rw & (1 << (flag)))
@@ -188,6 +190,7 @@ struct bio {
 #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)
+#define bio_noidle(bio)         bio_rw_flagged(bio, BIO_RW_NOIDLE)
 /*
 * upper 16 bits of bi_rw define the io priority of this bio
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 465d6babc847..ba54c834a590 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -38,6 +38,10 @@ struct request;
 typedef void (rq_end_io_fn)(struct request *, int);
 struct request_list {
+        /*
+         * count[], starved[], and wait[] are indexed by
+         * BLK_RW_SYNC/BLK_RW_ASYNC
+         */
        int count[2];
        int starved[2];
        int elvpriv;
@@ -66,6 +70,11 @@ enum rq_cmd_type_bits {
        REQ_TYPE_ATA_PC,
 };
+enum {
+        BLK_RW_ASYNC    = 0,
+        BLK_RW_SYNC     = 1,
+};
 /*
 * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
 * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
@@ -103,12 +112,12 @@ enum rq_flag_bits {
        __REQ_QUIET,            /* don't worry about errors */
        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
        __REQ_ORDERED_COLOR,    /* is before or after barrier */
-        __REQ_RW_SYNC,          /* request is sync (O_DIRECT) */
+        __REQ_RW_SYNC,          /* request is sync (sync write or read) */
        __REQ_ALLOCED,          /* request came from our alloc pool */
        __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_NOIDLE,           /* Don't anticipate more IO after this one */
        __REQ_NR_BITS,          /* stops here */
 };
@@ -135,7 +144,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 REQ_NOIDLE      (1 << __REQ_NOIDLE)
 #define BLK_MAX_CDB     16
@@ -438,8 +447,8 @@ struct request_queue
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */
-#define QUEUE_FLAG_READFULL     3       /* read queue has been filled */
+#define QUEUE_FLAG_SYNCFULL     3       /* read queue has been filled */
-#define QUEUE_FLAG_WRITEFULL    4       /* write queue has been filled */
+#define QUEUE_FLAG_ASYNCFULL    4       /* write queue has been filled */
 #define QUEUE_FLAG_DEAD         5       /* queue being torn down */
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
 #define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
@@ -611,32 +620,42 @@ enum {
 #define rq_data_dir(rq)         ((rq)->cmd_flags & 1)
 /*
- * We regard a request as sync, if it's a READ or a SYNC write.
+ * We regard a request as sync, if either a read or a sync write
 */
-#define rq_is_sync(rq)          (rq_data_dir((rq)) == READ || (rq)->cmd_flags & REQ_RW_SYNC)
+static inline bool rw_is_sync(unsigned int rw_flags)
+{
+        return !(rw_flags & REQ_RW) || (rw_flags & REQ_RW_SYNC);
+}
+static inline bool rq_is_sync(struct request *rq)
+{
+        return rw_is_sync(rq->cmd_flags);
+}
 #define rq_is_meta(rq)          ((rq)->cmd_flags & REQ_RW_META)
+#define rq_noidle(rq)           ((rq)->cmd_flags & REQ_NOIDLE)
-static inline int blk_queue_full(struct request_queue *q, int rw)
+static inline int blk_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                return test_bit(QUEUE_FLAG_READFULL, &q->queue_flags);
+                return test_bit(QUEUE_FLAG_SYNCFULL, &q->queue_flags);
-        return test_bit(QUEUE_FLAG_WRITEFULL, &q->queue_flags);
+        return test_bit(QUEUE_FLAG_ASYNCFULL, &q->queue_flags);
 }
-static inline void blk_set_queue_full(struct request_queue *q, int rw)
+static inline void blk_set_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                queue_flag_set(QUEUE_FLAG_READFULL, q);
+                queue_flag_set(QUEUE_FLAG_SYNCFULL, q);
        else
-                queue_flag_set(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_set(QUEUE_FLAG_ASYNCFULL, q);
 }
-static inline void blk_clear_queue_full(struct request_queue *q, int rw)
+static inline void blk_clear_queue_full(struct request_queue *q, int sync)
 {
-        if (rw == READ)
+        if (sync)
-                queue_flag_clear(QUEUE_FLAG_READFULL, q);
+                queue_flag_clear(QUEUE_FLAG_SYNCFULL, q);
        else
-                queue_flag_clear(QUEUE_FLAG_WRITEFULL, q);
+                queue_flag_clear(QUEUE_FLAG_ASYNCFULL, q);
 }
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 6faa7e549de4..cebfdcd3dbdd 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -114,7 +114,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 * "Define 'is'", Bill Clinton
 * "Define 'if'", Steven Rostedt
 */
-#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :          \
+#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+#define __trace_if(cond) \
+        if (__builtin_constant_p((cond)) ? !!(cond) :                   \
        ({                                                              \
                int ______r;                                            \
                static struct ftrace_branch_data                        \
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index d7d090d21031..8083b6a36a38 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -115,7 +115,7 @@ static inline u64 dma_get_mask(struct device *dev)
 {
        if (dev && dev->dma_mask && *dev->dma_mask)
                return *dev->dma_mask;
-        return DMA_32BIT_MASK;
+        return DMA_BIT_MASK(32);
 }
 extern u64 dma_get_required_mask(struct device *dev);
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 2f3427468956..e397dc342cda 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -34,6 +34,7 @@ struct dmar_drhd_unit {
        u64     reg_base_addr;          /* register base address*/
        struct  pci_dev **devices;      /* target device array  */
        int     devices_cnt;            /* target device count  */
+        u16     segment;                /* PCI domain           */
        u8      ignored:1;              /* ignore drhd          */
        u8      include_all:1;
        struct intel_iommu *iommu;
@@ -44,6 +45,14 @@ extern struct list_head dmar_drhd_units;
 #define for_each_drhd_unit(drhd) \
        list_for_each_entry(drhd, &dmar_drhd_units, list)
+#define for_each_active_iommu(i, drhd)                                  \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, drhd->ignored) {} else
+#define for_each_iommu(i, drhd)                                         \
+        list_for_each_entry(drhd, &dmar_drhd_units, list)               \
+                if (i=drhd->iommu, 0) {} else 
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
@@ -100,6 +109,8 @@ struct irte {
 #ifdef CONFIG_INTR_REMAP
 extern int intr_remapping_enabled;
 extern int enable_intr_remapping(int);
+extern void disable_intr_remapping(void);
+extern int reenable_intr_remapping(int);
 extern int get_irte(int irq, struct irte *entry);
 extern int modify_irte(int irq, struct irte *irte_modified);
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7a204256b155..c59b769f62b0 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -116,6 +116,7 @@ extern void elv_abort_queue(struct request_queue *);
 extern void elv_completed_request(struct request_queue *, struct request *);
 extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
 extern void elv_put_request(struct request_queue *, struct request *);
+extern void elv_drain_elevator(struct request_queue *);
 /*
 * io scheduler registration
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 09d6c5bbdddd..a2ec74bc4812 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -5,12 +5,14 @@
 #ifndef __LINUX_FDTABLE_H
 #define __LINUX_FDTABLE_H
-#include <asm/atomic.h>
 #include <linux/posix_types.h>
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
 #include <linux/types.h>
+#include <linux/init.h>
+#include <asm/atomic.h>
 /*
 * The default fd array needs to be at least BITS_PER_LONG,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a09e17c8f5fd..562d2855cf30 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -95,8 +95,12 @@ struct inodes_stat_t {
 #define SWRITE 3        /* for ll_rw_block() - wait for buffer lock */
 #define READ_SYNC       (READ | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
 #define READ_META       (READ | (1 << BIO_RW_META))
-#define WRITE_SYNC      (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
-#define SWRITE_SYNC     (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_SYNC      (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
+#define WRITE_ODIRECT   (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define SWRITE_SYNC_PLUG        \
+                        (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
+#define SWRITE_SYNC     (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
 #define WRITE_BARRIER   (WRITE | (1 << BIO_RW_BARRIER))
 #define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD)
 #define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER))
@@ -1695,6 +1699,9 @@ struct file_system_type {
        struct lock_class_key i_alloc_sem_key;
 };
+extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
+        int (*fill_super)(struct super_block *, void *, int),
+        struct vfsmount *mnt);
 extern int get_sb_bdev(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data,
        int (*fill_super)(struct super_block *, void *, int),
@@ -2337,19 +2344,7 @@ ssize_t simple_transaction_read(struct file *file, char __user *buf,
                                size_t size, loff_t *pos);
 int simple_transaction_release(struct inode *inode, struct file *file);
-static inline void simple_transaction_set(struct file *file, size_t n)
+void simple_transaction_set(struct file *file, size_t n);
-{
-        struct simple_transaction_argresp *ar = file->private_data;
-        BUG_ON(n > SIMPLE_TRANSACTION_LIMIT);
-        /*
-         * The barrier ensures that ar->size will really remain zero until
-         * ar->data is ready for reading.
-         */
-        smp_mb();
-        ar->size = n;
-}
 /*
 * simple attribute files
@@ -2396,27 +2391,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf,
 ssize_t simple_attr_write(struct file *file, const char __user *buf,
                          size_t len, loff_t *ppos);
-#ifdef CONFIG_SECURITY
-static inline char *alloc_secdata(void)
-{
-        return (char *)get_zeroed_page(GFP_KERNEL);
-}
-static inline void free_secdata(void *secdata)
-{
-        free_page((unsigned long)secdata);
-}
-#else
-static inline char *alloc_secdata(void)
-{
-        return (char *)1;
-}
-static inline void free_secdata(void *secdata)
-{ }
-#endif  /* CONFIG_SECURITY */
 struct ctl_table;
 int proc_nr_files(struct ctl_table *table, int write, struct file *filp,
                  void __user *buffer, size_t *lenp, loff_t *ppos);
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 7ef1caf50269..f2a78b5e8b55 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -18,7 +18,6 @@
 #define _FSL_DEVICE_H_
 #include <linux/types.h>
-#include <linux/phy.h>
 /*
 * Some conventions on how we handle peripherals on Freescale chips
@@ -44,27 +43,6 @@
 *
 */
-struct gianfar_platform_data {
-        /* device specific information */
-        u32     device_flags;
-        char    bus_id[BUS_ID_SIZE];
-        phy_interface_t interface;
-};
-struct gianfar_mdio_data {
-        /* board specific information */
-        int     irq[32];
-};
-/* Flags in gianfar_platform_data */
-#define FSL_GIANFAR_BRD_HAS_PHY_INTR    0x00000001 /* set or use a timer */
-#define FSL_GIANFAR_BRD_IS_REDUCED      0x00000002 /* Set if RGMII, RMII */
-struct fsl_i2c_platform_data {
-        /* device specific information */
-        u32     device_flags;
-};
 /* Flags related to I2C device features */
 #define FSL_I2C_DEV_SEPARATE_DFSRR      0x00000001
 #define FSL_I2C_DEV_CLOCK_5200          0x00000002
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index bd37078c2d7d..0d2f7c8a33d6 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -336,6 +336,11 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
                         const enum hrtimer_mode mode);
 extern int hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
                        unsigned long range_ns, const enum hrtimer_mode mode);
+extern int
+__hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+                         unsigned long delta_ns,
+                         const enum hrtimer_mode mode, int wakeup);
 extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
diff --git a/include/linux/i2c-algo-sgi.h b/include/linux/i2c-algo-sgi.h
deleted file mode 100644
index 3b7715024e69..000000000000
--- a/include/linux/i2c-algo-sgi.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- */
-#ifndef I2C_ALGO_SGI_H
-#define I2C_ALGO_SGI_H 1
-#include <linux/i2c.h>
-struct i2c_algo_sgi_data {
-        void *data;     /* private data for lowlevel routines */
-        unsigned (*getctrl)(void *data);
-        void (*setctrl)(void *data, unsigned val);
-        unsigned (*rdata)(void *data);
-        void (*wdata)(void *data, unsigned val);
-        int xfer_timeout;
-        int ack_timeout;
-};
-int i2c_sgi_add_bus(struct i2c_adapter *);
-#endif /* I2C_ALGO_SGI_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index f27604af8378..c9087de5c6c6 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -33,47 +33,10 @@
 #define I2C_DRIVERID_MSP3400     1
 #define I2C_DRIVERID_TUNER       2
-#define I2C_DRIVERID_TEA6420     5      /* audio matrix switch          */
-#define I2C_DRIVERID_TEA6415C    6      /* video matrix switch          */
-#define I2C_DRIVERID_TDA9840     7      /* stereo sound processor       */
-#define I2C_DRIVERID_SAA7111A    8      /* video input processor        */
-#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_TDA7432    27      /* Stereo sound processor       */
 #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                 */
-#define I2C_DRIVERID_BT856      41     /* video encoder                 */
-#define I2C_DRIVERID_VPX3220    42     /* video decoder+vbi/vtxt        */
-#define I2C_DRIVERID_ADV7175    48     /* ADV 7175/7176 video encoder   */
-#define I2C_DRIVERID_SAA7114    49      /* video decoder                */
-#define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#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_SAA6752HS  67      /* MPEG2 encoder                */
-#define I2C_DRIVERID_TVEEPROM   68      /* TV EEPROM                    */
-#define I2C_DRIVERID_WM8775     69      /* wm8775 audio processor       */
-#define I2C_DRIVERID_CS53L32A   70      /* cs53l32a audio processor     */
-#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_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_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_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
-#define I2C_DRIVERID_M52790     95      /* Mitsubishi M52790SP/FP AV switch */
-#define I2C_DRIVERID_CS5345     96      /* cs5345 audio processor       */
-#define I2C_DRIVERID_AU8522     97      /* Auvitek au8522       */
-#define I2C_DRIVERID_OV7670 1048        /* Omnivision 7670 camera */
 /*
 * ---- Adapter types ----------------------------------------------------
@@ -88,6 +51,7 @@
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_CX23885        0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828         0x010023 /* auvitek au0828 usb bridge */
+#define I2C_HW_B_CX231XX        0x010024 /* Conexant CX231XX USB based cards */
 #define I2C_HW_B_HDPVR          0x010025 /* Hauppauge HD PVR */
 /* --- SGI adapters                                                     */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index c86c3b07604c..00ee11eb9092 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -353,8 +353,8 @@ struct i2c_adapter {
        void *algo_data;
        /* --- administration stuff. */
-        int (*client_register)(struct i2c_client *);
+        int (*client_register)(struct i2c_client *) __deprecated;
-        int (*client_unregister)(struct i2c_client *);
+        int (*client_unregister)(struct i2c_client *) __deprecated;
        /* data fields that are valid for all devices   */
        u8 level;                       /* nesting level for lockdep */
diff --git a/include/linux/i2c/s6000.h b/include/linux/i2c/s6000.h
new file mode 100644
index 000000000000..d9b34bfdae76
--- /dev/null
+++ b/include/linux/i2c/s6000.h
@@ -0,0 +1,10 @@
+#ifndef __LINUX_I2C_S6000_H
+#define __LINUX_I2C_S6000_H
+struct s6_i2c_platform_data {
+        const char *clock; /* the clock to use */
+        int bus_num; /* the bus number to register */
+};
+#endif
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 77214ead1a36..aa8c53171233 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -164,6 +164,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GCMD_QIE (((u32)1) << 26)
 #define DMA_GCMD_SIRTP (((u32)1) << 24)
 #define DMA_GCMD_IRE (((u32) 1) << 25)
+#define DMA_GCMD_CFI (((u32) 1) << 23)
 /* GSTS_REG */
 #define DMA_GSTS_TES (((u32)1) << 31)
@@ -174,6 +175,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)
 #define DMA_GSTS_QIES (((u32)1) << 26)
 #define DMA_GSTS_IRTPS (((u32)1) << 24)
 #define DMA_GSTS_IRES (((u32)1) << 25)
+#define DMA_GSTS_CFIS (((u32)1) << 23)
 /* CCMD_REG */
 #define DMA_CCMD_ICC (((u64)1) << 63)
@@ -284,6 +286,14 @@ struct iommu_flush {
                unsigned int size_order, u64 type, int non_present_entry_flush);
 };
+enum {
+        SR_DMAR_FECTL_REG,
+        SR_DMAR_FEDATA_REG,
+        SR_DMAR_FEADDR_REG,
+        SR_DMAR_FEUADDR_REG,
+        MAX_SR_DMAR_REGS
+};
 struct intel_iommu {
        void __iomem    *reg; /* Pointer to hardware regs, virtual addr */
        u64             cap;
@@ -304,6 +314,8 @@ struct intel_iommu {
        struct iommu_flush flush;
 #endif
        struct q_inval  *qi;            /* Queued invalidation info */
+        u32 *iommu_state; /* Store iommu states between suspend and resume.*/
 #ifdef CONFIG_INTR_REMAP
        struct ir_table *ir_table;      /* Interrupt remapping info */
 #endif
@@ -322,6 +334,7 @@ extern int alloc_iommu(struct dmar_drhd_unit *drhd);
 extern void free_iommu(struct intel_iommu *iommu);
 extern int dmar_enable_qi(struct intel_iommu *iommu);
 extern void dmar_disable_qi(struct intel_iommu *iommu);
+extern int dmar_reenable_qi(struct intel_iommu *iommu);
 extern void qi_global_iec(struct intel_iommu *iommu);
 extern int qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid,
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 675727fb4b47..91bb76f44f14 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -364,6 +364,7 @@ extern void softirq_init(void);
 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
 extern void raise_softirq_irqoff(unsigned int nr);
 extern void raise_softirq(unsigned int nr);
+extern void wakeup_softirqd(void);
 /* This is the worklist that queues up per-cpu softirq work.
 *
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ea330f9e7100..3bf40e246a80 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -25,7 +25,7 @@ struct ipc_ids {
 };
 struct ipc_namespace {
-        struct kref     kref;
+        atomic_t        count;
        struct ipc_ids  ids[3];
        int             sem_ctls[4];
@@ -44,25 +44,57 @@ struct ipc_namespace {
        int             shm_tot;
        struct notifier_block ipcns_nb;
+        /* The kern_mount of the mqueuefs sb.  We take a ref on it */
+        struct vfsmount *mq_mnt;
+        /* # queues in this ns, protected by mq_lock */
+        unsigned int    mq_queues_count;
+        /* next fields are set through sysctl */
+        unsigned int    mq_queues_max;   /* initialized to DFLT_QUEUESMAX */
+        unsigned int    mq_msg_max;      /* initialized to DFLT_MSGMAX */
+        unsigned int    mq_msgsize_max;  /* initialized to DFLT_MSGSIZEMAX */
 };
 extern struct ipc_namespace init_ipc_ns;
 extern atomic_t nr_ipc_ns;
-#ifdef CONFIG_SYSVIPC
+extern spinlock_t mq_lock;
+#if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC)
 #define INIT_IPC_NS(ns)         .ns             = &init_ipc_ns,
+#else
+#define INIT_IPC_NS(ns)
+#endif
+#ifdef CONFIG_SYSVIPC
 extern int register_ipcns_notifier(struct ipc_namespace *);
 extern int cond_register_ipcns_notifier(struct ipc_namespace *);
 extern void unregister_ipcns_notifier(struct ipc_namespace *);
 extern int ipcns_notify(unsigned long);
 #else /* CONFIG_SYSVIPC */
-#define INIT_IPC_NS(ns)
+static inline int register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline int cond_register_ipcns_notifier(struct ipc_namespace *ns)
+{ return 0; }
+static inline void unregister_ipcns_notifier(struct ipc_namespace *ns) { }
+static inline int ipcns_notify(unsigned long l) { return 0; }
 #endif /* CONFIG_SYSVIPC */
-#if defined(CONFIG_SYSVIPC) && defined(CONFIG_IPC_NS)
+#ifdef CONFIG_POSIX_MQUEUE
-extern void free_ipc_ns(struct kref *kref);
+extern int mq_init_ns(struct ipc_namespace *ns);
+/* default values */
+#define DFLT_QUEUESMAX 256     /* max number of message queues */
+#define DFLT_MSGMAX    10      /* max number of messages in each queue */
+#define HARD_MSGMAX    (131072/sizeof(void *))
+#define DFLT_MSGSIZEMAX 8192   /* max message size */
+#else
+static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }
+#endif
+#if defined(CONFIG_IPC_NS)
+extern void free_ipc_ns(struct ipc_namespace *ns);
 extern struct ipc_namespace *copy_ipcs(unsigned long flags,
                                       struct ipc_namespace *ns);
 extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
@@ -72,14 +104,11 @@ extern void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids,
 static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
 {
        if (ns)
-                kref_get(&ns->kref);
+                atomic_inc(&ns->count);
        return ns;
 }
-static inline void put_ipc_ns(struct ipc_namespace *ns)
+extern void put_ipc_ns(struct ipc_namespace *ns);
-{
-        kref_put(&ns->kref, free_ipc_ns);
-}
 #else
 static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
                struct ipc_namespace *ns)
@@ -99,4 +128,18 @@ static inline void put_ipc_ns(struct ipc_namespace *ns)
 {
 }
 #endif
+#ifdef CONFIG_POSIX_MQUEUE_SYSCTL
+struct ctl_table_header;
+extern struct ctl_table_header *mq_register_sysctl_table(void);
+#else /* CONFIG_POSIX_MQUEUE_SYSCTL */
+static inline struct ctl_table_header *mq_register_sysctl_table(void)
+{
+        return NULL;
+}
+#endif /* CONFIG_POSIX_MQUEUE_SYSCTL */
 #endif
diff --git a/include/linux/key.h b/include/linux/key.h
index 21d32a142c00..e544f466d69a 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -20,6 +20,7 @@
 #include <linux/rbtree.h>
 #include <linux/rcupdate.h>
 #include <linux/sysctl.h>
+#include <linux/rwsem.h>
 #include <asm/atomic.h>
 #ifdef __KERNEL__
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 2ec6cc14a114..bcd9c07848be 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -94,12 +94,16 @@ struct kprobe {
        /* Called after addr is executed, unless... */
        kprobe_post_handler_t post_handler;
-        /* ... called if executing addr causes a fault (eg. page fault).
+        /*
-         * Return 1 if it handled fault, otherwise kernel will see it. */
+         * ... called if executing addr causes a fault (eg. page fault).
+         * Return 1 if it handled fault, otherwise kernel will see it.
+         */
        kprobe_fault_handler_t fault_handler;
-        /* ... called if breakpoint trap occurs in probe handler.
+        /*
-         * Return 1 if it handled break, otherwise kernel will see it. */
+         * ... called if breakpoint trap occurs in probe handler.
+         * Return 1 if it handled break, otherwise kernel will see it.
+         */
        kprobe_break_handler_t break_handler;
        /* Saved opcode (which has been replaced with breakpoint) */
@@ -108,18 +112,28 @@ struct kprobe {
        /* copy of the original instruction */
        struct arch_specific_insn ainsn;
-        /* Indicates various status flags.  Protected by kprobe_mutex. */
+        /*
+         * Indicates various status flags.
+         * Protected by kprobe_mutex after this kprobe is registered.
+         */
        u32 flags;
 };
 /* Kprobe status flags */
 #define KPROBE_FLAG_GONE        1 /* breakpoint has already gone */
+#define KPROBE_FLAG_DISABLED    2 /* probe is temporarily disabled */
+/* Has this kprobe gone ? */
 static inline int kprobe_gone(struct kprobe *p)
 {
        return p->flags & KPROBE_FLAG_GONE;
 }
+/* Is this kprobe disabled ? */
+static inline int kprobe_disabled(struct kprobe *p)
+{
+        return p->flags & (KPROBE_FLAG_DISABLED | KPROBE_FLAG_GONE);
+}
 /*
 * Special probe type that uses setjmp-longjmp type tricks to resume
 * execution at a specified entry with a matching prototype corresponding
@@ -279,6 +293,9 @@ void unregister_kretprobes(struct kretprobe **rps, int num);
 void kprobe_flush_task(struct task_struct *tk);
 void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
+int disable_kprobe(struct kprobe *kp);
+int enable_kprobe(struct kprobe *kp);
 #else /* !CONFIG_KPROBES: */
 static inline int kprobes_built_in(void)
@@ -345,5 +362,30 @@ static inline void unregister_kretprobes(struct kretprobe **rps, int num)
 static inline void kprobe_flush_task(struct task_struct *tk)
 {
 }
+static inline int disable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
+static inline int enable_kprobe(struct kprobe *kp)
+{
+        return -ENOSYS;
+}
 #endif /* CONFIG_KPROBES */
+static inline int disable_kretprobe(struct kretprobe *rp)
+{
+        return disable_kprobe(&rp->kp);
+}
+static inline int enable_kretprobe(struct kretprobe *rp)
+{
+        return enable_kprobe(&rp->kp);
+}
+static inline int disable_jprobe(struct jprobe *jp)
+{
+        return disable_kprobe(&jp->kp);
+}
+static inline int enable_jprobe(struct jprobe *jp)
+{
+        return enable_kprobe(&jp->kp);
+}
 #endif /* _LINUX_KPROBES_H */
diff --git a/include/linux/leds-bd2802.h b/include/linux/leds-bd2802.h
new file mode 100644
index 000000000000..42f854a1a199
--- /dev/null
+++ b/include/linux/leds-bd2802.h
@@ -0,0 +1,26 @@
+/*
+ * leds-bd2802.h - RGB LED Driver
+ *
+ * Copyright (C) 2009 Samsung Electronics
+ * Kim Kyuwon <q1.kim@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Datasheet: http://www.rohm.com/products/databook/driver/pdf/bd2802gu-e.pdf
+ *
+ */
+#ifndef _LEDS_BD2802_H_
+#define _LEDS_BD2802_H_
+struct bd2802_led_platform_data{
+        int     reset_gpio;
+        u8      rgb_time;
+};
+#define RGB_TIME(slopedown, slopeup, waveform) \
+        ((slopedown) << 6 | (slopeup) << 4 | (waveform))
+#endif /* _LEDS_BD2802_H_ */
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 24489da701e3..376fe07732ea 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -30,6 +30,7 @@ enum led_brightness {
 struct led_classdev {
        const char              *name;
        int                      brightness;
+        int                      max_brightness;
        int                      flags;
        /* Lower 16 bits reflect status */
@@ -140,7 +141,8 @@ struct gpio_led {
        const char *name;
        const char *default_trigger;
        unsigned        gpio;
-        u8              active_low;
+        u8              active_low : 1;
+        u8              retain_state_suspended : 1;
 };
 struct gpio_led_platform_data {
diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
new file mode 100644
index 000000000000..33a071167489
--- /dev/null
+++ b/include/linux/leds_pwm.h
@@ -0,0 +1,21 @@
+/*
+ * PWM LED driver data - see drivers/leds/leds-pwm.c
+ */
+#ifndef __LINUX_LEDS_PWM_H
+#define __LINUX_LEDS_PWM_H
+struct led_pwm {
+        const char      *name;
+        const char      *default_trigger;
+        unsigned        pwm_id;
+        u8              active_low;
+        unsigned        max_brightness;
+        unsigned        pwm_period_ns;
+};
+struct led_pwm_platform_data {
+        int                     num_leds;
+        struct led_pwm  *leds;
+};
+#endif
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 7dc5b6cb44cd..d39ed1cc5fbf 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -25,13 +25,13 @@ struct svc_rqst;
 #define NLM_MAXCOOKIELEN        32
 #define NLM_MAXSTRLEN           1024
-#define nlm_granted             __constant_htonl(NLM_LCK_GRANTED)
+#define nlm_granted             cpu_to_be32(NLM_LCK_GRANTED)
-#define nlm_lck_denied          __constant_htonl(NLM_LCK_DENIED)
+#define nlm_lck_denied          cpu_to_be32(NLM_LCK_DENIED)
-#define nlm_lck_denied_nolocks  __constant_htonl(NLM_LCK_DENIED_NOLOCKS)
+#define nlm_lck_denied_nolocks  cpu_to_be32(NLM_LCK_DENIED_NOLOCKS)
-#define nlm_lck_blocked         __constant_htonl(NLM_LCK_BLOCKED)
+#define nlm_lck_blocked         cpu_to_be32(NLM_LCK_BLOCKED)
-#define nlm_lck_denied_grace_period     __constant_htonl(NLM_LCK_DENIED_GRACE_PERIOD)
+#define nlm_lck_denied_grace_period     cpu_to_be32(NLM_LCK_DENIED_GRACE_PERIOD)
-#define nlm_drop_reply          __constant_htonl(30000)
+#define nlm_drop_reply          cpu_to_be32(30000)
 /* Lock info passed via NLM */
 struct nlm_lock {
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index 12bfe09de2b1..7353821341ed 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -15,11 +15,11 @@
 #include <linux/lockd/xdr.h>
 /* error codes new to NLMv4 */
-#define nlm4_deadlock           __constant_htonl(NLM_DEADLCK)
+#define nlm4_deadlock           cpu_to_be32(NLM_DEADLCK)
-#define nlm4_rofs               __constant_htonl(NLM_ROFS)
+#define nlm4_rofs               cpu_to_be32(NLM_ROFS)
-#define nlm4_stale_fh           __constant_htonl(NLM_STALE_FH)
+#define nlm4_stale_fh           cpu_to_be32(NLM_STALE_FH)
-#define nlm4_fbig               __constant_htonl(NLM_FBIG)
+#define nlm4_fbig               cpu_to_be32(NLM_FBIG)
-#define nlm4_failed             __constant_htonl(NLM_FAILED)
+#define nlm4_failed             cpu_to_be32(NLM_FAILED)
diff --git a/include/linux/mg_disk.h b/include/linux/mg_disk.h
new file mode 100644
index 000000000000..1f76b1ebf627
--- /dev/null
+++ b/include/linux/mg_disk.h
@@ -0,0 +1,206 @@
+/*
+ *  include/linux/mg_disk.c
+ *
+ *  Support for the mGine m[g]flash IO mode.
+ *  Based on legacy hd.c
+ *
+ * (c) 2008 mGine Co.,LTD
+ * (c) 2008 unsik Kim <donari75@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#ifndef __MG_DISK_H__
+#define __MG_DISK_H__
+#include <linux/blkdev.h>
+#include <linux/ata.h>
+/* name for block device */
+#define MG_DISK_NAME "mgd"
+/* name for platform device */
+#define MG_DEV_NAME "mg_disk"
+#define MG_DISK_MAJ 0
+#define MG_DISK_MAX_PART 16
+#define MG_SECTOR_SIZE 512
+#define MG_MAX_SECTS 256
+/* Register offsets */
+#define MG_BUFF_OFFSET                  0x8000
+#define MG_STORAGE_BUFFER_SIZE          0x200
+#define MG_REG_OFFSET                   0xC000
+#define MG_REG_FEATURE                  (MG_REG_OFFSET + 2)     /* write case */
+#define MG_REG_ERROR                    (MG_REG_OFFSET + 2)     /* read case */
+#define MG_REG_SECT_CNT                 (MG_REG_OFFSET + 4)
+#define MG_REG_SECT_NUM                 (MG_REG_OFFSET + 6)
+#define MG_REG_CYL_LOW                  (MG_REG_OFFSET + 8)
+#define MG_REG_CYL_HIGH                 (MG_REG_OFFSET + 0xA)
+#define MG_REG_DRV_HEAD                 (MG_REG_OFFSET + 0xC)
+#define MG_REG_COMMAND                  (MG_REG_OFFSET + 0xE)   /* write case */
+#define MG_REG_STATUS                   (MG_REG_OFFSET + 0xE)   /* read  case */
+#define MG_REG_DRV_CTRL                 (MG_REG_OFFSET + 0x10)
+#define MG_REG_BURST_CTRL               (MG_REG_OFFSET + 0x12)
+/* "Drive Select/Head Register" bit values */
+#define MG_REG_HEAD_MUST_BE_ON          0xA0 /* These 2 bits are always on */
+#define MG_REG_HEAD_DRIVE_MASTER        (0x00 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_DRIVE_SLAVE         (0x10 | MG_REG_HEAD_MUST_BE_ON)
+#define MG_REG_HEAD_LBA_MODE            (0x40 | MG_REG_HEAD_MUST_BE_ON)
+/* "Device Control Register" bit values */
+#define MG_REG_CTRL_INTR_ENABLE                 0x0
+#define MG_REG_CTRL_INTR_DISABLE                (0x1<<1)
+#define MG_REG_CTRL_RESET                       (0x1<<2)
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_HIGH       0x0
+#define MG_REG_CTRL_INTR_POLA_ACTIVE_LOW        (0x1<<4)
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_LOW         0x0
+#define MG_REG_CTRL_DPD_POLA_ACTIVE_HIGH        (0x1<<5)
+#define MG_REG_CTRL_DPD_DISABLE                 0x0
+#define MG_REG_CTRL_DPD_ENABLE                  (0x1<<6)
+/* Status register bit */
+/* error bit in status register */
+#define MG_REG_STATUS_BIT_ERROR                 0x01
+/* corrected error in status register */
+#define MG_REG_STATUS_BIT_CORRECTED_ERROR       0x04
+/* data request bit in status register */
+#define MG_REG_STATUS_BIT_DATA_REQ              0x08
+/* DSC - Drive Seek Complete */
+#define MG_REG_STATUS_BIT_SEEK_DONE             0x10
+/* DWF - Drive Write Fault */
+#define MG_REG_STATUS_BIT_WRITE_FAULT           0x20
+#define MG_REG_STATUS_BIT_READY                 0x40
+#define MG_REG_STATUS_BIT_BUSY                  0x80
+/* handy status */
+#define MG_STAT_READY   (MG_REG_STATUS_BIT_READY | MG_REG_STATUS_BIT_SEEK_DONE)
+#define MG_READY_OK(s)  (((s) & (MG_STAT_READY | \
+                                (MG_REG_STATUS_BIT_BUSY | \
+                                 MG_REG_STATUS_BIT_WRITE_FAULT | \
+                                 MG_REG_STATUS_BIT_ERROR))) == MG_STAT_READY)
+/* Error register */
+#define MG_REG_ERR_AMNF         0x01
+#define MG_REG_ERR_ABRT         0x04
+#define MG_REG_ERR_IDNF         0x10
+#define MG_REG_ERR_UNC          0x40
+#define MG_REG_ERR_BBK          0x80
+/* error code for others */
+#define MG_ERR_NONE             0
+#define MG_ERR_TIMEOUT          0x100
+#define MG_ERR_INIT_STAT        0x101
+#define MG_ERR_TRANSLATION      0x102
+#define MG_ERR_CTRL_RST         0x103
+#define MG_ERR_INV_STAT         0x104
+#define MG_ERR_RSTOUT           0x105
+#define MG_MAX_ERRORS   6       /* Max read/write errors */
+/* command */
+#define MG_CMD_RD 0x20
+#define MG_CMD_WR 0x30
+#define MG_CMD_SLEEP 0x99
+#define MG_CMD_WAKEUP 0xC3
+#define MG_CMD_ID 0xEC
+#define MG_CMD_WR_CONF 0x3C
+#define MG_CMD_RD_CONF 0x40
+/* operation mode */
+#define MG_OP_CASCADE (1 << 0)
+#define MG_OP_CASCADE_SYNC_RD (1 << 1)
+#define MG_OP_CASCADE_SYNC_WR (1 << 2)
+#define MG_OP_INTERLEAVE (1 << 3)
+/* synchronous */
+#define MG_BURST_LAT_4 (3 << 4)
+#define MG_BURST_LAT_5 (4 << 4)
+#define MG_BURST_LAT_6 (5 << 4)
+#define MG_BURST_LAT_7 (6 << 4)
+#define MG_BURST_LAT_8 (7 << 4)
+#define MG_BURST_LEN_4 (1 << 1)
+#define MG_BURST_LEN_8 (2 << 1)
+#define MG_BURST_LEN_16 (3 << 1)
+#define MG_BURST_LEN_32 (4 << 1)
+#define MG_BURST_LEN_CONT (0 << 1)
+/* timeout value (unit: ms) */
+#define MG_TMAX_CONF_TO_CMD     1
+#define MG_TMAX_WAIT_RD_DRQ     10
+#define MG_TMAX_WAIT_WR_DRQ     500
+#define MG_TMAX_RST_TO_BUSY     10
+#define MG_TMAX_HDRST_TO_RDY    500
+#define MG_TMAX_SWRST_TO_RDY    500
+#define MG_TMAX_RSTOUT          3000
+/* device attribution */
+/* use mflash as boot device */
+#define MG_BOOT_DEV             (1 << 0)
+/* use mflash as storage device */
+#define MG_STORAGE_DEV          (1 << 1)
+/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
+#define MG_STORAGE_DEV_SKIP_RST (1 << 2)
+#define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST)
+/* names of GPIO resource */
+#define MG_RST_PIN      "mg_rst"
+/* except MG_BOOT_DEV, reset-out pin should be assigned */
+#define MG_RSTOUT_PIN   "mg_rstout"
+/* private driver data */
+struct mg_drv_data {
+        /* disk resource */
+        u32 use_polling;
+        /* device attribution */
+        u32 dev_attr;
+        /* internally used */
+        struct mg_host *host;
+};
+/* main structure for mflash driver */
+struct mg_host {
+        struct device *dev;
+        struct request_queue *breq;
+        spinlock_t lock;
+        struct gendisk *gd;
+        struct timer_list timer;
+        void (*mg_do_intr) (struct mg_host *);
+        u16 id[ATA_ID_WORDS];
+        u16 cyls;
+        u16 heads;
+        u16 sectors;
+        u32 n_sectors;
+        u32 nres_sectors;
+        void __iomem *dev_base;
+        unsigned int irq;
+        unsigned int rst;
+        unsigned int rstout;
+        u32 major;
+        u32 error;
+};
+/*
+ * Debugging macro and defines
+ */
+#undef DO_MG_DEBUG
+#ifdef DO_MG_DEBUG
+#  define MG_DBG(fmt, args...) \
+        printk(KERN_DEBUG "%s:%d "fmt, __func__, __LINE__, ##args)
+#else /* CONFIG_MG_DEBUG */
+#  define MG_DBG(fmt, args...) do { } while (0)
+#endif /* CONFIG_MG_DEBUG */
+#endif
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 3aa5d77c2cdb..5675b63a0631 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/notifier.h>
+#include <linux/device.h>
 #include <linux/mtd/compatmac.h>
 #include <mtd/mtd-abi.h>
@@ -162,6 +163,20 @@ struct mtd_info {
        /* We probably shouldn't allow XIP if the unpoint isn't a NULL */
        void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
+        /* Allow NOMMU mmap() to directly map the device (if not NULL)
+         * - return the address to which the offset maps
+         * - return -ENOSYS to indicate refusal to do the mapping
+         */
+        unsigned long (*get_unmapped_area) (struct mtd_info *mtd,
+                                            unsigned long len,
+                                            unsigned long offset,
+                                            unsigned long flags);
+        /* Backing device capabilities for this device
+         * - provides mmap capabilities
+         */
+        struct backing_dev_info *backing_dev_info;
        int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
        int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
@@ -223,6 +238,7 @@ struct mtd_info {
        void *priv;
        struct module *owner;
+        struct device dev;
        int usecount;
        /* If the driver is something smart, like UBI, it may need to maintain
@@ -233,6 +249,11 @@ struct mtd_info {
        void (*put_device) (struct mtd_info *mtd);
 };
+static inline struct mtd_info *dev_to_mtd(struct device *dev)
+{
+        return dev ? container_of(dev, struct mtd_info, dev) : NULL;
+}
 static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
 {
        if (mtd->erasesize_shift)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index db5b63da2a7e..7efb9be34662 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -43,8 +43,8 @@ extern void nand_wait_ready(struct mtd_info *mtd);
 * is supported now. If you add a chip with bigger oobsize/page
 * adjust this accordingly.
 */
-#define NAND_MAX_OOBSIZE        64
+#define NAND_MAX_OOBSIZE        128
-#define NAND_MAX_PAGESIZE       2048
+#define NAND_MAX_PAGESIZE       4096
 /*
 * Constants for hardware specific CLE/ALE/NCE function
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index a45dd831b3f8..7535a74083b9 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -76,4 +76,16 @@ int __devinit of_mtd_parse_partitions(struct device *dev,
                                      struct device_node *node,
                                      struct mtd_partition **pparts);
+#ifdef CONFIG_MTD_PARTITIONS
+static inline int mtd_has_partitions(void) { return 1; }
+#else
+static inline int mtd_has_partitions(void) { return 0; }
+#endif
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+static inline int mtd_has_cmdlinepart(void) { return 1; }
+#else
+static inline int mtd_has_cmdlinepart(void) { return 0; }
+#endif
 #endif
diff --git a/include/linux/nfs.h b/include/linux/nfs.h
index 54af92c1c70b..214d499718f7 100644
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
@@ -109,7 +109,6 @@
        NFSERR_FILE_OPEN = 10046,      /*       v4 */
        NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
        NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-        NFSERR_REPLAY_ME = 10049        /*       v4 */
 };
 /* NFSv2 file types - beware, these are not the same in NFSv3 */
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index b912311a56b1..e3f0cbcbd0db 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -21,6 +21,7 @@
 #define NFS4_FHSIZE             128
 #define NFS4_MAXPATHLEN         PATH_MAX
 #define NFS4_MAXNAMLEN          NAME_MAX
+#define NFS4_MAX_SESSIONID_LEN  16
 #define NFS4_ACCESS_READ        0x0001
 #define NFS4_ACCESS_LOOKUP      0x0002
@@ -38,6 +39,7 @@
 #define NFS4_OPEN_RESULT_CONFIRM 0x0002
 #define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
+#define NFS4_SHARE_ACCESS_MASK  0x000F
 #define NFS4_SHARE_ACCESS_READ  0x0001
 #define NFS4_SHARE_ACCESS_WRITE 0x0002
 #define NFS4_SHARE_ACCESS_BOTH  0x0003
@@ -45,6 +47,19 @@
 #define NFS4_SHARE_DENY_WRITE   0x0002
 #define NFS4_SHARE_DENY_BOTH    0x0003
+/* nfs41 */
+#define NFS4_SHARE_WANT_MASK            0xFF00
+#define NFS4_SHARE_WANT_NO_PREFERENCE   0x0000
+#define NFS4_SHARE_WANT_READ_DELEG      0x0100
+#define NFS4_SHARE_WANT_WRITE_DELEG     0x0200
+#define NFS4_SHARE_WANT_ANY_DELEG       0x0300
+#define NFS4_SHARE_WANT_NO_DELEG        0x0400
+#define NFS4_SHARE_WANT_CANCEL          0x0500
+#define NFS4_SHARE_WHEN_MASK            0xF0000
+#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL        0x10000
+#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED          0x20000
 #define NFS4_SET_TO_SERVER_TIME 0
 #define NFS4_SET_TO_CLIENT_TIME 1
@@ -88,6 +103,31 @@
 #define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
 #define NFS4_ACE_MASK_ALL                     0x001F01FF
+#define EXCHGID4_FLAG_SUPP_MOVED_REFER          0x00000001
+#define EXCHGID4_FLAG_SUPP_MOVED_MIGR           0x00000002
+#define EXCHGID4_FLAG_USE_NON_PNFS              0x00010000
+#define EXCHGID4_FLAG_USE_PNFS_MDS              0x00020000
+#define EXCHGID4_FLAG_USE_PNFS_DS               0x00040000
+#define EXCHGID4_FLAG_UPD_CONFIRMED_REC_A       0x40000000
+#define EXCHGID4_FLAG_CONFIRMED_R               0x80000000
+/*
+ * Since the validity of these bits depends on whether
+ * they're set in the argument or response, have separate
+ * invalid flag masks for arg (_A) and resp (_R).
+ */
+#define EXCHGID4_FLAG_MASK_A                    0x40070003
+#define EXCHGID4_FLAG_MASK_R                    0x80070003
+#define SEQ4_STATUS_CB_PATH_DOWN                0x00000001
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING    0x00000002
+#define SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED     0x00000004
+#define SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED   0x00000008
+#define SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED  0x00000010
+#define SEQ4_STATUS_ADMIN_STATE_REVOKED         0x00000020
+#define SEQ4_STATUS_RECALLABLE_STATE_REVOKED    0x00000040
+#define SEQ4_STATUS_LEASE_MOVED                 0x00000080
+#define SEQ4_STATUS_RESTART_RECLAIM_NEEDED      0x00000100
 #define NFS4_MAX_UINT64 (~(u64)0)
 enum nfs4_acl_whotype {
@@ -154,6 +194,28 @@ enum nfs_opnum4 {
        OP_VERIFY = 37,
        OP_WRITE = 38,
        OP_RELEASE_LOCKOWNER = 39,
+        /* nfs41 */
+        OP_BACKCHANNEL_CTL = 40,
+        OP_BIND_CONN_TO_SESSION = 41,
+        OP_EXCHANGE_ID = 42,
+        OP_CREATE_SESSION = 43,
+        OP_DESTROY_SESSION = 44,
+        OP_FREE_STATEID = 45,
+        OP_GET_DIR_DELEGATION = 46,
+        OP_GETDEVICEINFO = 47,
+        OP_GETDEVICELIST = 48,
+        OP_LAYOUTCOMMIT = 49,
+        OP_LAYOUTGET = 50,
+        OP_LAYOUTRETURN = 51,
+        OP_SECINFO_NO_NAME = 52,
+        OP_SEQUENCE = 53,
+        OP_SET_SSV = 54,
+        OP_TEST_STATEID = 55,
+        OP_WANT_DELEGATION = 56,
+        OP_DESTROY_CLIENTID = 57,
+        OP_RECLAIM_COMPLETE = 58,
        OP_ILLEGAL = 10044,
 };
@@ -230,7 +292,48 @@ enum nfsstat4 {
        NFS4ERR_DEADLOCK = 10045,
        NFS4ERR_FILE_OPEN = 10046,
        NFS4ERR_ADMIN_REVOKED = 10047,
-        NFS4ERR_CB_PATH_DOWN = 10048
+        NFS4ERR_CB_PATH_DOWN = 10048,
+        /* nfs41 */
+        NFS4ERR_BADIOMODE       = 10049,
+        NFS4ERR_BADLAYOUT       = 10050,
+        NFS4ERR_BAD_SESSION_DIGEST = 10051,
+        NFS4ERR_BADSESSION      = 10052,
+        NFS4ERR_BADSLOT         = 10053,
+        NFS4ERR_COMPLETE_ALREADY = 10054,
+        NFS4ERR_CONN_NOT_BOUND_TO_SESSION = 10055,
+        NFS4ERR_DELEG_ALREADY_WANTED = 10056,
+        NFS4ERR_BACK_CHAN_BUSY  = 10057,        /* backchan reqs outstanding */
+        NFS4ERR_LAYOUTTRYLATER  = 10058,
+        NFS4ERR_LAYOUTUNAVAILABLE = 10059,
+        NFS4ERR_NOMATCHING_LAYOUT = 10060,
+        NFS4ERR_RECALLCONFLICT  = 10061,
+        NFS4ERR_UNKNOWN_LAYOUTTYPE = 10062,
+        NFS4ERR_SEQ_MISORDERED = 10063,         /* unexpected seq.id in req */
+        NFS4ERR_SEQUENCE_POS    = 10064,        /* [CB_]SEQ. op not 1st op */
+        NFS4ERR_REQ_TOO_BIG     = 10065,        /* request too big */
+        NFS4ERR_REP_TOO_BIG     = 10066,        /* reply too big */
+        NFS4ERR_REP_TOO_BIG_TO_CACHE = 10067,   /* rep. not all cached */
+        NFS4ERR_RETRY_UNCACHED_REP = 10068,     /* retry & rep. uncached */
+        NFS4ERR_UNSAFE_COMPOUND = 10069,        /* retry/recovery too hard */
+        NFS4ERR_TOO_MANY_OPS    = 10070,        /* too many ops in [CB_]COMP */
+        NFS4ERR_OP_NOT_IN_SESSION = 10071,      /* op needs [CB_]SEQ. op */
+        NFS4ERR_HASH_ALG_UNSUPP = 10072,        /* hash alg. not supp. */
+                                                /* Error 10073 is unused. */
+        NFS4ERR_CLIENTID_BUSY   = 10074,        /* clientid has state */
+        NFS4ERR_PNFS_IO_HOLE    = 10075,        /* IO to _SPARSE file hole */
+        NFS4ERR_SEQ_FALSE_RETRY = 10076,        /* retry not origional */
+        NFS4ERR_BAD_HIGH_SLOT   = 10077,        /* sequence arg bad */
+        NFS4ERR_DEADSESSION     = 10078,        /* persistent session dead */
+        NFS4ERR_ENCR_ALG_UNSUPP = 10079,        /* SSV alg mismatch */
+        NFS4ERR_PNFS_NO_LAYOUT  = 10080,        /* direct I/O with no layout */
+        NFS4ERR_NOT_ONLY_OP     = 10081,        /* bad compound */
+        NFS4ERR_WRONG_CRED      = 10082,        /* permissions:state change */
+        NFS4ERR_WRONG_TYPE      = 10083,        /* current operation mismatch */
+        NFS4ERR_DIRDELEG_UNAVAIL = 10084,       /* no directory delegation */
+        NFS4ERR_REJECT_DELEG    = 10085,        /* on callback */
+        NFS4ERR_RETURNCONFLICT  = 10086,        /* outstanding layoutreturn */
+        NFS4ERR_DELEG_REVOKED   = 10087,        /* deleg./layout revoked */
 };
 /*
@@ -265,7 +368,13 @@ enum opentype4 {
 enum createmode4 {
        NFS4_CREATE_UNCHECKED = 0,
        NFS4_CREATE_GUARDED = 1,
-        NFS4_CREATE_EXCLUSIVE = 2
+        NFS4_CREATE_EXCLUSIVE = 2,
+        /*
+         * New to NFSv4.1. If session is persistent,
+         * GUARDED4 MUST be used. Otherwise, use
+         * EXCLUSIVE4_1 instead of EXCLUSIVE4.
+         */
+        NFS4_CREATE_EXCLUSIVE4_1 = 3
 };
 enum limit_by4 {
@@ -301,6 +410,8 @@ enum lock_type4 {
 #define FATTR4_WORD0_UNIQUE_HANDLES     (1UL << 9)
 #define FATTR4_WORD0_LEASE_TIME         (1UL << 10)
 #define FATTR4_WORD0_RDATTR_ERROR       (1UL << 11)
+/* Mandatory in NFSv4.1 */
+#define FATTR4_WORD2_SUPPATTR_EXCLCREAT (1UL << 11)
 /* Recommended Attributes */
 #define FATTR4_WORD0_ACL                (1UL << 12)
@@ -391,6 +502,29 @@ enum {
        NFSPROC4_CLNT_GETACL,
        NFSPROC4_CLNT_SETACL,
        NFSPROC4_CLNT_FS_LOCATIONS,
+        /* nfs41 */
+        NFSPROC4_CLNT_EXCHANGE_ID,
+        NFSPROC4_CLNT_CREATE_SESSION,
+        NFSPROC4_CLNT_DESTROY_SESSION,
+        NFSPROC4_CLNT_SEQUENCE,
+        NFSPROC4_CLNT_GET_LEASE_TIME,
+};
+/* nfs41 types */
+struct nfs4_sessionid {
+        unsigned char data[NFS4_MAX_SESSIONID_LEN];
+};
+/* Create Session Flags */
+#define SESSION4_PERSIST         0x001
+#define SESSION4_BACK_CHAN       0x002
+#define SESSION4_RDMA            0x004
+enum state_protect_how4 {
+        SP4_NONE        = 0,
+        SP4_MACH_CRED   = 1,
+        SP4_SSV         = 2
 };
 #endif
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index 04b355c801d8..5bccaab81056 100644
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -76,4 +76,12 @@ void	nfsd_reply_cache_shutdown(void);
 int     nfsd_cache_lookup(struct svc_rqst *, int);
 void    nfsd_cache_update(struct svc_rqst *, int, __be32 *);
+#ifdef CONFIG_NFSD_V4
+void    nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp);
+#else  /* CONFIG_NFSD_V4 */
+static inline void nfsd4_set_statp(struct svc_rqst *rqstp, __be32 *statp)
+{
+}
+#endif /* CONFIG_NFSD_V4 */
 #endif /* NFSCACHE_H */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index e19f45991b2e..2b49d676d0c9 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -23,7 +23,7 @@
 /*
 * nfsd version
 */
-#define NFSD_SUPPORTED_MINOR_VERSION    0
+#define NFSD_SUPPORTED_MINOR_VERSION    1
 /*
 * Flags for nfsd_permission
@@ -53,6 +53,7 @@ typedef int (*nfsd_dirop_t)(struct inode *, struct dentry *, int, int);
 extern struct svc_program       nfsd_program;
 extern struct svc_version       nfsd_version2, nfsd_version3,
                                nfsd_version4;
+extern u32                      nfsd_supported_minorversion;
 extern struct mutex             nfsd_mutex;
 extern struct svc_serv          *nfsd_serv;
@@ -105,7 +106,7 @@ void		nfsd_close(struct file *);
 __be32          nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *,
                                loff_t, struct kvec *, int, unsigned long *);
 __be32          nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
-                                loff_t, struct kvec *,int, unsigned long, int *);
+                                loff_t, struct kvec *,int, unsigned long *, int *);
 __be32          nfsd_readlink(struct svc_rqst *, struct svc_fh *,
                                char *, int *);
 __be32          nfsd_symlink(struct svc_rqst *, struct svc_fh *,
@@ -149,6 +150,7 @@ int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
 enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
 int nfsd_vers(int vers, enum vers_op change);
+int nfsd_minorversion(u32 minorversion, enum vers_op change);
 void nfsd_reset_versions(void);
 int nfsd_create_serv(void);
@@ -186,78 +188,119 @@ void		nfsd_lockd_shutdown(void);
 /*
 * These macros provide pre-xdr'ed values for faster operation.
 */
-#define nfs_ok                  __constant_htonl(NFS_OK)
+#define nfs_ok                  cpu_to_be32(NFS_OK)
-#define nfserr_perm             __constant_htonl(NFSERR_PERM)
+#define nfserr_perm             cpu_to_be32(NFSERR_PERM)
-#define nfserr_noent            __constant_htonl(NFSERR_NOENT)
+#define nfserr_noent            cpu_to_be32(NFSERR_NOENT)
-#define nfserr_io               __constant_htonl(NFSERR_IO)
+#define nfserr_io               cpu_to_be32(NFSERR_IO)
-#define nfserr_nxio             __constant_htonl(NFSERR_NXIO)
+#define nfserr_nxio             cpu_to_be32(NFSERR_NXIO)
-#define nfserr_eagain           __constant_htonl(NFSERR_EAGAIN)
+#define nfserr_eagain           cpu_to_be32(NFSERR_EAGAIN)
-#define nfserr_acces            __constant_htonl(NFSERR_ACCES)
+#define nfserr_acces            cpu_to_be32(NFSERR_ACCES)
-#define nfserr_exist            __constant_htonl(NFSERR_EXIST)
+#define nfserr_exist            cpu_to_be32(NFSERR_EXIST)
-#define nfserr_xdev             __constant_htonl(NFSERR_XDEV)
+#define nfserr_xdev             cpu_to_be32(NFSERR_XDEV)
-#define nfserr_nodev            __constant_htonl(NFSERR_NODEV)
+#define nfserr_nodev            cpu_to_be32(NFSERR_NODEV)
-#define nfserr_notdir           __constant_htonl(NFSERR_NOTDIR)
+#define nfserr_notdir           cpu_to_be32(NFSERR_NOTDIR)
-#define nfserr_isdir            __constant_htonl(NFSERR_ISDIR)
+#define nfserr_isdir            cpu_to_be32(NFSERR_ISDIR)
-#define nfserr_inval            __constant_htonl(NFSERR_INVAL)
+#define nfserr_inval            cpu_to_be32(NFSERR_INVAL)
-#define nfserr_fbig             __constant_htonl(NFSERR_FBIG)
+#define nfserr_fbig             cpu_to_be32(NFSERR_FBIG)
-#define nfserr_nospc            __constant_htonl(NFSERR_NOSPC)
+#define nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
-#define nfserr_rofs             __constant_htonl(NFSERR_ROFS)
+#define nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
-#define nfserr_mlink            __constant_htonl(NFSERR_MLINK)
+#define nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
-#define nfserr_opnotsupp        __constant_htonl(NFSERR_OPNOTSUPP)
+#define nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
-#define nfserr_nametoolong      __constant_htonl(NFSERR_NAMETOOLONG)
+#define nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
-#define nfserr_notempty         __constant_htonl(NFSERR_NOTEMPTY)
+#define nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
-#define nfserr_dquot            __constant_htonl(NFSERR_DQUOT)
+#define nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)
-#define nfserr_stale            __constant_htonl(NFSERR_STALE)
+#define nfserr_stale            cpu_to_be32(NFSERR_STALE)
-#define nfserr_remote           __constant_htonl(NFSERR_REMOTE)
+#define nfserr_remote           cpu_to_be32(NFSERR_REMOTE)
-#define nfserr_wflush           __constant_htonl(NFSERR_WFLUSH)
+#define nfserr_wflush           cpu_to_be32(NFSERR_WFLUSH)
-#define nfserr_badhandle        __constant_htonl(NFSERR_BADHANDLE)
+#define nfserr_badhandle        cpu_to_be32(NFSERR_BADHANDLE)
-#define nfserr_notsync          __constant_htonl(NFSERR_NOT_SYNC)
+#define nfserr_notsync          cpu_to_be32(NFSERR_NOT_SYNC)
-#define nfserr_badcookie        __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_badcookie        cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_notsupp          __constant_htonl(NFSERR_NOTSUPP)
+#define nfserr_notsupp          cpu_to_be32(NFSERR_NOTSUPP)
-#define nfserr_toosmall         __constant_htonl(NFSERR_TOOSMALL)
+#define nfserr_toosmall         cpu_to_be32(NFSERR_TOOSMALL)
-#define nfserr_serverfault      __constant_htonl(NFSERR_SERVERFAULT)
+#define nfserr_serverfault      cpu_to_be32(NFSERR_SERVERFAULT)
-#define nfserr_badtype          __constant_htonl(NFSERR_BADTYPE)
+#define nfserr_badtype          cpu_to_be32(NFSERR_BADTYPE)
-#define nfserr_jukebox          __constant_htonl(NFSERR_JUKEBOX)
+#define nfserr_jukebox          cpu_to_be32(NFSERR_JUKEBOX)
-#define nfserr_denied           __constant_htonl(NFSERR_DENIED)
+#define nfserr_denied           cpu_to_be32(NFSERR_DENIED)
-#define nfserr_deadlock         __constant_htonl(NFSERR_DEADLOCK)
+#define nfserr_deadlock         cpu_to_be32(NFSERR_DEADLOCK)
-#define nfserr_expired          __constant_htonl(NFSERR_EXPIRED)
+#define nfserr_expired          cpu_to_be32(NFSERR_EXPIRED)
-#define nfserr_bad_cookie       __constant_htonl(NFSERR_BAD_COOKIE)
+#define nfserr_bad_cookie       cpu_to_be32(NFSERR_BAD_COOKIE)
-#define nfserr_same             __constant_htonl(NFSERR_SAME)
+#define nfserr_same             cpu_to_be32(NFSERR_SAME)
-#define nfserr_clid_inuse       __constant_htonl(NFSERR_CLID_INUSE)
+#define nfserr_clid_inuse       cpu_to_be32(NFSERR_CLID_INUSE)
-#define nfserr_stale_clientid   __constant_htonl(NFSERR_STALE_CLIENTID)
+#define nfserr_stale_clientid   cpu_to_be32(NFSERR_STALE_CLIENTID)
-#define nfserr_resource         __constant_htonl(NFSERR_RESOURCE)
+#define nfserr_resource         cpu_to_be32(NFSERR_RESOURCE)
-#define nfserr_moved            __constant_htonl(NFSERR_MOVED)
+#define nfserr_moved            cpu_to_be32(NFSERR_MOVED)
-#define nfserr_nofilehandle     __constant_htonl(NFSERR_NOFILEHANDLE)
+#define nfserr_nofilehandle     cpu_to_be32(NFSERR_NOFILEHANDLE)
-#define nfserr_minor_vers_mismatch      __constant_htonl(NFSERR_MINOR_VERS_MISMATCH)
+#define nfserr_minor_vers_mismatch      cpu_to_be32(NFSERR_MINOR_VERS_MISMATCH)
-#define nfserr_share_denied     __constant_htonl(NFSERR_SHARE_DENIED)
+#define nfserr_share_denied     cpu_to_be32(NFSERR_SHARE_DENIED)
-#define nfserr_stale_stateid    __constant_htonl(NFSERR_STALE_STATEID)
+#define nfserr_stale_stateid    cpu_to_be32(NFSERR_STALE_STATEID)
-#define nfserr_old_stateid      __constant_htonl(NFSERR_OLD_STATEID)
+#define nfserr_old_stateid      cpu_to_be32(NFSERR_OLD_STATEID)
-#define nfserr_bad_stateid      __constant_htonl(NFSERR_BAD_STATEID)
+#define nfserr_bad_stateid      cpu_to_be32(NFSERR_BAD_STATEID)
-#define nfserr_bad_seqid        __constant_htonl(NFSERR_BAD_SEQID)
+#define nfserr_bad_seqid        cpu_to_be32(NFSERR_BAD_SEQID)
-#define nfserr_symlink          __constant_htonl(NFSERR_SYMLINK)
+#define nfserr_symlink          cpu_to_be32(NFSERR_SYMLINK)
-#define nfserr_not_same         __constant_htonl(NFSERR_NOT_SAME)
+#define nfserr_not_same         cpu_to_be32(NFSERR_NOT_SAME)
-#define nfserr_restorefh        __constant_htonl(NFSERR_RESTOREFH)
+#define nfserr_restorefh        cpu_to_be32(NFSERR_RESTOREFH)
-#define nfserr_attrnotsupp      __constant_htonl(NFSERR_ATTRNOTSUPP)
+#define nfserr_attrnotsupp      cpu_to_be32(NFSERR_ATTRNOTSUPP)
-#define nfserr_bad_xdr          __constant_htonl(NFSERR_BAD_XDR)
+#define nfserr_bad_xdr          cpu_to_be32(NFSERR_BAD_XDR)
-#define nfserr_openmode         __constant_htonl(NFSERR_OPENMODE)
+#define nfserr_openmode         cpu_to_be32(NFSERR_OPENMODE)
-#define nfserr_locks_held       __constant_htonl(NFSERR_LOCKS_HELD)
+#define nfserr_locks_held       cpu_to_be32(NFSERR_LOCKS_HELD)
-#define nfserr_op_illegal       __constant_htonl(NFSERR_OP_ILLEGAL)
+#define nfserr_op_illegal       cpu_to_be32(NFSERR_OP_ILLEGAL)
-#define nfserr_grace            __constant_htonl(NFSERR_GRACE)
+#define nfserr_grace            cpu_to_be32(NFSERR_GRACE)
-#define nfserr_no_grace         __constant_htonl(NFSERR_NO_GRACE)
+#define nfserr_no_grace         cpu_to_be32(NFSERR_NO_GRACE)
-#define nfserr_reclaim_bad      __constant_htonl(NFSERR_RECLAIM_BAD)
+#define nfserr_reclaim_bad      cpu_to_be32(NFSERR_RECLAIM_BAD)
-#define nfserr_badname          __constant_htonl(NFSERR_BADNAME)
+#define nfserr_badname          cpu_to_be32(NFSERR_BADNAME)
-#define nfserr_cb_path_down     __constant_htonl(NFSERR_CB_PATH_DOWN)
+#define nfserr_cb_path_down     cpu_to_be32(NFSERR_CB_PATH_DOWN)
-#define nfserr_locked           __constant_htonl(NFSERR_LOCKED)
+#define nfserr_locked           cpu_to_be32(NFSERR_LOCKED)
-#define nfserr_wrongsec         __constant_htonl(NFSERR_WRONGSEC)
+#define nfserr_wrongsec         cpu_to_be32(NFSERR_WRONGSEC)
-#define nfserr_replay_me        __constant_htonl(NFSERR_REPLAY_ME)
+#define nfserr_badiomode                cpu_to_be32(NFS4ERR_BADIOMODE)
+#define nfserr_badlayout                cpu_to_be32(NFS4ERR_BADLAYOUT)
+#define nfserr_bad_session_digest       cpu_to_be32(NFS4ERR_BAD_SESSION_DIGEST)
+#define nfserr_badsession               cpu_to_be32(NFS4ERR_BADSESSION)
+#define nfserr_badslot                  cpu_to_be32(NFS4ERR_BADSLOT)
+#define nfserr_complete_already         cpu_to_be32(NFS4ERR_COMPLETE_ALREADY)
+#define nfserr_conn_not_bound_to_session cpu_to_be32(NFS4ERR_CONN_NOT_BOUND_TO_SESSION)
+#define nfserr_deleg_already_wanted     cpu_to_be32(NFS4ERR_DELEG_ALREADY_WANTED)
+#define nfserr_back_chan_busy           cpu_to_be32(NFS4ERR_BACK_CHAN_BUSY)
+#define nfserr_layouttrylater           cpu_to_be32(NFS4ERR_LAYOUTTRYLATER)
+#define nfserr_layoutunavailable        cpu_to_be32(NFS4ERR_LAYOUTUNAVAILABLE)
+#define nfserr_nomatching_layout        cpu_to_be32(NFS4ERR_NOMATCHING_LAYOUT)
+#define nfserr_recallconflict           cpu_to_be32(NFS4ERR_RECALLCONFLICT)
+#define nfserr_unknown_layouttype       cpu_to_be32(NFS4ERR_UNKNOWN_LAYOUTTYPE)
+#define nfserr_seq_misordered           cpu_to_be32(NFS4ERR_SEQ_MISORDERED)
+#define nfserr_sequence_pos             cpu_to_be32(NFS4ERR_SEQUENCE_POS)
+#define nfserr_req_too_big              cpu_to_be32(NFS4ERR_REQ_TOO_BIG)
+#define nfserr_rep_too_big              cpu_to_be32(NFS4ERR_REP_TOO_BIG)
+#define nfserr_rep_too_big_to_cache     cpu_to_be32(NFS4ERR_REP_TOO_BIG_TO_CACHE)
+#define nfserr_retry_uncached_rep       cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP)
+#define nfserr_unsafe_compound          cpu_to_be32(NFS4ERR_UNSAFE_COMPOUND)
+#define nfserr_too_many_ops             cpu_to_be32(NFS4ERR_TOO_MANY_OPS)
+#define nfserr_op_not_in_session        cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION)
+#define nfserr_hash_alg_unsupp          cpu_to_be32(NFS4ERR_HASH_ALG_UNSUPP)
+#define nfserr_clientid_busy            cpu_to_be32(NFS4ERR_CLIENTID_BUSY)
+#define nfserr_pnfs_io_hole             cpu_to_be32(NFS4ERR_PNFS_IO_HOLE)
+#define nfserr_seq_false_retry          cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY)
+#define nfserr_bad_high_slot            cpu_to_be32(NFS4ERR_BAD_HIGH_SLOT)
+#define nfserr_deadsession              cpu_to_be32(NFS4ERR_DEADSESSION)
+#define nfserr_encr_alg_unsupp          cpu_to_be32(NFS4ERR_ENCR_ALG_UNSUPP)
+#define nfserr_pnfs_no_layout           cpu_to_be32(NFS4ERR_PNFS_NO_LAYOUT)
+#define nfserr_not_only_op              cpu_to_be32(NFS4ERR_NOT_ONLY_OP)
+#define nfserr_wrong_cred               cpu_to_be32(NFS4ERR_WRONG_CRED)
+#define nfserr_wrong_type               cpu_to_be32(NFS4ERR_WRONG_TYPE)
+#define nfserr_dirdeleg_unavail         cpu_to_be32(NFS4ERR_DIRDELEG_UNAVAIL)
+#define nfserr_reject_deleg             cpu_to_be32(NFS4ERR_REJECT_DELEG)
+#define nfserr_returnconflict           cpu_to_be32(NFS4ERR_RETURNCONFLICT)
+#define nfserr_deleg_revoked            cpu_to_be32(NFS4ERR_DELEG_REVOKED)
 /* error codes for internal use */
 /* if a request fails due to kmalloc failure, it gets dropped.
 *  Client should resend eventually
 */
-#define nfserr_dropit           __constant_htonl(30000)
+#define nfserr_dropit           cpu_to_be32(30000)
 /* end-of-file indicator in readdir */
-#define nfserr_eof              __constant_htonl(30001)
+#define nfserr_eof              cpu_to_be32(30001)
+/* replay detected */
+#define nfserr_replay_me        cpu_to_be32(11001)
+/* nfs41 replay detected */
+#define nfserr_replay_cache     cpu_to_be32(11002)
 /* Check for dir entries '.' and '..' */
 #define isdotent(n, l)  (l < 3 && n[0] == '.' && (l == 1 || n[1] == '.'))
@@ -300,7 +343,7 @@ extern struct timeval	nfssvc_boot;
 *    TIME_BACKUP   (unlikely to be supported any time soon)
 *    TIME_CREATE   (unlikely to be supported any time soon)
 */
-#define NFSD_SUPPORTED_ATTRS_WORD0                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD0                                                         \
 (FATTR4_WORD0_SUPPORTED_ATTRS   | FATTR4_WORD0_TYPE         | FATTR4_WORD0_FH_EXPIRE_TYPE   \
 | FATTR4_WORD0_CHANGE          | FATTR4_WORD0_SIZE         | FATTR4_WORD0_LINK_SUPPORT     \
 | FATTR4_WORD0_SYMLINK_SUPPORT | FATTR4_WORD0_NAMED_ATTR   | FATTR4_WORD0_FSID             \
@@ -312,7 +355,7 @@ extern struct timeval	nfssvc_boot;
 | FATTR4_WORD0_MAXFILESIZE     | FATTR4_WORD0_MAXLINK      | FATTR4_WORD0_MAXNAME          \
 | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE     | FATTR4_WORD0_ACL)
-#define NFSD_SUPPORTED_ATTRS_WORD1                                                          \
+#define NFSD4_SUPPORTED_ATTRS_WORD1                                                         \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_NO_TRUNC     | FATTR4_WORD1_NUMLINKS         \
 | FATTR4_WORD1_OWNER           | FATTR4_WORD1_OWNER_GROUP  | FATTR4_WORD1_RAWDEV           \
 | FATTR4_WORD1_SPACE_AVAIL     | FATTR4_WORD1_SPACE_FREE   | FATTR4_WORD1_SPACE_TOTAL      \
@@ -320,6 +363,35 @@ extern struct timeval	nfssvc_boot;
 | FATTR4_WORD1_TIME_DELTA   | FATTR4_WORD1_TIME_METADATA    \
 | FATTR4_WORD1_TIME_MODIFY     | FATTR4_WORD1_TIME_MODIFY_SET | FATTR4_WORD1_MOUNTED_ON_FILEID)
+#define NFSD4_SUPPORTED_ATTRS_WORD2 0
+#define NFSD4_1_SUPPORTED_ATTRS_WORD0 \
+        NFSD4_SUPPORTED_ATTRS_WORD0
+#define NFSD4_1_SUPPORTED_ATTRS_WORD1 \
+        NFSD4_SUPPORTED_ATTRS_WORD1
+#define NFSD4_1_SUPPORTED_ATTRS_WORD2 \
+        (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)
+static inline u32 nfsd_suppattrs0(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
+                            : NFSD4_SUPPORTED_ATTRS_WORD0;
+}
+static inline u32 nfsd_suppattrs1(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD1
+                            : NFSD4_SUPPORTED_ATTRS_WORD1;
+}
+static inline u32 nfsd_suppattrs2(u32 minorversion)
+{
+        return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD2
+                            : NFSD4_SUPPORTED_ATTRS_WORD2;
+}
 /* These will return ERR_INVAL if specified in GETATTR or READDIR. */
 #define NFSD_WRITEONLY_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_TIME_ACCESS_SET   | FATTR4_WORD1_TIME_MODIFY_SET)
@@ -330,6 +402,19 @@ extern struct timeval	nfssvc_boot;
 #define NFSD_WRITEABLE_ATTRS_WORD1                                                          \
 (FATTR4_WORD1_MODE              | FATTR4_WORD1_OWNER         | FATTR4_WORD1_OWNER_GROUP     \
 | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET)
+#define NFSD_WRITEABLE_ATTRS_WORD2 0
+#define NFSD_SUPPATTR_EXCLCREAT_WORD0 \
+        NFSD_WRITEABLE_ATTRS_WORD0
+/*
+ * we currently store the exclusive create verifier in the v_{a,m}time
+ * attributes so the client can't set these at create time using EXCLUSIVE4_1
+ */
+#define NFSD_SUPPATTR_EXCLCREAT_WORD1 \
+        (NFSD_WRITEABLE_ATTRS_WORD1 & \
+         ~(FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_MODIFY_SET))
+#define NFSD_SUPPATTR_EXCLCREAT_WORD2 \
+        NFSD_WRITEABLE_ATTRS_WORD2
 #endif /* CONFIG_NFSD_V4 */
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index fa317f6c154b..afa19016c4a8 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -269,6 +269,13 @@ fh_copy(struct svc_fh *dst, struct svc_fh *src)
        return dst;
 }
+static inline void
+fh_copy_shallow(struct knfsd_fh *dst, struct knfsd_fh *src)
+{
+        dst->fh_size = src->fh_size;
+        memcpy(&dst->fh_base, &src->fh_base, src->fh_size);
+}
 static __inline__ struct svc_fh *
 fh_init(struct svc_fh *fhp, int maxsize)
 {
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 128298c0362d..4d61c873feed 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -66,8 +66,7 @@ struct nfs4_cb_recall {
        u32                     cbr_ident;
        int                     cbr_trunc;
        stateid_t               cbr_stateid;
-        u32                     cbr_fhlen;
+        struct knfsd_fh         cbr_fh;
-        char                    cbr_fhval[NFS4_FHSIZE];
        struct nfs4_delegation  *cbr_dp;
 };
@@ -86,8 +85,7 @@ struct nfs4_delegation {
 };
 #define dl_stateid      dl_recall.cbr_stateid
-#define dl_fhlen        dl_recall.cbr_fhlen
+#define dl_fh           dl_recall.cbr_fh
-#define dl_fhval        dl_recall.cbr_fhval
 /* client delegation callback info */
 struct nfs4_callback {
@@ -101,6 +99,64 @@ struct nfs4_callback {
        struct rpc_clnt *       cb_client;
 };
+/* Maximum number of slots per session. 128 is useful for long haul TCP */
+#define NFSD_MAX_SLOTS_PER_SESSION      128
+/* Maximum number of pages per slot cache entry */
+#define NFSD_PAGES_PER_SLOT     1
+/* Maximum number of operations per session compound */
+#define NFSD_MAX_OPS_PER_COMPOUND       16
+struct nfsd4_cache_entry {
+        __be32          ce_status;
+        struct kvec     ce_datav; /* encoded NFSv4.1 data in rq_res.head[0] */
+        struct page     *ce_respages[NFSD_PAGES_PER_SLOT + 1];
+        int             ce_cachethis;
+        short           ce_resused;
+        int             ce_opcnt;
+        int             ce_rpchdrlen;
+};
+struct nfsd4_slot {
+        bool                            sl_inuse;
+        u32                             sl_seqid;
+        struct nfsd4_cache_entry        sl_cache_entry;
+};
+struct nfsd4_session {
+        struct kref             se_ref;
+        struct list_head        se_hash;        /* hash by sessionid */
+        struct list_head        se_perclnt;
+        u32                     se_flags;
+        struct nfs4_client      *se_client;     /* for expire_client */
+        struct nfs4_sessionid   se_sessionid;
+        u32                     se_fmaxreq_sz;
+        u32                     se_fmaxresp_sz;
+        u32                     se_fmaxresp_cached;
+        u32                     se_fmaxops;
+        u32                     se_fnumslots;
+        struct nfsd4_slot       se_slots[];     /* forward channel slots */
+};
+static inline void
+nfsd4_put_session(struct nfsd4_session *ses)
+{
+        extern void free_session(struct kref *kref);
+        kref_put(&ses->se_ref, free_session);
+}
+static inline void
+nfsd4_get_session(struct nfsd4_session *ses)
+{
+        kref_get(&ses->se_ref);
+}
+/* formatted contents of nfs4_sessionid */
+struct nfsd4_sessionid {
+        clientid_t      clientid;
+        u32             sequence;
+        u32             reserved;
+};
 #define HEXDIR_LEN     33 /* hex version of 16 byte md5 of cl_name plus '\0' */
 /*
@@ -132,6 +188,12 @@ struct nfs4_client {
        struct nfs4_callback    cl_callback;    /* callback info */
        atomic_t                cl_count;       /* ref count */
        u32                     cl_firststate;  /* recovery dir creation */
+        /* for nfs41 */
+        struct list_head        cl_sessions;
+        struct nfsd4_slot       cl_slot;        /* create_session slot */
+        u32                     cl_exchange_flags;
+        struct nfs4_sessionid   cl_sessionid;
 };
 /* struct nfs4_client_reset
@@ -168,8 +230,7 @@ struct nfs4_replay {
        unsigned int            rp_buflen;
        char                    *rp_buf;
        unsigned                intrp_allocated;
-        int                     rp_openfh_len;
+        struct knfsd_fh         rp_openfh;
-        char                    rp_openfh[NFS4_FHSIZE];
        char                    rp_ibuf[NFSD4_REPLAY_ISIZE];
 };
@@ -217,7 +278,7 @@ struct nfs4_stateowner {
 *      share_acces, share_deny on the file.
 */
 struct nfs4_file {
-        struct kref             fi_ref;
+        atomic_t                fi_ref;
        struct list_head        fi_hash;    /* hash by "struct inode *" */
        struct list_head        fi_stateids;
        struct list_head        fi_delegations;
@@ -259,14 +320,13 @@ struct nfs4_stateid {
 };
 /* flags for preprocess_seqid_op() */
-#define CHECK_FH                0x00000001
+#define HAS_SESSION             0x00000001
 #define CONFIRM                 0x00000002
 #define OPEN_STATE              0x00000004
 #define LOCK_STATE              0x00000008
 #define RD_STATE                0x00000010
 #define WR_STATE                0x00000020
 #define CLOSE_STATE             0x00000040
-#define DELEG_RET               0x00000080
 #define seqid_mutating_err(err)                       \
        (((err) != nfserr_stale_clientid) &&    \
@@ -274,7 +334,9 @@ struct nfs4_stateid {
        ((err) != nfserr_stale_stateid) &&      \
        ((err) != nfserr_bad_stateid))
-extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
+struct nfsd4_compound_state;
+extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
                stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
 extern void nfs4_unlock_state(void);
@@ -290,7 +352,7 @@ extern void nfsd4_init_recdir(char *recdir_name);
 extern int nfsd4_recdir_load(void);
 extern void nfsd4_shutdown_recdir(void);
 extern int nfs4_client_to_reclaim(const char *name);
-extern int nfs4_has_reclaimed_state(const char *name);
+extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
 extern void nfsd4_recdir_purge_old(void);
 extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
 extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h
index 7678cfbe9960..2693ef647df6 100644
--- a/include/linux/nfsd/stats.h
+++ b/include/linux/nfsd/stats.h
@@ -11,6 +11,11 @@
 #include <linux/nfs4.h>
+/* thread usage wraps very million seconds (approx one fortnight) */
+#define NFSD_USAGE_WRAP (HZ*1000000)
+#ifdef __KERNEL__
 struct nfsd_stats {
        unsigned int    rchits;         /* repcache hits */
        unsigned int    rcmisses;       /* repcache hits */
@@ -35,10 +40,6 @@ struct nfsd_stats {
 };
-/* thread usage wraps very million seconds (approx one fortnight) */
-#define NFSD_USAGE_WRAP (HZ*1000000)
-#ifdef __KERNEL__
 extern struct nfsd_stats        nfsdstats;
 extern struct svc_stat          nfsd_svcstats;
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 27bd3e38ec5a..f80d6013fdc3 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -45,10 +45,22 @@
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 struct nfsd4_compound_state {
-        struct svc_fh current_fh;
+        struct svc_fh           current_fh;
-        struct svc_fh save_fh;
+        struct svc_fh           save_fh;
-        struct nfs4_stateowner *replay_owner;
+        struct nfs4_stateowner  *replay_owner;
-};
+        /* For sessions DRC */
+        struct nfsd4_session    *session;
+        struct nfsd4_slot       *slot;
+        __be32                  *statp;
+        size_t                  iovlen;
+        u32                     minorversion;
+        u32                     status;
+};
+static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs)
+{
+        return cs->slot != NULL;
+}
 struct nfsd4_change_info {
        u32             atomic;
@@ -90,7 +102,7 @@ struct nfsd4_create {
                        u32 specdata2;
                } dev;    /* NF4BLK, NF4CHR */
        } u;
-        u32             cr_bmval[2];        /* request */
+        u32             cr_bmval[3];        /* request */
        struct iattr    cr_iattr;           /* request */
        struct nfsd4_change_info  cr_cinfo; /* response */
        struct nfs4_acl *cr_acl;
@@ -105,7 +117,7 @@ struct nfsd4_delegreturn {
 };
 struct nfsd4_getattr {
-        u32             ga_bmval[2];        /* request */
+        u32             ga_bmval[3];        /* request */
        struct svc_fh   *ga_fhp;            /* response */
 };
@@ -206,11 +218,9 @@ struct nfsd4_open {
        stateid_t       op_delegate_stateid; /* request - response */
        u32             op_create;          /* request */
        u32             op_createmode;      /* request */
-        u32             op_bmval[2];        /* request */
+        u32             op_bmval[3];        /* request */
-        union {                             /* request */
+        struct iattr    iattr;              /* UNCHECKED4, GUARDED4, EXCLUSIVE4_1 */
-                struct iattr    iattr;                      /* UNCHECKED4,GUARDED4 */
+        nfs4_verifier   verf;               /* EXCLUSIVE4 */
-                nfs4_verifier   verf;                                /* EXCLUSIVE4 */
-        } u;
        clientid_t      op_clientid;        /* request */
        struct xdr_netobj op_owner;           /* request */
        u32             op_seqid;           /* request */
@@ -224,8 +234,8 @@ struct nfsd4_open {
        struct nfs4_stateowner *op_stateowner; /* used during processing */
        struct nfs4_acl *op_acl;
 };
-#define op_iattr        u.iattr
+#define op_iattr        iattr
-#define op_verf         u.verf
+#define op_verf         verf
 struct nfsd4_open_confirm {
        stateid_t       oc_req_stateid          /* request */;
@@ -259,7 +269,7 @@ struct nfsd4_readdir {
        nfs4_verifier   rd_verf;            /* request */
        u32             rd_dircount;        /* request */
        u32             rd_maxcount;        /* request */
-        u32             rd_bmval[2];        /* request */
+        u32             rd_bmval[3];        /* request */
        struct svc_rqst *rd_rqstp;          /* response */
        struct svc_fh * rd_fhp;             /* response */
@@ -301,7 +311,7 @@ struct nfsd4_secinfo {
 struct nfsd4_setattr {
        stateid_t       sa_stateid;         /* request */
-        u32             sa_bmval[2];        /* request */
+        u32             sa_bmval[3];        /* request */
        struct iattr    sa_iattr;           /* request */
        struct nfs4_acl *sa_acl;
 };
@@ -327,7 +337,7 @@ struct nfsd4_setclientid_confirm {
 /* also used for NVERIFY */
 struct nfsd4_verify {
-        u32             ve_bmval[2];        /* request */
+        u32             ve_bmval[3];        /* request */
        u32             ve_attrlen;         /* request */
        char *          ve_attrval;         /* request */
 };
@@ -344,6 +354,54 @@ struct nfsd4_write {
        nfs4_verifier   wr_verifier;        /* response */
 };
+struct nfsd4_exchange_id {
+        nfs4_verifier   verifier;
+        struct xdr_netobj clname;
+        u32             flags;
+        clientid_t      clientid;
+        u32             seqid;
+        int             spa_how;
+};
+struct nfsd4_channel_attrs {
+        u32             headerpadsz;
+        u32             maxreq_sz;
+        u32             maxresp_sz;
+        u32             maxresp_cached;
+        u32             maxops;
+        u32             maxreqs;
+        u32             nr_rdma_attrs;
+        u32             rdma_attrs;
+};
+struct nfsd4_create_session {
+        clientid_t              clientid;
+        struct nfs4_sessionid   sessionid;
+        u32                     seqid;
+        u32                     flags;
+        struct nfsd4_channel_attrs fore_channel;
+        struct nfsd4_channel_attrs back_channel;
+        u32                     callback_prog;
+        u32                     uid;
+        u32                     gid;
+};
+struct nfsd4_sequence {
+        struct nfs4_sessionid   sessionid;              /* request/response */
+        u32                     seqid;                  /* request/response */
+        u32                     slotid;                 /* request/response */
+        u32                     maxslots;               /* request/response */
+        u32                     cachethis;              /* request */
+#if 0
+        u32                     target_maxslots;        /* response */
+        u32                     status_flags;           /* response */
+#endif /* not yet */
+};
+struct nfsd4_destroy_session {
+        struct nfs4_sessionid   sessionid;
+};
 struct nfsd4_op {
        int                                     opnum;
        __be32                                  status;
@@ -378,6 +436,12 @@ struct nfsd4_op {
                struct nfsd4_verify             verify;
                struct nfsd4_write              write;
                struct nfsd4_release_lockowner  release_lockowner;
+                /* NFSv4.1 */
+                struct nfsd4_exchange_id        exchange_id;
+                struct nfsd4_create_session     create_session;
+                struct nfsd4_destroy_session    destroy_session;
+                struct nfsd4_sequence           sequence;
        } u;
        struct nfs4_replay *                    replay;
 };
@@ -416,9 +480,22 @@ struct nfsd4_compoundres {
        u32                             taglen;
        char *                          tag;
        u32                             opcnt;
-        __be32 *                        tagp; /* where to encode tag and  opcount */
+        __be32 *                        tagp; /* tag, opcount encode location */
+        struct nfsd4_compound_state     cstate;
 };
+static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp)
+{
+        struct nfsd4_compoundargs *args = resp->rqstp->rq_argp;
+        return args->opcnt == 1;
+}
+static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp)
+{
+        return !resp->cstate.slot->sl_cache_entry.ce_cachethis ||
+                        nfsd4_is_solo_sequence(resp);
+}
 #define NFS4_SVC_XDRSIZE                sizeof(struct nfsd4_compoundargs)
 static inline void
@@ -448,7 +525,23 @@ extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
 extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                struct nfsd4_compound_state *,
                struct nfsd4_setclientid_confirm *setclientid_confirm);
-extern __be32 nfsd4_process_open1(struct nfsd4_open *open);
+extern void nfsd4_store_cache_entry(struct nfsd4_compoundres *resp);
+extern __be32 nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
+                struct nfsd4_sequence *seq);
+extern __be32 nfsd4_exchange_id(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+struct nfsd4_exchange_id *);
+                extern __be32 nfsd4_create_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_create_session *);
+extern __be32 nfsd4_sequence(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_sequence *);
+extern __be32 nfsd4_destroy_session(struct svc_rqst *,
+                struct nfsd4_compound_state *,
+                struct nfsd4_destroy_session *);
+extern __be32 nfsd4_process_open1(struct nfsd4_compound_state *,
+                struct nfsd4_open *open);
 extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
                struct svc_fh *current_fh, struct nfsd4_open *open);
 extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
new file mode 100644
index 000000000000..79fec6af3f9f
--- /dev/null
+++ b/include/linux/nilfs2_fs.h
@@ -0,0 +1,801 @@
+/*
+ * nilfs2_fs.h - NILFS2 on-disk structures and common declarations.
+ *
+ * Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Written by Koji Sato <koji@osrg.net>
+ *            Ryusuke Konishi <ryusuke@osrg.net>
+ */
+/*
+ *  linux/include/linux/ext2_fs.h
+ *
+ * Copyright (C) 1992, 1993, 1994, 1995
+ * Remy Card (card@masi.ibp.fr)
+ * Laboratoire MASI - Institut Blaise Pascal
+ * Universite Pierre et Marie Curie (Paris VI)
+ *
+ *  from
+ *
+ *  linux/include/linux/minix_fs.h
+ *
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+#ifndef _LINUX_NILFS_FS_H
+#define _LINUX_NILFS_FS_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+/*
+ * Inode flags stored in nilfs_inode and on-memory nilfs inode
+ *
+ * We define these flags based on ext2-fs because of the
+ * compatibility reason; to avoid problems in chattr(1)
+ */
+#define NILFS_SECRM_FL          0x00000001 /* Secure deletion */
+#define NILFS_UNRM_FL           0x00000002 /* Undelete */
+#define NILFS_SYNC_FL           0x00000008 /* Synchronous updates */
+#define NILFS_IMMUTABLE_FL      0x00000010 /* Immutable file */
+#define NILFS_APPEND_FL         0x00000020 /* writes to file may only append */
+#define NILFS_NODUMP_FL         0x00000040 /* do not dump file */
+#define NILFS_NOATIME_FL        0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define NILFS_NOTAIL_FL         0x00008000 /* file tail should not be merged */
+#define NILFS_DIRSYNC_FL        0x00010000 /* dirsync behaviour */
+#define NILFS_FL_USER_VISIBLE   0x0003DFFF /* User visible flags */
+#define NILFS_FL_USER_MODIFIABLE        0x000380FF /* User modifiable flags */
+#define NILFS_INODE_BMAP_SIZE   7
+/**
+ * struct nilfs_inode - structure of an inode on disk
+ * @i_blocks: blocks count
+ * @i_size: size in bytes
+ * @i_ctime: creation time (seconds)
+ * @i_mtime: modification time (seconds)
+ * @i_ctime_nsec: creation time (nano seconds)
+ * @i_mtime_nsec: modification time (nano seconds)
+ * @i_uid: user id
+ * @i_gid: group id
+ * @i_mode: file mode
+ * @i_links_count: links count
+ * @i_flags: file flags
+ * @i_bmap: block mapping
+ * @i_xattr: extended attributes
+ * @i_generation: file generation (for NFS)
+ * @i_pad:      padding
+ */
+struct nilfs_inode {
+        __le64  i_blocks;
+        __le64  i_size;
+        __le64  i_ctime;
+        __le64  i_mtime;
+        __le32  i_ctime_nsec;
+        __le32  i_mtime_nsec;
+        __le32  i_uid;
+        __le32  i_gid;
+        __le16  i_mode;
+        __le16  i_links_count;
+        __le32  i_flags;
+        __le64  i_bmap[NILFS_INODE_BMAP_SIZE];
+#define i_device_code   i_bmap[0]
+        __le64  i_xattr;
+        __le32  i_generation;
+        __le32  i_pad;
+};
+/**
+ * struct nilfs_super_root - structure of super root
+ * @sr_sum: check sum
+ * @sr_bytes: byte count of the structure
+ * @sr_flags: flags (reserved)
+ * @sr_nongc_ctime: write time of the last segment not for cleaner operation
+ * @sr_dat: DAT file inode
+ * @sr_cpfile: checkpoint file inode
+ * @sr_sufile: segment usage file inode
+ */
+struct nilfs_super_root {
+        __le32 sr_sum;
+        __le16 sr_bytes;
+        __le16 sr_flags;
+        __le64 sr_nongc_ctime;
+        struct nilfs_inode sr_dat;
+        struct nilfs_inode sr_cpfile;
+        struct nilfs_inode sr_sufile;
+};
+#define NILFS_SR_MDT_OFFSET(inode_size, i)  \
+        ((unsigned long)&((struct nilfs_super_root *)0)->sr_dat + \
+                        (inode_size) * (i))
+#define NILFS_SR_DAT_OFFSET(inode_size)     NILFS_SR_MDT_OFFSET(inode_size, 0)
+#define NILFS_SR_CPFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 1)
+#define NILFS_SR_SUFILE_OFFSET(inode_size)  NILFS_SR_MDT_OFFSET(inode_size, 2)
+#define NILFS_SR_BYTES                  (sizeof(struct nilfs_super_root))
+/*
+ * Maximal mount counts
+ */
+#define NILFS_DFL_MAX_MNT_COUNT         50      /* 50 mounts */
+/*
+ * File system states (sbp->s_state, nilfs->ns_mount_state)
+ */
+#define NILFS_VALID_FS                  0x0001  /* Unmounted cleanly */
+#define NILFS_ERROR_FS                  0x0002  /* Errors detected */
+#define NILFS_RESIZE_FS                 0x0004  /* Resize required */
+/*
+ * Mount flags (sbi->s_mount_opt)
+ */
+#define NILFS_MOUNT_ERROR_MODE          0x0070  /* Error mode mask */
+#define NILFS_MOUNT_ERRORS_CONT         0x0010  /* Continue on errors */
+#define NILFS_MOUNT_ERRORS_RO           0x0020  /* Remount fs ro on errors */
+#define NILFS_MOUNT_ERRORS_PANIC        0x0040  /* Panic on errors */
+#define NILFS_MOUNT_SNAPSHOT            0x0080  /* Snapshot flag */
+#define NILFS_MOUNT_BARRIER             0x1000  /* Use block barriers */
+#define NILFS_MOUNT_STRICT_ORDER        0x2000  /* Apply strict in-order
+                                                   semantics also for data */
+/**
+ * struct nilfs_super_block - structure of super block on disk
+ */
+struct nilfs_super_block {
+        __le32  s_rev_level;            /* Revision level */
+        __le16  s_minor_rev_level;      /* minor revision level */
+        __le16  s_magic;                /* Magic signature */
+        __le16  s_bytes;                /* Bytes count of CRC calculation
+                                           for this structure. s_reserved
+                                           is excluded. */
+        __le16  s_flags;                /* flags */
+        __le32  s_crc_seed;             /* Seed value of CRC calculation */
+        __le32  s_sum;                  /* Check sum of super block */
+        __le32  s_log_block_size;       /* Block size represented as follows
+                                           blocksize =
+                                               1 << (s_log_block_size + 10) */
+        __le64  s_nsegments;            /* Number of segments in filesystem */
+        __le64  s_dev_size;             /* block device size in bytes */
+        __le64  s_first_data_block;     /* 1st seg disk block number */
+        __le32  s_blocks_per_segment;   /* number of blocks per full segment */
+        __le32  s_r_segments_percentage; /* Reserved segments percentage */
+        __le64  s_last_cno;             /* Last checkpoint number */
+        __le64  s_last_pseg;            /* disk block addr pseg written last */
+        __le64  s_last_seq;             /* seq. number of seg written last */
+        __le64  s_free_blocks_count;    /* Free blocks count */
+        __le64  s_ctime;                /* Creation time (execution time of
+                                           newfs) */
+        __le64  s_mtime;                /* Mount time */
+        __le64  s_wtime;                /* Write time */
+        __le16  s_mnt_count;            /* Mount count */
+        __le16  s_max_mnt_count;        /* Maximal mount count */
+        __le16  s_state;                /* File system state */
+        __le16  s_errors;               /* Behaviour when detecting errors */
+        __le64  s_lastcheck;            /* time of last check */
+        __le32  s_checkinterval;        /* max. time between checks */
+        __le32  s_creator_os;           /* OS */
+        __le16  s_def_resuid;           /* Default uid for reserved blocks */
+        __le16  s_def_resgid;           /* Default gid for reserved blocks */
+        __le32  s_first_ino;            /* First non-reserved inode */
+        __le16  s_inode_size;           /* Size of an inode */
+        __le16  s_dat_entry_size;       /* Size of a dat entry */
+        __le16  s_checkpoint_size;      /* Size of a checkpoint */
+        __le16  s_segment_usage_size;   /* Size of a segment usage */
+        __u8    s_uuid[16];             /* 128-bit uuid for volume */
+        char    s_volume_name[16];      /* volume name */
+        char    s_last_mounted[64];     /* directory where last mounted */
+        __le32  s_c_interval;           /* Commit interval of segment */
+        __le32  s_c_block_max;          /* Threshold of data amount for
+                                           the segment construction */
+        __u32   s_reserved[192];        /* padding to the end of the block */
+};
+/*
+ * Codes for operating systems
+ */
+#define NILFS_OS_LINUX          0
+/* Codes from 1 to 4 are reserved to keep compatibility with ext2 creator-OS */
+/*
+ * Revision levels
+ */
+#define NILFS_CURRENT_REV       2       /* current major revision */
+#define NILFS_MINOR_REV         0       /* minor revision */
+/*
+ * Bytes count of super_block for CRC-calculation
+ */
+#define NILFS_SB_BYTES  \
+        ((long)&((struct nilfs_super_block *)0)->s_reserved)
+/*
+ * Special inode number
+ */
+#define NILFS_ROOT_INO          2       /* Root file inode */
+#define NILFS_DAT_INO           3       /* DAT file */
+#define NILFS_CPFILE_INO        4       /* checkpoint file */
+#define NILFS_SUFILE_INO        5       /* segment usage file */
+#define NILFS_IFILE_INO         6       /* ifile */
+#define NILFS_ATIME_INO         7       /* Atime file (reserved) */
+#define NILFS_XATTR_INO         8       /* Xattribute file (reserved) */
+#define NILFS_SKETCH_INO        10      /* Sketch file */
+#define NILFS_USER_INO          11      /* Fisrt user's file inode number */
+#define NILFS_SB_OFFSET_BYTES   1024    /* byte offset of nilfs superblock */
+#define NILFS_SUPER_MAGIC       0x3434  /* NILFS filesystem  magic number */
+#define NILFS_SEG_MIN_BLOCKS    16      /* Minimum number of blocks in
+                                           a full segment */
+#define NILFS_PSEG_MIN_BLOCKS   2       /* Minimum number of blocks in
+                                           a partial segment */
+#define NILFS_MIN_NRSVSEGS      8       /* Minimum number of reserved
+                                           segments */
+/*
+ * bytes offset of secondary super block
+ */
+#define NILFS_SB2_OFFSET_BYTES(devsize) ((((devsize) >> 12) - 1) << 12)
+/*
+ * Maximal count of links to a file
+ */
+#define NILFS_LINK_MAX          32000
+/*
+ * Structure of a directory entry
+ *  (Same as ext2)
+ */
+#define NILFS_NAME_LEN 255
+/*
+ * The new version of the directory entry.  Since V0 structures are
+ * stored in intel byte order, and the name_len field could never be
+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
+ * file_type field.
+ */
+struct nilfs_dir_entry {
+        __le64  inode;                  /* Inode number */
+        __le16  rec_len;                /* Directory entry length */
+        __u8    name_len;               /* Name length */
+        __u8    file_type;
+        char    name[NILFS_NAME_LEN];   /* File name */
+        char    pad;
+};
+/*
+ * NILFS directory file types.  Only the low 3 bits are used.  The
+ * other bits are reserved for now.
+ */
+enum {
+        NILFS_FT_UNKNOWN,
+        NILFS_FT_REG_FILE,
+        NILFS_FT_DIR,
+        NILFS_FT_CHRDEV,
+        NILFS_FT_BLKDEV,
+        NILFS_FT_FIFO,
+        NILFS_FT_SOCK,
+        NILFS_FT_SYMLINK,
+        NILFS_FT_MAX
+};
+/*
+ * NILFS_DIR_PAD defines the directory entries boundaries
+ *
+ * NOTE: It must be a multiple of 8
+ */
+#define NILFS_DIR_PAD                   8
+#define NILFS_DIR_ROUND                 (NILFS_DIR_PAD - 1)
+#define NILFS_DIR_REC_LEN(name_len)     (((name_len) + 12 + NILFS_DIR_ROUND) & \
+                                        ~NILFS_DIR_ROUND)
+/**
+ * struct nilfs_finfo - file information
+ * @fi_ino: inode number
+ * @fi_cno: checkpoint number
+ * @fi_nblocks: number of blocks (including intermediate blocks)
+ * @fi_ndatablk: number of file data blocks
+ */
+struct nilfs_finfo {
+        __le64 fi_ino;
+        __le64 fi_cno;
+        __le32 fi_nblocks;
+        __le32 fi_ndatablk;
+        /* array of virtual block numbers */
+};
+/**
+ * struct nilfs_binfo_v - information for the block to which a virtual block number is assigned
+ * @bi_vblocknr: virtual block number
+ * @bi_blkoff: block offset
+ */
+struct nilfs_binfo_v {
+        __le64 bi_vblocknr;
+        __le64 bi_blkoff;
+};
+/**
+ * struct nilfs_binfo_dat - information for the block which belongs to the DAT file
+ * @bi_blkoff: block offset
+ * @bi_level: level
+ * @bi_pad: padding
+ */
+struct nilfs_binfo_dat {
+        __le64 bi_blkoff;
+        __u8 bi_level;
+        __u8 bi_pad[7];
+};
+/**
+ * union nilfs_binfo: block information
+ * @bi_v: nilfs_binfo_v structure
+ * @bi_dat: nilfs_binfo_dat structure
+ */
+union nilfs_binfo {
+        struct nilfs_binfo_v bi_v;
+        struct nilfs_binfo_dat bi_dat;
+};
+/**
+ * struct nilfs_segment_summary - segment summary
+ * @ss_datasum: checksum of data
+ * @ss_sumsum: checksum of segment summary
+ * @ss_magic: magic number
+ * @ss_bytes: size of this structure in bytes
+ * @ss_flags: flags
+ * @ss_seq: sequence number
+ * @ss_create: creation timestamp
+ * @ss_next: next segment
+ * @ss_nblocks: number of blocks
+ * @ss_nfinfo: number of finfo structures
+ * @ss_sumbytes: total size of segment summary in bytes
+ * @ss_pad: padding
+ */
+struct nilfs_segment_summary {
+        __le32 ss_datasum;
+        __le32 ss_sumsum;
+        __le32 ss_magic;
+        __le16 ss_bytes;
+        __le16 ss_flags;
+        __le64 ss_seq;
+        __le64 ss_create;
+        __le64 ss_next;
+        __le32 ss_nblocks;
+        __le32 ss_nfinfo;
+        __le32 ss_sumbytes;
+        __le32 ss_pad;
+        /* array of finfo structures */
+};
+#define NILFS_SEGSUM_MAGIC      0x1eaffa11  /* segment summary magic number */
+/*
+ * Segment summary flags
+ */
+#define NILFS_SS_LOGBGN 0x0001  /* begins a logical segment */
+#define NILFS_SS_LOGEND 0x0002  /* ends a logical segment */
+#define NILFS_SS_SR     0x0004  /* has super root */
+#define NILFS_SS_SYNDT  0x0008  /* includes data only updates */
+#define NILFS_SS_GC     0x0010  /* segment written for cleaner operation */
+/**
+ * struct nilfs_palloc_group_desc - block group descriptor
+ * @pg_nfrees: number of free entries in block group
+ */
+struct nilfs_palloc_group_desc {
+        __le32 pg_nfrees;
+};
+/**
+ * struct nilfs_dat_entry - disk address translation entry
+ * @dt_blocknr: block number
+ * @dt_start: start checkpoint number
+ * @dt_end: end checkpoint number
+ * @dt_rsv: reserved for future use
+ */
+struct nilfs_dat_entry {
+        __le64 de_blocknr;
+        __le64 de_start;
+        __le64 de_end;
+        __le64 de_rsv;
+};
+/**
+ * struct nilfs_dat_group_desc - block group descriptor
+ * @dg_nfrees: number of free virtual block numbers in block group
+ */
+struct nilfs_dat_group_desc {
+        __le32 dg_nfrees;
+};
+/**
+ * struct nilfs_snapshot_list - snapshot list
+ * @ssl_next: next checkpoint number on snapshot list
+ * @ssl_prev: previous checkpoint number on snapshot list
+ */
+struct nilfs_snapshot_list {
+        __le64 ssl_next;
+        __le64 ssl_prev;
+};
+/**
+ * struct nilfs_checkpoint - checkpoint structure
+ * @cp_flags: flags
+ * @cp_checkpoints_count: checkpoints count in a block
+ * @cp_snapshot_list: snapshot list
+ * @cp_cno: checkpoint number
+ * @cp_create: creation timestamp
+ * @cp_nblk_inc: number of blocks incremented by this checkpoint
+ * @cp_inodes_count: inodes count
+ * @cp_blocks_count: blocks count
+ * @cp_ifile_inode: inode of ifile
+ */
+struct nilfs_checkpoint {
+        __le32 cp_flags;
+        __le32 cp_checkpoints_count;
+        struct nilfs_snapshot_list cp_snapshot_list;
+        __le64 cp_cno;
+        __le64 cp_create;
+        __le64 cp_nblk_inc;
+        __le64 cp_inodes_count;
+        __le64 cp_blocks_count;         /* Reserved (might be deleted) */
+        /* Do not change the byte offset of ifile inode.
+           To keep the compatibility of the disk format,
+           additional fields should be added behind cp_ifile_inode. */
+        struct nilfs_inode cp_ifile_inode;
+};
+/* checkpoint flags */
+enum {
+        NILFS_CHECKPOINT_SNAPSHOT,
+        NILFS_CHECKPOINT_INVALID,
+        NILFS_CHECKPOINT_SKETCH,
+        NILFS_CHECKPOINT_MINOR,
+};
+#define NILFS_CHECKPOINT_FNS(flag, name)                                \
+static inline void                                                      \
+nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp)                \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) |          \
+                                   (1UL << NILFS_CHECKPOINT_##flag));   \
+}                                                                       \
+static inline void                                                      \
+nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) &          \
+                                   ~(1UL << NILFS_CHECKPOINT_##flag));  \
+}                                                                       \
+static inline int                                                       \
+nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp)              \
+{                                                                       \
+        return !!(le32_to_cpu(cp->cp_flags) &                           \
+                  (1UL << NILFS_CHECKPOINT_##flag));                    \
+}
+NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
+NILFS_CHECKPOINT_FNS(INVALID, invalid)
+NILFS_CHECKPOINT_FNS(MINOR, minor)
+/**
+ * struct nilfs_cpinfo - checkpoint information
+ * @ci_flags: flags
+ * @ci_pad: padding
+ * @ci_cno: checkpoint number
+ * @ci_create: creation timestamp
+ * @ci_nblk_inc: number of blocks incremented by this checkpoint
+ * @ci_inodes_count: inodes count
+ * @ci_blocks_count: blocks count
+ * @ci_next: next checkpoint number in snapshot list
+ */
+struct nilfs_cpinfo {
+        __u32 ci_flags;
+        __u32 ci_pad;
+        __u64 ci_cno;
+        __u64 ci_create;
+        __u64 ci_nblk_inc;
+        __u64 ci_inodes_count;
+        __u64 ci_blocks_count;
+        __u64 ci_next;
+};
+#define NILFS_CPINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_cpinfo_##name(const struct nilfs_cpinfo *cpinfo)                  \
+{                                                                       \
+        return !!(cpinfo->ci_flags & (1UL << NILFS_CHECKPOINT_##flag)); \
+}
+NILFS_CPINFO_FNS(SNAPSHOT, snapshot)
+NILFS_CPINFO_FNS(INVALID, invalid)
+NILFS_CPINFO_FNS(MINOR, minor)
+/**
+ * struct nilfs_cpfile_header - checkpoint file header
+ * @ch_ncheckpoints: number of checkpoints
+ * @ch_nsnapshots: number of snapshots
+ * @ch_snapshot_list: snapshot list
+ */
+struct nilfs_cpfile_header {
+        __le64 ch_ncheckpoints;
+        __le64 ch_nsnapshots;
+        struct nilfs_snapshot_list ch_snapshot_list;
+};
+#define NILFS_CPFILE_FIRST_CHECKPOINT_OFFSET    \
+        ((sizeof(struct nilfs_cpfile_header) +                          \
+          sizeof(struct nilfs_checkpoint) - 1) /                        \
+                        sizeof(struct nilfs_checkpoint))
+/**
+ * struct nilfs_segment_usage - segment usage
+ * @su_lastmod: last modified timestamp
+ * @su_nblocks: number of blocks in segment
+ * @su_flags: flags
+ */
+struct nilfs_segment_usage {
+        __le64 su_lastmod;
+        __le32 su_nblocks;
+        __le32 su_flags;
+};
+/* segment usage flag */
+enum {
+        NILFS_SEGMENT_USAGE_ACTIVE,
+        NILFS_SEGMENT_USAGE_DIRTY,
+        NILFS_SEGMENT_USAGE_ERROR,
+        /* ... */
+};
+#define NILFS_SEGMENT_USAGE_FNS(flag, name)                             \
+static inline void                                                      \
+nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su)          \
+{                                                                       \
+        su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) |          \
+                                   (1UL << NILFS_SEGMENT_USAGE_##flag));\
+}                                                                       \
+static inline void                                                      \
+nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su)        \
+{                                                                       \
+        su->su_flags =                                                  \
+                cpu_to_le32(le32_to_cpu(su->su_flags) &                 \
+                            ~(1UL << NILFS_SEGMENT_USAGE_##flag));      \
+}                                                                       \
+static inline int                                                       \
+nilfs_segment_usage_##name(const struct nilfs_segment_usage *su)        \
+{                                                                       \
+        return !!(le32_to_cpu(su->su_flags) &                           \
+                  (1UL << NILFS_SEGMENT_USAGE_##flag));                 \
+}
+NILFS_SEGMENT_USAGE_FNS(ACTIVE, active)
+NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty)
+NILFS_SEGMENT_USAGE_FNS(ERROR, error)
+static inline void
+nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
+{
+        su->su_lastmod = cpu_to_le64(0);
+        su->su_nblocks = cpu_to_le32(0);
+        su->su_flags = cpu_to_le32(0);
+}
+static inline int
+nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
+{
+        return !le32_to_cpu(su->su_flags);
+}
+/**
+ * struct nilfs_sufile_header - segment usage file header
+ * @sh_ncleansegs: number of clean segments
+ * @sh_ndirtysegs: number of dirty segments
+ * @sh_last_alloc: last allocated segment number
+ */
+struct nilfs_sufile_header {
+        __le64 sh_ncleansegs;
+        __le64 sh_ndirtysegs;
+        __le64 sh_last_alloc;
+        /* ... */
+};
+#define NILFS_SUFILE_FIRST_SEGMENT_USAGE_OFFSET \
+        ((sizeof(struct nilfs_sufile_header) +                          \
+          sizeof(struct nilfs_segment_usage) - 1) /                     \
+                         sizeof(struct nilfs_segment_usage))
+/**
+ * nilfs_suinfo - segment usage information
+ * @sui_lastmod:
+ * @sui_nblocks:
+ * @sui_flags:
+ */
+struct nilfs_suinfo {
+        __u64 sui_lastmod;
+        __u32 sui_nblocks;
+        __u32 sui_flags;
+};
+#define NILFS_SUINFO_FNS(flag, name)                                    \
+static inline int                                                       \
+nilfs_suinfo_##name(const struct nilfs_suinfo *si)                      \
+{                                                                       \
+        return si->sui_flags & (1UL << NILFS_SEGMENT_USAGE_##flag);     \
+}
+NILFS_SUINFO_FNS(ACTIVE, active)
+NILFS_SUINFO_FNS(DIRTY, dirty)
+NILFS_SUINFO_FNS(ERROR, error)
+static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si)
+{
+        return !si->sui_flags;
+}
+/* ioctl */
+enum {
+        NILFS_CHECKPOINT,
+        NILFS_SNAPSHOT,
+};
+/**
+ * struct nilfs_cpmode -
+ * @cc_cno:
+ * @cc_mode:
+ */
+struct nilfs_cpmode {
+        __u64 cm_cno;
+        __u32 cm_mode;
+        __u32 cm_pad;
+};
+/**
+ * struct nilfs_argv - argument vector
+ * @v_base:
+ * @v_nmembs:
+ * @v_size:
+ * @v_flags:
+ * @v_index:
+ */
+struct nilfs_argv {
+        __u64 v_base;
+        __u32 v_nmembs; /* number of members */
+        __u16 v_size;   /* size of members */
+        __u16 v_flags;
+        __u64 v_index;
+};
+/**
+ * struct nilfs_period -
+ * @p_start:
+ * @p_end:
+ */
+struct nilfs_period {
+        __u64 p_start;
+        __u64 p_end;
+};
+/**
+ * struct nilfs_cpstat -
+ * @cs_cno: checkpoint number
+ * @cs_ncps: number of checkpoints
+ * @cs_nsss: number of snapshots
+ */
+struct nilfs_cpstat {
+        __u64 cs_cno;
+        __u64 cs_ncps;
+        __u64 cs_nsss;
+};
+/**
+ * struct nilfs_sustat -
+ * @ss_nsegs: number of segments
+ * @ss_ncleansegs: number of clean segments
+ * @ss_ndirtysegs: number of dirty segments
+ * @ss_ctime: creation time of the last segment
+ * @ss_nongc_ctime: creation time of the last segment not for GC
+ * @ss_prot_seq: least sequence number of segments which must not be reclaimed
+ */
+struct nilfs_sustat {
+        __u64 ss_nsegs;
+        __u64 ss_ncleansegs;
+        __u64 ss_ndirtysegs;
+        __u64 ss_ctime;
+        __u64 ss_nongc_ctime;
+        __u64 ss_prot_seq;
+};
+/**
+ * struct nilfs_vinfo - virtual block number information
+ * @vi_vblocknr:
+ * @vi_start:
+ * @vi_end:
+ * @vi_blocknr:
+ */
+struct nilfs_vinfo {
+        __u64 vi_vblocknr;
+        __u64 vi_start;
+        __u64 vi_end;
+        __u64 vi_blocknr;
+};
+/**
+ * struct nilfs_vdesc -
+ */
+struct nilfs_vdesc {
+        __u64 vd_ino;
+        __u64 vd_cno;
+        __u64 vd_vblocknr;
+        struct nilfs_period vd_period;
+        __u64 vd_blocknr;
+        __u64 vd_offset;
+        __u32 vd_flags;
+        __u32 vd_pad;
+};
+/**
+ * struct nilfs_bdesc -
+ */
+struct nilfs_bdesc {
+        __u64 bd_ino;
+        __u64 bd_oblocknr;
+        __u64 bd_blocknr;
+        __u64 bd_offset;
+        __u32 bd_level;
+        __u32 bd_pad;
+};
+#define NILFS_IOCTL_IDENT               'n'
+#define NILFS_IOCTL_CHANGE_CPMODE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode)
+#define NILFS_IOCTL_DELETE_CHECKPOINT  \
+        _IOW(NILFS_IOCTL_IDENT, 0x81, __u64)
+#define NILFS_IOCTL_GET_CPINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x82, struct nilfs_argv)
+#define NILFS_IOCTL_GET_CPSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x83, struct nilfs_cpstat)
+#define NILFS_IOCTL_GET_SUINFO  \
+        _IOR(NILFS_IOCTL_IDENT, 0x84, struct nilfs_argv)
+#define NILFS_IOCTL_GET_SUSTAT  \
+        _IOR(NILFS_IOCTL_IDENT, 0x85, struct nilfs_sustat)
+#define NILFS_IOCTL_GET_VINFO  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x86, struct nilfs_argv)
+#define NILFS_IOCTL_GET_BDESCS  \
+        _IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
+#define NILFS_IOCTL_CLEAN_SEGMENTS  \
+        _IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
+#define NILFS_IOCTL_SYNC  \
+        _IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
+#define NILFS_IOCTL_RESIZE  \
+        _IOW(NILFS_IOCTL_IDENT, 0x8B, __u64)
+#endif  /* _LINUX_NILFS_FS_H */
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index ea8c6d84996d..cc1767f5cca8 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -228,10 +228,11 @@ extern void parport_pc_release_resources(struct parport *p);
 extern int parport_pc_claim_resources(struct parport *p);
 /* PCMCIA code will want to get us to look at a port.  Provide a mechanism. */
-extern struct parport *parport_pc_probe_port (unsigned long base,
+extern struct parport *parport_pc_probe_port(unsigned long base,
-                                              unsigned long base_hi,
+                                             unsigned long base_hi,
-                                              int irq, int dma,
+                                             int irq, int dma,
-                                              struct device *dev);
+                                             struct device *dev,
-extern void parport_pc_unregister_port (struct parport *p);
+                                             int irqflags);
+extern void parport_pc_unregister_port(struct parport *p);
 #endif
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a7fe4bbd7ff1..72698d89e767 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -674,6 +674,11 @@ int __must_check pci_reenable_device(struct pci_dev *);
 int __must_check pcim_enable_device(struct pci_dev *pdev);
 void pcim_pin_device(struct pci_dev *pdev);
+static inline int pci_is_enabled(struct pci_dev *pdev)
+{
+        return (atomic_read(&pdev->enable_cnt) > 0);
+}
 static inline int pci_is_managed(struct pci_dev *pdev)
 {
        return pdev->is_managed;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 170f8b1f22db..ee98cd570885 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -944,6 +944,32 @@
 #define PCI_DEVICE_ID_SUN_TOMATILLO     0xa801
 #define PCI_DEVICE_ID_SUN_CASSINI       0xabba
+#define PCI_VENDOR_ID_NI                0x1093
+#define PCI_DEVICE_ID_NI_PCI2322        0xd130
+#define PCI_DEVICE_ID_NI_PCI2324        0xd140
+#define PCI_DEVICE_ID_NI_PCI2328        0xd150
+#define PCI_DEVICE_ID_NI_PXI8422_2322   0xd190
+#define PCI_DEVICE_ID_NI_PXI8422_2324   0xd1a0
+#define PCI_DEVICE_ID_NI_PXI8420_2322   0xd1d0
+#define PCI_DEVICE_ID_NI_PXI8420_2324   0xd1e0
+#define PCI_DEVICE_ID_NI_PXI8420_2328   0xd1f0
+#define PCI_DEVICE_ID_NI_PXI8420_23216  0xd1f1
+#define PCI_DEVICE_ID_NI_PCI2322I       0xd250
+#define PCI_DEVICE_ID_NI_PCI2324I       0xd270
+#define PCI_DEVICE_ID_NI_PCI23216       0xd2b0
+#define PCI_DEVICE_ID_NI_PXI8430_2322   0x7080
+#define PCI_DEVICE_ID_NI_PCI8430_2322   0x70db
+#define PCI_DEVICE_ID_NI_PXI8430_2324   0x70dd
+#define PCI_DEVICE_ID_NI_PCI8430_2324   0x70df
+#define PCI_DEVICE_ID_NI_PXI8430_2328   0x70e2
+#define PCI_DEVICE_ID_NI_PCI8430_2328   0x70e4
+#define PCI_DEVICE_ID_NI_PXI8430_23216  0x70e6
+#define PCI_DEVICE_ID_NI_PCI8430_23216  0x70e7
+#define PCI_DEVICE_ID_NI_PXI8432_2322   0x70e8
+#define PCI_DEVICE_ID_NI_PCI8432_2322   0x70ea
+#define PCI_DEVICE_ID_NI_PXI8432_2324   0x70ec
+#define PCI_DEVICE_ID_NI_PCI8432_2324   0x70ee
 #define PCI_VENDOR_ID_CMD               0x1095
 #define PCI_DEVICE_ID_CMD_643           0x0643
 #define PCI_DEVICE_ID_CMD_646           0x0646
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index 80044a4f3ab9..bfd92e1e5d2c 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
@@ -108,25 +107,14 @@ struct rcu_data {
        struct rcu_head barrier;
 };
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
 /*
 * Increment the quiescent state counter.
 * The counter is a bit degenerated: We do not need to know
 * how many quiescent states passed, just if there was at least
 * one since the start of the grace period. Thus just a flag.
 */
-static inline void rcu_qsctr_inc(int cpu)
+extern void rcu_qsctr_inc(int cpu);
-{
+extern void rcu_bh_qsctr_inc(int cpu);
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-}
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 528343e6da51..15fbb3ca634d 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -36,7 +36,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
 #include <linux/lockdep.h>
diff --git a/include/linux/rcupreempt.h b/include/linux/rcupreempt.h
index 74304b4538d8..fce522782ffa 100644
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
@@ -36,34 +36,19 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
+#include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
-struct rcu_dyntick_sched {
+extern void rcu_qsctr_inc(int cpu);
-        int dynticks;
+static inline void rcu_bh_qsctr_inc(int cpu) { }
-        int dynticks_snap;
-        int sched_qs;
-        int sched_qs_snap;
-        int sched_dynticks_snap;
-};
-DECLARE_PER_CPU(struct rcu_dyntick_sched, rcu_dyntick_sched);
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_dyntick_sched *rdssp = &per_cpu(rcu_dyntick_sched, cpu);
-        rdssp->sched_qs++;
-}
-#define rcu_bh_qsctr_inc(cpu)
 /*
 * Someone might want to pass call_rcu_bh as a function pointer.
 * So this needs to just be a rename and not a macro function.
 *  (no parentheses)
 */
-#define call_rcu_bh             call_rcu
+#define call_rcu_bh             call_rcu
 /**
 * call_rcu_sched - Queue RCU callback for invocation after sched grace period.
@@ -117,30 +102,12 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu);
 struct softirq_action;
 #ifdef CONFIG_NO_HZ
+extern void rcu_enter_nohz(void);
-static inline void rcu_enter_nohz(void)
+extern void rcu_exit_nohz(void);
-{
+#else
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
+# define rcu_enter_nohz()       do { } while (0)
+# define rcu_exit_nohz()        do { } while (0)
-        smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
+#endif
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        WARN_ON_RATELIMIT(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1, &rs);
-}
-static inline void rcu_exit_nohz(void)
-{
-        static DEFINE_RATELIMIT_STATE(rs, 10 * HZ, 1);
-        __get_cpu_var(rcu_dyntick_sched).dynticks++;
-        smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
-        WARN_ON_RATELIMIT(!(__get_cpu_var(rcu_dyntick_sched).dynticks & 0x1),
-                                &rs);
-}
-#else /* CONFIG_NO_HZ */
-#define rcu_enter_nohz()        do { } while (0)
-#define rcu_exit_nohz()         do { } while (0)
-#endif /* CONFIG_NO_HZ */
 /*
 * A context switch is a grace period for rcupreempt synchronize_rcu()
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index a722fb67bb2d..0cdda00f2b2a 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -33,7 +33,6 @@
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
 #include <linux/seqlock.h>
@@ -236,30 +235,8 @@ struct rcu_state {
 #endif /* #ifdef CONFIG_NO_HZ */
 };
-extern struct rcu_state rcu_state;
+extern void rcu_qsctr_inc(int cpu);
-DECLARE_PER_CPU(struct rcu_data, rcu_data);
+extern void rcu_bh_qsctr_inc(int cpu);
-extern struct rcu_state rcu_bh_state;
-DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
-/*
- * Increment the quiescent state counter.
- * The counter is a bit degenerated: We do not need to know
- * how many quiescent states passed, just if there was at least
- * one since the start of the grace period. Thus just a flag.
- */
-static inline void rcu_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
-static inline void rcu_bh_qsctr_inc(int cpu)
-{
-        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
-        rdp->passed_quiesc = 1;
-        rdp->passed_quiesc_completed = rdp->completed;
-}
 extern int rcu_pending(int cpu);
 extern int rcu_needs_cpu(int cpu);
diff --git a/include/linux/security.h b/include/linux/security.h
index 54ed15799a83..d5fd6163606f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -32,6 +32,7 @@
 #include <linux/sched.h>
 #include <linux/key.h>
 #include <linux/xfrm.h>
+#include <linux/gfp.h>
 #include <net/flow.h>
 /* Maximum number of letters for an LSM name string */
@@ -2953,5 +2954,28 @@ static inline void securityfs_remove(struct dentry *dentry)
 #endif
+#ifdef CONFIG_SECURITY
+static inline char *alloc_secdata(void)
+{
+        return (char *)get_zeroed_page(GFP_KERNEL);
+}
+static inline void free_secdata(void *secdata)
+{
+        free_page((unsigned long)secdata);
+}
+#else
+static inline char *alloc_secdata(void)
+{
+        return (char *)1;
+}
+static inline void free_secdata(void *secdata)
+{ }
+#endif /* CONFIG_SECURITY */
 #endif /* ! __LINUX_SECURITY_H */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index df9245c7bd3b..57a97e52e58d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -164,6 +164,9 @@
 /* NWPSERIAL */
 #define PORT_NWPSERIAL  85
+/* MAX3100 */
+#define PORT_MAX3100    86
 #ifdef __KERNEL__
 #include <linux/compiler.h>
@@ -277,7 +280,7 @@ struct uart_port {
        struct uart_icount      icount;                 /* statistics */
        struct console          *cons;                  /* struct console, if any */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
        unsigned long           sysrq;                  /* sysrq timeout */
 #endif
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index f4523651fa42..5ac9b0bcaf9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -73,8 +73,8 @@ found:
                ret = kmem_cache_alloc_notrace(cachep, flags);
-                kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
+                trace_kmalloc(_THIS_IP_, ret,
-                                     size, slab_buffer_size(cachep), flags);
+                              size, slab_buffer_size(cachep), flags);
                return ret;
        }
@@ -128,9 +128,9 @@ found:
                ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_,
+                trace_kmalloc_node(_THIS_IP_, ret,
-                                          ret, size, slab_buffer_size(cachep),
+                                   size, slab_buffer_size(cachep),
-                                          flags, node);
+                                   flags, node);
                return ret;
        }
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index a1f90528e70b..5046f90c1171 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -233,8 +233,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
        unsigned int order = get_order(size);
        void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
-        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
+        trace_kmalloc(_THIS_IP_, ret, size, PAGE_SIZE << order, flags);
-                             size, PAGE_SIZE << order, flags);
        return ret;
 }
@@ -255,9 +254,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
                        ret = kmem_cache_alloc_notrace(s, flags);
-                        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC,
+                        trace_kmalloc(_THIS_IP_, ret, size, s->size, flags);
-                                             _THIS_IP_, ret,
-                                             size, s->size, flags);
                        return ret;
                }
@@ -296,9 +293,8 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                ret = kmem_cache_alloc_node_notrace(s, flags, node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
+                trace_kmalloc_node(_THIS_IP_, ret,
-                                          _THIS_IP_, ret,
+                                   size, s->size, flags, node);
-                                          size, s->size, flags, node);
                return ret;
        }
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 68bb1c501d0d..2cc43fa380cb 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -204,6 +204,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
 *      SPI slaves, and are numbered from zero to num_chipselects.
 *      each slave has a chipselect signal, but it's common that not
 *      every chipselect is connected to a slave.
+ * @dma_alignment: SPI controller constraint on DMA buffers alignment.
 * @setup: updates the device mode and clocking records used by a
 *      device's SPI controller; protocol code may call this.  This
 *      must fail if an unrecognized or unsupported mode is requested.
@@ -239,6 +240,11 @@ struct spi_master {
         */
        u16                     num_chipselect;
+        /* some SPI controllers pose alignment requirements on DMAable
+         * buffers; let protocol drivers know about these requirements.
+         */
+        u16                     dma_alignment;
        /* setup mode and clock, etc (spi driver may call many times) */
        int                     (*setup)(struct spi_device *spi);
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index d3a4c0231933..2a30775959e9 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -24,6 +24,15 @@
 */
 typedef int             (*svc_thread_fn)(void *);
+/* statistics for svc_pool structures */
+struct svc_pool_stats {
+        unsigned long   packets;
+        unsigned long   sockets_queued;
+        unsigned long   threads_woken;
+        unsigned long   overloads_avoided;
+        unsigned long   threads_timedout;
+};
 /*
 *
 * RPC service thread pool.
@@ -41,6 +50,8 @@ struct svc_pool {
        struct list_head        sp_sockets;     /* pending sockets */
        unsigned int            sp_nrthreads;   /* # of threads in pool */
        struct list_head        sp_all_threads; /* all server threads */
+        int                     sp_nwaking;     /* number of threads woken but not yet active */
+        struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
 } ____cacheline_aligned_in_smp;
 /*
@@ -83,6 +94,8 @@ struct svc_serv {
        struct module *         sv_module;      /* optional module to count when
                                                 * adding threads */
        svc_thread_fn           sv_function;    /* main function for threads */
+        unsigned int            sv_drc_max_pages; /* Total pages for DRC */
+        unsigned int            sv_drc_pages_used;/* DRC pages used */
 };
 /*
@@ -218,6 +231,7 @@ struct svc_rqst {
        struct svc_cred         rq_cred;        /* auth info */
        void *                  rq_xprt_ctxt;   /* transport specific context ptr */
        struct svc_deferred_req*rq_deferred;    /* deferred request we are replaying */
+        int                     rq_usedeferral; /* use deferral */
        size_t                  rq_xprt_hlen;   /* xprt header len */
        struct xdr_buf          rq_arg;
@@ -263,6 +277,7 @@ struct svc_rqst {
                                                 * cache pages */
        wait_queue_head_t       rq_wait;        /* synchronization */
        struct task_struct      *rq_task;       /* service thread */
+        int                     rq_waking;      /* 1 if thread is being woken */
 };
 /*
@@ -393,6 +408,7 @@ struct svc_serv *  svc_create_pooled(struct svc_program *, unsigned int,
                        void (*shutdown)(struct svc_serv *),
                        svc_thread_fn, struct module *);
 int                svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
+int                svc_pool_stats_open(struct svc_serv *serv, struct file *file);
 void               svc_destroy(struct svc_serv *);
 int                svc_process(struct svc_rqst *);
 int                svc_register(const struct svc_serv *, const int,
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 49e1eb454465..d8910b68e1bd 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -69,27 +69,27 @@ struct xdr_buf {
 * pre-xdr'ed macros.
 */
-#define xdr_zero        __constant_htonl(0)
+#define xdr_zero        cpu_to_be32(0)
-#define xdr_one         __constant_htonl(1)
+#define xdr_one         cpu_to_be32(1)
-#define xdr_two         __constant_htonl(2)
+#define xdr_two         cpu_to_be32(2)
-#define rpc_success             __constant_htonl(RPC_SUCCESS)
+#define rpc_success             cpu_to_be32(RPC_SUCCESS)
-#define rpc_prog_unavail        __constant_htonl(RPC_PROG_UNAVAIL)
+#define rpc_prog_unavail        cpu_to_be32(RPC_PROG_UNAVAIL)
-#define rpc_prog_mismatch       __constant_htonl(RPC_PROG_MISMATCH)
+#define rpc_prog_mismatch       cpu_to_be32(RPC_PROG_MISMATCH)
-#define rpc_proc_unavail        __constant_htonl(RPC_PROC_UNAVAIL)
+#define rpc_proc_unavail        cpu_to_be32(RPC_PROC_UNAVAIL)
-#define rpc_garbage_args        __constant_htonl(RPC_GARBAGE_ARGS)
+#define rpc_garbage_args        cpu_to_be32(RPC_GARBAGE_ARGS)
-#define rpc_system_err          __constant_htonl(RPC_SYSTEM_ERR)
+#define rpc_system_err          cpu_to_be32(RPC_SYSTEM_ERR)
-#define rpc_drop_reply          __constant_htonl(RPC_DROP_REPLY)
+#define rpc_drop_reply          cpu_to_be32(RPC_DROP_REPLY)
-#define rpc_auth_ok             __constant_htonl(RPC_AUTH_OK)
+#define rpc_auth_ok             cpu_to_be32(RPC_AUTH_OK)
-#define rpc_autherr_badcred     __constant_htonl(RPC_AUTH_BADCRED)
+#define rpc_autherr_badcred     cpu_to_be32(RPC_AUTH_BADCRED)
-#define rpc_autherr_rejectedcred __constant_htonl(RPC_AUTH_REJECTEDCRED)
+#define rpc_autherr_rejectedcred cpu_to_be32(RPC_AUTH_REJECTEDCRED)
-#define rpc_autherr_badverf     __constant_htonl(RPC_AUTH_BADVERF)
+#define rpc_autherr_badverf     cpu_to_be32(RPC_AUTH_BADVERF)
-#define rpc_autherr_rejectedverf __constant_htonl(RPC_AUTH_REJECTEDVERF)
+#define rpc_autherr_rejectedverf cpu_to_be32(RPC_AUTH_REJECTEDVERF)
-#define rpc_autherr_tooweak     __constant_htonl(RPC_AUTH_TOOWEAK)
+#define rpc_autherr_tooweak     cpu_to_be32(RPC_AUTH_TOOWEAK)
-#define rpcsec_gsserr_credproblem       __constant_htonl(RPCSEC_GSS_CREDPROBLEM)
+#define rpcsec_gsserr_credproblem       cpu_to_be32(RPCSEC_GSS_CREDPROBLEM)
-#define rpcsec_gsserr_ctxproblem        __constant_htonl(RPCSEC_GSS_CTXPROBLEM)
+#define rpcsec_gsserr_ctxproblem        cpu_to_be32(RPCSEC_GSS_CTXPROBLEM)
-#define rpc_autherr_oldseqnum   __constant_htonl(101)
+#define rpc_autherr_oldseqnum   cpu_to_be32(101)
 /*
 * Miscellaneous XDR helper functions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 8615d661ab60..bcba84ea2d86 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -309,7 +309,8 @@ extern void tty_set_operations(struct tty_driver *driver,
 extern struct tty_driver *tty_find_polling_driver(char *name, int *line);
 extern void tty_driver_kref_put(struct tty_driver *driver);
-extern inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
+static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d)
 {
        kref_get(&d->kref);
        return d;
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 139d234923cd..ebb2ea6b4995 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -737,6 +737,11 @@ struct v4l2_input {
 #define V4L2_IN_ST_NO_SIGNAL   0x00000002
 #define V4L2_IN_ST_NO_COLOR    0x00000004
+/* field 'status' - sensor orientation */
+/* If sensor is mounted upside down set both bits */
+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
 /* field 'status' - analog */
 #define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
 #define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 93445477f86a..9c1ed1fb6ddb 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -168,6 +168,8 @@ void writeback_set_ratelimit(void);
 /* pdflush.c */
 extern int nr_pdflush_threads;  /* Global so it can be exported to sysctl
                                   read-only. */
+extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */
+extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */
 #endif          /* WRITEBACK_H */
diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 6ab854931c05..90cf22ada8b4 100644
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
   =======
   So to specify a complete routing scheme for the msp3400 you will have to
-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:
   1) which tuner input to use
   2) which SCART input to use
   3) which DSP input to use for each DSP output
-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:
   1) which SCART input to use for each SCART output
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 57db48dd85b8..30d9629198ef 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -17,10 +17,45 @@
 #define OV772X_FLAG_VFLIP     0x00000001 /* Vertical flip image */
 #define OV772X_FLAG_HFLIP     0x00000002 /* Horizontal flip image */
+/*
+ * for Edge ctrl
+ *
+ * strength also control Auto or Manual Edge Control Mode
+ * see also OV772X_MANUAL_EDGE_CTRL
+ */
+struct ov772x_edge_ctrl {
+        unsigned char strength;
+        unsigned char threshold;
+        unsigned char upper;
+        unsigned char lower;
+};
+#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
+#define EDGE_STRENGTH_MASK      0x1F
+#define EDGE_THRESHOLD_MASK     0x0F
+#define EDGE_UPPER_MASK         0xFF
+#define EDGE_LOWER_MASK         0xFF
+#define OV772X_AUTO_EDGECTRL(u, l)      \
+{                                       \
+        .upper = (u & EDGE_UPPER_MASK), \
+        .lower = (l & EDGE_LOWER_MASK), \
+}
+#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
+{                                                                       \
+        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
+        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+}
+/*
+ * ov772x camera info
+ */
 struct ov772x_camera_info {
        unsigned long          buswidth;
        unsigned long          flags;
        struct soc_camera_link link;
+        struct ov772x_edge_ctrl edgectrl;
 };
 #endif /* __OV772X_H__ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index fff4235adae5..7a9f76ecbbbd 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -18,7 +18,7 @@
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
-#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
+#define SAA7146_VERSION_CODE 0x000600   /* 0.6.0 */
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
diff --git a/include/media/tvaudio.h b/include/media/tvaudio.h
index 6915aafc875a..1ac8184693f8 100644
--- a/include/media/tvaudio.h
+++ b/include/media/tvaudio.h
@@ -21,10 +21,29 @@
 #ifndef _TVAUDIO_H
 #define _TVAUDIO_H
+#include <media/i2c-addr.h>
 /* The tvaudio module accepts the following inputs: */
 #define TVAUDIO_INPUT_TUNER  0
 #define TVAUDIO_INPUT_RADIO  1
 #define TVAUDIO_INPUT_EXTERN 2
 #define TVAUDIO_INPUT_INTERN 3
+static inline const unsigned short *tvaudio_addrs(void)
+{
+        static const unsigned short addrs[] = {
+                I2C_ADDR_TDA8425   >> 1,
+                I2C_ADDR_TEA6300   >> 1,
+                I2C_ADDR_TEA6420   >> 1,
+                I2C_ADDR_TDA9840   >> 1,
+                I2C_ADDR_TDA985x_L >> 1,
+                I2C_ADDR_TDA985x_H >> 1,
+                I2C_ADDR_TDA9874   >> 1,
+                I2C_ADDR_PIC16C54  >> 1,
+                I2C_CLIENT_END
+        };
+        return addrs;
+}
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 3a6905615d68..c48c24e4d0fa 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -125,7 +125,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
 /* ------------------------------------------------------------------------- */
-/* Helper function for I2C legacy drivers */
+/* I2C Helper functions */
 struct i2c_driver;
 struct i2c_adapter;
@@ -135,21 +135,24 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct v4l2_subdev_ops;
-int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
-                const char *name,
-                int (*probe)(struct i2c_client *, const struct i2c_device_id *));
 /* Load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type, u8 addr);
 /* Probe and load an i2c module and return an initialized v4l2_subdev struct.
   Only call request_module if module_name != NULL.
   The client_type argument is the name of the chip that's on the adapter. */
-struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
                const char *module_name, const char *client_type,
                const unsigned short *addrs);
+/* Like v4l2_i2c_new_probed_subdev, except probe for a single address. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev_addr(struct v4l2_device *v4l2_dev,
+                struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr);
 /* Initialize an v4l2_subdev with data from an i2c_client struct */
 void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
                const struct v4l2_subdev_ops *ops);
@@ -171,139 +174,23 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
 /* ------------------------------------------------------------------------- */
-/* Internal ioctls */
+/* Note: these remaining ioctls/structs should be removed as well, but they are
+   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
-/* VIDIOC_INT_DECODE_VBI_LINE */
+   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
-struct v4l2_decode_vbi_line {
+   is needed in those modules. */
-        u32 is_second_field;    /* Set to 0 for the first (odd) field,
-                                   set to 1 for the second (even) field. */
-        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
-                                   On exit points to the start of the payload. */
-        u32 line;               /* Line number of the sliced VBI data (1-23) */
-        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
-};
+/* s_config */
 struct v4l2_priv_tun_config {
        int tuner;
        void *priv;
 };
-/* audio ioctls */
-/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
-#define AUDC_SET_RADIO        _IO('d',88)
-/* tuner ioctls */
-/* Sets tuner type and its I2C addr */
-#define TUNER_SET_TYPE_ADDR          _IOW('d', 90, int)
-/* Puts tuner on powersaving state, disabling it, except for i2c. To be replaced
-   by VIDIOC_INT_S_STANDBY. */
-#define TUNER_SET_STANDBY            _IOW('d', 91, int)
-/* Sets tda9887 specific stuff, like port1, port2 and qss */
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
-/* Switch the tuner to a specific tuner mode. Replacement of AUDC_SET_RADIO */
-#define VIDIOC_INT_S_TUNER_MODE      _IOW('d', 93, enum v4l2_tuner_type)
-/* Generic standby command. Passing -1 (all bits set to 1) will put the whole
-   chip into standby mode, value 0 will make the chip fully active. Specific
-   bits can be used by certain chips to enable/disable specific subsystems.
-   Replacement of TUNER_SET_STANDBY. */
-#define VIDIOC_INT_S_STANDBY         _IOW('d', 94, u32)
-/* 100, 101 used by  VIDIOC_DBG_[SG]_REGISTER */
-/* Generic reset command. The argument selects which subsystems to reset.
-   Passing 0 will always reset the whole chip. */
 #define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
-/* Set the frequency (in Hz) of the audio clock output.
-   Used to slave an audio processor to the video decoder, ensuring that audio
-   and video remain synchronized.
-   Usual values for the frequency are 48000, 44100 or 32000 Hz.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_AUDIO_CLOCK_FREQ     _IOW ('d', 103, u32)
-/* Video decoders that support sliced VBI need to implement this ioctl.
-   Field p of the v4l2_sliced_vbi_line struct is set to the start of the VBI
-   data that was generated by the decoder. The driver then parses the sliced
-   VBI data and sets the other fields in the struct accordingly. The pointer p
-   is updated to point to the start of the payload which can be copied
-   verbatim into the data field of the v4l2_sliced_vbi_data struct. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_DECODE_VBI_LINE      _IOWR('d', 104, struct v4l2_decode_vbi_line)
-/* Used to generate VBI signals on a video signal. v4l2_sliced_vbi_data is
-   filled with the data packets that should be output. Note that if you set
-   the line field to 0, then that VBI signal is disabled. If no
-   valid VBI data was found, then the type field is set to 0 on return. */
-#define VIDIOC_INT_S_VBI_DATA           _IOW ('d', 105, struct v4l2_sliced_vbi_data)
-/* Used to obtain the sliced VBI packet from a readback register. Not all
-   video decoders support this. If no data is available because the readback
-   register contains invalid or erroneous data -EIO is returned. Note that
-   you must fill in the 'id' member and the 'field' member (to determine
-   whether CC data from the first or second field should be obtained). */
-#define VIDIOC_INT_G_VBI_DATA           _IOWR('d', 106, struct v4l2_sliced_vbi_data)
-/* Sets I2S speed in bps. This is used to provide a standard way to select I2S
-   clock used by driving digital audio streams at some board designs.
-   Usual values for the frequency are 1024000 and 2048000.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_I2S_CLOCK_FREQ       _IOW ('d', 108, u32)
-/* Routing definition, device dependent. It specifies which inputs (if any)
-   should be routed to which outputs (if any). */
 struct v4l2_routing {
        u32 input;
        u32 output;
 };
-/* These internal commands should be used to define the inputs and outputs
-   of an audio/video chip. They will replace the v4l2 API commands
-   VIDIOC_S/G_INPUT, VIDIOC_S/G_OUTPUT, VIDIOC_S/G_AUDIO and VIDIOC_S/G_AUDOUT
-   that are meant to be used by the user.
-   The internal commands should be used to switch inputs/outputs
-   because only the driver knows how to map a 'Television' input to the precise
-   input/output routing of an A/D converter, or a DSP, or a video digitizer.
-   These four commands should only be sent directly to an i2c device, they
-   should not be broadcast as the routing is very device specific. */
-#define VIDIOC_INT_S_AUDIO_ROUTING      _IOW ('d', 109, struct v4l2_routing)
-#define VIDIOC_INT_G_AUDIO_ROUTING      _IOR ('d', 110, struct v4l2_routing)
-#define VIDIOC_INT_S_VIDEO_ROUTING      _IOW ('d', 111, struct v4l2_routing)
-#define VIDIOC_INT_G_VIDEO_ROUTING      _IOR ('d', 112, struct v4l2_routing)
-struct v4l2_crystal_freq {
-        u32 freq;       /* frequency in Hz of the crystal */
-        u32 flags;      /* device specific flags */
-};
-/* Sets the frequency of the crystal used to generate the clocks.
-   An extra flags field allows device specific configuration regarding
-   clock frequency dividers, etc. If not used, then set flags to 0.
-   If the frequency is not supported, then -EINVAL is returned. */
-#define VIDIOC_INT_S_CRYSTAL_FREQ       _IOW('d', 113, struct v4l2_crystal_freq)
-/* Initialize the sensor registors to some sort of reasonable
-   default values. */
-#define VIDIOC_INT_INIT                 _IOW('d', 114, u32)
-/* Set v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_S_STD_OUTPUT         _IOW('d', 115, v4l2_std_id)
-/* Get v4l2_std_id for video OUTPUT devices. This is ignored by
-   video input devices. */
-#define VIDIOC_INT_G_STD_OUTPUT         _IOW('d', 116, v4l2_std_id)
-/* Set GPIO pins. Very simple right now, might need to be extended with
-   a v4l2_gpio struct if a direction is also needed. */
-#define VIDIOC_INT_S_GPIO               _IOW('d', 117, u32)
-/* Get input status. Same as the status field in the v4l2_input struct. */
-#define VIDIOC_INT_G_INPUT_STATUS       _IOR('d', 118, u32)
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
deleted file mode 100644
index e65dd9d84e8b..000000000000
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * v4l2-i2c-drv-legacy.h - contains I2C handling code that's identical
- *                  for all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is used by both legacy drivers and
- *                  drivers converted to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on older kernels as well.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- */
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int driverid;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
-        const struct i2c_device_id *id_table;
-};
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static const struct i2c_client_address_data addr_data;
-static struct i2c_driver v4l2_i2c_driver_legacy;
-static char v4l2_i2c_drv_name_legacy[32];
-static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address, int kind)
-{
-        return v4l2_i2c_attach(adapter, address, &v4l2_i2c_driver_legacy,
-                        v4l2_i2c_drv_name_legacy, v4l2_i2c_data.probe);
-}
-static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
-{
-        if (v4l2_i2c_data.legacy_probe) {
-                if (v4l2_i2c_data.legacy_probe(adapter))
-                        return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-                return 0;
-        }
-        if (adapter->class & v4l2_i2c_data.legacy_class)
-                return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
-        return 0;
-}
-static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client)
-{
-        int err;
-        if (v4l2_i2c_data.remove)
-                v4l2_i2c_data.remove(client);
-        err = i2c_detach_client(client);
-        if (err)
-                return err;
-        kfree(client);
-        return 0;
-}
-static int v4l2_i2c_drv_suspend_helper(struct i2c_client *client, pm_message_t state)
-{
-        return v4l2_i2c_data.suspend ? v4l2_i2c_data.suspend(client, state) : 0;
-}
-static int v4l2_i2c_drv_resume_helper(struct i2c_client *client)
-{
-        return v4l2_i2c_data.resume ? v4l2_i2c_data.resume(client) : 0;
-}
-/* ----------------------------------------------------------------------- */
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver_legacy = {
-        .driver = {
-                .owner = THIS_MODULE,
-        },
-        .attach_adapter = v4l2_i2c_drv_probe_legacy,
-        .detach_client = v4l2_i2c_drv_detach_legacy,
-        .suspend = v4l2_i2c_drv_suspend_helper,
-        .resume  = v4l2_i2c_drv_resume_helper,
-};
-/* ----------------------------------------------------------------------- */
-/* i2c implementation */
-static struct i2c_driver v4l2_i2c_driver = {
-        .suspend        = v4l2_i2c_drv_suspend_helper,
-        .resume         = v4l2_i2c_drv_resume_helper,
-};
-static int __init v4l2_i2c_drv_init(void)
-{
-        int err;
-        strlcpy(v4l2_i2c_drv_name_legacy, v4l2_i2c_data.name, sizeof(v4l2_i2c_drv_name_legacy));
-        strlcat(v4l2_i2c_drv_name_legacy, "'", sizeof(v4l2_i2c_drv_name_legacy));
-        if (v4l2_i2c_data.legacy_class == 0)
-                v4l2_i2c_data.legacy_class = I2C_CLASS_TV_ANALOG;
-        v4l2_i2c_driver_legacy.driver.name = v4l2_i2c_drv_name_legacy;
-        v4l2_i2c_driver_legacy.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver_legacy.command = v4l2_i2c_data.command;
-        err = i2c_add_driver(&v4l2_i2c_driver_legacy);
-        if (err)
-                return err;
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        err = i2c_add_driver(&v4l2_i2c_driver);
-        if (err)
-                i2c_del_driver(&v4l2_i2c_driver_legacy);
-        return err;
-}
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver_legacy);
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..10a2882c3cbf 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
 struct v4l2_i2c_driver_data {
        const char * const name;
-        int driverid;
        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
        int (*remove)(struct i2c_client *client);
        int (*suspend)(struct i2c_client *client, pm_message_t state);
        int (*resume)(struct i2c_client *client);
-        int (*legacy_probe)(struct i2c_adapter *adapter);
-        int legacy_class;
        const struct i2c_device_id *id_table;
 };
@@ -54,12 +51,11 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data;
 static struct i2c_driver v4l2_i2c_driver;
-/* Bus-based I2C implementation for kernels >= 2.6.22 */
+/* Bus-based I2C implementation for kernels >= 2.6.26 */
 static int __init v4l2_i2c_drv_init(void)
 {
        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
        v4l2_i2c_driver.command = v4l2_i2c_data.command;
        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 1d181b4ccb01..17856081c809 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -27,6 +27,16 @@ struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
+/* decode_vbi_line */
+struct v4l2_decode_vbi_line {
+        u32 is_second_field;    /* Set to 0 for the first (odd) field,
+                                   set to 1 for the second (even) field. */
+        u8 *p;                  /* Pointer to the sliced VBI data from the decoder.
+                                   On exit points to the start of the payload. */
+        u32 line;               /* Line number of the sliced VBI data (1-23) */
+        u32 type;               /* VBI service type (V4L2_SLICED_*). 0 if no service found */
+};
 /* Sub-devices are devices that are connected somehow to the main bridge
   device. These devices are usually audio/video muxers/encoders/decoders or
   sensors and webcam controllers.
@@ -68,11 +78,26 @@ struct tuner_setup;
   the use-case it might be better to use subdev-specific ops (currently
   not yet implemented) since ops provide proper type-checking.
 */
+/* init: initialize the sensor registors to some sort of reasonable default
+        values. Do not use for new drivers and should be removed in existing
+        drivers.
+   load_fw: load firmware.
+   reset: generic reset command. The argument selects which subsystems to
+        reset. Passing 0 will always reset the whole chip. Do not use for new
+        drivers without discussing this first on the linux-media mailinglist.
+        There should be no reason normally to reset a device.
+   s_gpio: set GPIO pins. Very simple right now, might need to be extended with
+        a direction argument if needed.
+ */
 struct v4l2_subdev_core_ops {
        int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
        int (*log_status)(struct v4l2_subdev *sd);
        int (*init)(struct v4l2_subdev *sd, u32 val);
-        int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
+        int (*load_fw)(struct v4l2_subdev *sd);
        int (*reset)(struct v4l2_subdev *sd, u32 val);
        int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
        int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
@@ -82,6 +107,7 @@ struct v4l2_subdev_core_ops {
        int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
        int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
        int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
        long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
@@ -89,6 +115,16 @@ struct v4l2_subdev_core_ops {
 #endif
 };
+/* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
+   s_radio: v4l device was opened in Radio mode, to be replaced by s_mode.
+   s_type_addr: sets tuner type and its I2C addr.
+   s_config: sets tda9887 specific stuff, like port1, port2 and qss
+   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
+ */
 struct v4l2_subdev_tuner_ops {
        int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
        int (*s_radio)(struct v4l2_subdev *sd);
@@ -96,20 +132,77 @@ struct v4l2_subdev_tuner_ops {
        int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
        int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
        int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
-        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
        int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
        int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
+        int (*s_standby)(struct v4l2_subdev *sd);
 };
+/* s_clock_freq: set the frequency (in Hz) of the audio clock output.
+        Used to slave an audio processor to the video decoder, ensuring that
+        audio and video remain synchronized. Usual values for the frequency
+        are 48000, 44100 or 32000 Hz. If the frequency is not supported, then
+        -EINVAL is returned.
+   s_i2s_clock_freq: sets I2S speed in bps. This is used to provide a standard
+        way to select I2S clock used by driving digital audio streams at some
+        board designs. Usual values for the frequency are 1024000 and 2048000.
+        If the frequency is not supported, then -EINVAL is returned.
+   s_routing: used to define the input and/or output pins of an audio chip,
+        and any additional configuration data.
+        Never attempt to use user-level input IDs (e.g. Composite, S-Video,
+        Tuner) at this level. An i2c device shouldn't know about whether an
+        input pin is connected to a Composite connector, become on another
+        board or platform it might be connected to something else entirely.
+        The calling driver is responsible for mapping a user-level input to
+        the right pins on the i2c device.
+ */
 struct v4l2_subdev_audio_ops {
        int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
        int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
 };
+/*
+   decode_vbi_line: video decoders that support sliced VBI need to implement
+        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
+        start of the VBI data that was generated by the decoder. The driver
+        then parses the sliced VBI data and sets the other fields in the
+        struct accordingly. The pointer p is updated to point to the start of
+        the payload which can be copied verbatim into the data field of the
+        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
+        type field is set to 0 on return.
+   s_vbi_data: used to generate VBI signals on a video signal.
+        v4l2_sliced_vbi_data is filled with the data packets that should be
+        output. Note that if you set the line field to 0, then that VBI signal
+        is disabled. If no valid VBI data was found, then the type field is
+        set to 0 on return.
+   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
+        Not all video decoders support this. If no data is available because
+        the readback register contains invalid or erroneous data -EIO is
+        returned. Note that you must fill in the 'id' member and the 'field'
+        member (to determine whether CC data from the first or second field
+        should be obtained).
+   s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
+        video input devices.
+  s_crystal_freq: sets the frequency of the crystal used to generate the
+        clocks in Hz. An extra flags field allows device specific configuration
+        regarding clock frequency dividers, etc. If not used, then set flags
+        to 0. If the frequency is not supported, then -EINVAL is returned.
+   g_input_status: get input status. Same as the status field in the v4l2_input
+        struct.
+   s_routing: see s_routing in audio_ops, except this version is for video
+        devices.
+ */
 struct v4l2_subdev_video_ops {
-        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
-        int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
+        int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
        int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
        int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
        int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
@@ -163,18 +256,6 @@ static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
        return sd->priv;
 }
-/* Convert an ioctl-type command to the proper v4l2_subdev_ops function call.
-   This is used by subdev modules that can be called by both old-style ioctl
-   commands and through the v4l2_subdev_ops.
-   The ioctl API of the subdev driver can call this function to call the
-   right ops based on the ioctl cmd and arg.
-   Once all subdev drivers have been converted and all drivers no longer
-   use the ioctl interface, then this function can be removed.
- */
-int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg);
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
                                        const struct v4l2_subdev_ops *ops)
 {
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
new file mode 100644
index 000000000000..0627a9ae6347
--- /dev/null
+++ b/include/scsi/fc/fc_fip.h
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2008 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef _FC_FIP_H_
+#define _FC_FIP_H_
+/*
+ * This version is based on:
+ * http://www.t11.org/ftp/t11/pub/fc/bb-5/08-543v1.pdf
+ */
+/*
+ * The FIP ethertype eventually goes in net/if_ether.h.
+ */
+#ifndef ETH_P_FIP
+#define ETH_P_FIP       0x8914  /* FIP Ethertype */
+#endif
+#define FIP_DEF_PRI     128     /* default selection priority */
+#define FIP_DEF_FC_MAP  0x0efc00 /* default FCoE MAP (MAC OUI) value */
+#define FIP_DEF_FKA     8000    /* default FCF keep-alive/advert period (mS) */
+#define FIP_VN_KA_PERIOD 90000  /* required VN_port keep-alive period (mS) */
+#define FIP_FCF_FUZZ    100     /* random time added by FCF (mS) */
+/*
+ * Multicast MAC addresses.  T11-adopted.
+ */
+#define FIP_ALL_FCOE_MACS       ((u8[6]) { 1, 0x10, 0x18, 1, 0, 0 })
+#define FIP_ALL_ENODE_MACS      ((u8[6]) { 1, 0x10, 0x18, 1, 0, 1 })
+#define FIP_ALL_FCF_MACS        ((u8[6]) { 1, 0x10, 0x18, 1, 0, 2 })
+#define FIP_VER         1               /* version for fip_header */
+struct fip_header {
+        __u8    fip_ver;                /* upper 4 bits are the version */
+        __u8    fip_resv1;              /* reserved */
+        __be16  fip_op;                 /* operation code */
+        __u8    fip_resv2;              /* reserved */
+        __u8    fip_subcode;            /* lower 4 bits are sub-code */
+        __be16  fip_dl_len;             /* length of descriptors in words */
+        __be16  fip_flags;              /* header flags */
+} __attribute__((packed));
+#define FIP_VER_SHIFT   4
+#define FIP_VER_ENCAPS(v) ((v) << FIP_VER_SHIFT)
+#define FIP_VER_DECAPS(v) ((v) >> FIP_VER_SHIFT)
+#define FIP_BPW         4               /* bytes per word for lengths */
+/*
+ * fip_op.
+ */
+enum fip_opcode {
+        FIP_OP_DISC =   1,              /* discovery, advertisement, etc. */
+        FIP_OP_LS =     2,              /* Link Service request or reply */
+        FIP_OP_CTRL =   3,              /* Keep Alive / Link Reset */
+        FIP_OP_VLAN =   4,              /* VLAN discovery */
+        FIP_OP_VENDOR_MIN = 0xfff8,     /* min vendor-specific opcode */
+        FIP_OP_VENDOR_MAX = 0xfffe,     /* max vendor-specific opcode */
+};
+/*
+ * Subcodes for FIP_OP_DISC.
+ */
+enum fip_disc_subcode {
+        FIP_SC_SOL =    1,              /* solicitation */
+        FIP_SC_ADV =    2,              /* advertisement */
+};
+/*
+ * Subcodes for FIP_OP_LS.
+ */
+enum fip_trans_subcode {
+        FIP_SC_REQ =    1,              /* request */
+        FIP_SC_REP =    2,              /* reply */
+};
+/*
+ * Subcodes for FIP_OP_RESET.
+ */
+enum fip_reset_subcode {
+        FIP_SC_KEEP_ALIVE = 1,          /* keep-alive from VN_Port */
+        FIP_SC_CLR_VLINK = 2,           /* clear virtual link from VF_Port */
+};
+/*
+ * Subcodes for FIP_OP_VLAN.
+ */
+enum fip_vlan_subcode {
+        FIP_SC_VL_REQ = 1,              /* request */
+        FIP_SC_VL_REP = 2,              /* reply */
+};
+/*
+ * flags in header fip_flags.
+ */
+enum fip_flag {
+        FIP_FL_FPMA =   0x8000,         /* supports FPMA fabric-provided MACs */
+        FIP_FL_SPMA =   0x4000,         /* supports SPMA server-provided MACs */
+        FIP_FL_AVAIL =  0x0004,         /* available for FLOGI/ELP */
+        FIP_FL_SOL =    0x0002,         /* this is a solicited message */
+        FIP_FL_FPORT =  0x0001,         /* sent from an F port */
+};
+/*
+ * Common descriptor header format.
+ */
+struct fip_desc {
+        __u8    fip_dtype;              /* type - see below */
+        __u8    fip_dlen;               /* length - in 32-bit words */
+};
+enum fip_desc_type {
+        FIP_DT_PRI =    1,              /* priority for forwarder selection */
+        FIP_DT_MAC =    2,              /* MAC address */
+        FIP_DT_MAP_OUI = 3,             /* FC-MAP OUI */
+        FIP_DT_NAME =   4,              /* switch name or node name */
+        FIP_DT_FAB =    5,              /* fabric descriptor */
+        FIP_DT_FCOE_SIZE = 6,           /* max FCoE frame size */
+        FIP_DT_FLOGI =  7,              /* FLOGI request or response */
+        FIP_DT_FDISC =  8,              /* FDISC request or response */
+        FIP_DT_LOGO =   9,              /* LOGO request or response */
+        FIP_DT_ELP =    10,             /* ELP request or response */
+        FIP_DT_VN_ID =  11,             /* VN_Node Identifier */
+        FIP_DT_FKA =    12,             /* advertisement keep-alive period */
+        FIP_DT_VENDOR = 13,             /* vendor ID */
+        FIP_DT_VLAN =   14,             /* vlan number */
+        FIP_DT_LIMIT,                   /* max defined desc_type + 1 */
+        FIP_DT_VENDOR_BASE = 128,       /* first vendor-specific desc_type */
+};
+/*
+ * FIP_DT_PRI - priority descriptor.
+ */
+struct fip_pri_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd;
+        __u8            fd_pri;         /* FCF priority:  higher is better */
+} __attribute__((packed));
+/*
+ * FIP_DT_MAC - MAC address descriptor.
+ */
+struct fip_mac_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+} __attribute__((packed));
+/*
+ * FIP_DT_MAP - descriptor.
+ */
+struct fip_map_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[3];
+        __u8            fd_map[3];
+} __attribute__((packed));
+/*
+ * FIP_DT_NAME descriptor.
+ */
+struct fip_wwn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be64          fd_wwn;         /* 64-bit WWN, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FAB descriptor.
+ */
+struct fip_fab_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_vfid;        /* virtual fabric ID */
+        __u8            fd_resvd;
+        __u8            fd_map[3];      /* FC-MAP value */
+        __be64          fd_wwn;         /* fabric name, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FCOE_SIZE descriptor.
+ */
+struct fip_size_desc {
+        struct fip_desc fd_desc;
+        __be16          fd_size;
+} __attribute__((packed));
+/*
+ * Descriptor that encapsulates an ELS or ILS frame.
+ * The encapsulated frame immediately follows this header, without
+ * SOF, EOF, or CRC.
+ */
+struct fip_encaps {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+} __attribute__((packed));
+/*
+ * FIP_DT_VN_ID - VN_Node Identifier descriptor.
+ */
+struct fip_vn_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_mac[ETH_ALEN];
+        __u8            fd_resvd;
+        __u8            fd_fc_id[3];
+        __be64          fd_wwpn;        /* port name, unaligned */
+} __attribute__((packed));
+/*
+ * FIP_DT_FKA - Advertisement keep-alive period.
+ */
+struct fip_fka_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __be32          fd_fka_period;  /* adv./keep-alive period in mS */
+} __attribute__((packed));
+/*
+ * FIP_DT_VENDOR descriptor.
+ */
+struct fip_vendor_desc {
+        struct fip_desc fd_desc;
+        __u8            fd_resvd[2];
+        __u8            fd_vendor_id[8];
+} __attribute__((packed));
+#endif /* _FC_FIP_H_ */
diff --git a/include/scsi/fc_transport_fcoe.h b/include/scsi/fc_transport_fcoe.h
deleted file mode 100644
index 8dca2af14ffc..000000000000
--- a/include/scsi/fc_transport_fcoe.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef FC_TRANSPORT_FCOE_H
-#define FC_TRANSPORT_FCOE_H
-#include <linux/device.h>
-#include <linux/netdevice.h>
-#include <scsi/scsi_host.h>
-#include <scsi/libfc.h>
-/**
- * struct fcoe_transport - FCoE transport struct for generic transport
- * for Ethernet devices as well as pure HBAs
- *
- * @name: name for thsi transport
- * @bus: physical bus type (pci_bus_type)
- * @driver: physical bus driver for network device
- * @create: entry create function
- * @destroy: exit destroy function
- * @list: list of transports
- */
-struct fcoe_transport {
-        char *name;
-        unsigned short vendor;
-        unsigned short device;
-        struct bus_type *bus;
-        struct device_driver *driver;
-        int (*create)(struct net_device *device);
-        int (*destroy)(struct net_device *device);
-        bool (*match)(struct net_device *device);
-        struct list_head list;
-        struct list_head devlist;
-        struct mutex devlock;
-};
-/**
- * MODULE_ALIAS_FCOE_PCI
- *
- * some care must be taken with this, vendor and device MUST be a hex value
- * preceded with 0x and with letters in lower case (0x12ab, not 0x12AB or 12AB)
- */
-#define MODULE_ALIAS_FCOE_PCI(vendor, device) \
-        MODULE_ALIAS("fcoe-pci-" __stringify(vendor) "-" __stringify(device))
-/* exported funcs */
-int fcoe_transport_attach(struct net_device *netdev);
-int fcoe_transport_release(struct net_device *netdev);
-int fcoe_transport_register(struct fcoe_transport *t);
-int fcoe_transport_unregister(struct fcoe_transport *t);
-int fcoe_load_transport_driver(struct net_device *netdev);
-int __init fcoe_transport_init(void);
-int __exit fcoe_transport_exit(void);
-/* fcow_sw is the default transport */
-extern struct fcoe_transport fcoe_sw_transport;
-#endif /* FC_TRANSPORT_FCOE_H */
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index a70eafaad084..0303a6a098cc 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -22,6 +22,7 @@
 #include <linux/timer.h>
 #include <linux/if.h>
+#include <linux/percpu.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
@@ -661,7 +662,8 @@ struct fc_lport {
        unsigned long           boot_time;
        struct fc_host_statistics host_stats;
-        struct fcoe_dev_stats   *dev_stats[NR_CPUS];
+        struct fcoe_dev_stats   *dev_stats;
        u64                     wwpn;
        u64                     wwnn;
        u8                      retry_count;
@@ -694,11 +696,6 @@ struct fc_lport {
 /*
 * FC_LPORT HELPER FUNCTIONS
 *****************************/
-static inline void *lport_priv(const struct fc_lport *lp)
-{
-        return (void *)(lp + 1);
-}
 static inline int fc_lport_test_ready(struct fc_lport *lp)
 {
        return lp->state == LPORT_ST_READY;
@@ -722,6 +719,42 @@ static inline void fc_lport_state_enter(struct fc_lport *lp,
        lp->state = state;
 }
+static inline int fc_lport_init_stats(struct fc_lport *lp)
+{
+        /* allocate per cpu stats block */
+        lp->dev_stats = alloc_percpu(struct fcoe_dev_stats);
+        if (!lp->dev_stats)
+                return -ENOMEM;
+        return 0;
+}
+static inline void fc_lport_free_stats(struct fc_lport *lp)
+{
+        free_percpu(lp->dev_stats);
+}
+static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lp)
+{
+        return per_cpu_ptr(lp->dev_stats, smp_processor_id());
+}
+static inline void *lport_priv(const struct fc_lport *lp)
+{
+        return (void *)(lp + 1);
+}
+/**
+ * libfc_host_alloc() - Allocate a Scsi_Host with room for the fc_lport
+ * @sht: ptr to the scsi host templ
+ * @priv_size: size of private data after fc_lport
+ *
+ * Returns: ptr to Scsi_Host
+ */
+static inline struct Scsi_Host *
+libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
+{
+        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+}
 /*
 * LOCAL PORT LAYER
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index c41f7d0c6efc..666cc131732e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -1,5 +1,6 @@
 /*
- * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
+ * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2007-2008 Intel Corporation.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -20,134 +21,144 @@
 #ifndef _LIBFCOE_H
 #define _LIBFCOE_H
+#include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <scsi/libfc.h>
 /*
- * this percpu struct for fcoe
+ * FIP tunable parameters.
 */
-struct fcoe_percpu_s {
+#define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
-        int             cpu;
+#define FCOE_CTRL_SOL_TOV       2000    /* min. solicitation interval (mS) */
-        struct task_struct *thread;
+#define FCOE_CTLR_FCF_LIMIT     20      /* max. number of FCF entries */
-        struct sk_buff_head fcoe_rx_list;
-        struct page *crc_eof_page;
+/**
-        int crc_eof_offset;
+ * enum fip_state - internal state of FCoE controller.
+ * @FIP_ST_DISABLED:    controller has been disabled or not yet enabled.
+ * @FIP_ST_LINK_WAIT:   the physical link is down or unusable.
+ * @FIP_ST_AUTO:        determining whether to use FIP or non-FIP mode.
+ * @FIP_ST_NON_FIP:     non-FIP mode selected.
+ * @FIP_ST_ENABLED:     FIP mode selected.
+ */
+enum fip_state {
+        FIP_ST_DISABLED,
+        FIP_ST_LINK_WAIT,
+        FIP_ST_AUTO,
+        FIP_ST_NON_FIP,
+        FIP_ST_ENABLED,
 };
-/*
+/**
- * the fcoe sw transport private data
+ * struct fcoe_ctlr - FCoE Controller and FIP state.
+ * @state:      internal FIP state for network link and FIP or non-FIP mode.
+ * @lp:         &fc_lport: libfc local port.
+ * @sel_fcf:    currently selected FCF, or NULL.
+ * @fcfs:       list of discovered FCFs.
+ * @fcf_count:  number of discovered FCF entries.
+ * @sol_time:   time when a multicast solicitation was last sent.
+ * @sel_time:   time after which to select an FCF.
+ * @port_ka_time: time of next port keep-alive.
+ * @ctlr_ka_time: time of next controller keep-alive.
+ * @timer:      timer struct used for all delayed events.
+ * @link_work:  &work_struct for doing FCF selection.
+ * @recv_work:  &work_struct for receiving FIP frames.
+ * @fip_recv_list: list of received FIP frames.
+ * @user_mfs:   configured maximum FC frame size, including FC header.
+ * @flogi_oxid: exchange ID of most recent fabric login.
+ * @flogi_count: number of FLOGI attempts in AUTO mode.
+ * @link:       current link status for libfc.
+ * @last_link:  last link state reported to libfc.
+ * @map_dest:   use the FC_MAP mode for destination MAC addresses.
+ * @dest_addr:  MAC address of the selected FC forwarder.
+ * @ctl_src_addr: the native MAC address of our local port.
+ * @data_src_addr: the assigned MAC address for the local port after FLOGI.
+ * @send:       LLD-supplied function to handle sending of FIP Ethernet frames.
+ * @update_mac: LLD-supplied function to handle changes to MAC addresses.
+ * @lock:       lock protecting this structure.
+ *
+ * This structure is used by all FCoE drivers.  It contains information
+ * needed by all FCoE low-level drivers (LLDs) as well as internal state
+ * for FIP, and fields shared with the LLDS.
 */
-struct fcoe_softc {
+struct fcoe_ctlr {
-        struct list_head list;
+        enum fip_state state;
        struct fc_lport *lp;
-        struct net_device *real_dev;
+        struct fcoe_fcf *sel_fcf;
-        struct net_device *phys_dev;            /* device with ethtool_ops */
+        struct list_head fcfs;
-        struct packet_type  fcoe_packet_type;
+        u16 fcf_count;
-        struct sk_buff_head fcoe_pending_queue;
+        unsigned long sol_time;
-        u8      fcoe_pending_queue_active;
+        unsigned long sel_time;
+        unsigned long port_ka_time;
+        unsigned long ctlr_ka_time;
+        struct timer_list timer;
+        struct work_struct link_work;
+        struct work_struct recv_work;
+        struct sk_buff_head fip_recv_list;
+        u16 user_mfs;
+        u16 flogi_oxid;
+        u8 flogi_count;
+        u8 link;
+        u8 last_link;
+        u8 map_dest;
        u8 dest_addr[ETH_ALEN];
        u8 ctl_src_addr[ETH_ALEN];
        u8 data_src_addr[ETH_ALEN];
-        /*
-         * fcoe protocol address learning related stuff
-         */
-        u16 flogi_oxid;
-        u8 flogi_progress;
-        u8 address_mode;
-};
-static inline struct net_device *fcoe_netdev(
-        const struct fc_lport *lp)
-{
-        return ((struct fcoe_softc *)lport_priv(lp))->real_dev;
-}
-static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)
-{
-        return (struct fcoe_hdr *)skb_network_header(skb);
-}
-static inline int skb_fcoe_offset(const struct sk_buff *skb)
-{
-        return skb_network_offset(skb);
-}
-static inline struct fc_frame_header *skb_fc_header(const struct sk_buff *skb)
-{
-        return (struct fc_frame_header *)skb_transport_header(skb);
-}
-static inline int skb_fc_offset(const struct sk_buff *skb)
-{
-        return skb_transport_offset(skb);
-}
-static inline void skb_reset_fc_header(struct sk_buff *skb)
+        void (*send)(struct fcoe_ctlr *, struct sk_buff *);
-{
+        void (*update_mac)(struct fcoe_ctlr *, u8 *old, u8 *new);
-        skb_reset_network_header(skb);
+        spinlock_t lock;
-        skb_set_transport_header(skb, skb_network_offset(skb) +
+};
-                                 sizeof(struct fcoe_hdr));
-}
-static inline bool skb_fc_is_data(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_SOL_DATA;
-}
-static inline bool skb_fc_is_cmd(const struct sk_buff *skb)
-{
-        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_UNSOL_CMD;
-}
-static inline bool skb_fc_has_exthdr(const struct sk_buff *skb)
+/*
-{
+ * struct fcoe_fcf - Fibre-Channel Forwarder.
-        return (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_VFTH) ||
+ * @list:       list linkage.
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_IFRH) ||
+ * @time:       system time (jiffies) when an advertisement was last received.
-            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_ENCH);
+ * @switch_name: WWN of switch from advertisement.
-}
+ * @fabric_name: WWN of fabric from advertisement.
+ * @fc_map:     FC_MAP value from advertisement.
+ * @fcf_mac:    Ethernet address of the FCF.
+ * @vfid:       virtual fabric ID.
+ * @pri:        seletion priority, smaller values are better.
+ * @flags:      flags received from advertisement.
+ * @fka_period: keep-alive period, in jiffies.
+ *
+ * A Fibre-Channel Forwarder (FCF) is the entity on the Ethernet that
+ * passes FCoE frames on to an FC fabric.  This structure represents
+ * one FCF from which advertisements have been received.
+ *
+ * When looking up an FCF, @switch_name, @fabric_name, @fc_map, @vfid, and
+ * @fcf_mac together form the lookup key.
+ */
+struct fcoe_fcf {
+        struct list_head list;
+        unsigned long time;
-static inline bool skb_fc_is_roff(const struct sk_buff *skb)
+        u64 switch_name;
-{
+        u64 fabric_name;
-        return skb_fc_header(skb)->fh_f_ctl[2] & FC_FC_REL_OFF;
+        u32 fc_map;
-}
+        u16 vfid;
+        u8 fcf_mac[ETH_ALEN];
-static inline u16 skb_fc_oxid(const struct sk_buff *skb)
+        u8 pri;
-{
+        u16 flags;
-        return be16_to_cpu(skb_fc_header(skb)->fh_ox_id);
+        u32 fka_period;
-}
+};
-static inline u16 skb_fc_rxid(const struct sk_buff *skb)
+/* FIP API functions */
-{
+void fcoe_ctlr_init(struct fcoe_ctlr *);
-        return be16_to_cpu(skb_fc_header(skb)->fh_rx_id);
+void fcoe_ctlr_destroy(struct fcoe_ctlr *);
-}
+void fcoe_ctlr_link_up(struct fcoe_ctlr *);
+int fcoe_ctlr_link_down(struct fcoe_ctlr *);
+int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct sk_buff *);
+void fcoe_ctlr_recv(struct fcoe_ctlr *, struct sk_buff *);
+int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_frame *fp, u8 *sa);
 /* libfcoe funcs */
-int fcoe_reset(struct Scsi_Host *shost);
+u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
-u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
-                      unsigned int scheme, unsigned int port);
-u32 fcoe_fc_crc(struct fc_frame *fp);
-int fcoe_xmit(struct fc_lport *, struct fc_frame *);
-int fcoe_rcv(struct sk_buff *, struct net_device *,
-             struct packet_type *, struct net_device *);
-int fcoe_percpu_receive_thread(void *arg);
-void fcoe_clean_pending_queue(struct fc_lport *lp);
-void fcoe_percpu_clean(struct fc_lport *lp);
-void fcoe_watchdog(ulong vp);
-int fcoe_link_ok(struct fc_lport *lp);
-struct fc_lport *fcoe_hostlist_lookup(const struct net_device *);
-int fcoe_hostlist_add(const struct fc_lport *);
-int fcoe_hostlist_remove(const struct fc_lport *);
-struct Scsi_Host *fcoe_host_alloc(struct scsi_host_template *, int);
 int fcoe_libfc_config(struct fc_lport *, struct libfc_function_template *);
-/* fcoe sw hba */
-int __init fcoe_sw_init(void);
-int __exit fcoe_sw_exit(void);
 #endif /* _LIBFCOE_H */
diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h
index ad8b7857855a..28ee69f9cd46 100644
--- a/include/trace/kmemtrace.h
+++ b/include/trace/kmemtrace.h
@@ -9,65 +9,53 @@
 #ifdef __KERNEL__
+#include <linux/tracepoint.h>
 #include <linux/types.h>
-#include <linux/marker.h>
-enum kmemtrace_type_id {
-        KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
-        KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-        KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-};
 #ifdef CONFIG_KMEMTRACE
 extern void kmemtrace_init(void);
+#else
-extern void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
-                                             const void *ptr,
-                                             size_t bytes_req,
-                                             size_t bytes_alloc,
-                                             gfp_t gfp_flags,
-                                             int node);
-extern void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                       unsigned long call_site,
-                                       const void *ptr);
-#else /* CONFIG_KMEMTRACE */
 static inline void kmemtrace_init(void)
 {
 }
+#endif
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
+DECLARE_TRACE(kmalloc,
-                                             const void *ptr,
+              TP_PROTO(unsigned long call_site,
-                                             size_t bytes_req,
+                      const void *ptr,
-                                             size_t bytes_alloc,
+                      size_t bytes_req,
-                                             gfp_t gfp_flags,
+                      size_t bytes_alloc,
-                                             int node)
+                      gfp_t gfp_flags),
-{
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
-}
+DECLARE_TRACE(kmem_cache_alloc,
+              TP_PROTO(unsigned long call_site,
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
+                      const void *ptr,
-                                       unsigned long call_site,
+                      size_t bytes_req,
-                                       const void *ptr)
+                      size_t bytes_alloc,
-{
+                      gfp_t gfp_flags),
-}
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmalloc_node,
-#endif /* CONFIG_KMEMTRACE */
+              TP_PROTO(unsigned long call_site,
+                      const void *ptr,
-static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id,
+                      size_t bytes_req,
-                                        unsigned long call_site,
+                      size_t bytes_alloc,
-                                        const void *ptr,
+                      gfp_t gfp_flags,
-                                        size_t bytes_req,
+                      int node),
-                                        size_t bytes_alloc,
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
-                                        gfp_t gfp_flags)
+DECLARE_TRACE(kmem_cache_alloc_node,
-{
+              TP_PROTO(unsigned long call_site,
-        kmemtrace_mark_alloc_node(type_id, call_site, ptr,
+                      const void *ptr,
-                                  bytes_req, bytes_alloc, gfp_flags, -1);
+                      size_t bytes_req,
-}
+                      size_t bytes_alloc,
+                      gfp_t gfp_flags,
+                      int node),
+              TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kfree,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
+DECLARE_TRACE(kmem_cache_free,
+              TP_PROTO(unsigned long call_site, const void *ptr),
+              TP_ARGS(call_site, ptr));
 #endif /* __KERNEL__ */
diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index 7431d9681e57..befbaf0a92d8 100644
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -1,6 +1,9 @@
 #ifndef _TDFX_H
 #define _TDFX_H
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
 /* membase0 register offsets */
 #define STATUS          0x00
 #define PCIINIT0        0x04
@@ -123,6 +126,18 @@
 #define VIDCFG_PIXFMT_SHIFT             18
 #define DACMODE_2X                      BIT(0)
+/* I2C bit locations in the VIDSERPARPORT register */
+#define DDC_ENAB        0x00040000
+#define DDC_SCL_OUT     0x00080000
+#define DDC_SDA_OUT     0x00100000
+#define DDC_SCL_IN      0x00200000
+#define DDC_SDA_IN      0x00400000
+#define I2C_ENAB        0x00800000
+#define I2C_SCL_OUT     0x01000000
+#define I2C_SDA_OUT     0x02000000
+#define I2C_SCL_IN      0x04000000
+#define I2C_SDA_IN      0x08000000
 /* VGA rubbish, need to change this for multihead support */
 #define MISC_W          0x3c2
 #define MISC_R          0x3cc
@@ -168,12 +183,23 @@ struct banshee_reg {
        unsigned long miscinit0;
 };
+struct tdfx_par;
+struct tdfxfb_i2c_chan {
+        struct tdfx_par *par;
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
 struct tdfx_par {
        u32 max_pixclock;
        u32 palette[16];
        void __iomem *regbase_virt;
        unsigned long iobase;
        int mtrr_handle;
+#ifdef CONFIG_FB_3DFX_I2C
+        struct tdfxfb_i2c_chan chan[2];
+#endif
 };
 #endif  /* __KERNEL__ */