31 files changed, 431 insertions, 184 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 0fac822c1157..29ab9b95d376 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -127,7 +127,6 @@ header-y += pkt_sched.h
 header-y += posix_types.h
 header-y += ppdev.h
 header-y += prctl.h
-header-y += ps2esdi.h
 header-y += qnxtypes.h
 header-y += quotaio_v1.h
 header-y += quotaio_v2.h
@@ -196,7 +195,6 @@ unifdef-y += ethtool.h
 unifdef-y += eventpoll.h
 unifdef-y += signalfd.h
 unifdef-y += ext2_fs.h
-unifdef-y += ext3_fs.h
 unifdef-y += fb.h
 unifdef-y += fcntl.h
 unifdef-y += filter.h
@@ -249,14 +247,13 @@ unifdef-y += isdn.h
 unifdef-y += isdnif.h
 unifdef-y += isdn_divertif.h
 unifdef-y += isdn_ppp.h
-unifdef-y += jbd.h
 unifdef-y += joystick.h
 unifdef-y += kdev_t.h
 unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
-unifdef-$(CONFIG_HAVE_KVM) += kvm.h
+unifdef-y += kvm.h
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h
@@ -264,6 +261,7 @@ unifdef-y += mempolicy.h
 unifdef-y += mii.h
 unifdef-y += mman.h
 unifdef-y += mroute.h
+unifdef-y += mroute6.h
 unifdef-y += msdos_fs.h
 unifdef-y += msg.h
 unifdef-y += nbd.h
@@ -292,6 +290,7 @@ unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
 unifdef-y += personality.h
+unifdef-y += pim.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 69c1edb9fe54..40d54731de7e 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -65,6 +65,46 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
        return (word >> shift) | (word << (32 - shift));
 }
+/**
+ * rol16 - rotate a 16-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u16 rol16(__u16 word, unsigned int shift)
+{
+        return (word << shift) | (word >> (16 - shift));
+}
+/**
+ * ror16 - rotate a 16-bit value right
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u16 ror16(__u16 word, unsigned int shift)
+{
+        return (word >> shift) | (word << (16 - shift));
+}
+/**
+ * rol8 - rotate an 8-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u8 rol8(__u8 word, unsigned int shift)
+{
+        return (word << shift) | (word >> (8 - shift));
+}
+/**
+ * ror8 - rotate an 8-bit value right
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u8 ror8(__u8 word, unsigned int shift)
+{
+        return (word >> shift) | (word << (8 - shift));
+}
 static inline unsigned fls_long(unsigned long l)
 {
        if (sizeof(l) == 4)
diff --git a/include/linux/compat.h b/include/linux/compat.h
index a671dbff7a1f..8fa7857e153b 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -192,8 +192,8 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
                struct compat_timeval __user *tvp);
 asmlinkage long compat_sys_wait4(compat_pid_t pid,
-                                 compat_uint_t *stat_addr, int options,
+                                 compat_uint_t __user *stat_addr, int options,
-                                 struct compat_rusage *ru);
+                                 struct compat_rusage __user *ru);
 #define BITS_PER_COMPAT_LONG    (8*sizeof(compat_long_t))
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 6b72a4584086..51e6b1e520e6 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -38,8 +38,8 @@ struct cpuidle_state {
        unsigned int    power_usage; /* in mW */
        unsigned int    target_residency; /* in US */
-        unsigned int    usage;
+        unsigned long long      usage;
-        unsigned int    time; /* in US */
+        unsigned long long      time; /* in US */
        int (*enter)    (struct cpuidle_device *dev,
                         struct cpuidle_state *state);
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 261e43a4c873..34d440698293 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -423,7 +423,7 @@ void dma_async_device_unregister(struct dma_device *device);
 /* --- Helper iov-locking functions --- */
 struct dma_page_list {
-        char *base_address;
+        char __user *base_address;
        int nr_pages;
        struct page **pages;
 };
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 49829988bfa0..897f723bd222 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -72,6 +72,13 @@
 #define in_softirq()            (softirq_count())
 #define in_interrupt()          (irq_count())
+/*
+ * Are we running in atomic context?  WARNING: this macro cannot
+ * always detect atomic context; in particular, it cannot know about
+ * held spinlocks in non-preemptible kernels.  Thus it should not be
+ * used in the general case to determine whether sleeping is possible.
+ * Do not use in_atomic() in driver code.
+ */
 #define in_atomic()             ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
 #ifdef CONFIG_PREEMPT
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a3b69c10d667..bc26b2f27359 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -26,7 +26,7 @@
 #include <asm/semaphore.h>
 #include <asm/mutex.h>
