146 files changed, 2002 insertions, 647 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 0b54e9a4a8a1..6dca3d542080 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -269,7 +269,7 @@ struct acpi_device_wakeup_state {
 struct acpi_device_wakeup {
        acpi_handle gpe_device;
-        acpi_integer gpe_number;;
+        acpi_integer gpe_number;
        acpi_integer sleep_state;
        struct acpi_handle_list resources;
        struct acpi_device_wakeup_state state;
@@ -330,6 +330,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
 int acpi_bus_unregister_driver(struct acpi_driver *driver);
 int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
                 acpi_handle handle, int type);
+int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 int acpi_bus_start(struct acpi_device *device);
 int acpi_match_ids(struct acpi_device *device, char *ids);
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 871dd7ad909d..3ebbeee753e9 100644
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -534,9 +534,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
 #define eth_io_copy_and_sum(skb,src,len,unused) \
  memcpy_fromio((skb)->data,src,len)
-#define isa_eth_io_copy_and_sum(skb,src,len,unused) \
-  isa_memcpy_fromio((skb)->data,src,len)
 static inline int
 check_signature(const volatile void __iomem *io_addr,
                const unsigned char *signature, int length)
@@ -550,87 +547,6 @@ check_signature(const volatile void __iomem *io_addr,
        return 1;
 }
-/*
- * ISA space is mapped to some machine-specific location on Alpha.
- * Call into the existing hooks to get the address translated.
- */
-static inline u8
-isa_readb(unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 1);
-        u8 ret = readb(addr);
-        iounmap(addr);
-        return ret;
-}
-static inline u16
-isa_readw(unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 2);
-        u16 ret = readw(addr);
-        iounmap(addr);
-        return ret;
-}
-static inline u32
-isa_readl(unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 2);
-        u32 ret = readl(addr);
-        iounmap(addr);
-        return ret;
-}
-static inline void
-isa_writeb(u8 b, unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 2);
-        writeb(b, addr);
-        iounmap(addr);
-}
-static inline void
-isa_writew(u16 w, unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 2);
-        writew(w, addr);
-        iounmap(addr);
-}
-static inline void
-isa_writel(u32 l, unsigned long offset)
-{
-        void __iomem *addr = ioremap(offset, 2);
-        writel(l, addr);
-        iounmap(addr);
-}
-static inline void
-isa_memset_io(unsigned long offset, u8 val, long n)
-{
-        void __iomem *addr = ioremap(offset, n);
-        memset_io(addr, val, n);
-        iounmap(addr);
-}
-static inline void
-isa_memcpy_fromio(void *dest, unsigned long offset, long n)
-{
-        void __iomem *addr = ioremap(offset, n);
-        memcpy_fromio(dest, addr, n);
-        iounmap(addr);
-}
-static inline void
-isa_memcpy_toio(unsigned long offset, const void *src, long n)
-{
-        void __iomem *addr = ioremap(offset, n);
-        memcpy_toio(addr, src, n);
-        iounmap(addr);
-}
 /*
 * The Alpha Jensen hardware for some rather strange reason puts
 * the RTC clock at 0x170 instead of 0x70. Probably due to some
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h
index 6f92482cc96c..0c017fc181c1 100644
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
@@ -231,9 +231,8 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
        int i;
-        for (i = 0; i < NR_CPUS; i++)
+        for_each_online_cpu(i)
-                if (cpu_online(i))
+                mm->context[i] = 0;
-                        mm->context[i] = 0;
        if (tsk != current)
                task_thread_info(tsk)->pcb.ptbr
                  = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT;
diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h
index eb740e280d9c..420ccde6b916 100644
--- a/include/asm-alpha/topology.h
+++ b/include/asm-alpha/topology.h
@@ -27,8 +27,8 @@ static inline cpumask_t node_to_cpumask(int node)
        cpumask_t node_cpu_mask = CPU_MASK_NONE;
        int cpu;
-        for(cpu = 0; cpu < NR_CPUS; cpu++) {
+        for_each_online_cpu(cpu) {
-                if (cpu_online(cpu) && (cpu_to_node(cpu) == node))
+                if (cpu_to_node(cpu) == node)
                        cpu_set(cpu, node_cpu_mask);
        }
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index fd0147e52dbb..b3479fc1cc8f 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -226,42 +226,6 @@ out:
 #endif  /* __mem_pci */
 /*
- * If this architecture has ISA IO, then define the isa_read/isa_write
- * macros.
- */
-#ifdef __mem_isa
-#define isa_readb(addr)                 __raw_readb(__mem_isa(addr))
-#define isa_readw(addr)                 __raw_readw(__mem_isa(addr))
-#define isa_readl(addr)                 __raw_readl(__mem_isa(addr))
-#define isa_writeb(val,addr)            __raw_writeb(val,__mem_isa(addr))
-#define isa_writew(val,addr)            __raw_writew(val,__mem_isa(addr))
-#define isa_writel(val,addr)            __raw_writel(val,__mem_isa(addr))
-#define isa_memset_io(a,b,c)            _memset_io(__mem_isa(a),(b),(c))
-#define isa_memcpy_fromio(a,b,c)        _memcpy_fromio((a),__mem_isa(b),(c))
-#define isa_memcpy_toio(a,b,c)          _memcpy_toio(__mem_isa((a)),(b),(c))
-#define isa_eth_io_copy_and_sum(a,b,c,d) \
-                                eth_copy_and_sum((a),__mem_isa(b),(c),(d))
-#else   /* __mem_isa */
-#define isa_readb(addr)                 (__readwrite_bug("isa_readb"),0)
-#define isa_readw(addr)                 (__readwrite_bug("isa_readw"),0)
-#define isa_readl(addr)                 (__readwrite_bug("isa_readl"),0)
-#define isa_writeb(val,addr)            __readwrite_bug("isa_writeb")
-#define isa_writew(val,addr)            __readwrite_bug("isa_writew")
-#define isa_writel(val,addr)            __readwrite_bug("isa_writel")
-#define isa_memset_io(a,b,c)            __readwrite_bug("isa_memset_io")
-#define isa_memcpy_fromio(a,b,c)        __readwrite_bug("isa_memcpy_fromio")
-#define isa_memcpy_toio(a,b,c)          __readwrite_bug("isa_memcpy_toio")
-#define isa_eth_io_copy_and_sum(a,b,c,d) \
-                                __readwrite_bug("isa_eth_io_copy_and_sum")
-#endif  /* __mem_isa */
-/*
 * ioremap and friends.
 *
 * ioremap takes a PCI memory address, as specified in
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index d48670107a85..1d63c2aa8ec2 100644
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -71,4 +71,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 #define arch_align_stack(x) (x)
+void default_idle(void);
 #endif
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 400c2b41896e..1a565a9d2fa7 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -7,7 +7,7 @@
 #ifdef CONFIG_BUG
 #ifndef HAVE_ARCH_BUG
 #define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+        printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
        panic("BUG!"); \
 } while (0)
 #endif
@@ -19,7 +19,7 @@
 #ifndef HAVE_ARCH_WARN_ON
 #define WARN_ON(condition) do { \
        if (unlikely((condition)!=0)) { \
-                printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
+                printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \
                dump_stack(); \
        } \
 } while (0)
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index 9044aeb37828..78cf45547e31 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -19,10 +19,9 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for (__i = 0; __i < NR_CPUS; __i++)                     \
+        for_each_cpu(__i)                                       \
-                if (cpu_possible(__i))                          \
+                memcpy((pcpudst)+__per_cpu_offset[__i],         \
-                        memcpy((pcpudst)+__per_cpu_offset[__i], \
+                       (src), (size));                          \
-                               (src), (size));                  \
 } while (0)
 #else /* ! SMP */
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h
new file mode 100644
index 000000000000..e201decea0c9
--- /dev/null
+++ b/include/asm-i386/alternative.h
@@ -0,0 +1,129 @@
+#ifndef _I386_ALTERNATIVE_H
+#define _I386_ALTERNATIVE_H
+#ifdef __KERNEL__
+struct alt_instr {
+        u8 *instr;              /* original instruction */
+        u8 *replacement;
+        u8  cpuid;              /* cpuid bit set for replacement */
+        u8  instrlen;           /* length of original instruction */
+        u8  replacementlen;     /* length of new instruction, <= instrlen */
+        u8  pad;
+};
+extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
+struct module;
+extern void alternatives_smp_module_add(struct module *mod, char *name,
+                                        void *locks, void *locks_end,
+                                        void *text, void *text_end);
+extern void alternatives_smp_module_del(struct module *mod);
+extern void alternatives_smp_switch(int smp);
+#endif
+/*
+ * Alternative instructions for different CPU types or capabilities.
+ *
+ * This allows to use optimized instructions even on generic binary
+ * kernels.
+ *
+ * length of oldinstr must be longer or equal the length of newinstr
+ * It can be padded with nops as needed.
+ *
+ * For non barrier like inlines please define new variants
+ * without volatile and memory clobber.
+ */
+#define alternative(oldinstr, newinstr, feature)                        \
+        asm volatile ("661:\n\t" oldinstr "\n662:\n"                    \
+                      ".section .altinstructions,\"a\"\n"               \
+                      "  .align 4\n"                                    \
+                      "  .long 661b\n"            /* label */           \
+                      "  .long 663f\n"            /* new instruction */ \
+                      "  .byte %c0\n"             /* feature bit */     \
+                      "  .byte 662b-661b\n"       /* sourcelen */       \
+                      "  .byte 664f-663f\n"       /* replacementlen */  \
+                      ".previous\n"                                     \
+                      ".section .altinstr_replacement,\"ax\"\n"         \
+                      "663:\n\t" newinstr "\n664:\n"   /* replacement */\
+                      ".previous" :: "i" (feature) : "memory")
+/*
+ * Alternative inline assembly with input.
+ *
+ * Pecularities:
+ * No memory clobber here.
+ * Argument numbers start with 1.
+ * Best is to use constraints that are fixed size (like (%1) ... "r")
+ * If you use variable sized constraints like "m" or "g" in the
+ * replacement maake sure to pad to the worst case length.
+ */
+#define alternative_input(oldinstr, newinstr, feature, input...)        \
+        asm volatile ("661:\n\t" oldinstr "\n662:\n"                    \
+                      ".section .altinstructions,\"a\"\n"               \
+                      "  .align 4\n"                                    \
+                      "  .long 661b\n"            /* label */           \
+                      "  .long 663f\n"            /* new instruction */ \
+                      "  .byte %c0\n"             /* feature bit */     \
+                      "  .byte 662b-661b\n"       /* sourcelen */       \
+                      "  .byte 664f-663f\n"       /* replacementlen */  \
+                      ".previous\n"                                     \
+                      ".section .altinstr_replacement,\"ax\"\n"         \
+                      "663:\n\t" newinstr "\n664:\n"   /* replacement */\
+                      ".previous" :: "i" (feature), ##input)
+/*
+ * Alternative inline assembly for SMP.
+ *
+ * alternative_smp() takes two versions (SMP first, UP second) and is
+ * for more complex stuff such as spinlocks.
+ *
+ * The LOCK_PREFIX macro defined here replaces the LOCK and
+ * LOCK_PREFIX macros used everywhere in the source tree.
+ *
+ * SMP alternatives use the same data structures as the other
+ * alternatives and the X86_FEATURE_UP flag to indicate the case of a
+ * UP system running a SMP kernel.  The existing apply_alternatives()
+ * works fine for patching a SMP kernel for UP.
+ *
+ * The SMP alternative tables can be kept after boot and contain both
+ * UP and SMP versions of the instructions to allow switching back to
+ * SMP at runtime, when hotplugging in a new CPU, which is especially
+ * useful in virtualized environments.
+ *
+ * The very common lock prefix is handled as special case in a
+ * separate table which is a pure address list without replacement ptr
+ * and size information.  That keeps the table sizes small.
+ */
+#ifdef CONFIG_SMP
+#define alternative_smp(smpinstr, upinstr, args...)                     \
+        asm volatile ("661:\n\t" smpinstr "\n662:\n"                    \
+                      ".section .smp_altinstructions,\"a\"\n"           \
+                      "  .align 4\n"                                    \
+                      "  .long 661b\n"            /* label */           \
+                      "  .long 663f\n"            /* new instruction */ \
+                      "  .byte 0x68\n"            /* X86_FEATURE_UP */  \
+                      "  .byte 662b-661b\n"       /* sourcelen */       \
+                      "  .byte 664f-663f\n"       /* replacementlen */  \
+                      ".previous\n"                                     \
+                      ".section .smp_altinstr_replacement,\"awx\"\n"    \
+                      "663:\n\t" upinstr "\n"     /* replacement */     \
+                      "664:\n\t.fill 662b-661b,1,0x42\n" /* space for original */ \
+                      ".previous" : args)
+#define LOCK_PREFIX \
+                ".section .smp_locks,\"a\"\n"   \
+                "  .align 4\n"                  \
+                "  .long 661f\n" /* address */  \
+                ".previous\n"                   \
+                "661:\n\tlock; "
+#else /* ! CONFIG_SMP */
+#define alternative_smp(smpinstr, upinstr, args...) \
+        asm volatile (upinstr : args)
+#define LOCK_PREFIX ""
+#endif
+#endif /* _I386_ALTERNATIVE_H */
diff --git a/include/asm-i386/arch_hooks.h b/include/asm-i386/arch_hooks.h
index 28b96a6fb9fa..238cf4275b96 100644
--- a/include/asm-i386/arch_hooks.h
+++ b/include/asm-i386/arch_hooks.h
@@ -24,4 +24,7 @@ extern void trap_init_hook(void);
 extern void time_init_hook(void);
 extern void mca_nmi_hook(void);
+extern int setup_early_printk(char *);
+extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
 #endif
diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h
index de649d3aa2d4..22d80ece95cb 100644
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -10,12 +10,6 @@
 * resource counting etc..
 */
-#ifdef CONFIG_SMP
-#define LOCK "lock ; "
-#else
-#define LOCK ""
-#endif
 /*
 * Make sure gcc doesn't try to be clever and move things around
 * on us. We need to use _exactly_ the address the user gave us,
@@ -52,7 +46,7 @@ typedef struct { volatile int counter; } atomic_t;
 static __inline__ void atomic_add(int i, atomic_t *v)
 {
        __asm__ __volatile__(
-                LOCK "addl %1,%0"
+                LOCK_PREFIX "addl %1,%0"
                :"=m" (v->counter)
                :"ir" (i), "m" (v->counter));
 }
@@ -67,7 +61,7 @@ static __inline__ void atomic_add(int i, atomic_t *v)
 static __inline__ void atomic_sub(int i, atomic_t *v)
 {
        __asm__ __volatile__(
-                LOCK "subl %1,%0"
+                LOCK_PREFIX "subl %1,%0"
                :"=m" (v->counter)
                :"ir" (i), "m" (v->counter));
 }
@@ -86,7 +80,7 @@ static __inline__ int atomic_sub_and_test(int i, atomic_t *v)
        unsigned char c;
        __asm__ __volatile__(
-                LOCK "subl %2,%0; sete %1"
+                LOCK_PREFIX "subl %2,%0; sete %1"
                :"=m" (v->counter), "=qm" (c)
                :"ir" (i), "m" (v->counter) : "memory");
        return c;
@@ -101,7 +95,7 @@ static __inline__ int atomic_sub_and_test(int i, atomic_t *v)
 static __inline__ void atomic_inc(atomic_t *v)
 {
        __asm__ __volatile__(
-                LOCK "incl %0"
+                LOCK_PREFIX "incl %0"
                :"=m" (v->counter)
                :"m" (v->counter));
 }
@@ -115,7 +109,7 @@ static __inline__ void atomic_inc(atomic_t *v)
 static __inline__ void atomic_dec(atomic_t *v)
 {
        __asm__ __volatile__(
-                LOCK "decl %0"
+                LOCK_PREFIX "decl %0"
                :"=m" (v->counter)
                :"m" (v->counter));
 }
@@ -133,7 +127,7 @@ static __inline__ int atomic_dec_and_test(atomic_t *v)
        unsigned char c;
        __asm__ __volatile__(
-                LOCK "decl %0; sete %1"
+                LOCK_PREFIX "decl %0; sete %1"
                :"=m" (v->counter), "=qm" (c)
                :"m" (v->counter) : "memory");
        return c != 0;
@@ -152,7 +146,7 @@ static __inline__ int atomic_inc_and_test(atomic_t *v)
        unsigned char c;
        __asm__ __volatile__(
-                LOCK "incl %0; sete %1"
+                LOCK_PREFIX "incl %0; sete %1"
                :"=m" (v->counter), "=qm" (c)
                :"m" (v->counter) : "memory");
        return c != 0;
@@ -172,7 +166,7 @@ static __inline__ int atomic_add_negative(int i, atomic_t *v)
        unsigned char c;
        __asm__ __volatile__(
-                LOCK "addl %2,%0; sets %1"
+                LOCK_PREFIX "addl %2,%0; sets %1"
                :"=m" (v->counter), "=qm" (c)
                :"ir" (i), "m" (v->counter) : "memory");
        return c;
@@ -195,7 +189,7 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
        /* Modern 486+ processor */
        __i = i;
        __asm__ __volatile__(
-                LOCK "xaddl %0, %1;"
+                LOCK_PREFIX "xaddl %0, %1;"
                :"=r"(i)
                :"m"(v->counter), "0"(i));
        return i + __i;
@@ -231,8 +225,14 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)
 ({                                                              \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
+        for (;;) {                                              \
+                if (unlikely(c == (u)))                         \
+                        break;                                  \
+                old = atomic_cmpxchg((v), c, c + (a));          \
+                if (likely(old == c))                           \
+                        break;                                  \
                c = old;                                        \
+        }                                                       \
        c != (u);                                               \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
@@ -242,11 +242,11 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)
 /* These are x86-specific, used by some header files */
 #define atomic_clear_mask(mask, addr) \
-__asm__ __volatile__(LOCK "andl %0,%1" \
+__asm__ __volatile__(LOCK_PREFIX "andl %0,%1" \
 : : "r" (~(mask)),"m" (*addr) : "memory")
 #define atomic_set_mask(mask, addr) \
-__asm__ __volatile__(LOCK "orl %0,%1" \
+__asm__ __volatile__(LOCK_PREFIX "orl %0,%1" \
 : : "r" (mask),"m" (*(addr)) : "memory")
 /* Atomic operations are already serializing on x86 */
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 88e6ca248cd7..7d20b95edb3b 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 #include <linux/compiler.h>
+#include <asm/alternative.h>
 /*
 * These have to be done with inline assembly: that way the bit-setting
@@ -16,12 +17,6 @@
 * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
 */
-#ifdef CONFIG_SMP
-#define LOCK_PREFIX "lock ; "
-#else
-#define LOCK_PREFIX ""
-#endif
 #define ADDR (*(volatile long *) addr)
 /**
diff --git a/include/asm-i386/cache.h b/include/asm-i386/cache.h
index 615911e5bd24..ca15c9c665cf 100644
--- a/include/asm-i386/cache.h
+++ b/include/asm-i386/cache.h
@@ -10,4 +10,6 @@
 #define L1_CACHE_SHIFT  (CONFIG_X86_L1_CACHE_SHIFT)
 #define L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif
diff --git a/include/asm-i386/cpufeature.h b/include/asm-i386/cpufeature.h
index c4ec2a4d8fdf..5c0b5876b931 100644
--- a/include/asm-i386/cpufeature.h
+++ b/include/asm-i386/cpufeature.h
@@ -70,6 +70,7 @@
 #define X86_FEATURE_P3          (3*32+ 6) /* P3 */
 #define X86_FEATURE_P4          (3*32+ 7) /* P4 */
 #define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */
+#define X86_FEATURE_UP          (3*32+ 9) /* smp kernel running on up */
 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_XMM3        (4*32+ 0) /* Streaming SIMD Extensions-3 */
diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index 03233c2ab820..79670bb4b0c7 100644
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -219,23 +219,11 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
 */
 #define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
-#define isa_readb(a) readb(__ISA_IO_base + (a))
-#define isa_readw(a) readw(__ISA_IO_base + (a))
-#define isa_readl(a) readl(__ISA_IO_base + (a))
-#define isa_writeb(b,a) writeb(b,__ISA_IO_base + (a))
-#define isa_writew(w,a) writew(w,__ISA_IO_base + (a))
-#define isa_writel(l,a) writel(l,__ISA_IO_base + (a))
-#define isa_memset_io(a,b,c)            memset_io(__ISA_IO_base + (a),(b),(c))
-#define isa_memcpy_fromio(a,b,c)        memcpy_fromio((a),__ISA_IO_base + (b),(c))
-#define isa_memcpy_toio(a,b,c)          memcpy_toio(__ISA_IO_base + (a),(b),(c))
 /*
 * Again, i386 does not require mem IO specific function.
 */
 #define eth_io_copy_and_sum(a,b,c,d)            eth_copy_and_sum((a),(void __force *)(b),(c),(d))
-#define isa_eth_io_copy_and_sum(a,b,c,d)        eth_copy_and_sum((a),(void __force *)(__ISA_IO_base + (b)),(c),(d))
 /**
 *      check_signature         -       find BIOS signatures
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h
index 56211414fc95..6312c3e79814 100644
--- a/include/asm-i386/mach-default/do_timer.h
+++ b/include/asm-i386/mach-default/do_timer.h
@@ -18,7 +18,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
        do_timer(regs);
 #ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
+        update_process_times(user_mode_vm(regs));
 #endif
 /*
 * In the SMP case we use the local APIC timer interrupt to do the
diff --git a/include/asm-i386/mach-es7000/mach_mpparse.h b/include/asm-i386/mach-es7000/mach_mpparse.h
index 4a0637a3e208..99f66be240be 100644
--- a/include/asm-i386/mach-es7000/mach_mpparse.h
+++ b/include/asm-i386/mach-es7000/mach_mpparse.h
@@ -30,7 +30,8 @@ static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
        return 0;
 }
-static inline int es7000_check_dsdt()
+#ifdef CONFIG_ACPI
+static inline int es7000_check_dsdt(void)
 {
        struct acpi_table_header *header = NULL;
        if(!acpi_get_table_header_early(ACPI_DSDT, &header))
@@ -54,6 +55,11 @@ static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
        }
        return 0;
 }
+#else
+static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+        return 0;
+}
+#endif
 #endif /* __ASM_MACH_MPPARSE_H */
diff --git a/include/asm-i386/mach-visws/do_timer.h b/include/asm-i386/mach-visws/do_timer.h
index 92d638fc8b11..95568e6ca91c 100644
--- a/include/asm-i386/mach-visws/do_timer.h
+++ b/include/asm-i386/mach-visws/do_timer.h
@@ -11,7 +11,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs)
        do_timer(regs);
 #ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
+        update_process_times(user_mode_vm(regs));
 #endif
 /*
 * In the SMP case we use the local APIC timer interrupt to do the
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-i386/mach-voyager/do_timer.h
index ae510e5d0d78..eaf518098981 100644
--- a/include/asm-i386/mach-voyager/do_timer.h
+++ b/include/asm-i386/mach-voyager/do_timer.h
@@ -5,7 +5,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
        do_timer(regs);
 #ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
+        update_process_times(user_mode_vm(regs));
 #endif
        voyager_timer_interrupt(regs);
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h
index 64a0b8e6afeb..62113d3bfdc2 100644
--- a/include/asm-i386/mpspec.h
+++ b/include/asm-i386/mpspec.h
@@ -22,7 +22,6 @@ extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_irq_entries;
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
-extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 extern unsigned long mp_lapic_addr;
 extern int pic_mode;
 extern int using_apic_timer;
diff --git a/include/asm-i386/mtrr.h b/include/asm-i386/mtrr.h
index 5b6ceda68c5f..64cf937c7e33 100644
--- a/include/asm-i386/mtrr.h
+++ b/include/asm-i386/mtrr.h
@@ -25,6 +25,7 @@
 #include <linux/config.h>
 #include <linux/ioctl.h>
+#include <linux/errno.h>
 #define MTRR_IOCTL_BASE 'M'
diff --git a/include/asm-i386/mutex.h b/include/asm-i386/mutex.h
index 9b2199e829f3..05a538531229 100644
--- a/include/asm-i386/mutex.h
+++ b/include/asm-i386/mutex.h
@@ -9,6 +9,8 @@
 #ifndef _ASM_MUTEX_H
 #define _ASM_MUTEX_H
+#include "asm/alternative.h"
 /**
 *  __mutex_fastpath_lock - try to take the lock by moving the count
 *                          from 1 to a 0 value
@@ -27,7 +29,7 @@ do {									\
        typecheck_fn(fastcall void (*)(atomic_t *), fail_fn);           \
                                                                        \
        __asm__ __volatile__(                                           \
-                LOCK    "   decl (%%eax)        \n"                     \
+                LOCK_PREFIX "   decl (%%eax)    \n"                     \
                        "   js 2f               \n"                     \
                        "1:                     \n"                     \
                                                                        \
@@ -83,7 +85,7 @@ do {									\
        typecheck_fn(fastcall void (*)(atomic_t *), fail_fn);           \
                                                                        \
        __asm__ __volatile__(                                           \
-                LOCK    "   incl (%%eax)        \n"                     \
+                LOCK_PREFIX "   incl (%%eax)    \n"                     \
                        "   jle 2f              \n"                     \
                        "1:                     \n"                     \
                                                                        \
diff --git a/include/asm-i386/pgtable-2level.h b/include/asm-i386/pgtable-2level.h
index 74ef721b534d..27bde973abc7 100644
--- a/include/asm-i386/pgtable-2level.h
+++ b/include/asm-i386/pgtable-2level.h
@@ -61,4 +61,6 @@ static inline int pte_exec_kernel(pte_t pte)
 #define __pte_to_swp_entry(pte)         ((swp_entry_t) { (pte).pte_low })
 #define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
+void vmalloc_sync_all(void);
 #endif /* _I386_PGTABLE_2LEVEL_H */
diff --git a/include/asm-i386/pgtable-3level.h b/include/asm-i386/pgtable-3level.h
index f1a8b454920a..36a5aa63cbbf 100644
--- a/include/asm-i386/pgtable-3level.h
+++ b/include/asm-i386/pgtable-3level.h
@@ -152,4 +152,6 @@ static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot)
 #define __pmd_free_tlb(tlb, x)          do { } while (0)
+#define vmalloc_sync_all() ((void)0)
 #endif /* _I386_PGTABLE_3LEVEL_H */
diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index b57cc7afdf7e..94f00195d543 100644
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -21,21 +21,23 @@
 #define RW_LOCK_BIAS_STR        "0x01000000"
 #define __build_read_lock_ptr(rw, helper)   \
-        asm volatile(LOCK "subl $1,(%0)\n\t" \
+        alternative_smp("lock; subl $1,(%0)\n\t" \
-                     "jns 1f\n" \
+                        "jns 1f\n" \
-                     "call " helper "\n\t" \
+                        "call " helper "\n\t" \
-                     "1:\n" \
+                        "1:\n", \
-                     ::"a" (rw) : "memory")
+                        "subl $1,(%0)\n\t", \
+                        :"a" (rw) : "memory")
 #define __build_read_lock_const(rw, helper)   \
-        asm volatile(LOCK "subl $1,%0\n\t" \
+        alternative_smp("lock; subl $1,%0\n\t" \
-                     "jns 1f\n" \
+                        "jns 1f\n" \
-                     "pushl %%eax\n\t" \
+                        "pushl %%eax\n\t" \
-                     "leal %0,%%eax\n\t" \
+                        "leal %0,%%eax\n\t" \
-                     "call " helper "\n\t" \
+                        "call " helper "\n\t" \
-                     "popl %%eax\n\t" \
+                        "popl %%eax\n\t" \
-                     "1:\n" \
+                        "1:\n", \
-                     :"=m" (*(volatile int *)rw) : : "memory")
+                        "subl $1,%0\n\t", \
+                        "=m" (*(volatile int *)rw) : : "memory")
 #define __build_read_lock(rw, helper)   do { \
                                                if (__builtin_constant_p(rw)) \
@@ -45,21 +47,23 @@
                                        } while (0)
 #define __build_write_lock_ptr(rw, helper) \