-#if defined(CRIS) || defined(FRV)
+#if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
 # define SUPPORT_VLB_SYNC 0
 #else
 # define SUPPORT_VLB_SYNC 1
diff --git a/include/linux/in6.h b/include/linux/in6.h
index f674000c6c99..e6aa8de2b939 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -260,4 +260,19 @@ struct in6_flowlabel_req
 #define IPV6_PREFER_SRC_CGA             0x0008
 #define IPV6_PREFER_SRC_NONCGA          0x0800
+/*
+ * Multicast Routing:
+ * see include/linux/mroute6.h.
+ *
+ * MRT6_INIT                    200
+ * MRT6_DONE                    201
+ * MRT6_ADD_MIF                 202
+ * MRT6_DEL_MIF                 203
+ * MRT6_ADD_MFC                 204
+ * MRT6_DEL_MFC                 205
+ * MRT6_VERSION                 206
+ * MRT6_ASSERT                  207
+ * MRT6_PIM                     208
+ * (reserved)                   209
+ */
 #endif
diff --git a/include/linux/input.h b/include/linux/input.h
index 1bdc39a8c76c..cae2c35d1206 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1227,12 +1227,13 @@ void input_free_device(struct input_dev *dev);
 static inline struct input_dev *input_get_device(struct input_dev *dev)
 {
-        return to_input_dev(get_device(&dev->dev));
+        return dev ? to_input_dev(get_device(&dev->dev)) : NULL;
 }
 static inline void input_put_device(struct input_dev *dev)
 {
-        put_device(&dev->dev);
+        if (dev)
+                put_device(&dev->dev);
 }
 static inline void *input_get_drvdata(struct input_dev *dev)
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 1b4ccf25b4d2..cac4b364cd40 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -2,6 +2,7 @@
 #define IOCONTEXT_H
 #include <linux/radix-tree.h>
+#include <linux/rcupdate.h>
 /*
 * This is the per-process anticipatory I/O scheduler state.
@@ -54,6 +55,8 @@ struct cfq_io_context {
        void (*dtor)(struct io_context *); /* destructor */
        void (*exit)(struct io_context *); /* called on task exit */
+        struct rcu_head rcu_head;
 };
 /*
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index b90d3d461d4e..f53e4764fc05 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -160,6 +160,9 @@ struct ipv6_devconf {
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
        __s32           optimistic_dad;
 #endif
+#ifdef CONFIG_IPV6_MROUTE
+        __s32           mc_forwarding;
+#endif
        void            *sysctl;
 };
@@ -190,6 +193,7 @@ enum {
        DEVCONF_PROXY_NDP,
        DEVCONF_OPTIMISTIC_DAD,
        DEVCONF_ACCEPT_SOURCE_ROUTE,
+        DEVCONF_MC_FORWARDING,
        DEVCONF_MAX
 };
@@ -230,6 +234,7 @@ struct inet6_skb_parm {
 #endif
 #define IP6SKB_XFRM_TRANSFORMED 1
+#define IP6SKB_FORWARDED        2
 };
 #define IP6CB(skb)      ((struct inet6_skb_parm*)((skb)->cb))
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index b18fd3b9b835..423f58272188 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -348,8 +348,7 @@ static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
 struct jbd_revoke_table_s;
 /**
- * struct handle_s - The handle_s type is the concrete type associated with
+ * struct handle_s - this is the concrete type associated with handle_t.
- *     handle_t.
 * @h_transaction: Which compound transaction is this update a part of?
 * @h_buffer_credits: Number of remaining buffers we are allowed to dirty.
 * @h_ref: Reference count on this handle
@@ -358,12 +357,7 @@ struct jbd_revoke_table_s;
 * @h_jdata: flag to force data journaling
 * @h_aborted: flag indicating fatal error on handle
 * @h_lockdep_map: lockdep info for debugging lock problems
- **/
-/* Docbook can't yet cope with the bit fields, but will leave the documentation
- * in so it can be fixed later.
 */
 struct handle_s
 {
        /* Which compound transaction is this update a part of? */
@@ -558,8 +552,7 @@ struct transaction_s
 };
 /**
- * struct journal_s - The journal_s type is the concrete type associated with
+ * struct journal_s - this is the concrete type associated with journal_t.
- *     journal_t.
 * @j_flags:  General journaling state flags
 * @j_errno:  Is there an outstanding uncleared error on the journal (from a
 *     prior abort)?
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h
index 589be3e1f3ac..e7217dc58f39 100644
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
@@ -16,6 +16,10 @@
 * a new device, we simply need to write a new virtio driver and create support
 * for it in the Launcher: this code won't need to change.
 *
+ * Virtio devices are also used by kvm, so we can simply reuse their optimized
+ * device drivers.  And one day when everyone uses virtio, my plan will be
+ * complete.  Bwahahahah!
+ *
 * Devices are described by a simplified ID, a status byte, and some "config"
 * bytes which describe this device's configuration.  This is placed by the
 * Launcher just above the top of physical memory:
@@ -26,7 +30,7 @@ struct lguest_device_desc {
        /* The number of virtqueues (first in config array) */
        __u8 num_vq;
        /* The number of bytes of feature bits.  Multiply by 2: one for host
-         * features and one for guest acknowledgements. */
+         * features and one for Guest acknowledgements. */
        __u8 feature_len;
        /* The number of bytes of the config array after virtqueues. */
        __u8 config_len;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index a05f60013642..b064bfeb69ee 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -295,6 +295,7 @@ enum {
        ATA_EH_SOFTRESET        = (1 << 1),
        ATA_EH_HARDRESET        = (1 << 2),
        ATA_EH_ENABLE_LINK      = (1 << 3),
+        ATA_EH_LPM              = (1 << 4),  /* link power management action */
        ATA_EH_RESET_MASK       = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
        ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE,
@@ -304,7 +305,6 @@ enum {
        ATA_EHI_RESUME_LINK     = (1 << 1),  /* resume link (reset modifier) */
        ATA_EHI_NO_AUTOPSY      = (1 << 2),  /* no autopsy */
        ATA_EHI_QUIET           = (1 << 3),  /* be quiet */
-        ATA_EHI_LPM             = (1 << 4),  /* link power management action */
        ATA_EHI_DID_SOFTRESET   = (1 << 16), /* already soft-reset this port */
        ATA_EHI_DID_HARDRESET   = (1 << 17), /* already soft-reset this port */
@@ -463,6 +463,7 @@ struct ata_queued_cmd {
        unsigned int            sect_size;
        unsigned int            nbytes;
+        unsigned int            extrabytes;
        unsigned int            curbytes;
        struct scatterlist      *cursg;
@@ -1336,6 +1337,11 @@ static inline struct ata_queued_cmd *ata_qc_from_tag(struct ata_port *ap,
        return NULL;
 }
+static inline unsigned int ata_qc_raw_nbytes(struct ata_queued_cmd *qc)
+{
+        return qc->nbytes - min(qc->extrabytes, qc->nbytes);
+}
 static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf)
 {
        memset(tf, 0, sizeof(*tf));
@@ -1354,7 +1360,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
        qc->flags = 0;
        qc->cursg = NULL;
        qc->cursg_ofs = 0;
-        qc->nbytes = qc->curbytes = 0;
+        qc->nbytes = qc->extrabytes = qc->curbytes = 0;
        qc->n_elem = 0;
        qc->err_mask = 0;
        qc->sect_size = ATA_SECT_SIZE;
diff --git a/include/linux/memstick.h b/include/linux/memstick.h
index b7ee25888836..3e686ec6a967 100644
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
@@ -239,7 +239,6 @@ struct memstick_request {
        unsigned char tpc;
        unsigned char data_dir:1,
                      need_card_int:1,
-                      get_int_reg:1,
                      long_data:1;
        unsigned char int_reg;
        int           error;
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 6d3047d8c91c..5ee2df217cdf 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -61,6 +61,7 @@ struct vfsmount {
        atomic_t mnt_count;
        int mnt_expiry_mark;            /* true if marked for expiry */
        int mnt_pinned;
+        int mnt_ghosts;
 };
 static inline struct vfsmount *mntget(struct vfsmount *mnt)
@@ -98,7 +99,6 @@ extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
                        int mnt_flags, struct list_head *fslist);
 extern void mark_mounts_for_expiry(struct list_head *mounts);
-extern void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts);
 extern spinlock_t vfsmount_lock;
 extern dev_t name_to_dev_t(char *name);
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 35a8277ec1bd..de4decfa1bfc 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,11 @@
 #define __LINUX_MROUTE_H
 #include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
 #include <linux/in.h>
+#endif
+#include <linux/pim.h>
 /*
 *      Based on the MROUTING 3.5 defines primarily to keep
@@ -210,27 +214,6 @@ struct mfc_cache
 #define IGMPMSG_WHOLEPKT        3               /* For PIM Register processing */
 #ifdef __KERNEL__
-#define PIM_V1_VERSION          __constant_htonl(0x10000000)
-#define PIM_V1_REGISTER         1
-#define PIM_VERSION             2
-#define PIM_REGISTER            1
-#define PIM_NULL_REGISTER       __constant_htonl(0x40000000)
-/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
-struct pimreghdr
-{
-        __u8    type;
-        __u8    reserved;
-        __be16  csum;
-        __be32  flags;
-};
-extern int pim_rcv_v1(struct sk_buff *);
 struct rtmsg;
 extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
 #endif
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
new file mode 100644
index 000000000000..f6469fb90840
--- /dev/null
+++ b/include/linux/mroute6.h
@@ -0,0 +1,231 @@
+#ifndef __LINUX_MROUTE6_H
+#define __LINUX_MROUTE6_H
+#include <linux/types.h>
+#include <linux/sockios.h>
+/*
+ *      Based on the MROUTING 3.5 defines primarily to keep
+ *      source compatibility with BSD.
+ *
+ *      See the pim6sd code for the original history.
+ *
+ *      Protocol Independent Multicast (PIM) data structures included
+ *      Carlos Picoto (cap@di.fc.ul.pt)
+ *
+ */
+#define MRT6_BASE       200
+#define MRT6_INIT       (MRT6_BASE)     /* Activate the kernel mroute code      */
+#define MRT6_DONE       (MRT6_BASE+1)   /* Shutdown the kernel mroute           */
+#define MRT6_ADD_MIF    (MRT6_BASE+2)   /* Add a virtual interface              */
+#define MRT6_DEL_MIF    (MRT6_BASE+3)   /* Delete a virtual interface           */
+#define MRT6_ADD_MFC    (MRT6_BASE+4)   /* Add a multicast forwarding entry     */
+#define MRT6_DEL_MFC    (MRT6_BASE+5)   /* Delete a multicast forwarding entry  */
+#define MRT6_VERSION    (MRT6_BASE+6)   /* Get the kernel multicast version     */
+#define MRT6_ASSERT     (MRT6_BASE+7)   /* Activate PIM assert mode             */
+#define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code      */
+#define SIOCGETMIFCNT_IN6       SIOCPROTOPRIVATE        /* IP protocol privates */
+#define SIOCGETSGCNT_IN6        (SIOCPROTOPRIVATE+1)
+#define SIOCGETRPF      (SIOCPROTOPRIVATE+2)
+#define MAXMIFS         32
+typedef unsigned long mifbitmap_t;      /* User mode code depends on this lot */
+typedef unsigned short mifi_t;
+#define ALL_MIFS        ((mifi_t)(-1))
+#ifndef IF_SETSIZE
+#define IF_SETSIZE      256
+#endif
+typedef __u32           if_mask;
+#define NIFBITS (sizeof(if_mask) * 8)        /* bits per mask */
+#if !defined(__KERNEL__) && !defined(DIV_ROUND_UP)
+#define DIV_ROUND_UP(x,y)       (((x) + ((y) - 1)) / (y))
+#endif
+typedef struct if_set {
+        if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
+} if_set;
+#define IF_SET(n, p)    ((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
+#define IF_CLR(n, p)    ((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
+#define IF_ISSET(n, p)  ((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
+#define IF_COPY(f, t)   bcopy(f, t, sizeof(*(f)))
+#define IF_ZERO(p)      bzero(p, sizeof(*(p)))
+/*
+ *      Passed by mrouted for an MRT_ADD_MIF - again we use the
+ *      mrouted 3.6 structures for compatibility
+ */
+struct mif6ctl {
+        mifi_t  mif6c_mifi;             /* Index of MIF */
+        unsigned char mif6c_flags;      /* MIFF_ flags */
+        unsigned char vifc_threshold;   /* ttl limit */
+        u_short  mif6c_pifi;            /* the index of the physical IF */
+        unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
+};
+#define MIFF_REGISTER   0x1     /* register vif */
+/*
+ *      Cache manipulation structures for mrouted and PIMd
+ */
+struct mf6cctl
+{
+        struct sockaddr_in6 mf6cc_origin;               /* Origin of mcast      */
+        struct sockaddr_in6 mf6cc_mcastgrp;             /* Group in question    */
+        mifi_t  mf6cc_parent;                   /* Where it arrived     */
+        struct if_set mf6cc_ifset;              /* Where it is going */
+};
+/*
+ *      Group count retrieval for pim6sd
+ */
+struct sioc_sg_req6
+{
+        struct sockaddr_in6 src;
+        struct sockaddr_in6 grp;
+        unsigned long pktcnt;
+        unsigned long bytecnt;
+        unsigned long wrong_if;
+};
+/*
+ *      To get vif packet counts
+ */
+struct sioc_mif_req6
+{
+        mifi_t  mifi;           /* Which iface */
+        unsigned long icount;   /* In packets */
+        unsigned long ocount;   /* Out packets */
+        unsigned long ibytes;   /* In bytes */
+        unsigned long obytes;   /* Out bytes */
+};
+/*
+ *      That's all usermode folks
+ */
+#ifdef __KERNEL__
+#include <linux/skbuff.h>       /* for struct sk_buff_head */
+struct net_device;
+struct inet6_dev *ipv6_find_idev(struct net_device *dev);
+#ifdef CONFIG_IPV6_MROUTE
+static inline int ip6_mroute_opt(int opt)
+{
+        return (opt >= MRT6_BASE) && (opt <= MRT6_BASE + 10);
+}
+#else
+static inline int ip6_mroute_opt(int opt)
+{
+        return 0;
+}
+#endif
+struct sock;
+extern int ip6_mroute_setsockopt(struct sock *, int, char __user *, int);
+extern int ip6_mroute_getsockopt(struct sock *, int, char __user *, int __user *);
+extern int ip6_mr_input(struct sk_buff *skb);
+extern int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg);
+extern void ip6_mr_init(void);
+struct mif_device
+{
+        struct net_device       *dev;                   /* Device we are using */
+        unsigned long   bytes_in,bytes_out;
+        unsigned long   pkt_in,pkt_out;         /* Statistics                   */
+        unsigned long   rate_limit;             /* Traffic shaping (NI)         */
+        unsigned char   threshold;              /* TTL threshold                */
+        unsigned short  flags;                  /* Control flags                */
+        int             link;                   /* Physical interface index     */
+};
+#define VIFF_STATIC 0x8000
+struct mfc6_cache
+{
+        struct mfc6_cache *next;                /* Next entry on cache line     */
+        struct in6_addr mf6c_mcastgrp;                  /* Group the entry belongs to   */
+        struct in6_addr mf6c_origin;                    /* Source of packet             */
+        mifi_t mf6c_parent;                     /* Source interface             */
+        int mfc_flags;                          /* Flags on line                */
+        union {
+                struct {
+                        unsigned long expires;
+                        struct sk_buff_head unresolved; /* Unresolved buffers           */
+                } unres;
+                struct {
+                        unsigned long last_assert;
+                        int minvif;
+                        int maxvif;
+                        unsigned long bytes;
+                        unsigned long pkt;
+                        unsigned long wrong_if;
+                        unsigned char ttls[MAXMIFS];    /* TTL thresholds               */
+                } res;
+        } mfc_un;
+};
+#define MFC_STATIC              1
+#define MFC_NOTIFY              2
+#define MFC6_LINES              64
+#define MFC6_HASH(a, g) (((__force u32)(a)->s6_addr32[0] ^ \
+                          (__force u32)(a)->s6_addr32[1] ^ \
+                          (__force u32)(a)->s6_addr32[2] ^ \
+                          (__force u32)(a)->s6_addr32[3] ^ \
+                          (__force u32)(g)->s6_addr32[0] ^ \
+                          (__force u32)(g)->s6_addr32[1] ^ \
+                          (__force u32)(g)->s6_addr32[2] ^ \
+                          (__force u32)(g)->s6_addr32[3]) % MFC6_LINES)
+#define MFC_ASSERT_THRESH (3*HZ)                /* Maximal freq. of asserts */
+#endif
+#ifdef __KERNEL__
+struct rtmsg;
+extern int ip6mr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
+#ifdef CONFIG_IPV6_MROUTE
+extern struct sock *mroute6_socket;
+extern int ip6mr_sk_done(struct sock *sk);
+#else
+#define mroute6_socket NULL
+static inline int ip6mr_sk_done(struct sock *sk) { return 0; }
+#endif
+#endif
+/*
+ * Structure used to communicate from kernel to multicast router.
+ * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
+ * used for IPv4 implementation). This is because this structure will be passed via an
+ * IPv6 raw socket, on wich an application will only receiver the payload i.e the data after
+ * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
+ */
+struct mrt6msg {
+#define MRT6MSG_NOCACHE         1
+#define MRT6MSG_WRONGMIF        2
+#define MRT6MSG_WHOLEPKT        3               /* used for use level encap */
+        __u8            im6_mbz;                /* must be zero            */
+        __u8            im6_msgtype;            /* what type of message    */
+        __u16           im6_mif;                /* mif rec'd on            */
+        __u32           im6_pad;                /* padding for 64 bit arch */
+        struct in6_addr im6_src, im6_dst;
+};
+#endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 993758f924be..8b17ed40dea2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -741,7 +741,6 @@ struct net_device
 #define NETDEV_ALIGN            32
 #define NETDEV_ALIGN_CONST      (NETDEV_ALIGN - 1)