-        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
-                     "jz 1f\n" \
+                        "jz 1f\n" \
-                     "call " helper "\n\t" \
+                        "call " helper "\n\t" \
-                     "1:\n" \
+                        "1:\n", \
-                     ::"a" (rw) : "memory")
+                        "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \
+                        :"a" (rw) : "memory")
 #define __build_write_lock_const(rw, helper) \
-        asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
-                     "jz 1f\n" \
+                        "jz 1f\n" \
-                     "pushl %%eax\n\t" \
+                        "pushl %%eax\n\t" \
-                     "leal %0,%%eax\n\t" \
+                        "leal %0,%%eax\n\t" \
-                     "call " helper "\n\t" \
+                        "call " helper "\n\t" \
-                     "popl %%eax\n\t" \
+                        "popl %%eax\n\t" \
-                     "1:\n" \
+                        "1:\n", \
-                     :"=m" (*(volatile int *)rw) : : "memory")
+                        "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \
+                        "=m" (*(volatile int *)rw) : : "memory")
 #define __build_write_lock(rw, helper)  do { \
                                                if (__builtin_constant_p(rw)) \
diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h
index 6a42b2142fd6..f7a0f310c524 100644
--- a/include/asm-i386/semaphore.h
+++ b/include/asm-i386/semaphore.h
@@ -99,7 +99,7 @@ static inline void down(struct semaphore * sem)
        might_sleep();
        __asm__ __volatile__(
                "# atomic down operation\n\t"
-                LOCK "decl %0\n\t"     /* --sem->count */
+                LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
                "js 2f\n"
                "1:\n"
                LOCK_SECTION_START("")
@@ -123,7 +123,7 @@ static inline int down_interruptible(struct semaphore * sem)
        might_sleep();
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
-                LOCK "decl %1\n\t"     /* --sem->count */
+                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
                "js 2f\n\t"
                "xorl %0,%0\n"
                "1:\n"
@@ -148,7 +148,7 @@ static inline int down_trylock(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
-                LOCK "decl %1\n\t"     /* --sem->count */
+                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
                "js 2f\n\t"
                "xorl %0,%0\n"
                "1:\n"
@@ -173,7 +173,7 @@ static inline void up(struct semaphore * sem)
 {
        __asm__ __volatile__(
                "# atomic up operation\n\t"
-                LOCK "incl %0\n\t"     /* ++sem->count */
+                LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
                "jle 2f\n"
                "1:\n"
                LOCK_SECTION_START("")
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h
index 23604350cdf4..d76b7693cf1d 100644
--- a/include/asm-i386/spinlock.h
+++ b/include/asm-i386/spinlock.h
@@ -35,31 +35,41 @@
 #define __raw_spin_lock_string_flags \
        "\n1:\t" \
        "lock ; decb %0\n\t" \
-        "jns 4f\n\t" \
+        "jns 5f\n" \
        "2:\t" \
        "testl $0x200, %1\n\t" \
-        "jz 3f\n\t" \
+        "jz 4f\n\t" \
-        "sti\n\t" \
+        "sti\n" \
        "3:\t" \
        "rep;nop\n\t" \
        "cmpb $0, %0\n\t" \
        "jle 3b\n\t" \
        "cli\n\t" \
        "jmp 1b\n" \
-        "4:\n\t"
+        "4:\t" \
+        "rep;nop\n\t" \
+        "cmpb $0, %0\n\t" \
+        "jg 1b\n\t" \
+        "jmp 4b\n" \
+        "5:\n\t"
+#define __raw_spin_lock_string_up \
+        "\n\tdecb %0"
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
-        __asm__ __volatile__(
+        alternative_smp(
-                __raw_spin_lock_string
+                __raw_spin_lock_string,
-                :"=m" (lock->slock) : : "memory");
+                __raw_spin_lock_string_up,
+                "=m" (lock->slock) : : "memory");
 }
 static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 {
-        __asm__ __volatile__(
+        alternative_smp(
-                __raw_spin_lock_string_flags
+                __raw_spin_lock_string_flags,
-                :"=m" (lock->slock) : "r" (flags) : "memory");
+                __raw_spin_lock_string_up,
+                "=m" (lock->slock) : "r" (flags) : "memory");
 }
 static inline int __raw_spin_trylock(raw_spinlock_t *lock)
@@ -178,12 +188,12 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
 static inline void __raw_read_unlock(raw_rwlock_t *rw)
 {
-        asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory");
+        asm volatile(LOCK_PREFIX "incl %0" :"=m" (rw->lock) : : "memory");
 }
 static inline void __raw_write_unlock(raw_rwlock_t *rw)
 {
-        asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ", %0"
+        asm volatile(LOCK_PREFIX "addl $" RW_LOCK_BIAS_STR ", %0"
                                 : "=m" (rw->lock) : : "memory");
 }
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 399145a247f2..19cc79c9a35d 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -352,67 +352,6 @@ static inline unsigned long long __cmpxchg64(volatile void *ptr, unsigned long l
 #endif
    
-#ifdef __KERNEL__
-struct alt_instr { 
-        __u8 *instr;            /* original instruction */
-        __u8 *replacement;
-        __u8  cpuid;            /* cpuid bit set for replacement */
-        __u8  instrlen;         /* length of original instruction */
-        __u8  replacementlen;   /* length of new instruction, <= instrlen */ 
-        __u8  pad;
-}; 
-#endif
-/* 
- * Alternative instructions for different CPU types or capabilities.
- * 
- * This allows to use optimized instructions even on generic binary
- * kernels.
- * 
- * length of oldinstr must be longer or equal the length of newinstr
- * It can be padded with nops as needed.
- * 
- * For non barrier like inlines please define new variants
- * without volatile and memory clobber.
- */
-#define alternative(oldinstr, newinstr, feature)        \
-        asm volatile ("661:\n\t" oldinstr "\n662:\n"                 \
-                      ".section .altinstructions,\"a\"\n"            \
-                      "  .align 4\n"                                   \
-                      "  .long 661b\n"            /* label */          \
-                      "  .long 663f\n"            /* new instruction */         \
-                      "  .byte %c0\n"             /* feature bit */    \
-                      "  .byte 662b-661b\n"       /* sourcelen */      \
-                      "  .byte 664f-663f\n"       /* replacementlen */ \
-                      ".previous\n"                                             \
-                      ".section .altinstr_replacement,\"ax\"\n"                 \
-                      "663:\n\t" newinstr "\n664:\n"   /* replacement */    \
-                      ".previous" :: "i" (feature) : "memory")  
-/*
- * Alternative inline assembly with input.
- * 
- * Pecularities:
- * No memory clobber here. 
- * Argument numbers start with 1.
- * Best is to use constraints that are fixed size (like (%1) ... "r")
- * If you use variable sized constraints like "m" or "g" in the 
- * replacement maake sure to pad to the worst case length.
- */
-#define alternative_input(oldinstr, newinstr, feature, input...)                \
-        asm volatile ("661:\n\t" oldinstr "\n662:\n"                            \
-                      ".section .altinstructions,\"a\"\n"                       \
-                      "  .align 4\n"                                            \
-                      "  .long 661b\n"            /* label */                   \
-                      "  .long 663f\n"            /* new instruction */         \
-                      "  .byte %c0\n"             /* feature bit */             \
-                      "  .byte 662b-661b\n"       /* sourcelen */               \
-                      "  .byte 664f-663f\n"       /* replacementlen */          \
-                      ".previous\n"                                             \
-                      ".section .altinstr_replacement,\"ax\"\n"                 \
-                      "663:\n\t" newinstr "\n664:\n"   /* replacement */        \
-                      ".previous" :: "i" (feature), ##input)
 /*
 * Force strict CPU ordering.
 * And yes, this is required on UP too when we're talking
@@ -558,5 +497,8 @@ static inline void sched_cacheflush(void)
 }
 extern unsigned long arch_align_stack(unsigned long sp);
+extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
+void default_idle(void);
 #endif
diff --git a/include/asm-i386/uaccess.h b/include/asm-i386/uaccess.h
index 3f1337c34208..371457b1ceb6 100644
--- a/include/asm-i386/uaccess.h
+++ b/include/asm-i386/uaccess.h
@@ -197,13 +197,15 @@ extern void __put_user_8(void);
 #define put_user(x,ptr)                                         \
 ({      int __ret_pu;                                           \
+        __typeof__(*(ptr)) __pu_val;                            \
        __chk_user_ptr(ptr);                                    \
+        __pu_val = x;                                           \
        switch(sizeof(*(ptr))) {                                \
-        case 1: __put_user_1(x, ptr); break;                    \
+        case 1: __put_user_1(__pu_val, ptr); break;             \
-        case 2: __put_user_2(x, ptr); break;                    \
+        case 2: __put_user_2(__pu_val, ptr); break;             \
-        case 4: __put_user_4(x, ptr); break;                    \
+        case 4: __put_user_4(__pu_val, ptr); break;             \
-        case 8: __put_user_8(x, ptr); break;                    \
+        case 8: __put_user_8(__pu_val, ptr); break;             \
-        default:__put_user_X(x, ptr); break;                    \
+        default:__put_user_X(__pu_val, ptr); break;             \
        }                                                       \
        __ret_pu;                                               \
 })
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index dc81a55dd94d..d8afd0e3b81a 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -347,9 +347,9 @@ __syscall_return(type,__res); \
 type name(type1 arg1) \
 { \
 long __res; \
-__asm__ volatile ("int $0x80" \
+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
        : "=a" (__res) \
-        : "0" (__NR_##name),"b" ((long)(arg1)) : "memory"); \
+        : "0" (__NR_##name),"ri" ((long)(arg1)) : "memory"); \
 __syscall_return(type,__res); \
 }
@@ -357,9 +357,10 @@ __syscall_return(type,__res); \
 type name(type1 arg1,type2 arg2) \
 { \
 long __res; \
-__asm__ volatile ("int $0x80" \
+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
        : "=a" (__res) \
-        : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)) : "memory"); \
+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
+        : "memory"); \
 __syscall_return(type,__res); \
 }
@@ -367,9 +368,9 @@ __syscall_return(type,__res); \
 type name(type1 arg1,type2 arg2,type3 arg3) \
 { \
 long __res; \
-__asm__ volatile ("int $0x80" \
+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
        : "=a" (__res) \
-        : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
                  "d" ((long)(arg3)) : "memory"); \
 __syscall_return(type,__res); \
 }
@@ -378,9 +379,9 @@ __syscall_return(type,__res); \
 type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
 { \
 long __res; \
-__asm__ volatile ("int $0x80" \
+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
        : "=a" (__res) \
-        : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
          "d" ((long)(arg3)),"S" ((long)(arg4)) : "memory"); \
 __syscall_return(type,__res); \
 } 
@@ -390,10 +391,12 @@ __syscall_return(type,__res); \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
 { \
 long __res; \
-__asm__ volatile ("int $0x80" \
+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; movl %1,%%eax ; " \
+                  "int $0x80 ; pop %%ebx" \
        : "=a" (__res) \
-        : "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
+        : "i" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) : "memory"); \
+          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
+        : "memory"); \
 __syscall_return(type,__res); \
 }
@@ -402,11 +405,14 @@ __syscall_return(type,__res); \
 type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
 { \
 long __res; \
-__asm__ volatile ("push %%ebp ; movl %%eax,%%ebp ; movl %1,%%eax ; int $0x80 ; pop %%ebp" \
+  struct { long __a1; long __a6; } __s = { (long)arg1, (long)arg6 }; \
+__asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \
+                  "movl 0(%2),%%ebx ; movl %1,%%eax ; int $0x80 ; " \
+                  "pop %%ebx ;  pop %%ebp" \
        : "=a" (__res) \
-        : "i" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
+        : "i" (__NR_##name),"0" ((long)(&__s)),"c" ((long)(arg2)), \
-          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)), \
+          "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)) \
-          "0" ((long)(arg6)) : "memory"); \
+        : "memory"); \
 __syscall_return(type,__res); \
 }
diff --git a/include/asm-ia64/atomic.h b/include/asm-ia64/atomic.h
index d3e0dfa99e1f..569ec7574baf 100644
--- a/include/asm-ia64/atomic.h
+++ b/include/asm-ia64/atomic.h
@@ -95,8 +95,14 @@ ia64_atomic64_sub (__s64 i, atomic64_t *v)
 ({                                                              \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
+        for (;;) {                                              \
+                if (unlikely(c == (u)))                         \
+                        break;                                  \
+                old = atomic_cmpxchg((v), c, c + (a));          \
+                if (likely(old == c))                           \
+                        break;                                  \
                c = old;                                        \
+        }                                                       \
        c != (u);                                               \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
diff --git a/include/asm-ia64/cache.h b/include/asm-ia64/cache.h
index 40dd25195d65..f0a104db8f20 100644
--- a/include/asm-ia64/cache.h
+++ b/include/asm-ia64/cache.h
@@ -25,4 +25,6 @@
 # define SMP_CACHE_BYTES        (1 << 3)
 #endif
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif /* _ASM_IA64_CACHE_H */
diff --git a/include/asm-ia64/linkage.h b/include/asm-ia64/linkage.h
index 14cd72cd8007..ef22a45c1890 100644
--- a/include/asm-ia64/linkage.h
+++ b/include/asm-ia64/linkage.h
@@ -1,6 +1,14 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
+#ifndef __ASSEMBLY__
 #define asmlinkage CPP_ASMLINKAGE __attribute__((syscall_linkage))
+#else
+#include <asm/asmmacro.h>
+#endif
 #endif
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index e77f0c9b7d3d..b546de2fdce5 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -1037,7 +1037,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
 /***** BEGIN HACK - temp til old proms no longer supported ********/
        if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) {
-                int nasid = get_sapicid() & 0xfff;;
+                int nasid = get_sapicid() & 0xfff;
 #define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL
 #define SH_SHUB_ID_NODES_PER_BIT_SHFT 48
                if (shubtype) *shubtype = 0;
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index cd4233d66f15..2f3620593687 100644
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -265,6 +265,8 @@ void sched_cacheflush(void);
 #define arch_align_stack(x) (x)
+void default_idle(void);
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h
index 862e497c2645..732d696d31a6 100644
--- a/include/asm-m68k/atomic.h
+++ b/include/asm-m68k/atomic.h
@@ -175,8 +175,14 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
 ({                                                              \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
+        for (;;) {                                              \
+                if (unlikely(c == (u)))                         \
+                        break;                                  \
+                old = atomic_cmpxchg((v), c, c + (a));          \
+                if (likely(old == c))                           \
+                        break;                                  \
                c = old;                                        \
+        }                                                       \
        c != (u);                                               \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index 546a17e56a9b..6b17eb9d79a5 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -556,24 +556,11 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
 */
 #define __ISA_IO_base ((char *)(isa_slot_offset))
-#define isa_readb(a)            readb(__ISA_IO_base + (a))
-#define isa_readw(a)            readw(__ISA_IO_base + (a))
-#define isa_readl(a)            readl(__ISA_IO_base + (a))
-#define isa_readq(a)            readq(__ISA_IO_base + (a))
-#define isa_writeb(b,a)         writeb(b,__ISA_IO_base + (a))
-#define isa_writew(w,a)         writew(w,__ISA_IO_base + (a))
-#define isa_writel(l,a)         writel(l,__ISA_IO_base + (a))
-#define isa_writeq(q,a)         writeq(q,__ISA_IO_base + (a))
-#define isa_memset_io(a,b,c)    memset_io(__ISA_IO_base + (a),(b),(c))
-#define isa_memcpy_fromio(a,b,c) memcpy_fromio((a),__ISA_IO_base + (b),(c))
-#define isa_memcpy_toio(a,b,c)  memcpy_toio(__ISA_IO_base + (a),(b),(c))
 /*
 * We don't have csum_partial_copy_fromio() yet, so we cheat here and
 * just copy it. The net code will then do the checksum later.
 */
 #define eth_io_copy_and_sum(skb,src,len,unused) memcpy_fromio((skb)->data,(src),(len))
-#define isa_eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(b),(c),(d))
 /*
 *     check_signature         -       find BIOS signatures
diff --git a/include/asm-mips/linkage.h b/include/asm-mips/linkage.h
index 291c2d01c44f..b6185d3cfe68 100644
--- a/include/asm-mips/linkage.h
+++ b/include/asm-mips/linkage.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
-/* Nothing to see here... */
+#ifdef __ASSEMBLY__
+#include <asm/asm.h>
+#endif
 #endif
diff --git a/include/asm-parisc/cache.h b/include/asm-parisc/cache.h
index 93f179f13ce8..ae50f8e12eed 100644
--- a/include/asm-parisc/cache.h
+++ b/include/asm-parisc/cache.h
@@ -29,6 +29,8 @@
 #define SMP_CACHE_BYTES L1_CACHE_BYTES
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 extern void flush_data_cache_local(void *);  /* flushes local data-cache only */
 extern void flush_instruction_cache_local(void *); /* flushes local code-cache only */
 #ifdef CONFIG_SMP
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h
index 0db00adc942a..be0c7234a6da 100644
--- a/include/asm-parisc/io.h
+++ b/include/asm-parisc/io.h
@@ -294,22 +294,6 @@ void memset_io(volatile void __iomem *addr, unsigned char val, int count);
 void memcpy_fromio(void *dst, const volatile void __iomem *src, int count);
 void memcpy_toio(volatile void __iomem *dst, const void *src, int count);
-/* Support old drivers which don't ioremap.
- * NB this interface is scheduled to disappear in 2.5
- */
-#define __isa_addr(x) (void __iomem *)(F_EXTEND(0xfc000000) | (x))
-#define isa_readb(a) readb(__isa_addr(a))
-#define isa_readw(a) readw(__isa_addr(a))
-#define isa_readl(a) readl(__isa_addr(a))
-#define isa_writeb(b,a) writeb((b), __isa_addr(a))
-#define isa_writew(b,a) writew((b), __isa_addr(a))
-#define isa_writel(b,a) writel((b), __isa_addr(a))
-#define isa_memset_io(a,b,c) memset_io(__isa_addr(a), (b), (c))
-#define isa_memcpy_fromio(a,b,c) memcpy_fromio((a), __isa_addr(b), (c))
-#define isa_memcpy_toio(a,b,c) memcpy_toio(__isa_addr(a), (b), (c))
 /*
 * XXX - We don't have csum_partial_copy_fromio() yet, so we cheat here and 
 * just copy it. The net code will then do the checksum later. Presently 
@@ -318,8 +302,6 @@ void memcpy_toio(volatile void __iomem *dst, const void *src, int count);
 #define eth_io_copy_and_sum(skb,src,len,unused) \
  memcpy_fromio((skb)->data,(src),(len))
-#define isa_eth_io_copy_and_sum(skb,src,len,unused) \
-  isa_memcpy_fromio((skb)->data,(src),(len))
 /* Port-space IO */
diff --git a/include/asm-powerpc/atomic.h b/include/asm-powerpc/atomic.h
index 147a38dcc766..bb3c0ab7e667 100644
--- a/include/asm-powerpc/atomic.h
+++ b/include/asm-powerpc/atomic.h
@@ -8,6 +8,7 @@
 typedef struct { volatile int counter; } atomic_t;
 #ifdef __KERNEL__
+#include <linux/compiler.h>
 #include <asm/synch.h>
 #include <asm/asm-compat.h>
@@ -176,20 +177,29 @@ static __inline__ int atomic_dec_return(atomic_t *v)
 * Atomically adds @a to @v, so long as it was not @u.
 * Returns non-zero if @v was not @u, and zero otherwise.
 */
-#define atomic_add_unless(v, a, u)                      \
+static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
-({                                                      \
+{
-        int c, old;                                     \
+        int t;
-        c = atomic_read(v);                             \
-        for (;;) {                                      \
+        __asm__ __volatile__ (
-                if (unlikely(c == (u)))                 \
+        LWSYNC_ON_SMP
-                        break;                          \
+"1:     lwarx   %0,0,%1         # atomic_add_unless\n\
-                old = atomic_cmpxchg((v), c, c + (a));  \
+        cmpw    0,%0,%3 \n\
-                if (likely(old == c))                   \
+        beq-    2f \n\
-                        break;                          \
+        add     %0,%2,%0 \n"
-                c = old;                                \
+        PPC405_ERR77(0,%2)
-        }                                               \
+"       stwcx.  %0,0,%1 \n\
-        c != (u);                                       \
+        bne-    1b \n"
-})
+        ISYNC_ON_SMP
+"       subf    %0,%2,%0 \n\
+2:"
+        : "=&r" (t)
+        : "r" (&v->counter), "r" (a), "r" (u)
+        : "cc", "memory");
+        return t != u;
+}
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 #define atomic_sub_and_test(a, v)       (atomic_sub_return((a), (v)) == 0)
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 5638518968c3..fe45f6f3a4be 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -102,38 +102,40 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
 #define CPU_FTR_NEED_COHERENT           ASM_CONST(0x0000000000020000)
 #define CPU_FTR_NO_BTIC                 ASM_CONST(0x0000000000040000)
 #define CPU_FTR_BIG_PHYS                ASM_CONST(0x0000000000080000)
-#define CPU_FTR_NODSISRALIGN            ASM_CONST(0x0000000000100000)
+#define CPU_FTR_NODSISRALIGN            ASM_CONST(0x0000000000100000)
 #ifdef __powerpc64__
 /* Add the 64b processor unique features in the top half of the word */
-#define CPU_FTR_SLB                     ASM_CONST(0x0000000100000000)
+#define CPU_FTR_SLB                     ASM_CONST(0x0000000100000000)
-#define CPU_FTR_16M_PAGE                ASM_CONST(0x0000000200000000)
+#define CPU_FTR_16M_PAGE                ASM_CONST(0x0000000200000000)
-#define CPU_FTR_TLBIEL                  ASM_CONST(0x0000000400000000)
+#define CPU_FTR_TLBIEL                  ASM_CONST(0x0000000400000000)
-#define CPU_FTR_NOEXECUTE               ASM_CONST(0x0000000800000000)
+#define CPU_FTR_NOEXECUTE               ASM_CONST(0x0000000800000000)
-#define CPU_FTR_IABR                    ASM_CONST(0x0000002000000000)
+#define CPU_FTR_IABR                    ASM_CONST(0x0000002000000000)
-#define CPU_FTR_MMCRA                   ASM_CONST(0x0000004000000000)
+#define CPU_FTR_MMCRA                   ASM_CONST(0x0000004000000000)
 #define CPU_FTR_CTRL                    ASM_CONST(0x0000008000000000)
-#define CPU_FTR_SMT                     ASM_CONST(0x0000010000000000)
+#define CPU_FTR_SMT                     ASM_CONST(0x0000010000000000)
-#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x0000020000000000)
+#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x0000020000000000)
 #define CPU_FTR_LOCKLESS_TLBIE          ASM_CONST(0x0000040000000000)
 #define CPU_FTR_MMCRA_SIHV              ASM_CONST(0x0000080000000000)
 #define CPU_FTR_CI_LARGE_PAGE           ASM_CONST(0x0000100000000000)
 #define CPU_FTR_PAUSE_ZERO              ASM_CONST(0x0000200000000000)
+#define CPU_FTR_PURR                    ASM_CONST(0x0000400000000000)
 #else
 /* ensure on 32b processors the flags are available for compiling but
 * don't do anything */
-#define CPU_FTR_SLB                     ASM_CONST(0x0)
+#define CPU_FTR_SLB                     ASM_CONST(0x0)
-#define CPU_FTR_16M_PAGE                ASM_CONST(0x0)
+#define CPU_FTR_16M_PAGE                ASM_CONST(0x0)
-#define CPU_FTR_TLBIEL                  ASM_CONST(0x0)
+#define CPU_FTR_TLBIEL                  ASM_CONST(0x0)
-#define CPU_FTR_NOEXECUTE               ASM_CONST(0x0)
+#define CPU_FTR_NOEXECUTE               ASM_CONST(0x0)
-#define CPU_FTR_IABR                    ASM_CONST(0x0)
+#define CPU_FTR_IABR                    ASM_CONST(0x0)
-#define CPU_FTR_MMCRA                   ASM_CONST(0x0)
+#define CPU_FTR_MMCRA                   ASM_CONST(0x0)
 #define CPU_FTR_CTRL                    ASM_CONST(0x0)
-#define CPU_FTR_SMT                     ASM_CONST(0x0)
+#define CPU_FTR_SMT                     ASM_CONST(0x0)
-#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x0)
+#define CPU_FTR_COHERENT_ICACHE         ASM_CONST(0x0)
 #define CPU_FTR_LOCKLESS_TLBIE          ASM_CONST(0x0)
 #define CPU_FTR_MMCRA_SIHV              ASM_CONST(0x0)
 #define CPU_FTR_CI_LARGE_PAGE           ASM_CONST(0x0)
+#define CPU_FTR_PURR                    ASM_CONST(0x0)
 #endif
 #ifndef __ASSEMBLY__
@@ -318,7 +320,7 @@ enum {
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 |
            CPU_FTR_MMCRA | CPU_FTR_SMT |
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE |
-            CPU_FTR_MMCRA_SIHV,
+            CPU_FTR_MMCRA_SIHV | CPU_FTR_PURR,
        CPU_FTRS_CELL = CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB |
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 |
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT |
diff --git a/include/asm-powerpc/cputime.h b/include/asm-powerpc/cputime.h
index 6d68ad7e0ea3..a21185d47883 100644
--- a/include/asm-powerpc/cputime.h
+++ b/include/asm-powerpc/cputime.h
@@ -1 +1,203 @@
+/*
+ * Definitions for measuring cputime on powerpc machines.
+ *
+ * Copyright (C) 2006 Paul Mackerras, IBM Corp.
+ *
+ * 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.
+ *
+ * If we have CONFIG_VIRT_CPU_ACCOUNTING, we measure cpu time in
+ * the same units as the timebase.  Otherwise we measure cpu time
+ * in jiffies using the generic definitions.
+ */
+#ifndef __POWERPC_CPUTIME_H
+#define __POWERPC_CPUTIME_H
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
 #include <asm-generic/cputime.h>
+#else
+#include <linux/types.h>
+#include <linux/time.h>
+#include <asm/div64.h>
+#include <asm/time.h>
+#include <asm/param.h>
+typedef u64 cputime_t;
+typedef u64 cputime64_t;
+#define cputime_zero                    ((cputime_t)0)
+#define cputime_max                     ((~((cputime_t)0) >> 1) - 1)
+#define cputime_add(__a, __b)           ((__a) +  (__b))
+#define cputime_sub(__a, __b)           ((__a) -  (__b))
+#define cputime_div(__a, __n)           ((__a) /  (__n))
+#define cputime_halve(__a)              ((__a) >> 1)
+#define cputime_eq(__a, __b)            ((__a) == (__b))
+#define cputime_gt(__a, __b)            ((__a) >  (__b))
+#define cputime_ge(__a, __b)            ((__a) >= (__b))
+#define cputime_lt(__a, __b)            ((__a) <  (__b))
+#define cputime_le(__a, __b)            ((__a) <= (__b))
+#define cputime64_zero                  ((cputime64_t)0)
+#define cputime64_add(__a, __b)         ((__a) + (__b))
+#define cputime_to_cputime64(__ct)      (__ct)
+#ifdef __KERNEL__
+/*
+ * Convert cputime <-> jiffies
+ */
+extern u64 __cputime_jiffies_factor;
+static inline unsigned long cputime_to_jiffies(const cputime_t ct)
+{
+        return mulhdu(ct, __cputime_jiffies_factor);
+}
+static inline cputime_t jiffies_to_cputime(const unsigned long jif)
+{
+        cputime_t ct;
+        unsigned long sec;
+        /* have to be a little careful about overflow */
+        ct = jif % HZ;
+        sec = jif / HZ;
+        if (ct) {
+                ct *= tb_ticks_per_sec;
+                do_div(ct, HZ);
+        }
+        if (sec)
+                ct += (cputime_t) sec * tb_ticks_per_sec;
+        return ct;
+}
+static inline u64 cputime64_to_jiffies64(const cputime_t ct)
+{
+        return mulhdu(ct, __cputime_jiffies_factor);
+}
+/*
+ * Convert cputime <-> milliseconds
+ */
+extern u64 __cputime_msec_factor;
+static inline unsigned long cputime_to_msecs(const cputime_t ct)
+{
+        return mulhdu(ct, __cputime_msec_factor);
+}
+static inline cputime_t msecs_to_cputime(const unsigned long ms)
+{
+        cputime_t ct;
+        unsigned long sec;
+        /* have to be a little careful about overflow */
+        ct = ms % 1000;
+        sec = ms / 1000;
+        if (ct) {
+                ct *= tb_ticks_per_sec;
+                do_div(ct, 1000);
+        }
+        if (sec)
+                ct += (cputime_t) sec * tb_ticks_per_sec;
+        return ct;
+}
+/*
+ * Convert cputime <-> seconds
+ */
+extern u64 __cputime_sec_factor;
+static inline unsigned long cputime_to_secs(const cputime_t ct)
+{
+        return mulhdu(ct, __cputime_sec_factor);
+}
+static inline cputime_t secs_to_cputime(const unsigned long sec)
+{
+        return (cputime_t) sec * tb_ticks_per_sec;
+}
+/*
+ * Convert cputime <-> timespec
+ */
+static inline void cputime_to_timespec(const cputime_t ct, struct timespec *p)
+{
+        u64 x = ct;
+        unsigned int frac;
+        frac = do_div(x, tb_ticks_per_sec);
+        p->tv_sec = x;
+        x = (u64) frac * 1000000000;
+        do_div(x, tb_ticks_per_sec);
+        p->tv_nsec = x;
+}
+static inline cputime_t timespec_to_cputime(const struct timespec *p)
+{
+        cputime_t ct;
+        ct = (u64) p->tv_nsec * tb_ticks_per_sec;
+        do_div(ct, 1000000000);
+        return ct + (u64) p->tv_sec * tb_ticks_per_sec;
+}
+/*
+ * Convert cputime <-> timeval
+ */
+static inline void cputime_to_timeval(const cputime_t ct, struct timeval *p)
+{
+        u64 x = ct;
+        unsigned int frac;
+        frac = do_div(x, tb_ticks_per_sec);
+        p->tv_sec = x;
+        x = (u64) frac * 1000000;
+        do_div(x, tb_ticks_per_sec);
+        p->tv_usec = x;
+}
+static inline cputime_t timeval_to_cputime(const struct timeval *p)
+{
+        cputime_t ct;
+        ct = (u64) p->tv_usec * tb_ticks_per_sec;
+        do_div(ct, 1000000);
+        return ct + (u64) p->tv_sec * tb_ticks_per_sec;
+}
+/*
+ * Convert cputime <-> clock_t (units of 1/USER_HZ seconds)
+ */
+extern u64 __cputime_clockt_factor;
+static inline unsigned long cputime_to_clock_t(const cputime_t ct)
+{
+        return mulhdu(ct, __cputime_clockt_factor);
+}
+static inline cputime_t clock_t_to_cputime(const unsigned long clk)
+{
+        cputime_t ct;
+        unsigned long sec;
+        /* have to be a little careful about overflow */
+        ct = clk % USER_HZ;
+        sec = clk / USER_HZ;
+        if (ct) {
+                ct *= tb_ticks_per_sec;
+                do_div(ct, USER_HZ);
+        }
+        if (sec)
+                ct += (cputime_t) sec * tb_ticks_per_sec;
+        return ct;
+}
+#define cputime64_to_clock_t(ct)        cputime_to_clock_t((cputime_t)(ct))
+#endif /* __KERNEL__ */
+#endif /* CONFIG_VIRT_CPU_ACCOUNTING */
+#endif /* __POWERPC_CPUTIME_H */
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index f804b34cf06a..ce3788224ed0 100644
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -41,6 +41,7 @@
 #define FW_FEATURE_MULTITCE     (1UL<<19)
 #define FW_FEATURE_SPLPAR       (1UL<<20)
 #define FW_FEATURE_ISERIES      (1UL<<21)
+#define FW_FEATURE_LPAR         (1UL<<22)
 enum {
 #ifdef CONFIG_PPC64
@@ -51,10 +52,10 @@ enum {
                FW_FEATURE_MIGRATE | FW_FEATURE_PERFMON | FW_FEATURE_CRQ |
                FW_FEATURE_VIO | FW_FEATURE_RDMA | FW_FEATURE_LLAN |
                FW_FEATURE_BULK | FW_FEATURE_XDABR | FW_FEATURE_MULTITCE |
-                FW_FEATURE_SPLPAR,
+                FW_FEATURE_SPLPAR | FW_FEATURE_LPAR,
        FW_FEATURE_PSERIES_ALWAYS = 0,
-        FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES,
+        FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
-        FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES,
+        FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
        FW_FEATURE_POSSIBLE =
 #ifdef CONFIG_PPC_PSERIES
                FW_FEATURE_PSERIES_POSSIBLE |
@@ -89,15 +90,6 @@ static inline unsigned long firmware_has_feature(unsigned long feature)
                (FW_FEATURE_POSSIBLE & ppc64_firmware_features & feature);
 }
-#ifdef CONFIG_PPC_PSERIES
-typedef struct {
-    unsigned long val;
-    char * name;
-} firmware_feature_t;
-extern firmware_feature_t firmware_features_table[];
-#endif
 extern void system_reset_fwnmi(void);
 extern void machine_check_fwnmi(void);
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index 8eb7e857ec4c..51f87d9993b6 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -479,6 +479,10 @@ extern int distribute_irqs;
 struct irqaction;
 struct pt_regs;
+#define __ARCH_HAS_DO_SOFTIRQ
+extern void __do_softirq(void);
 #ifdef CONFIG_IRQSTACKS
 /*
 * Per-cpu stacks for handling hard and soft interrupts.
@@ -491,8 +495,6 @@ extern void call_do_softirq(struct thread_info *tp);
 extern int call___do_IRQ(int irq, struct pt_regs *regs,
                struct thread_info *tp);
-#define __ARCH_HAS_DO_SOFTIRQ
 #else
 #define irq_ctx_init()
diff --git a/include/asm-powerpc/iseries/mf.h b/include/asm-powerpc/iseries/mf.h
index 857e5202fc78..eb851a9c9e5c 100644
--- a/include/asm-powerpc/iseries/mf.h
+++ b/include/asm-powerpc/iseries/mf.h
@@ -41,16 +41,11 @@ extern void mf_deallocate_lp_events(HvLpIndex targetLp, HvLpEvent_Type type,
                unsigned count, MFCompleteHandler hdlr, void *userToken);
 extern void mf_power_off(void);
-extern void mf_reboot(void);
+extern void mf_reboot(char *cmd);
 extern void mf_display_src(u32 word);
 extern void mf_display_progress(u16 value);
-extern void mf_clear_src(void);
 extern void mf_init(void);
-extern int mf_get_rtc(struct rtc_time *tm);
-extern int mf_get_boot_rtc(struct rtc_time *tm);
-extern int mf_set_rtc(struct rtc_time *tm);
 #endif /* _ASM_POWERPC_ISERIES_MF_H */
diff --git a/include/asm-powerpc/lmb.h b/include/asm-powerpc/lmb.h
index d3546c4c9f46..0c5880f70225 100644
--- a/include/asm-powerpc/lmb.h
+++ b/include/asm-powerpc/lmb.h
@@ -19,8 +19,6 @@
 #define MAX_LMB_REGIONS 128
-#define LMB_ALLOC_ANYWHERE      0
 struct lmb_property {
        unsigned long base;
        unsigned long size;
@@ -43,20 +41,19 @@ extern struct lmb lmb;
 extern void __init lmb_init(void);
 extern void __init lmb_analyze(void);
-extern long __init lmb_add(unsigned long, unsigned long);
+extern long __init lmb_add(unsigned long base, unsigned long size);
-extern long __init lmb_reserve(unsigned long, unsigned long);
+extern long __init lmb_reserve(unsigned long base, unsigned long size);
-extern unsigned long __init lmb_alloc(unsigned long, unsigned long);
+extern unsigned long __init lmb_alloc(unsigned long size, unsigned long align);
-extern unsigned long __init lmb_alloc_base(unsigned long, unsigned long,
+extern unsigned long __init lmb_alloc_base(unsigned long size,
-                                           unsigned long);
+                unsigned long align, unsigned long max_addr);
+extern unsigned long __init __lmb_alloc_base(unsigned long size,
+                unsigned long align, unsigned long max_addr);
 extern unsigned long __init lmb_phys_mem_size(void);
 extern unsigned long __init lmb_end_of_DRAM(void);
-extern unsigned long __init lmb_abs_to_phys(unsigned long);
+extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
-extern void __init lmb_enforce_memory_limit(unsigned long);
 extern void lmb_dump_all(void);
-extern unsigned long io_hole_start;
 static inline unsigned long
 lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
 {
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h
index b0b9a3f8cdc2..31f721994bd8 100644
--- a/include/asm-powerpc/mmu.h
+++ b/include/asm-powerpc/mmu.h
@@ -236,7 +236,6 @@ extern void htab_initialize_secondary(void);
 extern void hpte_init_native(void);
 extern void hpte_init_lpar(void);
 extern void hpte_init_iSeries(void);
-extern void mm_init_ppc64(void);
 extern long pSeries_lpar_hpte_insert(unsigned long hpte_group,
                                     unsigned long va, unsigned long prpn,
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index c9add8f1ad94..4465b95ebef0 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -54,7 +54,7 @@ struct paca_struct {
 #endif /* CONFIG_PPC_ISERIES */
        /*
-         * MAGIC: the spinlock functions in arch/ppc64/lib/locks.c
+         * MAGIC: the spinlock functions in arch/powerpc/lib/locks.c 
         * load lock_token and paca_index with a single lwz
         * instruction.  They must travel together and be properly
         * aligned.
@@ -96,6 +96,11 @@ struct paca_struct {
        u64 saved_r1;                   /* r1 save for RTAS calls */
        u64 saved_msr;                  /* MSR saved here by enter_rtas */
        u8 proc_enabled;                /* irq soft-enable flag */
+        /* Stuff for accurate time accounting */
+        u64 user_time;                  /* accumulated usermode TB ticks */
+        u64 system_time;                /* accumulated system TB ticks */
+        u64 startpurr;                  /* PURR/TB value snapshot */
 };
 extern struct paca_struct paca[];
diff --git a/include/asm-powerpc/percpu.h b/include/asm-powerpc/percpu.h
index e31922c50e53..464301cd0d03 100644
--- a/include/asm-powerpc/percpu.h
+++ b/include/asm-powerpc/percpu.h
@@ -27,10 +27,9 @@
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for (__i = 0; __i < NR_CPUS; __i++)                     \
+        for_each_cpu(__i)                                       \
-                if (cpu_possible(__i))                          \
+                memcpy((pcpudst)+__per_cpu_offset(__i),         \
-                        memcpy((pcpudst)+__per_cpu_offset(__i), \
+                       (src), (size));                          \
-                               (src), (size));                  \
 } while (0)
 extern void setup_per_cpu_areas(void);
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h
index 80a7832d2721..b2e18629932a 100644
--- a/include/asm-powerpc/pgtable-4k.h
+++ b/include/asm-powerpc/pgtable-4k.h
@@ -62,9 +62,14 @@
 /* shift to put page number into pte */
 #define PTE_RPN_SHIFT   (17)
-#define __real_pte(e,p)         ((real_pte_t)(e))
+#ifdef STRICT_MM_TYPECHECKS
-#define __rpte_to_pte(r)        (r)
+#define __real_pte(e,p)         ((real_pte_t){(e)})
-#define __rpte_to_hidx(r,index) (pte_val((r)) >> 12)
+#define __rpte_to_pte(r)        ((r).pte)
+#else
+#define __real_pte(e,p)         (e)
+#define __rpte_to_pte(r)        (__pte(r))
+#endif
+#define __rpte_to_hidx(r,index) (pte_val(__rpte_to_pte(r)) >> 12)
 #define pte_iterate_hashed_subpages(rpte, psize, va, index, shift)       \
        do {                                                             \
diff --git a/include/asm-powerpc/pgtable.h b/include/asm-powerpc/pgtable.h
index 185ee15963a1..e9f1f4627e6b 100644
--- a/include/asm-powerpc/pgtable.h
+++ b/include/asm-powerpc/pgtable.h
@@ -188,9 +188,13 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
 #define pte_pfn(x)              ((unsigned long)((pte_val(x)>>PTE_RPN_SHIFT)))
 #define pte_page(x)             pfn_to_page(pte_pfn(x))
+#define PMD_BAD_BITS            (PTE_TABLE_SIZE-1)
+#define PUD_BAD_BITS            (PMD_TABLE_SIZE-1)
 #define pmd_set(pmdp, pmdval)   (pmd_val(*(pmdp)) = (pmdval))
 #define pmd_none(pmd)           (!pmd_val(pmd))
-#define pmd_bad(pmd)            (pmd_val(pmd) == 0)
+#define pmd_bad(pmd)            (!is_kernel_addr(pmd_val(pmd)) \
+                                 || (pmd_val(pmd) & PMD_BAD_BITS))
 #define pmd_present(pmd)        (pmd_val(pmd) != 0)
 #define pmd_clear(pmdp)         (pmd_val(*(pmdp)) = 0)
 #define pmd_page_kernel(pmd)    (pmd_val(pmd) & ~PMD_MASKED_BITS)
@@ -198,7 +202,8 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
 #define pud_set(pudp, pudval)   (pud_val(*(pudp)) = (pudval))
 #define pud_none(pud)           (!pud_val(pud))
-#define pud_bad(pud)            ((pud_val(pud)) == 0)
+#define pud_bad(pud)            (!is_kernel_addr(pud_val(pud)) \
+                                 || (pud_val(pud) & PUD_BAD_BITS))
 #define pud_present(pud)        (pud_val(pud) != 0)
 #define pud_clear(pudp)         (pud_val(*(pudp)) = 0)
 #define pud_page(pud)           (pud_val(pud) & ~PUD_MASKED_BITS)
diff --git a/include/asm-powerpc/ppc_asm.h b/include/asm-powerpc/ppc_asm.h
index ab8688d39024..dd1c0a913d5f 100644
--- a/include/asm-powerpc/ppc_asm.h
+++ b/include/asm-powerpc/ppc_asm.h
@@ -15,6 +15,48 @@
 #define SZL                     (BITS_PER_LONG/8)
 /*
+ * Stuff for accurate CPU time accounting.
+ * These macros handle transitions between user and system state
+ * in exception entry and exit and accumulate time to the
+ * user_time and system_time fields in the paca.
+ */
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#define ACCOUNT_CPU_USER_ENTRY(ra, rb)
+#define ACCOUNT_CPU_USER_EXIT(ra, rb)
+#else
+#define ACCOUNT_CPU_USER_ENTRY(ra, rb)                                  \
+        beq     2f;                     /* if from kernel mode */       \
+BEGIN_FTR_SECTION;                                                      \
+        mfspr   ra,SPRN_PURR;           /* get processor util. reg */   \
+END_FTR_SECTION_IFSET(CPU_FTR_PURR);                                    \
+BEGIN_FTR_SECTION;                                                      \
+        mftb    ra;                     /* or get TB if no PURR */      \
+END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                                    \
+        ld      rb,PACA_STARTPURR(r13);                         \
+        std     ra,PACA_STARTPURR(r13);                                 \
+        subf    rb,rb,ra;               /* subtract start value */      \
+        ld      ra,PACA_USER_TIME(r13);                                 \
+        add     ra,ra,rb;               /* add on to user time */       \
+        std     ra,PACA_USER_TIME(r13);                                 \
+2:
+#define ACCOUNT_CPU_USER_EXIT(ra, rb)                                   \
+BEGIN_FTR_SECTION;                                                      \
+        mfspr   ra,SPRN_PURR;           /* get processor util. reg */   \
+END_FTR_SECTION_IFSET(CPU_FTR_PURR);                                    \
+BEGIN_FTR_SECTION;                                                      \
+        mftb    ra;                     /* or get TB if no PURR */      \
+END_FTR_SECTION_IFCLR(CPU_FTR_PURR);                                    \
+        ld      rb,PACA_STARTPURR(r13);                         \
+        std     ra,PACA_STARTPURR(r13);                                 \
+        subf    rb,rb,ra;               /* subtract start value */      \
+        ld      ra,PACA_SYSTEM_TIME(r13);                               \
+        add     ra,ra,rb;               /* add on to user time */       \
+        std     ra,PACA_SYSTEM_TIME(r13);
+#endif
+/*
 * Macros for storing registers into and loading registers from
 * exception frames.
 */
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h
index 415fa393b00c..1c64a211cf19 100644
--- a/include/asm-powerpc/processor.h
+++ b/include/asm-powerpc/processor.h
@@ -52,7 +52,6 @@
 #ifdef __KERNEL__
 #define platform_is_pseries()   (_machine == PLATFORM_PSERIES || \
                                 _machine == PLATFORM_PSERIES_LPAR)
-#define platform_is_lpar()      (!!(_machine & PLATFORM_LPAR))
 #if defined(CONFIG_PPC_MULTIPLATFORM)
 extern int _machine;
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index cbd297f44cce..782e13a070a1 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -126,8 +126,14 @@ extern struct device_node *find_all_nodes(void);
 /* New style node lookup */
 extern struct device_node *of_find_node_by_name(struct device_node *from,
        const char *name);
+#define for_each_node_by_name(dn, name) \
+        for (dn = of_find_node_by_name(NULL, name); dn; \
+             dn = of_find_node_by_name(dn, name))
 extern struct device_node *of_find_node_by_type(struct device_node *from,
        const char *type);
+#define for_each_node_by_type(dn, type) \
+        for (dn = of_find_node_by_type(NULL, type); dn; \
+             dn = of_find_node_by_type(dn, type))
 extern struct device_node *of_find_compatible_node(struct device_node *from,
        const char *type, const char *compat);
 extern struct device_node *of_find_node_by_path(const char *path);
diff --git a/include/asm-powerpc/rwsem.h b/include/asm-powerpc/rwsem.h
index 79bae4933b73..2c2fe9647595 100644
--- a/include/asm-powerpc/rwsem.h
+++ b/include/asm-powerpc/rwsem.h
@@ -4,7 +4,7 @@
 #ifdef __KERNEL__
 /*
- * include/asm-ppc64/rwsem.h: R/W semaphores for PPC using the stuff
+ * include/asm-powerpc/rwsem.h: R/W semaphores for PPC using the stuff
 * in lib/rwsem.c.  Adapted largely from include/asm-i386/rwsem.h
 * by Paul Mackerras <paulus@samba.org>.
 */
diff --git a/include/asm-powerpc/synch.h b/include/asm-powerpc/synch.h
index c90d9d9aae72..2cda3c38a9fa 100644
--- a/include/asm-powerpc/synch.h
+++ b/include/asm-powerpc/synch.h
@@ -15,7 +15,7 @@
 #endif
 #ifdef CONFIG_SMP
-#define ISYNC_ON_SMP    "\n\tisync"
+#define ISYNC_ON_SMP    "\n\tisync\n"
 #define LWSYNC_ON_SMP   __stringify(LWSYNC) "\n"
 #else
 #define ISYNC_ON_SMP
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index d9bf53653b10..65f5a7b2646b 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -171,6 +171,8 @@ extern u32 booke_wdt_period;
 /* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
 extern unsigned char e2a(unsigned char);
+extern unsigned char* strne2a(unsigned char *dest,
+                const unsigned char *src, size_t n);
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);
@@ -424,5 +426,9 @@ static inline void create_function_call(unsigned long addr, void * func)
        create_branch(addr, func_addr, BRANCH_SET_LINK);
 }
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+extern void account_system_vtime(struct task_struct *);
+#endif
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_SYSTEM_H */
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index baddc9ab57ad..912118db13ae 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -41,6 +41,7 @@ extern time_t last_rtc_update;
 extern void generic_calibrate_decr(void);
 extern void wakeup_decrementer(void);
+extern void snapshot_timebase(void);
 /* Some sane defaults: 125 MHz timebase, 1GHz processor */
 extern unsigned long ppc_proc_freq;
@@ -221,5 +222,19 @@ struct cpu_usage {
 DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+extern void account_process_vtime(struct task_struct *tsk);
+#else
+#define account_process_vtime(tsk)              do { } while (0)
+#endif
+#if defined(CONFIG_VIRT_CPU_ACCOUNTING) && defined(CONFIG_PPC_SPLPAR)
+extern void calculate_steal_time(void);
+extern void snapshot_timebases(void);
+#else
+#define calculate_steal_time()                  do { } while (0)
+#define snapshot_timebases()                    do { } while (0)
+#endif
 #endif /* __KERNEL__ */
 #endif /* __PPC64_TIME_H */
diff --git a/include/asm-ppc/harrier.h b/include/asm-ppc/harrier.h
index 36c73ab7e43e..7acd7fc126ec 100644
--- a/include/asm-ppc/harrier.h
+++ b/include/asm-ppc/harrier.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/harrier.h
- *
 * Definitions for Motorola MCG Harrier North Bridge & Memory controller
 *
 * Author: Dale Farnsworth
diff --git a/include/asm-ppc/ibm44x.h b/include/asm-ppc/ibm44x.h
index f835066fb3ca..3acc382cc83f 100644
--- a/include/asm-ppc/ibm44x.h
+++ b/include/asm-ppc/ibm44x.h
@@ -29,7 +29,7 @@
 /* TLB entry offset/size used for pinning kernel lowmem */
 #define PPC44x_PIN_SHIFT        28
-#define PPC44x_PIN_SIZE         (1 << PPC44x_PIN_SHIFT)
+#define PPC_PIN_SIZE            (1 << PPC44x_PIN_SHIFT)
 /* Lowest TLB slot consumed by the default pinned TLBs */
 #define PPC44x_LOW_SLOT         63
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h
index 6c28ae7807f4..38f99710752b 100644
--- a/include/asm-ppc/ibm4xx.h
+++ b/include/asm-ppc/ibm4xx.h
@@ -51,6 +51,10 @@
 #include <platforms/4xx/xilinx_ml300.h>
 #endif
+#if defined(CONFIG_XILINX_ML403)
+#include <platforms/4xx/xilinx_ml403.h>
+#endif
 #ifndef __ASSEMBLY__
 #ifdef CONFIG_40x
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index df9cf6ed189d..b919d8fb7d98 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -575,4 +575,11 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
 */
 #define xlate_dev_kmem_ptr(p)   p
+/* access ports */
+#define setbits32(_addr, _v) out_be32((_addr), in_be32(_addr) |  (_v))
+#define clrbits32(_addr, _v) out_be32((_addr), in_be32(_addr) & ~(_v))
+#define setbits16(_addr, _v) out_be16((_addr), in_be16(_addr) |  (_v))
+#define clrbits16(_addr, _v) out_be16((_addr), in_be16(_addr) & ~(_v))
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h
index 77b1e092c206..b30a6a3b5bd2 100644
--- a/include/asm-ppc/mpc10x.h
+++ b/include/asm-ppc/mpc10x.h
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/kernel/mpc10x.h
- *
 * Common routines for the Motorola SPS MPC106/8240/107 Host bridge/Mem
 * ctlr/EPIC/etc.
 *
@@ -165,6 +163,7 @@ enum ppc_sys_devices {
        MPC10X_DMA1,
        MPC10X_UART0,
        MPC10X_UART1,
+        NUM_PPC_SYS_DEVS,
 };
 int mpc10x_bridge_init(struct pci_controller *hose,
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
index a055e0756b9d..6167f74635f7 100644
--- a/include/asm-ppc/mpc52xx.h
+++ b/include/asm-ppc/mpc52xx.h
@@ -60,6 +60,7 @@ enum ppc_sys_devices {
        MPC52xx_ATA,
        MPC52xx_I2C1,
        MPC52xx_I2C2,
+        NUM_PPC_SYS_DEVS,
 };
diff --git a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h
index 321452695039..6ba69a86b9dd 100644
--- a/include/asm-ppc/mpc8260.h
+++ b/include/asm-ppc/mpc8260.h
@@ -83,6 +83,7 @@ enum ppc_sys_devices {
        MPC82xx_CPM_SMC2,
        MPC82xx_CPM_USB,
        MPC82xx_SEC1,
+        NUM_PPC_SYS_DEVS,
 };
 #ifndef __ASSEMBLY__
diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h
index 7cdf60fa69b6..3c23fc43bfbc 100644
--- a/include/asm-ppc/mpc83xx.h
+++ b/include/asm-ppc/mpc83xx.h
@@ -108,6 +108,7 @@ enum ppc_sys_devices {
        MPC83xx_USB2_DR,
        MPC83xx_USB2_MPH,
        MPC83xx_MDIO,
+        NUM_PPC_SYS_DEVS,
 };
 #endif /* CONFIG_83xx */
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
index c8a96aa44fb7..f47002a60edf 100644
--- a/include/asm-ppc/mpc85xx.h
+++ b/include/asm-ppc/mpc85xx.h
@@ -139,6 +139,7 @@ enum ppc_sys_devices {
        MPC85xx_eTSEC4,
        MPC85xx_IIC2,
        MPC85xx_MDIO,
+        NUM_PPC_SYS_DEVS,
 };
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h
index 46f159cf589e..3515a7fa6c89 100644
--- a/include/asm-ppc/mpc8xx.h
+++ b/include/asm-ppc/mpc8xx.h
@@ -111,8 +111,11 @@ enum ppc_sys_devices {
        MPC8xx_CPM_SMC1,
        MPC8xx_CPM_SMC2,
        MPC8xx_CPM_USB,
+        NUM_PPC_SYS_DEVS,
 };
+#define PPC_PIN_SIZE    (24 * 1024 * 1024)      /* 24Mbytes of data pinned */
 #ifndef BOARD_CHIP_NAME
 #define BOARD_CHIP_NAME ""
 #endif
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h
index 6d1c39e8a6af..e1c62da12e74 100644
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
@@ -12,6 +12,7 @@
 #include <asm/processor.h>              /* For TASK_SIZE */
 #include <asm/mmu.h>
 #include <asm/page.h>
+#include <asm/io.h>                     /* For sub-arch specific PPC_PIN_SIZE */
 struct mm_struct;
 extern unsigned long va_to_phys(unsigned long address);
@@ -127,9 +128,8 @@ extern unsigned long ioremap_bot, ioremap_base;
 * of RAM.  -- Cort
 */
 #define VMALLOC_OFFSET (0x1000000) /* 16M */
-#ifdef CONFIG_44x
+#ifdef PPC_PIN_SIZE
-#include <asm/ibm44x.h>
+#define VMALLOC_START (((_ALIGN((long)high_memory, PPC_PIN_SIZE) + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)))
-#define VMALLOC_START (((_ALIGN((long)high_memory, PPC44x_PIN_SIZE) + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)))
 #else
 #define VMALLOC_START ((((long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)))
 #endif
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
index 83d8c77c124d..4b94f7059ebe 100644
--- a/include/asm-ppc/ppc_sys.h
+++ b/include/asm-ppc/ppc_sys.h
@@ -33,6 +33,8 @@
 #include <asm/mpc52xx.h>
 #elif defined(CONFIG_MPC10X_BRIDGE)
 #include <asm/mpc10x.h>
+#elif defined(CONFIG_XILINX_VIRTEX)
+#include <platforms/4xx/virtex.h>
 #else
 #error "need definition of ppc_sys_devices"
 #endif
@@ -44,9 +46,26 @@ struct ppc_sys_spec {
        u32                     value;
        u32                     num_devices;
        char                    *ppc_sys_name;
+        u8                      config[NUM_PPC_SYS_DEVS];
        enum ppc_sys_devices    *device_list;
 };
+struct platform_notify_dev_map {
+        const char *bus_id;
+        void (*rtn)(struct platform_device * pdev, int idx);
+};
+enum platform_device_func {
+        PPC_SYS_FUNC_DUMMY = 0,
+        PPC_SYS_FUNC_ETH = 1,
+        PPC_SYS_FUNC_UART = 2,
+        PPC_SYS_FUNC_HLDC = 3,
+        PPC_SYS_FUNC_USB = 4,
+        PPC_SYS_FUNC_IRDA = 5,
+};
+#define PPC_SYS_CONFIG_DISABLED         1
 /* describes all specific chips and which devices they have on them */
 extern struct ppc_sys_spec ppc_sys_specs[];
 extern struct ppc_sys_spec *cur_ppc_sys_spec;
@@ -72,5 +91,20 @@ extern void *ppc_sys_get_pdata(enum ppc_sys_devices dev) __init;
 /* remove a device from the system */
 extern void ppc_sys_device_remove(enum ppc_sys_devices dev);
+/* Function assignment stuff */
+void ppc_sys_device_initfunc(void);
+void ppc_sys_device_setfunc(enum ppc_sys_devices dev,
+                            enum platform_device_func func);
+void ppc_sys_device_set_func_all(enum platform_device_func func);
+void platform_notify_map(const struct platform_notify_dev_map *map,
+                         struct device *dev);
+/* Enable / disable stuff */
+void ppc_sys_device_disable(enum ppc_sys_devices dev);
+void ppc_sys_device_enable(enum ppc_sys_devices dev);
+void ppc_sys_device_enable_all(void);
+void ppc_sys_device_disable_all(void);
 #endif                          /* __ASM_PPC_SYS_H */
 #endif                          /* __KERNEL__ */
diff --git a/include/asm-ppc/time.h b/include/asm-ppc/time.h
index 321fb75b5f22..c86112323c9f 100644
--- a/include/asm-ppc/time.h
+++ b/include/asm-ppc/time.h
@@ -153,5 +153,10 @@ extern __inline__ unsigned binary_tbl(void) {
 ({unsigned z; asm ("mulhwu %0,%1,%2" : "=r" (z) : "r" (x), "r" (y)); z;})
 unsigned mulhwu_scale_factor(unsigned, unsigned);
+#define account_process_vtime(tsk)              do { } while (0)
+#define calculate_steal_time()                  do { } while (0)
+#define snapshot_timebases()                    do { } while (0)
 #endif /* __ASM_TIME_H__ */
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/todc.h b/include/asm-ppc/todc.h
index 84bae7d76814..937c7dbe6e5c 100644
--- a/include/asm-ppc/todc.h
+++ b/include/asm-ppc/todc.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-ppc/todc.h
- *
 * Definitions for the M48Txx and mc146818 series of Time of day/Real Time
 * Clock chips.
 *
diff --git a/include/asm-ppc/xparameters.h b/include/asm-ppc/xparameters.h
deleted file mode 100644
index fe4eac629139..000000000000
--- a/include/asm-ppc/xparameters.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * include/asm-ppc/xparameters.h
- *
- * This file includes the correct xparameters.h for the CONFIG'ed board
- *
- * Author: MontaVista Software, Inc.
- *         source@mvista.com
- *
- * 2004 (c) MontaVista Software, Inc.  This file is licensed under the terms
- * of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
- */
-#include <linux/config.h>
-#if defined(CONFIG_XILINX_ML300)
-#include <platforms/4xx/xparameters/xparameters_ml300.h>
-#endif
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index be6fefe223d6..de1d9926aa60 100644
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
@@ -89,10 +89,15 @@ static __inline__ int atomic_cmpxchg(atomic_t *v, int old, int new)
 static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 {
        int c, old;
        c = atomic_read(v);
-        while (c != u && (old = atomic_cmpxchg(v, c, c + a)) != c)
+        for (;;) {
+                if (unlikely(c == u))
+                        break;
+                old = atomic_cmpxchg(v, c, c + a);
+                if (likely(old == c))
+                        break;
                c = old;
+        }
        return c != u;
 }
@@ -167,10 +172,15 @@ static __inline__ int atomic64_add_unless(atomic64_t *v,
                                          long long a, long long u)
 {
        long long c, old;
        c = atomic64_read(v);
-        while (c != u && (old = atomic64_cmpxchg(v, c, c + a)) != c)
+        for (;;) {
+                if (unlikely(c == u))
+                        break;
+                old = atomic64_cmpxchg(v, c, c + a);
+                if (likely(old == c))
+                        break;
                c = old;
+        }
        return c != u;
 }
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index a2e7430aafa6..7ddaa05b98d8 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -4,9 +4,10 @@
 #include <linux/kernel.h>
 #ifdef CONFIG_BUG
 #define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        __asm__ __volatile__(".long 0"); \
+        __builtin_trap(); \
 } while (0)
 #define HAVE_ARCH_BUG
diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h
index 123fcaca295e..e10ed87094f0 100644
--- a/include/asm-s390/percpu.h
+++ b/include/asm-s390/percpu.h
@@ -46,10 +46,9 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for (__i = 0; __i < NR_CPUS; __i++)                     \
+        for_each_cpu(__i)                                       \
-                if (cpu_possible(__i))                          \
+                memcpy((pcpudst)+__per_cpu_offset[__i],         \
-                        memcpy((pcpudst)+__per_cpu_offset[__i], \
+                       (src), (size));                          \
-                               (src), (size));                  \
 } while (0)
 #else /* ! SMP */
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index b0b2937b6f83..2c3afe71323d 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -174,20 +174,6 @@ static inline void __set_io_port_base(unsigned long pbase)
        generic_io_base = pbase;
 }
-#define isa_readb(a) readb(ioport_map(a, 1))
-#define isa_readw(a) readw(ioport_map(a, 2))
-#define isa_readl(a) readl(ioport_map(a, 4))
-#define isa_writeb(b,a) writeb(b,ioport_map(a, 1))
-#define isa_writew(w,a) writew(w,ioport_map(a, 2))
-#define isa_writel(l,a) writel(l,ioport_map(a, 4))
-#define isa_memset_io(a,b,c) \
-  memset((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))
-#define isa_memcpy_fromio(a,b,c) \
-  memcpy((a),(void *)(ioport_map((unsigned long)(b), 1)),(c))
-#define isa_memcpy_toio(a,b,c) \
-  memcpy((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))
 /* We really want to try and get these to memcpy etc */
 extern void memcpy_fromio(void *, volatile void __iomem *, unsigned long);
 extern void memcpy_toio(volatile void __iomem *, const void *, unsigned long);
diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h
index 25256bdc8aae..468eb48d8142 100644
--- a/include/asm-sparc64/atomic.h
+++ b/include/asm-sparc64/atomic.h
@@ -78,9 +78,15 @@ extern int atomic64_sub_ret(int, atomic64_t *);
 ({                                                              \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
+        for (;;) {                                              \
+                if (unlikely(c == (u)))                         \
+                        break;                                  \
+                old = atomic_cmpxchg((v), c, c + (a));          \
+                if (likely(old == c))                           \
+                        break;                                  \
                c = old;                                        \
-        c != (u);                                               \
+        }                                                       \
+        likely(c != (u));                                       \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h
index f7d35a2ae9b8..e9df17acedde 100644
--- a/include/asm-sparc64/cache.h
+++ b/include/asm-sparc64/cache.h
@@ -13,4 +13,6 @@
 #define        SMP_CACHE_BYTES_SHIFT    6
 #define        SMP_CACHE_BYTES          (1 << SMP_CACHE_BYTES_SHIFT) /* L2 cache line size. */
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h
index aea4e51e7cd1..82032e159a76 100644
--- a/include/asm-sparc64/percpu.h
+++ b/include/asm-sparc64/percpu.h
@@ -26,10 +26,9 @@ register unsigned long __local_per_cpu_offset asm("g5");
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for (__i = 0; __i < NR_CPUS; __i++)                     \
+        for_each_cpu(__i)                                       \
-                if (cpu_possible(__i))                          \
+                memcpy((pcpudst)+__per_cpu_offset(__i),         \
-                        memcpy((pcpudst)+__per_cpu_offset(__i), \
+                       (src), (size));                          \
-                               (src), (size));                  \
 } while (0)
 #else /* ! SMP */
diff --git a/include/asm-um/alternative.h b/include/asm-um/alternative.h
new file mode 100644
index 000000000000..b6434396bd42
--- /dev/null
+++ b/include/asm-um/alternative.h
@@ -0,0 +1,6 @@
+#ifndef __UM_ALTERNATIVE_H
+#define __UM_ALTERNATIVE_H
+#include "asm/arch/alternative.h"
+#endif
diff --git a/include/asm-v850/linkage.h b/include/asm-v850/linkage.h
index 291c2d01c44f..b6185d3cfe68 100644
--- a/include/asm-v850/linkage.h
+++ b/include/asm-v850/linkage.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
-/* Nothing to see here... */
+#ifdef __ASSEMBLY__
+#include <asm/asm.h>
+#endif
 #endif
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86_64/atomic.h
index 4b5cd553e772..cecbf7baa6aa 100644
--- a/include/asm-x86_64/atomic.h
+++ b/include/asm-x86_64/atomic.h
@@ -405,8 +405,14 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
 ({                                                              \
        int c, old;                                             \
        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
+        for (;;) {                                              \
+                if (unlikely(c == (u)))                         \
+                        break;                                  \
+                old = atomic_cmpxchg((v), c, c + (a));          \
+                if (likely(old == c))                           \
+                        break;                                  \
                c = old;                                        \
+        }                                                       \
        c != (u);                                               \
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
diff --git a/include/asm-x86_64/cache.h b/include/asm-x86_64/cache.h
index 263f0a211ed7..c8043a16152e 100644
--- a/include/asm-x86_64/cache.h
+++ b/include/asm-x86_64/cache.h
@@ -20,6 +20,8 @@
       __attribute__((__section__(".data.page_aligned")))
 #endif
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif
 #endif
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index 9dac18db8291..a85fe8370820 100644
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -269,23 +269,11 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
 */
 #define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
-#define isa_readb(a) readb(__ISA_IO_base + (a))
-#define isa_readw(a) readw(__ISA_IO_base + (a))
-#define isa_readl(a) readl(__ISA_IO_base + (a))
-#define isa_writeb(b,a) writeb(b,__ISA_IO_base + (a))
-#define isa_writew(w,a) writew(w,__ISA_IO_base + (a))
-#define isa_writel(l,a) writel(l,__ISA_IO_base + (a))
-#define isa_memset_io(a,b,c)            memset_io(__ISA_IO_base + (a),(b),(c))
-#define isa_memcpy_fromio(a,b,c)        memcpy_fromio((a),__ISA_IO_base + (b),(c))
-#define isa_memcpy_toio(a,b,c)          memcpy_toio(__ISA_IO_base + (a),(b),(c))
 /*
 * Again, x86-64 does not require mem IO specific function.
 */
 #define eth_io_copy_and_sum(a,b,c,d)            eth_copy_and_sum((a),(void *)(b),(c),(d))
-#define isa_eth_io_copy_and_sum(a,b,c,d)        eth_copy_and_sum((a),(void *)(__ISA_IO_base + (b)),(c),(d))
 /**
 *      check_signature         -       find BIOS signatures
diff --git a/include/asm-x86_64/mmu_context.h b/include/asm-x86_64/mmu_context.h
index 16e4be4de0c5..19f0c83d0792 100644
--- a/include/asm-x86_64/mmu_context.h
+++ b/include/asm-x86_64/mmu_context.h
@@ -34,12 +34,12 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
        unsigned cpu = smp_processor_id();
        if (likely(prev != next)) {
                /* stop flush ipis for the previous mm */
-                clear_bit(cpu, &prev->cpu_vm_mask);
+                cpu_clear(cpu, prev->cpu_vm_mask);
 #ifdef CONFIG_SMP
                write_pda(mmu_state, TLBSTATE_OK);
                write_pda(active_mm, next);
 #endif
-                set_bit(cpu, &next->cpu_vm_mask);
+                cpu_set(cpu, next->cpu_vm_mask);
                load_cr3(next->pgd);
                if (unlikely(next->context.ldt != prev->context.ldt)) 
@@ -50,7 +50,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                write_pda(mmu_state, TLBSTATE_OK);
                if (read_pda(active_mm) != next)
                        out_of_line_bug();
-                if(!test_and_set_bit(cpu, &next->cpu_vm_mask)) {
+                if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
                        /* We were in lazy tlb mode and leave_mm disabled 
                         * tlb flush IPI delivery. We must reload CR3
                         * to make sure to use no freed page tables.
diff --git a/include/asm-x86_64/percpu.h b/include/asm-x86_64/percpu.h
index 29a6b0408f75..4405b4adeaba 100644
--- a/include/asm-x86_64/percpu.h
+++ b/include/asm-x86_64/percpu.h
@@ -26,10 +26,9 @@
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for (__i = 0; __i < NR_CPUS; __i++)                     \
+        for_each_cpu(__i)                                       \
-                if (cpu_possible(__i))                          \
+                memcpy((pcpudst)+__per_cpu_offset(__i),         \
-                        memcpy((pcpudst)+__per_cpu_offset(__i), \
+                       (src), (size));                          \
-                               (src), (size));                  \
 } while (0)
 extern void setup_per_cpu_areas(void);
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index a617d364d08d..def903287193 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -293,19 +293,19 @@ static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned
 {
        if (!pte_dirty(*ptep))
                return 0;
-        return test_and_clear_bit(_PAGE_BIT_DIRTY, ptep);
+        return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte);
 }
 static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
 {
        if (!pte_young(*ptep))
                return 0;
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, ptep);
+        return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte);
 }
 static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        clear_bit(_PAGE_BIT_RW, ptep);
+        clear_bit(_PAGE_BIT_RW, &ptep->pte);
 }
 /*
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 7d8ff97b3e92..d9ed27969855 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -46,6 +46,9 @@
 * bitmap_parse(ubuf, ulen, dst, nbits)         Parse bitmap dst from user buf
 * bitmap_scnlistprintf(buf, len, src, nbits)   Print bitmap src as list to buf
 * bitmap_parselist(buf, dst, nbits)            Parse bitmap dst from list
+ * bitmap_find_free_region(bitmap, bits, order) Find and allocate bit region
+ * bitmap_release_region(bitmap, pos, order)    Free specified bit region
+ * bitmap_allocate_region(bitmap, pos, order)   Allocate specified bit region
 */
 /*
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 56bb6a4e15f3..c179966f1a2f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -22,6 +22,7 @@ typedef struct request_queue request_queue_t;
 struct elevator_queue;
 typedef struct elevator_queue elevator_t;
 struct request_pm_state;
+struct blk_trace;
 #define BLKDEV_MIN_RQ   4
 #define BLKDEV_MAX_RQ   128     /* Default maximum */
@@ -416,6 +417,8 @@ struct request_queue
        unsigned int            sg_reserved_size;
        int                     node;
+        struct blk_trace        *blk_trace;
        /*
         * reserved for flush operations
         */
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
new file mode 100644
index 000000000000..b34d3e73d5ea
--- /dev/null
+++ b/include/linux/blktrace_api.h
@@ -0,0 +1,277 @@
+#ifndef BLKTRACE_H
+#define BLKTRACE_H
+#include <linux/config.h>
+#include <linux/blkdev.h>
+#include <linux/relay.h>
+/*
+ * Trace categories
+ */
+enum blktrace_cat {
+        BLK_TC_READ     = 1 << 0,       /* reads */
+        BLK_TC_WRITE    = 1 << 1,       /* writes */
+        BLK_TC_BARRIER  = 1 << 2,       /* barrier */
+        BLK_TC_SYNC     = 1 << 3,       /* barrier */
+        BLK_TC_QUEUE    = 1 << 4,       /* queueing/merging */
+        BLK_TC_REQUEUE  = 1 << 5,       /* requeueing */
+        BLK_TC_ISSUE    = 1 << 6,       /* issue */
+        BLK_TC_COMPLETE = 1 << 7,       /* completions */
+        BLK_TC_FS       = 1 << 8,       /* fs requests */
+        BLK_TC_PC       = 1 << 9,       /* pc requests */
+        BLK_TC_NOTIFY   = 1 << 10,      /* special message */
+        BLK_TC_END      = 1 << 15,      /* only 16-bits, reminder */
+};
+#define BLK_TC_SHIFT            (16)
+#define BLK_TC_ACT(act)         ((act) << BLK_TC_SHIFT)
+/*
+ * Basic trace actions
+ */
+enum blktrace_act {
+        __BLK_TA_QUEUE = 1,             /* queued */
+        __BLK_TA_BACKMERGE,             /* back merged to existing rq */
+        __BLK_TA_FRONTMERGE,            /* front merge to existing rq */
+        __BLK_TA_GETRQ,                 /* allocated new request */
+        __BLK_TA_SLEEPRQ,               /* sleeping on rq allocation */
+        __BLK_TA_REQUEUE,               /* request requeued */
+        __BLK_TA_ISSUE,                 /* sent to driver */
+        __BLK_TA_COMPLETE,              /* completed by driver */
+        __BLK_TA_PLUG,                  /* queue was plugged */
+        __BLK_TA_UNPLUG_IO,             /* queue was unplugged by io */
+        __BLK_TA_UNPLUG_TIMER,          /* queue was unplugged by timer */
+        __BLK_TA_INSERT,                /* insert request */
+        __BLK_TA_SPLIT,                 /* bio was split */
+        __BLK_TA_BOUNCE,                /* bio was bounced */
+        __BLK_TA_REMAP,                 /* bio was remapped */
+};
+/*
+ * Trace actions in full. Additionally, read or write is masked
+ */
+#define BLK_TA_QUEUE            (__BLK_TA_QUEUE | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_BACKMERGE        (__BLK_TA_BACKMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_FRONTMERGE       (__BLK_TA_FRONTMERGE | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_GETRQ            (__BLK_TA_GETRQ | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_SLEEPRQ          (__BLK_TA_SLEEPRQ | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_REQUEUE          (__BLK_TA_REQUEUE | BLK_TC_ACT(BLK_TC_REQUEUE))
+#define BLK_TA_ISSUE            (__BLK_TA_ISSUE | BLK_TC_ACT(BLK_TC_ISSUE))
+#define BLK_TA_COMPLETE         (__BLK_TA_COMPLETE| BLK_TC_ACT(BLK_TC_COMPLETE))
+#define BLK_TA_PLUG             (__BLK_TA_PLUG | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_UNPLUG_IO        (__BLK_TA_UNPLUG_IO | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_UNPLUG_TIMER     (__BLK_TA_UNPLUG_TIMER | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_INSERT           (__BLK_TA_INSERT | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_TA_SPLIT            (__BLK_TA_SPLIT)
+#define BLK_TA_BOUNCE           (__BLK_TA_BOUNCE)
+#define BLK_TA_REMAP            (__BLK_TA_REMAP | BLK_TC_ACT(BLK_TC_QUEUE))
+#define BLK_IO_TRACE_MAGIC      0x65617400
+#define BLK_IO_TRACE_VERSION    0x07
+/*
+ * The trace itself
+ */
+struct blk_io_trace {
+        u32 magic;              /* MAGIC << 8 | version */
+        u32 sequence;           /* event number */
+        u64 time;               /* in microseconds */
+        u64 sector;             /* disk offset */
+        u32 bytes;              /* transfer length */
+        u32 action;             /* what happened */
+        u32 pid;                /* who did it */
+        u32 device;             /* device number */
+        u32 cpu;                /* on what cpu did it happen */
+        u16 error;              /* completion error */
+        u16 pdu_len;            /* length of data after this trace */
+};
+/*
+ * The remap event
+ */
+struct blk_io_trace_remap {
+        u32 device;
+        u32 __pad;
+        u64 sector;
+};
+enum {
+        Blktrace_setup = 1,
+        Blktrace_running,
+        Blktrace_stopped,
+};
+struct blk_trace {
+        int trace_state;
+        struct rchan *rchan;
+        unsigned long *sequence;
+        u16 act_mask;
+        u64 start_lba;
+        u64 end_lba;
+        u32 pid;
+        u32 dev;
+        struct dentry *dir;
+        struct dentry *dropped_file;
+        atomic_t dropped;
+};
+/*
+ * User setup structure passed with BLKTRACESTART
+ */
+struct blk_user_trace_setup {
+        char name[BDEVNAME_SIZE];       /* output */
+        u16 act_mask;                   /* input */
+        u32 buf_size;                   /* input */
+        u32 buf_nr;                     /* input */
+        u64 start_lba;
+        u64 end_lba;
+        u32 pid;
+};
+#if defined(CONFIG_BLK_DEV_IO_TRACE)
+extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
+extern void blk_trace_shutdown(request_queue_t *);
+extern void __blk_add_trace(struct blk_trace *, sector_t, int, int, u32, int, int, void *);
+/**
+ * blk_add_trace_rq - Add a trace for a request oriented action
+ * @q:          queue the io is for
+ * @rq:         the source request
+ * @what:       the action
+ *
+ * Description:
+ *     Records an action against a request. Will log the bio offset + size.
+ *
+ **/
+static inline void blk_add_trace_rq(struct request_queue *q, struct request *rq,
+                                    u32 what)
+{
+        struct blk_trace *bt = q->blk_trace;
+        int rw = rq->flags & 0x07;
+        if (likely(!bt))
+                return;
+        if (blk_pc_request(rq)) {
+                what |= BLK_TC_ACT(BLK_TC_PC);
+                __blk_add_trace(bt, 0, rq->data_len, rw, what, rq->errors, sizeof(rq->cmd), rq->cmd);
+        } else  {
+                what |= BLK_TC_ACT(BLK_TC_FS);
+                __blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9, rw, what, rq->errors, 0, NULL);
+        }
+}
+/**
+ * blk_add_trace_bio - Add a trace for a bio oriented action
+ * @q:          queue the io is for
+ * @bio:        the source bio
+ * @what:       the action
+ *
+ * Description:
+ *     Records an action against a bio. Will log the bio offset + size.
+ *
+ **/
+static inline void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
+                                     u32 what)
+{
+        struct blk_trace *bt = q->blk_trace;
+        if (likely(!bt))
+                return;
+        __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what, !bio_flagged(bio, BIO_UPTODATE), 0, NULL);
+}
+/**
+ * blk_add_trace_generic - Add a trace for a generic action
+ * @q:          queue the io is for
+ * @bio:        the source bio
+ * @rw:         the data direction
+ * @what:       the action
+ *
+ * Description:
+ *     Records a simple trace
+ *
+ **/
+static inline void blk_add_trace_generic(struct request_queue *q,
+                                         struct bio *bio, int rw, u32 what)
+{
+        struct blk_trace *bt = q->blk_trace;
+        if (likely(!bt))
+                return;
+        if (bio)
+                blk_add_trace_bio(q, bio, what);
+        else
+                __blk_add_trace(bt, 0, 0, rw, what, 0, 0, NULL);
+}
+/**
+ * blk_add_trace_pdu_int - Add a trace for a bio with an integer payload
+ * @q:          queue the io is for
+ * @what:       the action
+ * @bio:        the source bio
+ * @pdu:        the integer payload
+ *
+ * Description:
+ *     Adds a trace with some integer payload. This might be an unplug
+ *     option given as the action, with the depth at unplug time given
+ *     as the payload
+ *
+ **/
+static inline void blk_add_trace_pdu_int(struct request_queue *q, u32 what,
+                                         struct bio *bio, unsigned int pdu)
+{
+        struct blk_trace *bt = q->blk_trace;
+        u64 rpdu = cpu_to_be64(pdu);
+        if (likely(!bt))
+                return;
+        if (bio)
+                __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what, !bio_flagged(bio, BIO_UPTODATE), sizeof(rpdu), &rpdu);
+        else
+                __blk_add_trace(bt, 0, 0, 0, what, 0, sizeof(rpdu), &rpdu);
+}
+/**
+ * blk_add_trace_remap - Add a trace for a remap operation
+ * @q:          queue the io is for
+ * @bio:        the source bio
+ * @dev:        target device
+ * @from:       source sector
+ * @to:         target sector
+ *
+ * Description:
+ *     Device mapper or raid target sometimes need to split a bio because
+ *     it spans a stripe (or similar). Add a trace for that action.
+ *
+ **/
+static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
+                                       dev_t dev, sector_t from, sector_t to)
+{
+        struct blk_trace *bt = q->blk_trace;
+        struct blk_io_trace_remap r;
+        if (likely(!bt))
+                return;
+        r.device = cpu_to_be32(dev);
+        r.sector = cpu_to_be64(to);
+        __blk_add_trace(bt, from, bio->bi_size, bio->bi_rw, BLK_TA_REMAP, !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r);
+}
+#else /* !CONFIG_BLK_DEV_IO_TRACE */
+#define blk_trace_ioctl(bdev, cmd, arg)         (-ENOTTY)
+#define blk_trace_shutdown(q)                   do { } while (0)
+#define blk_add_trace_rq(q, rq, what)           do { } while (0)
+#define blk_add_trace_bio(q, rq, what)          do { } while (0)
+#define blk_add_trace_generic(q, rq, rw, what)  do { } while (0)
+#define blk_add_trace_pdu_int(q, what, bio, pdu)        do { } while (0)
+#define blk_add_trace_remap(q, bio, dev, f, t)  do {} while (0)
+#endif /* CONFIG_BLK_DEV_IO_TRACE */
+#endif
diff --git a/include/linux/cache.h b/include/linux/cache.h
index d22e632f41fb..cc4b3aafad9a 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -13,9 +13,7 @@
 #define SMP_CACHE_BYTES L1_CACHE_BYTES
 #endif
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64) || defined(CONFIG_PARISC)
+#ifndef __read_mostly
-#define __read_mostly __attribute__((__section__(".data.read_mostly")))
-#else
 #define __read_mostly
 #endif
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index b68fdf1f3156..3c9b0bc05123 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -378,7 +378,6 @@ struct cdrom_generic_command
 #define CDC_MEDIA_CHANGED       0x80    /* media changed */
 #define CDC_PLAY_AUDIO          0x100   /* audio functions */
 #define CDC_RESET               0x200   /* hard reset device */
-#define CDC_IOCTLS              0x400   /* driver has non-standard ioctls */
 #define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
 #define CDC_GENERIC_PACKET      0x1000  /* driver implements generic packets */
 #define CDC_CD_R                0x2000  /* drive is a CD-R */
@@ -974,9 +973,7 @@ struct cdrom_device_ops {
        int (*reset) (struct cdrom_device_info *);
        /* play stuff */
        int (*audio_ioctl) (struct cdrom_device_info *,unsigned int, void *);
-        /* dev-specific */
-        int (*dev_ioctl) (struct cdrom_device_info *,
-                          unsigned int, unsigned long);
 /* driver specifications */
        const int capability;   /* capability flags */
        int n_minors;           /* number of active minor devices */
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h
index ae7dfb790df3..efb518f16bb3 100644
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
@@ -97,6 +97,10 @@ COMPATIBLE_IOCTL(BLKRRPART)
 COMPATIBLE_IOCTL(BLKFLSBUF)
 COMPATIBLE_IOCTL(BLKSECTSET)
 COMPATIBLE_IOCTL(BLKSSZGET)
+COMPATIBLE_IOCTL(BLKTRACESTART)
+COMPATIBLE_IOCTL(BLKTRACESTOP)
+COMPATIBLE_IOCTL(BLKTRACESETUP)
+COMPATIBLE_IOCTL(BLKTRACETEARDOWN)
 ULONG_IOCTL(BLKRASET)
 ULONG_IOCTL(BLKFRASET)
 /* RAID */
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 3bc606927116..9354722a9217 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -4,7 +4,7 @@
 *  cpuset interface
 *
 *  Copyright (C) 2003 BULL SA
- *  Copyright (C) 2004 Silicon Graphics, Inc.
+ *  Copyright (C) 2004-2006 Silicon Graphics, Inc.
 *
 */
@@ -51,6 +51,18 @@ extern char *cpuset_task_status_allowed(struct task_struct *task, char *buffer);
 extern void cpuset_lock(void);
 extern void cpuset_unlock(void);
+extern int cpuset_mem_spread_node(void);
+static inline int cpuset_do_page_mem_spread(void)
+{
+        return current->flags & PF_SPREAD_PAGE;
+}
+static inline int cpuset_do_slab_mem_spread(void)
+{
+        return current->flags & PF_SPREAD_SLAB;
+}
 #else /* !CONFIG_CPUSETS */
 static inline int cpuset_init_early(void) { return 0; }
@@ -99,6 +111,21 @@ static inline char *cpuset_task_status_allowed(struct task_struct *task,
 static inline void cpuset_lock(void) {}
 static inline void cpuset_unlock(void) {}
+static inline int cpuset_mem_spread_node(void)
+{
+        return 0;
+}
+static inline int cpuset_do_page_mem_spread(void)
+{
+        return 0;
+}
+static inline int cpuset_do_slab_mem_spread(void)
+{
+        return 0;
+}
 #endif /* !CONFIG_CPUSETS */
 #endif /* _LINUX_CPUSET_H */
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index 1289f0ec4c00..1e4bdfcf83a2 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -52,7 +52,12 @@ struct file;
 #ifdef CONFIG_EPOLL
 /* Used to initialize the epoll bits inside the "struct file" */
-void eventpoll_init_file(struct file *file);
+static inline void eventpoll_init_file(struct file *file)
+{
+        INIT_LIST_HEAD(&file->f_ep_links);
+        spin_lock_init(&file->f_ep_lock);
+}
 /* Used to release the epoll bits inside the "struct file" */
 void eventpoll_release_file(struct file *file);
@@ -85,7 +90,6 @@ static inline void eventpoll_release(struct file *file)
        eventpoll_release_file(file);
 }
 #else
 static inline void eventpoll_init_file(struct file *file) {}
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index c0272d73ab20..e7239f2f97a1 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -772,9 +772,12 @@ extern unsigned long ext3_count_free (struct buffer_head *, unsigned);
 /* inode.c */
-extern int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int);
+int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int);
-extern struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
+struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
-extern struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
+struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
+int ext3_get_block_handle(handle_t *handle, struct inode *inode,
+        sector_t iblock, struct buffer_head *bh_result, int create,
+        int extend_disksize);
 extern void ext3_read_inode (struct inode *);
 extern int  ext3_write_inode (struct inode *, int);
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index e71dd98dbcae..7abf90147180 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -19,6 +19,7 @@
 #include <linux/rwsem.h>
 #include <linux/rbtree.h>
 #include <linux/seqlock.h>
+#include <linux/mutex.h>
 struct ext3_reserve_window {
        __u32                   _rsv_start;     /* First byte reserved */
@@ -122,16 +123,16 @@ struct ext3_inode_info {
        __u16 i_extra_isize;
        /*
-         * truncate_sem is for serialising ext3_truncate() against
+         * truncate_mutex is for serialising ext3_truncate() against
         * ext3_getblock().  In the 2.4 ext2 design, great chunks of inode's
         * data tree are chopped off during truncate. We can't do that in
         * ext3 because whenever we perform intermediate commits during
         * truncate, the inode and all the metadata blocks *must* be in a
         * consistent state which allows truncation of the orphans to restart
         * during recovery.  Hence we must fix the get_block-vs-truncate race
-         * by other means, so we have truncate_sem.
+         * by other means, so we have truncate_mutex.
         */
-        struct semaphore truncate_sem;
+        struct mutex truncate_mutex;
        struct inode vfs_inode;
 };
diff --git a/include/linux/fadvise.h b/include/linux/fadvise.h
index e8e747139b9a..b2913bba35d8 100644
--- a/include/linux/fadvise.h
+++ b/include/linux/fadvise.h
@@ -18,4 +18,10 @@
 #define POSIX_FADV_NOREUSE      5 /* Data will be accessed once.  */
 #endif
+/*
+ * Linux-specific fadvise() extensions:
+ */
+#define LINUX_FADV_ASYNC_WRITE  32      /* Start writeout on range */
+#define LINUX_FADV_WRITE_WAIT   33      /* Wait upon writeout to range */
 #endif  /* FADVISE_H_INCLUDED */
diff --git a/include/linux/file.h b/include/linux/file.h
index 9901b850f2e4..9f7c2513866f 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -10,6 +10,7 @@
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
+#include <linux/types.h>
 /*
 * The default fd array needs to be at least BITS_PER_LONG,
@@ -17,10 +18,22 @@
 */
 #define NR_OPEN_DEFAULT BITS_PER_LONG
+/*
+ * The embedded_fd_set is a small fd_set,
+ * suitable for most tasks (which open <= BITS_PER_LONG files)
+ */
+struct embedded_fd_set {
+        unsigned long fds_bits[1];
+};
+/*
+ * More than this number of fds: we use a separately allocated fd_set
+ */
+#define EMBEDDED_FD_SET_SIZE (BITS_PER_BYTE * sizeof(struct embedded_fd_set))
 struct fdtable {
        unsigned int max_fds;
        int max_fdset;
-        int next_fd;
        struct file ** fd;      /* current fd array */
        fd_set *close_on_exec;
        fd_set *open_fds;
@@ -33,13 +46,20 @@ struct fdtable {
 * Open file table structure
 */
 struct files_struct {
+  /*
+   * read mostly part
+   */
        atomic_t count;
        struct fdtable *fdt;
        struct fdtable fdtab;
-        fd_set close_on_exec_init;
+  /*
-        fd_set open_fds_init;
+   * written part on a separate cache line in SMP
+   */
+        spinlock_t file_lock ____cacheline_aligned_in_smp;
+        int next_fd;
+        struct embedded_fd_set close_on_exec_init;
+        struct embedded_fd_set open_fds_init;
        struct file * fd_array[NR_OPEN_DEFAULT];
-        spinlock_t file_lock;     /* Protects concurrent writers.  Nests inside tsk->alloc_lock */
 };
 #define files_fdtable(files) (rcu_dereference((files)->fdt))
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 128d0082522c..215696a0f16f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -103,7 +103,9 @@ extern int dir_notify_enable;
 #define MS_BIND         4096
 #define MS_MOVE         8192
 #define MS_REC          16384
-#define MS_VERBOSE      32768
+#define MS_VERBOSE      32768   /* War is peace. Verbosity is silence.
+                                   MS_VERBOSE is deprecated. */
+#define MS_SILENT       32768
 #define MS_POSIXACL     (1<<16) /* VFS does not apply the umask */
 #define MS_UNBINDABLE   (1<<17) /* change to unbindable */
 #define MS_PRIVATE      (1<<18) /* change to private */
@@ -197,6 +199,10 @@ extern int dir_notify_enable;
 #define BLKBSZGET  _IOR(0x12,112,size_t)
 #define BLKBSZSET  _IOW(0x12,113,size_t)
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)      /* return device size in bytes (u64 *arg) */
+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
+#define BLKTRACESTART _IO(0x12,116)
+#define BLKTRACESTOP _IO(0x12,117)
+#define BLKTRACETEARDOWN _IO(0x12,118)
 #define BMAP_IOCTL 1            /* obsolete - kept for compatibility */
 #define FIBMAP     _IO(0x00,1)  /* bmap access */
@@ -344,7 +350,7 @@ struct address_space_operations {
        /* Write back some dirty pages from this mapping. */
        int (*writepages)(struct address_space *, struct writeback_control *);
-        /* Set a page dirty */
+        /* Set a page dirty.  Return true if this dirtied it */
        int (*set_page_dirty)(struct page *page);
        int (*readpages)(struct file *filp, struct address_space *mapping,
@@ -397,8 +403,8 @@ struct block_device {
        dev_t                   bd_dev;  /* not a kdev_t - it's a search key */
        struct inode *          bd_inode;       /* will die */
        int                     bd_openers;
-        struct semaphore        bd_sem; /* open/close mutex */
+        struct mutex            bd_mutex;       /* open/close mutex */
-        struct semaphore        bd_mount_sem;   /* mount mutex */
+        struct mutex            bd_mount_mutex; /* mount mutex */
        struct list_head        bd_inodes;
        void *                  bd_holder;
        int                     bd_holders;
@@ -509,7 +515,7 @@ struct inode {
 #ifdef CONFIG_INOTIFY
        struct list_head        inotify_watches; /* watches on this inode */
-        struct semaphore        inotify_sem;    /* protects the watches list */
+        struct mutex            inotify_mutex;  /* protects the watches list */
 #endif
        unsigned long           i_state;
@@ -847,7 +853,7 @@ struct super_block {
         * The next field is for VFS *only*. No filesystems have any business
         * even looking at it. You had been warned.
         */
-        struct semaphore s_vfs_rename_sem;      /* Kludge */
+        struct mutex s_vfs_rename_mutex;        /* Kludge */
        /* Granuality of c/m/atime in ns.
           Cannot be worse than a second */
@@ -1115,6 +1121,18 @@ static inline void mark_inode_dirty_sync(struct inode *inode)
        __mark_inode_dirty(inode, I_DIRTY_SYNC);
 }
+static inline void inode_inc_link_count(struct inode *inode)
+{
+        inode->i_nlink++;
+        mark_inode_dirty(inode);
+}
+static inline void inode_dec_link_count(struct inode *inode)
+{
+        inode->i_nlink--;
+        mark_inode_dirty(inode);
+}
 extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry);
 static inline void file_accessed(struct file *file)
 {
@@ -1455,6 +1473,12 @@ extern int filemap_fdatawait(struct address_space *);
 extern int filemap_write_and_wait(struct address_space *mapping);
 extern int filemap_write_and_wait_range(struct address_space *mapping,
                                        loff_t lstart, loff_t lend);
+extern int wait_on_page_writeback_range(struct address_space *mapping,
+                                pgoff_t start, pgoff_t end);
+extern int __filemap_fdatawrite_range(struct address_space *mapping,
+                                loff_t start, loff_t end, int sync_mode);
+extern long do_fsync(struct file *file, int datasync);
 extern void sync_supers(void);
 extern void sync_filesystems(int wait);
 extern void emergency_sync(void);
@@ -1534,7 +1558,7 @@ extern void destroy_inode(struct inode *);
 extern struct inode *new_inode(struct super_block *);
 extern int remove_suid(struct dentry *);
 extern void remove_dquot_ref(struct super_block *, int, struct list_head *);
-extern struct semaphore iprune_sem;
+extern struct mutex iprune_mutex;
 extern void __insert_inode_hash(struct inode *, unsigned long hashval);
 extern void remove_inode_hash(struct inode *);
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index 0abe9d9a0069..652611a4bdcd 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -12,6 +12,8 @@
 #ifndef GENERIC_SERIAL_H
 #define GENERIC_SERIAL_H
+#include <linux/mutex.h>
 struct real_driver {
  void                    (*disable_tx_interrupts) (void *);
  void                    (*enable_tx_interrupts) (void *);
@@ -34,7 +36,7 @@ struct gs_port {
  int                     xmit_head;
  int                     xmit_tail;
  int                     xmit_cnt;
-  struct semaphore        port_write_sem;
+  struct mutex            port_write_mutex;
  int                     flags;
  wait_queue_head_t       open_wait;
  wait_queue_head_t       close_wait;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index eef5ccdcd731..fd647fde5ec1 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -149,22 +149,16 @@ struct disk_attribute {
 ({                                                                      \
        typeof(gendiskp->dkstats->field) res = 0;                       \
        int i;                                                          \
-        for (i=0; i < NR_CPUS; i++) {                                   \
+        for_each_cpu(i)                                                 \
-                if (!cpu_possible(i))                                   \
-                        continue;                                       \
                res += per_cpu_ptr(gendiskp->dkstats, i)->field;        \
-        }                                                               \
        res;                                                            \
 })
 static inline void disk_stat_set_all(struct gendisk *gendiskp, int value)       {
        int i;
-        for (i=0; i < NR_CPUS; i++) {
+        for_each_cpu(i)
-                if (cpu_possible(i)) {
+                memset(per_cpu_ptr(gendiskp->dkstats, i), value,
-                        memset(per_cpu_ptr(gendiskp->dkstats, i), value,        
+                                sizeof (struct disk_stats));
-                                        sizeof (struct disk_stats));
-                }
-        }
 }               
                                
 #else
diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
index 7eb4004b3601..a90c09d331c1 100644
--- a/include/linux/hwmon-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
@@ -27,11 +27,13 @@ struct sensor_device_attribute{
 #define to_sensor_dev_attr(_dev_attr) \
        container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
-#define SENSOR_DEVICE_ATTR(_name,_mode,_show,_store,_index)     \
+#define SENSOR_ATTR(_name, _mode, _show, _store, _index)        \
-struct sensor_device_attribute sensor_dev_attr_##_name = {      \
+        { .dev_attr = __ATTR(_name, _mode, _show, _store),      \
-        .dev_attr =     __ATTR(_name,_mode,_show,_store),       \
+          .index = _index }
-        .index =        _index,                                 \
-}
+#define SENSOR_DEVICE_ATTR(_name, _mode, _show, _store, _index) \
+struct sensor_device_attribute sensor_dev_attr_##_name          \
+        = SENSOR_ATTR(_name, _mode, _show, _store, _index)
 struct sensor_device_attribute_2 {
        struct device_attribute dev_attr;
@@ -41,11 +43,13 @@ struct sensor_device_attribute_2 {
 #define to_sensor_dev_attr_2(_dev_attr) \
        container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
+#define SENSOR_ATTR_2(_name, _mode, _show, _store, _nr, _index) \
+        { .dev_attr = __ATTR(_name, _mode, _show, _store),      \
+          .index = _index,                                      \
+          .nr = _nr }
 #define SENSOR_DEVICE_ATTR_2(_name,_mode,_show,_store,_nr,_index)       \
-struct sensor_device_attribute_2 sensor_dev_attr_##_name = {    \
+struct sensor_device_attribute_2 sensor_dev_attr_##_name                \
-        .dev_attr =     __ATTR(_name,_mode,_show,_store),       \
+        = SENSOR_ATTR_2(_name, _mode, _show, _store, _nr, _index)
-        .index =        _index,                                 \
-        .nr =           _nr,                                    \
-}
 #endif /* _LINUX_HWMON_SYSFS_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 474c8f4f5d4f..ec311bc89439 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -172,7 +172,6 @@
 #define I2C_HW_B_RIVA           0x010010 /* Riva based graphics cards */
 #define I2C_HW_B_IOC            0x010011 /* IOC bit-wiggling */
 #define I2C_HW_B_TSUNA          0x010012 /* DEC Tsunami chipset */
-#define I2C_HW_B_FRODO          0x010013 /* 2d3D SA-1110 Development Board */
 #define I2C_HW_B_OMAHA          0x010014 /* Omaha I2C interface (ARM) */
 #define I2C_HW_B_GUIDE          0x010015 /* Guide bit-basher */
 #define I2C_HW_B_IXP2000        0x010016 /* GPIO on IXP2000 systems */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 63f1d63cc1d8..1635ee25918f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -32,7 +32,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/device.h>       /* for struct device */
 #include <linux/sched.h>        /* for completion */
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 /* --- For i2c-isa ---------------------------------------------------- */
@@ -225,8 +225,8 @@ struct i2c_adapter {
        int (*client_unregister)(struct i2c_client *);
        /* data fields that are valid for all devices   */
-        struct semaphore bus_lock;
+        struct mutex bus_lock;
-        struct semaphore clist_lock;
+        struct mutex clist_lock;
        int timeout;
        int retries;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a7fc4cc79b23..8d2db412ba9c 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -792,6 +792,7 @@ typedef struct hwif_s {
        unsigned        no_dsc     : 1; /* 0 default, 1 dsc_overlap disabled */
        unsigned        auto_poll  : 1; /* supports nop auto-poll */
        unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
+        unsigned        no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
        struct device   gendev;
        struct completion gendev_rel_comp; /* To deal with device release() */
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index dcfd2ecccb5d..92146f3b7423 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -7,11 +7,10 @@
 #define INIT_FDTABLE \
 {                                                       \
        .max_fds        = NR_OPEN_DEFAULT,              \
-        .max_fdset      = __FD_SETSIZE,                 \
+        .max_fdset      = EMBEDDED_FD_SET_SIZE,         \
-        .next_fd        = 0,                            \
        .fd             = &init_files.fd_array[0],      \
-        .close_on_exec  = &init_files.close_on_exec_init, \
+        .close_on_exec  = (fd_set *)&init_files.close_on_exec_init, \
-        .open_fds       = &init_files.open_fds_init,    \
+        .open_fds       = (fd_set *)&init_files.open_fds_init,  \
        .rcu            = RCU_HEAD_INIT,                \
        .free_files     = NULL,                         \
        .next           = NULL,                         \
@@ -20,9 +19,10 @@
 #define INIT_FILES \
 {                                                       \
        .count          = ATOMIC_INIT(1),               \
-        .file_lock      = SPIN_LOCK_UNLOCKED,           \
        .fdt            = &init_files.fdtab,            \
        .fdtab          = INIT_FDTABLE,                 \
+        .file_lock      = SPIN_LOCK_UNLOCKED,           \
+        .next_fd        = 0,                            \
        .close_on_exec_init = { { 0, } },               \
        .open_fds_init  = { { 0, } },                   \
        .fd_array       = { NULL, }                     \
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 41ee79962bb2..2ccbfb6340ba 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -28,6 +28,7 @@
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
 #include <linux/bit_spinlock.h>
+#include <linux/mutex.h>
 #include <asm/semaphore.h>
 #endif
@@ -575,7 +576,7 @@ struct transaction_s
 * @j_wait_checkpoint:  Wait queue to trigger checkpointing
 * @j_wait_commit: Wait queue to trigger commit
 * @j_wait_updates: Wait queue to wait for updates to complete
- * @j_checkpoint_sem: Semaphore for locking against concurrent checkpoints
+ * @j_checkpoint_mutex: Mutex for locking against concurrent checkpoints
 * @j_head: Journal head - identifies the first unused block in the journal
 * @j_tail: Journal tail - identifies the oldest still-used block in the
 *  journal.
@@ -645,7 +646,7 @@ struct journal_s
        int                     j_barrier_count;
        /* The barrier lock itself */
-        struct semaphore        j_barrier;
+        struct mutex            j_barrier;
        /*
         * Transactions: The current running transaction...
@@ -687,7 +688,7 @@ struct journal_s
        wait_queue_head_t       j_wait_updates;
        /* Semaphore for locking against concurrent checkpoints */
-        struct semaphore        j_checkpoint_sem;
+        struct mutex            j_checkpoint_mutex;
        /*
         * Journal head: identifies the first unused block in the journal.
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3b507bf05d09..bb6e7ddee2fd 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -91,6 +91,9 @@ extern struct notifier_block *panic_notifier_list;
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
        __attribute__ ((NORET_AND format (printf, 1, 2)));
+extern void oops_enter(void);
+extern void oops_exit(void);
+extern int oops_may_print(void);
 fastcall NORET_TYPE void do_exit(long error_code)
        ATTRIB_NORET;
 NORET_TYPE void complete_and_exit(struct completion *, long)
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 669756bc20a2..778adc0fa640 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -36,6 +36,7 @@
 #include <linux/percpu.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
+#include <linux/mutex.h>
 #ifdef CONFIG_KPROBES
 #include <asm/kprobes.h>
@@ -152,7 +153,7 @@ struct kretprobe_instance {
 };
 extern spinlock_t kretprobe_lock;
-extern struct semaphore kprobe_mutex;
+extern struct mutex kprobe_mutex;
 extern int arch_prepare_kprobe(struct kprobe *p);
 extern void arch_arm_kprobe(struct kprobe *p);
 extern void arch_disarm_kprobe(struct kprobe *p);
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 147eb01e0d4b..c08c9983e840 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -28,17 +28,27 @@
 #define ALIGN __ALIGN
 #define ALIGN_STR __ALIGN_STR
+#ifndef ENTRY
 #define ENTRY(name) \
  .globl name; \
  ALIGN; \
  name:
+#endif
 #define KPROBE_ENTRY(name) \
  .section .kprobes.text, "ax"; \
-  .globl name; \
+  ENTRY(name)
-  ALIGN; \
-  name:
+#ifndef END
+#define END(name) \
+  .size name, .-name
+#endif
+#ifndef ENDPROC
+#define ENDPROC(name) \
+  .type name, @function; \
+  END(name)
+#endif
 #endif
diff --git a/include/linux/loop.h b/include/linux/loop.h
index f96506782ebe..e76c7611d6cc 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -17,6 +17,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 /* Possible states of device */
 enum {
@@ -60,7 +61,7 @@ struct loop_device {
        int                     lo_state;
        struct completion       lo_done;
        struct completion       lo_bh_done;
-        struct semaphore        lo_ctl_mutex;
+        struct mutex            lo_ctl_mutex;
        int                     lo_pending;
        request_queue_t         *lo_queue;
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index bbd2221923c3..6a7621b2b12b 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -147,6 +147,7 @@ extern void mpol_rebind_policy(struct mempolicy *pol, const nodemask_t *new);
 extern void mpol_rebind_task(struct task_struct *tsk,
                                        const nodemask_t *new);
 extern void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new);
+extern void mpol_fix_fork_child_flag(struct task_struct *p);
 #define set_cpuset_being_rebound(x) (cpuset_being_rebound = (x))
 #ifdef CONFIG_CPUSET
@@ -248,6 +249,10 @@ static inline void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new)
 {
 }
+static inline void mpol_fix_fork_child_flag(struct task_struct *p)
+{
+}
 #define set_cpuset_being_rebound(x) do {} while (0)
 static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index 8bcd9450d926..779e6a5744c7 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -184,6 +184,7 @@ struct fat_slot_info {
 #include <linux/string.h>
 #include <linux/nls.h>
 #include <linux/fs.h>
+#include <linux/mutex.h>
 struct fat_mount_options {
        uid_t fs_uid;
@@ -226,7 +227,7 @@ struct msdos_sb_info {
        unsigned long max_cluster;   /* maximum cluster number */
        unsigned long root_cluster;  /* first cluster of the root directory */
        unsigned long fsinfo_sector; /* sector number of FAT32 fsinfo */
-        struct semaphore fat_lock;
+        struct mutex fat_lock;
        unsigned int prev_free;      /* previously allocated cluster number */
        unsigned int free_clusters;  /* -1 if undefined */
        struct fat_mount_options options;
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index f95d51fae733..a6ce409ec6fc 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -38,6 +38,7 @@ enum {
 #ifdef __KERNEL__
 #include <linux/wait.h>
+#include <linux/mutex.h>
 /* values for flags field */
 #define NBD_READ_ONLY 0x0001
@@ -57,7 +58,7 @@ struct nbd_device {
        struct request *active_req;
        wait_queue_head_t active_wq;
-        struct semaphore tx_lock;
+        struct mutex tx_lock;
        struct gendisk *disk;
        int blksize;
        u64 bytesize;
diff --git a/include/linux/ncp_fs_i.h b/include/linux/ncp_fs_i.h
index 415be1ec6f98..bdb4c8ae6924 100644
--- a/include/linux/ncp_fs_i.h
+++ b/include/linux/ncp_fs_i.h
@@ -19,7 +19,7 @@ struct ncp_inode_info {
        __le32  DosDirNum;
        __u8    volNumber;
        __le32  nwattr;
-        struct semaphore open_sem;
+        struct mutex open_mutex;
        atomic_t        opened;
        int     access;
        int     flags;
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index cf858eb80f0b..b089d9506283 100644
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
 #include <linux/net.h>
+#include <linux/mutex.h>
 #ifdef __KERNEL__
@@ -51,7 +52,7 @@ struct ncp_server {
                                   receive replies */
        int lock;               /* To prevent mismatch in protocols. */
-        struct semaphore sem;
+        struct mutex mutex;
        int current_size;       /* for packet preparation */
        int has_subfunction;
@@ -96,7 +97,7 @@ struct ncp_server {
        struct {
                struct work_struct tq;          /* STREAM/DGRAM: data/error ready */
                struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */
-                struct semaphore creq_sem;      /* DGRAM only: lock accesses to rcv.creq */
+                struct mutex creq_mutex;        /* DGRAM only: lock accesses to rcv.creq */
                unsigned int state;             /* STREAM only: receiver state */
                struct {
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index ee700c6eb442..839f0b3c23aa 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -51,6 +51,10 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)
 #define page_cache_release(page)        put_page(page)
 void release_pages(struct page **pages, int nr, int cold);
+#ifdef CONFIG_NUMA
+extern struct page *page_cache_alloc(struct address_space *x);
+extern struct page *page_cache_alloc_cold(struct address_space *x);
+#else
 static inline struct page *page_cache_alloc(struct address_space *x)
 {
        return alloc_pages(mapping_gfp_mask(x), 0);
@@ -60,6 +64,7 @@ static inline struct page *page_cache_alloc_cold(struct address_space *x)
 {
        return alloc_pages(mapping_gfp_mask(x)|__GFP_COLD, 0);
 }
+#endif
 typedef int filler_t(void *, struct page *);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index fe1a2b02fc55..0aad5a378e95 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -95,6 +95,11 @@ enum pci_channel_state {
        pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
 };
+typedef unsigned short __bitwise pci_bus_flags_t;
+enum pci_bus_flags {
+        PCI_BUS_FLAGS_NO_MSI = (pci_bus_flags_t) 1,
+};
 /*
 * The pci_dev structure is used to describe PCI devices.
 */
@@ -203,7 +208,7 @@ struct pci_bus {
        char            name[48];
        unsigned short  bridge_ctl;     /* manage NO_ISA/FBB/et al behaviors */
-        unsigned short  pad2;
+        pci_bus_flags_t bus_flags;      /* Inherited by child busses */
        struct device           *bridge;
        struct class_device     class_dev;
        struct bin_attribute    *legacy_io; /* legacy I/O for this bus */
@@ -485,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *);
 void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
                    int (*)(struct pci_dev *, u8, u8));
 #define HAVE_PCI_REQ_REGIONS    2
-int pci_request_regions(struct pci_dev *, char *);
+int pci_request_regions(struct pci_dev *, const char *);
 void pci_release_regions(struct pci_dev *);
-int pci_request_region(struct pci_dev *, int, char *);
+int pci_request_region(struct pci_dev *, int, const char *);
 void pci_release_region(struct pci_dev *, int);
 /* drivers/pci/bus.c */
@@ -516,6 +521,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
 void pci_walk_bus(struct pci_bus *top, void (*cb)(struct pci_dev *, void *),
                  void *userdata);
 int pci_cfg_space_size(struct pci_dev *dev);
+unsigned char pci_bus_max_busnr(struct pci_bus* bus);
 /* kmem_cache style wrapper around pci_alloc_consistent() */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ec3c32932620..6f080ae59286 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -69,6 +69,7 @@
 #define PCI_CLASS_SYSTEM_TIMER          0x0802
 #define PCI_CLASS_SYSTEM_RTC            0x0803
 #define PCI_CLASS_SYSTEM_PCI_HOTPLUG    0x0804
+#define PCI_CLASS_SYSTEM_SDHCI          0x0805
 #define PCI_CLASS_SYSTEM_OTHER          0x0880
 #define PCI_BASE_CLASS_INPUT            0x09
@@ -1371,6 +1372,7 @@
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4    0x0200
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5    0x0201
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6    0x0203
+#define PCI_DEVICE_ID_SERVERWORKS_HT1000SB 0x0205
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
@@ -1864,11 +1866,13 @@
 #define PCI_DEVICE_ID_TIGON3_5780S      0x166b
 #define PCI_DEVICE_ID_TIGON3_5705F      0x166e
 #define PCI_DEVICE_ID_TIGON3_5754M      0x1672
+#define PCI_DEVICE_ID_TIGON3_5755M      0x1673
 #define PCI_DEVICE_ID_TIGON3_5750       0x1676
 #define PCI_DEVICE_ID_TIGON3_5751       0x1677
 #define PCI_DEVICE_ID_TIGON3_5715       0x1678
 #define PCI_DEVICE_ID_TIGON3_5715S      0x1679
 #define PCI_DEVICE_ID_TIGON3_5754       0x167a
+#define PCI_DEVICE_ID_TIGON3_5755       0x167b
 #define PCI_DEVICE_ID_TIGON3_5750M      0x167c
 #define PCI_DEVICE_ID_TIGON3_5751M      0x167d
 #define PCI_DEVICE_ID_TIGON3_5751F      0x167e
diff --git a/include/linux/platform.h b/include/linux/platform.h
deleted file mode 100644
index 3c33084a6ec2..000000000000
--- a/include/linux/platform.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * include/linux/platform.h - platform driver definitions
- *
- * Because of the prolific consumerism of the average American,
- * and the dominant marketing budgets of PC OEMs, we have been
- * blessed with frequent updates of the PC architecture. 
- *
- * While most of these calls are singular per architecture, they 
- * require an extra layer of abstraction on the x86 so the right
- * subsystem gets the right call. 
- *
- * Basically, this consolidates the power off and reboot callbacks 
- * into one structure, as well as adding power management hooks.
- *
- * When adding a platform driver, please make sure all callbacks are 
- * filled. There are defaults defined below that do nothing; use those
- * if you do not support that callback.
- */ 
-#ifndef _PLATFORM_H_
-#define _PLATFORM_H_
-#ifdef __KERNEL__
-#include <linux/types.h>
-struct platform_t {
-        char    * name;
-        u32     suspend_states;
-        void    (*reboot)(char * cmd);
-        void    (*halt)(void);
-        void    (*power_off)(void);
-        int     (*suspend)(int state, int flags);
-        void    (*idle)(void);
-};
-extern struct platform_t * platform;
-extern void default_reboot(char * cmd);
-extern void default_halt(void);
-extern int default_suspend(int state, int flags);
-extern void default_idle(void);
-#endif /* __KERNEL__ */
-#endif /* _PLATFORM_H */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 5be87ba3b7ac..6df2585c0169 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -188,6 +188,8 @@ extern void device_power_up(void);
 extern void device_resume(void);
 #ifdef CONFIG_PM
+extern suspend_disk_method_t pm_disk_mode;
 extern int device_suspend(pm_message_t state);
 #define device_set_wakeup_enable(dev,val) \
@@ -215,7 +217,6 @@ static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
 static inline void dpm_runtime_resume(struct device * dev)
 {
 }
 #endif
diff --git a/include/linux/profile.h b/include/linux/profile.h
index 026969a5595c..1f2fea6640a4 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -14,6 +14,7 @@
 struct proc_dir_entry;
 struct pt_regs;
+struct notifier_block;
 /* init basic kernel profiler */
 void __init profile_init(void);
@@ -32,7 +33,6 @@ enum profile_type {
 #ifdef CONFIG_PROFILING
-struct notifier_block;
 struct task_struct;
 struct mm_struct;
diff --git a/include/linux/quota.h b/include/linux/quota.h
index f33aeb22c26a..8dc2d04a103f 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -38,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
 #define __DQUOT_VERSION__       "dquot_6.5.1"
 #define __DQUOT_NUM_VERSION__   6*10000+5*100+1
@@ -215,7 +216,7 @@ struct dquot {
        struct list_head dq_inuse;      /* List of all quotas */
        struct list_head dq_free;       /* Free list element */
        struct list_head dq_dirty;      /* List of dirty dquots */
-        struct semaphore dq_lock;       /* dquot IO lock */
+        struct mutex dq_lock;           /* dquot IO lock */
        atomic_t dq_count;              /* Use count */
        wait_queue_head_t dq_wait_unused;       /* Wait queue for dquot to become unused */
        struct super_block *dq_sb;      /* superblock this applies to */
@@ -285,8 +286,8 @@ struct quota_format_type {
 struct quota_info {
        unsigned int flags;                     /* Flags for diskquotas on this device */
-        struct semaphore dqio_sem;              /* lock device while I/O in progress */
+        struct mutex dqio_mutex;                /* lock device while I/O in progress */
-        struct semaphore dqonoff_sem;           /* Serialize quotaon & quotaoff */
+        struct mutex dqonoff_mutex;             /* Serialize quotaon & quotaoff */
        struct rw_semaphore dqptr_sem;          /* serialize ops using quota_info struct, pointers from inode to dquots */
        struct inode *files[MAXQUOTAS];         /* inodes of quotafiles */
        struct mem_dqinfo info[MAXQUOTAS];      /* Information for each quota type */
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index 9d5494aaac0f..3009c813d83d 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -130,6 +130,6 @@ struct r1bio_s {
 * with failure when last write completes (and all failed).
 * Record that bi_end_io was called with this flag...
 */
-#define R1BIO_Returned 4
+#define R1BIO_Returned 6
 #endif
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index c2ec6c77874e..5673008b61e1 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -113,8 +113,6 @@ struct rcu_data {
 DECLARE_PER_CPU(struct rcu_data, rcu_data);
 DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
-extern struct rcu_ctrlblk rcu_ctrlblk;
-extern struct rcu_ctrlblk rcu_bh_ctrlblk;
 /*
 * Increment the quiescent state counter.
diff --git a/include/linux/relay.h b/include/linux/relay.h
new file mode 100644
index 000000000000..4bcc1531d6a9
--- /dev/null
+++ b/include/linux/relay.h
@@ -0,0 +1,281 @@
+/*
+ * linux/include/linux/relay.h
+ *
+ * Copyright (C) 2002, 2003 - Tom Zanussi (zanussi@us.ibm.com), IBM Corp
+ * Copyright (C) 1999, 2000, 2001, 2002 - Karim Yaghmour (karim@opersys.com)
+ *
+ * CONFIG_RELAY definitions and declarations
+ */
+#ifndef _LINUX_RELAY_H
+#define _LINUX_RELAY_H
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/list.h>
+#include <linux/fs.h>
+#include <linux/poll.h>
+#include <linux/kref.h>
+/* Needs a _much_ better name... */
+#define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE)
+/*
+ * Tracks changes to rchan/rchan_buf structs
+ */
+#define RELAYFS_CHANNEL_VERSION         6
+/*
+ * Per-cpu relay channel buffer
+ */
+struct rchan_buf
+{
+        void *start;                    /* start of channel buffer */
+        void *data;                     /* start of current sub-buffer */
+        size_t offset;                  /* current offset into sub-buffer */
+        size_t subbufs_produced;        /* count of sub-buffers produced */
+        size_t subbufs_consumed;        /* count of sub-buffers consumed */
+        struct rchan *chan;             /* associated channel */
+        wait_queue_head_t read_wait;    /* reader wait queue */
+        struct work_struct wake_readers; /* reader wake-up work struct */
+        struct dentry *dentry;          /* channel file dentry */
+        struct kref kref;               /* channel buffer refcount */
+        struct page **page_array;       /* array of current buffer pages */
+        unsigned int page_count;        /* number of current buffer pages */
+        unsigned int finalized;         /* buffer has been finalized */
+        size_t *padding;                /* padding counts per sub-buffer */
+        size_t prev_padding;            /* temporary variable */
+        size_t bytes_consumed;          /* bytes consumed in cur read subbuf */
+        unsigned int cpu;               /* this buf's cpu */
+} ____cacheline_aligned;
+/*
+ * Relay channel data structure
+ */
+struct rchan
+{
+        u32 version;                    /* the version of this struct */
+        size_t subbuf_size;             /* sub-buffer size */
+        size_t n_subbufs;               /* number of sub-buffers per buffer */
+        size_t alloc_size;              /* total buffer size allocated */
+        struct rchan_callbacks *cb;     /* client callbacks */
+        struct kref kref;               /* channel refcount */
+        void *private_data;             /* for user-defined data */
+        size_t last_toobig;             /* tried to log event > subbuf size */
+        struct rchan_buf *buf[NR_CPUS]; /* per-cpu channel buffers */
+};
+/*
+ * Relay channel client callbacks
+ */
+struct rchan_callbacks
+{
+        /*
+         * subbuf_start - called on buffer-switch to a new sub-buffer
+         * @buf: the channel buffer containing the new sub-buffer
+         * @subbuf: the start of the new sub-buffer
+         * @prev_subbuf: the start of the previous sub-buffer
+         * @prev_padding: unused space at the end of previous sub-buffer
+         *
+         * The client should return 1 to continue logging, 0 to stop
+         * logging.
+         *
+         * NOTE: subbuf_start will also be invoked when the buffer is
+         *       created, so that the first sub-buffer can be initialized
+         *       if necessary.  In this case, prev_subbuf will be NULL.
+         *
+         * NOTE: the client can reserve bytes at the beginning of the new
+         *       sub-buffer by calling subbuf_start_reserve() in this callback.
+         */
+        int (*subbuf_start) (struct rchan_buf *buf,
+                             void *subbuf,
+                             void *prev_subbuf,
+                             size_t prev_padding);
+        /*
+         * buf_mapped - relay buffer mmap notification
+         * @buf: the channel buffer
+         * @filp: relay file pointer
+         *
+         * Called when a relay file is successfully mmapped
+         */
+        void (*buf_mapped)(struct rchan_buf *buf,
+                           struct file *filp);
+        /*
+         * buf_unmapped - relay buffer unmap notification
+         * @buf: the channel buffer
+         * @filp: relay file pointer
+         *
+         * Called when a relay file is successfully unmapped
+         */
+        void (*buf_unmapped)(struct rchan_buf *buf,
+                             struct file *filp);
+        /*
+         * create_buf_file - create file to represent a relay channel buffer
+         * @filename: the name of the file to create
+         * @parent: the parent of the file to create
+         * @mode: the mode of the file to create
+         * @buf: the channel buffer
+         * @is_global: outparam - set non-zero if the buffer should be global
+         *
+         * Called during relay_open(), once for each per-cpu buffer,
+         * to allow the client to create a file to be used to
+         * represent the corresponding channel buffer.  If the file is
+         * created outside of relay, the parent must also exist in
+         * that filesystem.
+         *
+         * The callback should return the dentry of the file created
+         * to represent the relay buffer.
+         *
+         * Setting the is_global outparam to a non-zero value will
+         * cause relay_open() to create a single global buffer rather
+         * than the default set of per-cpu buffers.
+         *
+         * See Documentation/filesystems/relayfs.txt for more info.
+         */
+        struct dentry *(*create_buf_file)(const char *filename,
+                                          struct dentry *parent,
+                                          int mode,
+                                          struct rchan_buf *buf,
+                                          int *is_global);
+        /*
+         * remove_buf_file - remove file representing a relay channel buffer
+         * @dentry: the dentry of the file to remove
+         *
+         * Called during relay_close(), once for each per-cpu buffer,
+         * to allow the client to remove a file used to represent a
+         * channel buffer.
+         *
+         * The callback should return 0 if successful, negative if not.
+         */
+        int (*remove_buf_file)(struct dentry *dentry);
+};
+/*
+ * CONFIG_RELAY kernel API, kernel/relay.c
+ */
+struct rchan *relay_open(const char *base_filename,
+                         struct dentry *parent,
+                         size_t subbuf_size,
+                         size_t n_subbufs,
+                         struct rchan_callbacks *cb);
+extern void relay_close(struct rchan *chan);
+extern void relay_flush(struct rchan *chan);
+extern void relay_subbufs_consumed(struct rchan *chan,
+                                   unsigned int cpu,
+                                   size_t consumed);
+extern void relay_reset(struct rchan *chan);
+extern int relay_buf_full(struct rchan_buf *buf);
+extern size_t relay_switch_subbuf(struct rchan_buf *buf,
+                                  size_t length);
+/**
+ *      relay_write - write data into the channel
+ *      @chan: relay channel
+ *      @data: data to be written
+ *      @length: number of bytes to write
+ *
+ *      Writes data into the current cpu's channel buffer.
+ *
+ *      Protects the buffer by disabling interrupts.  Use this
+ *      if you might be logging from interrupt context.  Try
+ *      __relay_write() if you know you won't be logging from
+ *      interrupt context.
+ */
+static inline void relay_write(struct rchan *chan,
+                               const void *data,
+                               size_t length)
+{
+        unsigned long flags;
+        struct rchan_buf *buf;
+        local_irq_save(flags);
+        buf = chan->buf[smp_processor_id()];
+        if (unlikely(buf->offset + length > chan->subbuf_size))
+                length = relay_switch_subbuf(buf, length);
+        memcpy(buf->data + buf->offset, data, length);
+        buf->offset += length;
+        local_irq_restore(flags);
+}
+/**
+ *      __relay_write - write data into the channel
+ *      @chan: relay channel
+ *      @data: data to be written
+ *      @length: number of bytes to write
+ *
+ *      Writes data into the current cpu's channel buffer.
+ *
+ *      Protects the buffer by disabling preemption.  Use
+ *      relay_write() if you might be logging from interrupt
+ *      context.
+ */
+static inline void __relay_write(struct rchan *chan,
+                                 const void *data,
+                                 size_t length)
+{
+        struct rchan_buf *buf;
+        buf = chan->buf[get_cpu()];
+        if (unlikely(buf->offset + length > buf->chan->subbuf_size))
+                length = relay_switch_subbuf(buf, length);
+        memcpy(buf->data + buf->offset, data, length);
+        buf->offset += length;
+        put_cpu();
+}
+/**
+ *      relay_reserve - reserve slot in channel buffer
+ *      @chan: relay channel
+ *      @length: number of bytes to reserve
+ *
+ *      Returns pointer to reserved slot, NULL if full.
+ *
+ *      Reserves a slot in the current cpu's channel buffer.
+ *      Does not protect the buffer at all - caller must provide
+ *      appropriate synchronization.
+ */
+static inline void *relay_reserve(struct rchan *chan, size_t length)
+{
+        void *reserved;
+        struct rchan_buf *buf = chan->buf[smp_processor_id()];
+        if (unlikely(buf->offset + length > buf->chan->subbuf_size)) {
+                length = relay_switch_subbuf(buf, length);
+                if (!length)
+                        return NULL;
+        }
+        reserved = buf->data + buf->offset;
+        buf->offset += length;
+        return reserved;
+}
+/**
+ *      subbuf_start_reserve - reserve bytes at the start of a sub-buffer
+ *      @buf: relay channel buffer
+ *      @length: number of bytes to reserve
+ *
+ *      Helper function used to reserve bytes at the beginning of
+ *      a sub-buffer in the subbuf_start() callback.
+ */
+static inline void subbuf_start_reserve(struct rchan_buf *buf,
+                                        size_t length)
+{
+        BUG_ON(length >= buf->chan->subbuf_size - 1);
+        buf->offset = length;
+}
+/*
+ * exported relay file operations, kernel/relay.c
+ */
+extern struct file_operations relay_file_operations;
+#endif /* _LINUX_RELAY_H */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index d572d5376319..df0cdd41085c 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -839,6 +839,7 @@ enum
 #define RTMGRP_IPV4_IFADDR      0x10
 #define RTMGRP_IPV4_MROUTE      0x20
 #define RTMGRP_IPV4_ROUTE       0x40
+#define RTMGRP_IPV4_RULE        0x80
 #define RTMGRP_IPV6_IFADDR      0x100
 #define RTMGRP_IPV6_MROUTE      0x200
@@ -869,7 +870,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV4_MROUTE     RTNLGRP_IPV4_MROUTE
        RTNLGRP_IPV4_ROUTE,
 #define RTNLGRP_IPV4_ROUTE      RTNLGRP_IPV4_ROUTE
-        RTNLGRP_NOP1,
+        RTNLGRP_IPV4_RULE,
+#define RTNLGRP_IPV4_RULE       RTNLGRP_IPV4_RULE
        RTNLGRP_IPV6_IFADDR,
 #define RTNLGRP_IPV6_IFADDR     RTNLGRP_IPV6_IFADDR
        RTNLGRP_IPV6_MROUTE,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 62e6314382f0..e0054c1b9a09 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -206,11 +206,11 @@ extern void update_process_times(int user);
 extern void scheduler_tick(void);
 #ifdef CONFIG_DETECT_SOFTLOCKUP
-extern void softlockup_tick(struct pt_regs *regs);
+extern void softlockup_tick(void);
 extern void spawn_softlockup_task(void);
 extern void touch_softlockup_watchdog(void);
 #else
-static inline void softlockup_tick(struct pt_regs *regs)
+static inline void softlockup_tick(void)
 {
 }
 static inline void spawn_softlockup_task(void)
@@ -706,6 +706,7 @@ struct task_struct {
        prio_array_t *array;
        unsigned short ioprio;
+        unsigned int btrace_seq;
        unsigned long sleep_avg;
        unsigned long long timestamp, last_ran;
@@ -868,6 +869,7 @@ struct task_struct {
        struct cpuset *cpuset;
        nodemask_t mems_allowed;
        int cpuset_mems_generation;
+        int cpuset_mem_spread_rotor;
 #endif
        atomic_t fs_excl;       /* holding fs exclusive resources */
        struct rcu_head rcu;
@@ -928,6 +930,9 @@ static inline void put_task_struct(struct task_struct *t)
 #define PF_BORROWED_MM  0x00400000      /* I am a kthread doing use_mm */
 #define PF_RANDOMIZE    0x00800000      /* randomize virtual address space */
 #define PF_SWAPWRITE    0x01000000      /* Allowed to write to swap */
+#define PF_SPREAD_PAGE  0x04000000      /* Spread page cache over cpuset */
+#define PF_SPREAD_SLAB  0x08000000      /* Spread some slab caches over cpuset */
+#define PF_MEMPOLICY    0x10000000      /* Non-default NUMA mempolicy */
 /*
 * Only the _current_ task can read/write to tsk->flags, but other
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 850a974ee505..b95f6eb7254c 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -4,7 +4,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 struct seq_operations;
 struct file;
@@ -19,7 +19,7 @@ struct seq_file {
        size_t count;
        loff_t index;
        loff_t version;
-        struct semaphore sem;
+        struct mutex lock;
        struct seq_operations *op;
        void *private;
 };
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 2b28c849d75a..e2ee5b268797 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -46,6 +46,7 @@ typedef struct kmem_cache kmem_cache_t;
                                                   what is reclaimable later*/
 #define SLAB_PANIC              0x00040000UL    /* panic if kmem_cache_create() fails */
 #define SLAB_DESTROY_BY_RCU     0x00080000UL    /* defer freeing pages to RCU */
+#define SLAB_MEM_SPREAD         0x00100000UL    /* Spread some memory over cpuset */
 /* flags passed to a constructor func */
 #define SLAB_CTOR_CONSTRUCTOR   0x001UL         /* if not set, then deconstructor */
diff --git a/include/linux/string.h b/include/linux/string.h
index 369be3264a55..dee221429ad0 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -18,6 +18,8 @@ extern char * strsep(char **,const char *);
 extern __kernel_size_t strspn(const char *,const char *);
 extern __kernel_size_t strcspn(const char *,const char *);
+extern char *strndup_user(const char __user *, long);
 /*
 * Include machine specific inline routines
 */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 12415dd94451..54eac8a39a4c 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -234,14 +234,15 @@ extern struct page * read_swap_cache_async(swp_entry_t, struct vm_area_struct *v
 /* linux/mm/swapfile.c */
 extern long total_swap_pages;
 extern unsigned int nr_swapfiles;
-extern struct swap_info_struct swap_info[];
 extern void si_swapinfo(struct sysinfo *);
 extern swp_entry_t get_swap_page(void);
-extern swp_entry_t get_swap_page_of_type(int type);
+extern swp_entry_t get_swap_page_of_type(int);
 extern int swap_duplicate(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
 extern void swap_free(swp_entry_t);
 extern void free_swap_and_cache(swp_entry_t);
+extern int swap_type_of(dev_t);
+extern unsigned int count_swap_pages(int, int);
 extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t);
 extern struct swap_info_struct *get_swap_info_struct(unsigned);
 extern int can_share_swap_page(struct page *);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b9ea44ac0ddb..e487e3b60f60 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -568,5 +568,6 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
                                      int flag);
 asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
                                   int flags, int mode);
+asmlinkage long sys_unshare(unsigned long unshare_flags);
 #endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index f45cd74e6f24..f13f49afe198 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -24,6 +24,7 @@
 #include <linux/tty_driver.h>
 #include <linux/tty_ldisc.h>
 #include <linux/screen_info.h>
+#include <linux/mutex.h>
 #include <asm/system.h>
@@ -231,8 +232,8 @@ struct tty_struct {
        int canon_data;
        unsigned long canon_head;
        unsigned int canon_column;
-        struct semaphore atomic_read;
+        struct mutex atomic_read_lock;
-        struct semaphore atomic_write;
+        struct mutex atomic_write_lock;
        unsigned char *write_buf;
        int write_cnt;
        spinlock_t read_lock;
@@ -319,8 +320,7 @@ extern void tty_ldisc_put(int);
 extern void tty_wakeup(struct tty_struct *tty);
 extern void tty_ldisc_flush(struct tty_struct *tty);
-struct semaphore;
+extern struct mutex tty_mutex;
-extern struct semaphore tty_sem;
 /* n_tty.c */
 extern struct tty_ldisc tty_ldisc_N_TTY;
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 222faf97d5f9..0c6169fff366 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -7,14 +7,8 @@ extern int tty_insert_flip_string_flags(struct tty_struct *tty, unsigned char *c
 extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size);
 extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size);
-#ifdef INCLUDE_INLINE_FUNCS
+static inline int tty_insert_flip_char(struct tty_struct *tty,
-#define _INLINE_ extern
+                                       unsigned char ch, char flag)
-#else
-#define _INLINE_ static __inline__
-#endif
-_INLINE_ int tty_insert_flip_char(struct tty_struct *tty,
-                                   unsigned char ch, char flag)
 {
        struct tty_buffer *tb = tty->buf.tail;
        if (tb && tb->active && tb->used < tb->size) {
@@ -25,7 +19,7 @@ _INLINE_ int tty_insert_flip_char(struct tty_struct *tty,
        return tty_insert_flip_string_flags(tty, &ch, &flag, 1);
 }
-_INLINE_ void tty_schedule_flip(struct tty_struct *tty)
+static inline void tty_schedule_flip(struct tty_struct *tty)
 {
        unsigned long flags;
        spin_lock_irqsave(&tty->buf.lock, flags);
diff --git a/include/linux/udf_fs_sb.h b/include/linux/udf_fs_sb.h
index b15ff2e99c91..80ae9ef940dc 100644
--- a/include/linux/udf_fs_sb.h
+++ b/include/linux/udf_fs_sb.h
@@ -13,7 +13,7 @@
 #ifndef _UDF_FS_SB_H
 #define _UDF_FS_SB_H 1
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #pragma pack(1)
@@ -111,7 +111,7 @@ struct udf_sb_info
        /* VAT inode */
        struct inode            *s_vat;
-        struct semaphore        s_alloc_sem;
+        struct mutex            s_alloc_mutex;
 };
 #endif /* _UDF_FS_SB_H */
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index fab5aed8ca31..530ae3f4248c 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -73,6 +73,11 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
 int vt_waitactive(int vt);
 void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
+#ifdef CONFIG_VT
+int is_console_suspend_safe(void);
+#else
+static inline int is_console_suspend_safe(void) { return 1; }
+#endif
 /*
 * vc_screen.c shares this temporary buffer with the console write code so that
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index a555a0f7a7b4..13588564b42b 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1,10 +1,10 @@
 /*
 * This file define a set of standard wireless extensions
 *
- * Version :    19      18.3.05
+ * Version :    20      17.2.06
 *
 * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved.
+ * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
 */
 #ifndef _LINUX_WIRELESS_H
@@ -80,7 +80,7 @@
 * (there is some stuff that will be added in the future...)
 * I just plan to increment with each new version.
 */
-#define WIRELESS_EXT    19
+#define WIRELESS_EXT    20
 /*
 * Changes :
@@ -204,6 +204,10 @@
 *      - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
 *      - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
 *      - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
+ *
+ * V19 to V20
+ * ----------
+ *      - RtNetlink requests support (SET/GET)
 */
 /**************************** CONSTANTS ****************************/
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index beaef5c7a0ea..56f92fcbe94a 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -88,8 +88,8 @@ void throttle_vm_writeout(void);
 /* These are exported to sysctl. */
 extern int dirty_background_ratio;
 extern int vm_dirty_ratio;
-extern int dirty_writeback_centisecs;
+extern int dirty_writeback_interval;
-extern int dirty_expire_centisecs;
+extern int dirty_expire_interval;
 extern int block_dump;
 extern int laptop_mode;
@@ -99,7 +99,15 @@ int dirty_writeback_centisecs_handler(struct ctl_table *, int, struct file *,
                                      void __user *, size_t *, loff_t *);
 void page_writeback_init(void);
-void balance_dirty_pages_ratelimited(struct address_space *mapping);
+void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
+                                        unsigned long nr_pages_dirtied);
+static inline void
+balance_dirty_pages_ratelimited(struct address_space *mapping)
+{
+        balance_dirty_pages_ratelimited_nr(mapping, 1);
+}
 int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
 int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
 int sync_page_range(struct inode *inode, struct address_space *mapping,
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
new file mode 100644
index 000000000000..b971d8c82bdd
--- /dev/null
+++ b/include/net/ieee80211softmac.h
@@ -0,0 +1,292 @@
+/*
+ * ieee80211softmac.h - public interface to the softmac
+ *
+ * Copyright (c) 2005 Johannes Berg <johannes@sipsolutions.net>
+ *                    Joseph Jezak <josejx@gentoo.org>
+ *                    Larry Finger <Larry.Finger@lwfinger.net>
+ *                    Danny van Dyk <kugelfang@gentoo.org>
+ *                    Michael Buesch <mbuesch@freenet.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
+#ifndef IEEE80211SOFTMAC_H_
+#define IEEE80211SOFTMAC_H_
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/list.h>
+#include <net/ieee80211.h>
+/* Once the API is considered more or less stable,
+ * this should be incremented on API incompatible changes.
+ */
+#define IEEE80211SOFTMAC_API    0
+#define IEEE80211SOFTMAC_MAX_RATES_LEN          8
+#define IEEE80211SOFTMAC_MAX_EX_RATES_LEN       255
+struct ieee80211softmac_ratesinfo {
+        u8 count;
+        u8 rates[IEEE80211SOFTMAC_MAX_RATES_LEN + IEEE80211SOFTMAC_MAX_EX_RATES_LEN];
+};
+/* internal structures */
+struct ieee80211softmac_network;
+struct ieee80211softmac_scaninfo;
+struct ieee80211softmac_essid {
+        u8 len;
+        char data[IW_ESSID_MAX_SIZE+1];
+};
+struct ieee80211softmac_wpa {
+        char *IE;
+        int IElen;
+        int IEbuflen;
+};
+/*
+ * Information about association
+ *
+ * Do we need a lock for this?
+ * We only ever use this structure inlined
+ * into our global struct. I've used its lock,
+ * but maybe we need a local one here?
+ */
+struct ieee80211softmac_assoc_info {
+        /*
+         * This is the requested ESSID. It is written
+         * only by the WX handlers.
+         *
+         */
+        struct ieee80211softmac_essid req_essid;
+        /*
+         * the ESSID of the network we're currently
+         * associated (or trying) to. This is
+         * updated to the network's actual ESSID
+         * even if the requested ESSID was 'ANY'
+         */
+        struct ieee80211softmac_essid associate_essid;
+        
+        /* BSSID we're trying to associate to */
+        char bssid[ETH_ALEN];
+        
+        /* some flags.
+         * static_essid is valid if the essid is constant,
+         * this is for use by the wx handlers only.
+         *
+         * associating is true, if the network has been
+         * auth'ed on and we are in the process of associating.
+         *
+         * bssvalid is true if we found a matching network
+         * and saved it's BSSID into the bssid above.
+         */
+        u8 static_essid:1,
+           associating:1,
+           bssvalid:1;
+        /* Scan retries remaining */
+        int scan_retry;
+        struct work_struct work;
+        struct work_struct timeout;
+};
+enum {
+        IEEE80211SOFTMAC_AUTH_OPEN_REQUEST      = 1,
+        IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE     = 2,
+};
+enum {
+        IEEE80211SOFTMAC_AUTH_SHARED_REQUEST    = 1,
+        IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE = 2,
+        IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE   = 3,
+        IEEE80211SOFTMAC_AUTH_SHARED_PASS       = 4,
+};
+/* We should make these tunable
+ * AUTH_TIMEOUT seems really long, but that's what it is in BSD */
+#define IEEE80211SOFTMAC_AUTH_TIMEOUT           (12 * HZ)
+#define IEEE80211SOFTMAC_AUTH_RETRY_LIMIT       5
+#define IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT 3
+struct ieee80211softmac_txrates {
+        /* The Bit-Rate to be used for multicast frames. */
+        u8 mcast_rate;
+        /* The Bit-Rate to be used for multicast fallback
+         * (If the device supports fallback and hardware-retry)
+         */
+        u8 mcast_fallback;
+        /* The Bit-Rate to be used for any other (normal) data packet. */
+        u8 default_rate;
+        /* The Bit-Rate to be used for default fallback
+         * (If the device supports fallback and hardware-retry)
+         */
+        u8 default_fallback;
+};
+/* Bits for txrates_change callback. */
+#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT              (1 << 0) /* default_rate */
+#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK        (1 << 1) /* default_fallback */
+#define IEEE80211SOFTMAC_TXRATECHG_MCAST                (1 << 2) /* mcast_rate */
+#define IEEE80211SOFTMAC_TXRATECHG_MCAST_FBACK          (1 << 3) /* mcast_fallback */
+struct ieee80211softmac_device {
+        /* 802.11 structure for data stuff */
+        struct ieee80211_device *ieee;
+        struct net_device *dev;
+        /* only valid if associated, then holds the Association ID */
+        u16 association_id;
+        
+        /* the following methods are callbacks that the driver
+         * using this framework has to assign
+         */
+        /* always assign these */
+        void (*set_bssid_filter)(struct net_device *dev, const u8 *bssid);
+        void (*set_channel)(struct net_device *dev, u8 channel);
+        /* assign if you need it, informational only */
+        void (*link_change)(struct net_device *dev);
+        /* If the hardware can do scanning, assign _all_ three of these callbacks.
+         * When the scan finishes, call ieee80211softmac_scan_finished().
+         */
+        
+        /* when called, start_scan is guaranteed to not be called again
+         * until you call ieee80211softmac_scan_finished.
+         * Return 0 if scanning could start, error otherwise.
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_start_scan */
+        int (*start_scan)(struct net_device *dev);
+        /* this should block until after ieee80211softmac_scan_finished was called
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_wait_for_scan */
+        void (*wait_for_scan)(struct net_device *dev);
+        /* stop_scan aborts a scan, but is asynchronous.
+         * if you want to wait for it too, use wait_for_scan
+         * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_stop_scan */
+        void (*stop_scan)(struct net_device *dev);
+        /* we'll need something about beacons here too, for AP or ad-hoc modes */
+        /* Transmission rates to be used by the driver.
+         * The SoftMAC figures out the best possible rates.
+         * The driver just needs to read them.
+         */
+        struct ieee80211softmac_txrates txrates;
+        /* If the driver needs to do stuff on TX rate changes, assign this callback. */
+        void (*txrates_change)(struct net_device *dev,
+                               u32 changes, /* see IEEE80211SOFTMAC_TXRATECHG flags */
+                               const struct ieee80211softmac_txrates *rates_before_change);
+        /* private stuff follows */
+        /* this lock protects this structure */
+        spinlock_t lock;
+        
+        /* couple of flags */
+        u8 scanning:1, /* protects scanning from being done multiple times at once */
+           associated:1;
+        
+        struct ieee80211softmac_scaninfo *scaninfo;
+        struct ieee80211softmac_assoc_info associnfo;
+        struct list_head auth_queue;
+        struct list_head events;
+        struct ieee80211softmac_ratesinfo ratesinfo;
+        int txrate_badness;
+        
+        /* WPA stuff */
+        struct ieee80211softmac_wpa wpa;
+        /* we need to keep a list of network structs we copied */
+        struct list_head network_list;
+        
+        /* This must be the last item so that it points to the data
+         * allocated beyond this structure by alloc_ieee80211 */
+        u8 priv[0];
+};
+extern void ieee80211softmac_scan_finished(struct ieee80211softmac_device *sm);
+static inline void * ieee80211softmac_priv(struct net_device *dev)
+{
+        return ((struct ieee80211softmac_device *)ieee80211_priv(dev))->priv;
+}
+extern struct net_device * alloc_ieee80211softmac(int sizeof_priv);
+extern void free_ieee80211softmac(struct net_device *dev);
+/* Call this function if you detect a lost TX fragment.
+ * (If the device indicates failure of ACK RX, for example.)
+ * It is wise to call this function if you are able to detect lost packets,
+ * because it contributes to the TX Rates auto adjustment.
+ */
+extern void ieee80211softmac_fragment_lost(struct net_device *dev,
+                                           u16 wireless_sequence_number);
+/* Call this function before _start to tell the softmac what rates
+ * the hw supports. The rates parameter is copied, so you can
+ * free it right after calling this function. 
+ * Note that the rates need to be sorted. */
+extern void ieee80211softmac_set_rates(struct net_device *dev, u8 count, u8 *rates);
+/* Start the SoftMAC. Call this after you initialized the device
+ * and it is ready to run.
+ */
+extern void ieee80211softmac_start(struct net_device *dev);
+/* Stop the SoftMAC. Call this before you shutdown the device. */
+extern void ieee80211softmac_stop(struct net_device *dev);
+/*
+ * Event system
+ */
+/* valid event types */
+#define IEEE80211SOFTMAC_EVENT_ANY                      -1 /*private use only*/
+#define IEEE80211SOFTMAC_EVENT_SCAN_FINISHED            0
+#define IEEE80211SOFTMAC_EVENT_ASSOCIATED               1
+#define IEEE80211SOFTMAC_EVENT_ASSOCIATE_FAILED         2
+#define IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT        3
+#define IEEE80211SOFTMAC_EVENT_AUTHENTICATED            4
+#define IEEE80211SOFTMAC_EVENT_AUTH_FAILED              5
+#define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT             6
+#define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND  7
+/* keep this updated! */
+#define IEEE80211SOFTMAC_EVENT_LAST                     7
+/*
+ * If you want to be notified of certain events, you can call
+ * ieee80211softmac_notify[_atomic] with
+ *      - event set to one of the constants below
+ *      - fun set to a function pointer of the appropriate type
+ *      - context set to the context data you want passed
+ * The return value is 0, or an error.
+ */
+typedef void (*notify_function_ptr)(struct net_device *dev, void *context);
+#define ieee80211softmac_notify(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_KERNEL);
+#define ieee80211softmac_notify_atomic(dev, event, fun, context) ieee80211softmac_notify_gfp(dev, event, fun, context, GFP_ATOMIC);
+extern int ieee80211softmac_notify_gfp(struct net_device *dev,
+        int event, notify_function_ptr fun, void *context, gfp_t gfp_mask);
+/* To clear pending work (for ifconfig down, etc.) */
+extern void
+ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm);
+#endif /* IEEE80211SOFTMAC_H_ */
diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h
new file mode 100644
index 000000000000..3e0be453ecea
--- /dev/null
+++ b/include/net/ieee80211softmac_wx.h
@@ -0,0 +1,94 @@
+/*
+ * This file contains the prototypes for the wireless extension
+ * handlers that the softmac API provides. Include this file to
+ * use the wx handlers, you can assign these directly.
+ *
+ * Copyright (c) 2005 Johannes Berg <johannes@sipsolutions.net>
+ *                    Joseph Jezak <josejx@gentoo.org>
+ *                    Larry Finger <Larry.Finger@lwfinger.net>
+ *                    Danny van Dyk <kugelfang@gentoo.org>
+ *                    Michael Buesch <mbuesch@freenet.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called COPYING.
+ */
+#ifndef _IEEE80211SOFTMAC_WX_H
+#define _IEEE80211SOFTMAC_WX_H
+#include <net/ieee80211softmac.h>
+#include <net/iw_handler.h>
+extern int
+ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *data,
+                                 char *extra);
+extern int
+ieee80211softmac_wx_get_scan_results(struct net_device *net_dev,
+                                     struct iw_request_info *info,
+                                     union iwreq_data *data,
+                                     char *extra);
+extern int
+ieee80211softmac_wx_set_essid(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra);
+extern int
+ieee80211softmac_wx_get_essid(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra);
+extern int
+ieee80211softmac_wx_set_rate(struct net_device *net_dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data,
+                             char *extra);
+extern int
+ieee80211softmac_wx_get_rate(struct net_device *net_dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data,
+                             char *extra);
+extern int
+ieee80211softmac_wx_get_wap(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra);
+extern int
+ieee80211softmac_wx_set_wap(struct net_device *net_dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *data,
+                              char *extra);
+extern int
+ieee80211softmac_wx_set_genie(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu,
+                              char *extra);
+extern int
+ieee80211softmac_wx_get_genie(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu,
+                              char *extra);
+#endif /* _IEEE80211SOFTMAC_WX */
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index a2c5e0b88422..10559e937d27 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -4,7 +4,7 @@
 * Version :    7       18.3.05
 *
 * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 2001-2005 Jean Tourrilhes, All Rights Reserved.
+ * Copyright (c) 2001-2006 Jean Tourrilhes, All Rights Reserved.
 */
 #ifndef _IW_HANDLER_H
@@ -436,6 +436,16 @@ extern int dev_get_wireless_info(char * buffer, char **start, off_t offset,
 /* Handle IOCTLs, called in net/core/dev.c */
 extern int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
+/* Handle RtNetlink requests, called in net/core/rtnetlink.c */
+extern int wireless_rtnetlink_set(struct net_device *   dev,
+                                  char *                data,
+                                  int                   len);
+extern int wireless_rtnetlink_get(struct net_device *   dev,
+                                  char *                data,
+                                  int                   len,
+                                  char **               p_buf,
+                                  int *                 p_len);
 /* Second : functions that may be called by driver modules */
 /* Send a single event to user space */
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index 444907166f97..82fdb0930720 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -230,7 +230,6 @@
 #define OPL3_HW_OPL3_CS         0x0302  /* CS4232/CS4236+ */
 #define OPL3_HW_OPL3_FM801      0x0303  /* FM801 */
 #define OPL3_HW_OPL3_CS4281     0x0304  /* CS4281 */
-#define OPL3_HW_OPL3_PC98       0x0305  /* PC9800 */
 #define OPL3_HW_OPL4            0x0400  /* YMF278B/YMF295 */
 #define OPL3_HW_OPL4_ML         0x0401  /* YMF704/YMF721 */
 #define OPL3_HW_MASK            0xff00