-#ifdef CONFIG_NET
 /*
 * Net namespace inlines
 */
@@ -762,7 +761,6 @@ void dev_net_set(struct net_device *dev, struct net *net)
        dev->nd_net = net;
 #endif
 }
-#endif
 /**
 *      netdev_priv - access network device private data
@@ -827,7 +825,6 @@ struct packet_type {
 extern rwlock_t                         dev_base_lock;          /* Device list lock */
-#ifdef CONFIG_NET
 #define for_each_netdev(net, d)         \
                list_for_each_entry(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_safe(net, d, n) \
@@ -851,7 +848,6 @@ static inline struct net_device *first_net_device(struct net *net)
        return list_empty(&net->dev_base_head) ? NULL :
                net_device_entry(net->dev_base_head.next);
 }
-#endif
 extern int                      netdev_boot_setup_check(struct net_device *dev);
 extern unsigned long            netdev_boot_base(const char *prefix, int unit);
@@ -1105,12 +1101,14 @@ static inline int netif_is_multiqueue(const struct net_device *dev)
 }
 /* Use this variant when it is known for sure that it
- * is executing from interrupt context.
+ * is executing from hardware interrupt context or with hardware interrupts
+ * disabled.
 */
 extern void dev_kfree_skb_irq(struct sk_buff *skb);
 /* Use this variant in places where it could be invoked
- * either from interrupt or non-interrupt context.
+ * from either hardware interrupt or other context, with hardware interrupts
+ * either disabled or enabled.
 */
 extern void dev_kfree_skb_any(struct sk_buff *skb);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b7e4b633c69b..ea760e519c46 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -513,7 +513,6 @@ int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap);
 int pci_find_ext_capability(struct pci_dev *dev, int cap);
 int pci_find_ht_capability(struct pci_dev *dev, int ht_cap);
 int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);
-void pcie_wait_pending_transaction(struct pci_dev *dev);
 struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
 struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
@@ -884,9 +883,6 @@ static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)
        return 0;
 }
-static inline void pcie_wait_pending_transaction(struct pci_dev *dev)
-{ }
 /* Power management related routines */
 static inline int pci_save_state(struct pci_dev *dev)
 {
diff --git a/include/linux/pim.h b/include/linux/pim.h
new file mode 100644
index 000000000000..236ffd317394
--- /dev/null
+++ b/include/linux/pim.h
@@ -0,0 +1,45 @@
+#ifndef __LINUX_PIM_H
+#define __LINUX_PIM_H
+#include <asm/byteorder.h>
+#ifndef __KERNEL__
+struct pim {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u8    pim_type:4,             /* PIM message type */
+                pim_ver:4;              /* PIM version */
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u8    pim_ver:4;              /* PIM version */
+                pim_type:4;             /* PIM message type */
+#endif
+        __u8    pim_rsv;                /* Reserved */
+        __be16  pim_cksum;              /* Checksum */
+};
+#define PIM_MINLEN              8
+#endif
+/* Message types - V1 */
+#define PIM_V1_VERSION          __constant_htonl(0x10000000)
+#define PIM_V1_REGISTER         1
+/* Message types - V2 */
+#define PIM_VERSION             2
+#define PIM_REGISTER            1
+#if defined(__KERNEL__)
+#define PIM_NULL_REGISTER       __constant_htonl(0x40000000)
+/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
+struct pimreghdr
+{
+        __u8    type;
+        __u8    reserved;
+        __be16  csum;
+        __be32  flags;
+};
+struct sk_buff;
+extern int pim_rcv_v1(struct sk_buff *);
+#endif
+#endif
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index cd6332b88829..29dd55838e84 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -14,7 +14,7 @@
 #include <linux/mod_devicetable.h>
 #define PNP_MAX_PORT            40
-#define PNP_MAX_MEM             12
+#define PNP_MAX_MEM             24
 #define PNP_MAX_IRQ             2
 #define PNP_MAX_DMA             2
 #define PNP_NAME_LEN            50
diff --git a/include/linux/ps2esdi.h b/include/linux/ps2esdi.h
deleted file mode 100644
index c0e050b1dfe9..000000000000
--- a/include/linux/ps2esdi.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _PS2ESDI_H_
-#define _PS2ESDI_H_
-#define NRML_ESDI_ID 0xddff
-#define INTG_ESDI_ID 0xdf9f
-#define PRIMARY_IO_BASE 0x3510
-#define ALT_IO_BASE 0x3518
-#define ESDI_CMD_INT (io_base+0)
-#define ESDI_STT_INT (io_base+0)
-#define ESDI_CONTROL (io_base+2)
-#define ESDI_STATUS  (io_base+2)
-#define ESDI_ATTN    (io_base+3)
-#define ESDI_INTRPT  (io_base+3)
-#define STATUS_ENABLED    0x01
-#define STATUS_ALTERNATE  0x02
-#define STATUS_BUSY       0x10
-#define STATUS_STAT_AVAIL 0x08
-#define STATUS_INTR       0x01
-#define STATUS_RESET_FAIL 0xea
-#define STATUS_CMD_INF    0x04
-#define CTRL_SOFT_RESET   0xe4
-#define CTRL_HARD_RESET   0x80
-#define CTRL_EOI          0xe2
-#define CTRL_ENABLE_DMA   0x02
-#define CTRL_ENABLE_INTR  0x01
-#define CTRL_DISABLE_INTR  0x00
-#define ATT_EOI 0x02
-/* bits of word 0 of configuration status block. more info see p.38 of tech ref */
-#define CONFIG_IS 0x10 /* Invalid Secondary */
-#define CONFIG_ZD 0x08 /* Zero Defect */
-#define CONFIG_SF 0x04 /* Skewed Format */
-#define CONFIG_FR 0x02 /* Removable */
-#define CONFIG_RT 0x01 /* Retries */
-#define PORT_SYS_A   0x92
-#define PORT_DMA_FN  0x18
-#define PORT_DMA_EX  0x1a
-#define ON (unsigned char)0x40
-#define OFF (unsigned char)~ON
-#define LITE_ON outb(inb(PORT_SYS_A) | ON,PORT_SYS_A)
-#define LITE_OFF outb((inb(PORT_SYS_A) & OFF),PORT_SYS_A)
-#define FAIL 0
-#define SUCCES 1
-#define INT_CMD_COMPLETE 0x01
-#define INT_CMD_ECC      0x03
-#define INT_CMD_RETRY    0x05
-#define INT_CMD_FORMAT   0x06
-#define INT_CMD_ECC_RETRY 0x07
-#define INT_CMD_WARNING  0x08
-#define INT_CMD_ABORT    0x09
-#define INT_RESET        0x0A
-#define INT_TRANSFER_REQ 0x0B
-#define INT_CMD_FAILED   0x0C
-#define INT_DMA_ERR      0x0D
-#define INT_CMD_BLK_ERR  0x0E
-#define INT_ATTN_ERROR   0x0F
-#define DMA_MASK_CHAN 0x90
-#define DMA_UNMASK_CHAN 0xA0
-#define DMA_WRITE_ADDR 0x20
-#define DMA_WRITE_TC 0x40
-#define DMA_WRITE_MODE 0x70
-#define CMD_GET_DEV_CONFIG 0x09
-#define CMD_READ 0x4601
-#define CMD_WRITE 0x4602
-#define DMA_READ_16 0x4C
-#define DMA_WRITE_16 0x44
-#define MB 1024*1024
-#define SECT_SIZE 512   
-#define ERROR 1
-#define OK 0
-#define HDIO_GETGEO 0x0301
-#define FALSE 0
-#define TRUE !FALSE
-struct ps2esdi_geometry {
-        unsigned char heads;
-        unsigned char sectors;
-        unsigned short cylinders;
-        unsigned long start;
-};
-#endif /* _PS2ESDI_H_ */
diff --git a/include/linux/rcupreempt.h b/include/linux/rcupreempt.h
index 01152ed532c8..d038aa6e5ee1 100644
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
@@ -87,15 +87,15 @@ DECLARE_PER_CPU(long, dynticks_progress_counter);
 static inline void rcu_enter_nohz(void)
 {
+        smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
        __get_cpu_var(dynticks_progress_counter)++;
        WARN_ON(__get_cpu_var(dynticks_progress_counter) & 0x1);
-        mb();
 }
 static inline void rcu_exit_nohz(void)
 {
-        mb();
        __get_cpu_var(dynticks_progress_counter)++;
+        smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
        WARN_ON(!(__get_cpu_var(dynticks_progress_counter) & 0x1));
 }
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 11d8e9a74eff..6a1e7afb099b 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -790,6 +790,7 @@ struct sched_domain {
 };
 extern void partition_sched_domains(int ndoms_new, cpumask_t *doms_new);
+extern int arch_reinit_sched_domains(void);
 #endif  /* CONFIG_SMP */
@@ -929,6 +930,9 @@ struct sched_entity {
        u64                     vruntime;
        u64                     prev_sum_exec_runtime;
+        u64                     last_wakeup;
+        u64                     avg_overlap;
 #ifdef CONFIG_SCHEDSTATS
        u64                     wait_start;
        u64                     wait_max;
@@ -1537,6 +1541,12 @@ static inline void idle_task_exit(void) {}
 extern void sched_idle_next(void);
+#if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP)
+extern void wake_up_idle_cpu(int cpu);
+#else
+static inline void wake_up_idle_cpu(int cpu) { }
+#endif
 #ifdef CONFIG_SCHED_DEBUG
 extern unsigned int sysctl_sched_latency;
 extern unsigned int sysctl_sched_min_granularity;
diff --git a/include/linux/security.h b/include/linux/security.h
index b07357ca2137..c673dfd4dffc 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -57,7 +57,6 @@ extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
 extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
 extern void cap_task_reparent_to_init (struct task_struct *p);
-extern int cap_task_kill(struct task_struct *p, struct siginfo *info, int sig, u32 secid);
 extern int cap_task_setscheduler (struct task_struct *p, int policy, struct sched_param *lp);
 extern int cap_task_setioprio (struct task_struct *p, int ioprio);
 extern int cap_task_setnice (struct task_struct *p, int nice);
@@ -2187,7 +2186,7 @@ static inline int security_task_kill (struct task_struct *p,
                                      struct siginfo *info, int sig,
                                      u32 secid)
 {
-        return cap_task_kill(p, info, sig, secid);
+        return 0;
 }
 static inline int security_task_wait (struct task_struct *p)
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 5da70c3f4417..1da1e6208a0a 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/mutex.h>
-#include <net/net_namespace.h>
 struct seq_operations;
 struct file;
@@ -63,26 +62,5 @@ extern struct list_head *seq_list_start_head(struct list_head *head,
 extern struct list_head *seq_list_next(void *v, struct list_head *head,
                loff_t *ppos);
-#ifdef CONFIG_NET
-struct net;
-struct seq_net_private {
-#ifdef CONFIG_NET_NS
-        struct net *net;
-#endif
-};
-int seq_open_net(struct inode *, struct file *,
-                 const struct seq_operations *, int);
-int seq_release_net(struct inode *, struct file *);
-static inline struct net *seq_file_net(struct seq_file *seq)
-{
-#ifdef CONFIG_NET_NS
-        return ((struct seq_net_private *)seq->private)->net;
-#else
-        return &init_net;
-#endif
-}
-#endif  /* CONFIG_NET */
 #endif
 #endif
diff --git a/include/linux/seq_file_net.h b/include/linux/seq_file_net.h
new file mode 100644
index 000000000000..4ac52542a563
--- /dev/null
+++ b/include/linux/seq_file_net.h
@@ -0,0 +1,27 @@
+#ifndef __SEQ_FILE_NET_H__
+#define __SEQ_FILE_NET_H__
+#include <linux/seq_file.h>
+struct net;
+extern struct net init_net;
+struct seq_net_private {
+#ifdef CONFIG_NET_NS
+        struct net *net;
+#endif
+};
+int seq_open_net(struct inode *, struct file *,
+                 const struct seq_operations *, int);
+int seq_release_net(struct inode *, struct file *);
+static inline struct net *seq_file_net(struct seq_file *seq)
+{
+#ifdef CONFIG_NET_NS
+        return ((struct seq_net_private *)seq->private)->net;
+#else
+        return &init_net;
+#endif
+}
+#endif
diff --git a/include/linux/topology.h b/include/linux/topology.h
index 2352f46160d3..bd14f8b30f09 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -50,6 +50,8 @@
        for_each_online_node(node)                                              \
                if (nr_cpus_node(node))
+void arch_update_cpu_topology(void);
 /* Conform to ACPI 2.0 SLIT distance definitions */
 #define LOCAL_DISTANCE          10
 #define REMOTE_DISTANCE         20
@@ -138,7 +140,6 @@
                                | SD_BALANCE_FORK       \
                                | SD_BALANCE_EXEC       \
                                | SD_WAKE_AFFINE        \
-                                | SD_WAKE_IDLE          \
                                | SD_SHARE_PKG_RESOURCES\
                                | BALANCE_FOR_MC_POWER, \
        .last_balance           = jiffies,              \
diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
index 2692ec9389ca..1f999ec8d08c 100644
--- a/include/linux/usb/quirks.h
+++ b/include/linux/usb/quirks.h
@@ -9,3 +9,6 @@
 /* device can't resume correctly so reset it instead */
 #define USB_QUIRK_RESET_RESUME          0x00000002
+/* device can't handle Set-Interface requests */
+#define USB_QUIRK_NO_SET_INTF           0x00000004
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index cee0623b3c7b..0a40dfa44c9f 100644
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -50,7 +50,9 @@
        US_FLAG(CAPACITY_HEURISTICS,    0x00001000)             \
                /* sometimes sizes is too big */                \
        US_FLAG(MAX_SECTORS_MIN,0x00002000)                     \
-                /* Sets max_sectors to arch min */
+                /* Sets max_sectors to arch min */              \
+        US_FLAG(BULK_IGNORE_TAG,0x00004000)                     \
+                /* Ignore tag mismatch in bulk operations */
 #define US_FLAG(name, value)    US_FL_##name = value ,