124 files changed, 1843 insertions, 1969 deletions
diff --git a/include/asm-alpha/atomic.h b/include/asm-alpha/atomic.h
index 6183eab006d4..cb03bbe92cdf 100644
--- a/include/asm-alpha/atomic.h
+++ b/include/asm-alpha/atomic.h
@@ -216,4 +216,5 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
 #define smp_mb__before_atomic_inc()     smp_mb()
 #define smp_mb__after_atomic_inc()      smp_mb()
+#include <asm-generic/atomic.h>
 #endif /* _ALPHA_ATOMIC_H */
diff --git a/include/asm-alpha/dma-mapping.h b/include/asm-alpha/dma-mapping.h
index 680f7ecbb28f..9dc7256cf979 100644
--- a/include/asm-alpha/dma-mapping.h
+++ b/include/asm-alpha/dma-mapping.h
@@ -16,7 +16,7 @@
 #define dma_free_coherent(dev, size, va, addr)          \
                pci_free_consistent(alpha_gendev_to_pci(dev), size, va, addr)
 #define dma_map_page(dev, page, off, size, dir)         \
-                pci_map_single(alpha_gendev_to_pci(dev), page, off, size, dir)
+                pci_map_page(alpha_gendev_to_pci(dev), page, off, size, dir)
 #define dma_unmap_page(dev, addr, size, dir)            \
                pci_unmap_page(alpha_gendev_to_pci(dev), addr, size, dir)
 #define dma_map_sg(dev, sg, nents, dir)                 \
diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h
index c0593f9b21e1..7bb6a36c96a1 100644
--- a/include/asm-alpha/hardirq.h
+++ b/include/asm-alpha/hardirq.h
@@ -13,6 +13,8 @@ typedef struct {
 #include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
+void ack_bad_irq(unsigned int irq);
 #define HARDIRQ_BITS    12
 /*
diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h
index eb9c279045ef..f6439532a262 100644
--- a/include/asm-alpha/mman.h
+++ b/include/asm-alpha/mman.h
@@ -42,6 +42,7 @@
 #define MADV_WILLNEED   3               /* will need these pages */
 #define MADV_SPACEAVAIL 5               /* ensure resources are available */
 #define MADV_DONTNEED   6               /* don't need these pages */
+#define MADV_REMOVE     7               /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index d586f65c8228..f72b63309bc5 100644
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -205,5 +205,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif
 #endif
diff --git a/include/asm-arm/mman.h b/include/asm-arm/mman.h
index 8e4f69c4fa5f..f0bebca2ac21 100644
--- a/include/asm-arm/mman.h
+++ b/include/asm-arm/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-arm26/atomic.h b/include/asm-arm26/atomic.h
index a47cadc59686..3074b0e76343 100644
--- a/include/asm-arm26/atomic.h
+++ b/include/asm-arm26/atomic.h
@@ -118,5 +118,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif
 #endif
diff --git a/include/asm-arm26/mman.h b/include/asm-arm26/mman.h
index cc27b8240265..0ed7780541fa 100644
--- a/include/asm-arm26/mman.h
+++ b/include/asm-arm26/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-cris/atomic.h b/include/asm-cris/atomic.h
index 683b05a57d88..2df2c7aa19b7 100644
--- a/include/asm-cris/atomic.h
+++ b/include/asm-cris/atomic.h
@@ -156,4 +156,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__before_atomic_inc()    barrier()
 #define smp_mb__after_atomic_inc()     barrier()
+#include <asm-generic/atomic.h>
 #endif
diff --git a/include/asm-cris/mman.h b/include/asm-cris/mman.h
index 8570e72b9502..5a382b8bf3f7 100644
--- a/include/asm-cris/mman.h
+++ b/include/asm-cris/mman.h
@@ -37,6 +37,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
index f6539ff569c5..3f54fea2b051 100644
--- a/include/asm-frv/atomic.h
+++ b/include/asm-frv/atomic.h
@@ -426,4 +426,5 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+#include <asm-generic/atomic.h>
 #endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-frv/futex.h b/include/asm-frv/futex.h
index 9feff4ce1424..fca9d90e32c9 100644
--- a/include/asm-frv/futex.h
+++ b/include/asm-frv/futex.h
@@ -7,47 +7,7 @@
 #include <asm/errno.h>
 #include <asm/uaccess.h>
-static inline int
+extern int futex_atomic_op_inuser(int encoded_op, int __user *uaddr);
-futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
-{
-        int op = (encoded_op >> 28) & 7;
-        int cmp = (encoded_op >> 24) & 15;
-        int oparg = (encoded_op << 8) >> 20;
-        int cmparg = (encoded_op << 20) >> 20;
-        int oldval = 0, ret;
-        if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
-                oparg = 1 << oparg;
-        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
-                return -EFAULT;
-        inc_preempt_count();
-        switch (op) {
-        case FUTEX_OP_SET:
-        case FUTEX_OP_ADD:
-        case FUTEX_OP_OR:
-        case FUTEX_OP_ANDN:
-        case FUTEX_OP_XOR:
-        default:
-                ret = -ENOSYS;
-        }
-        dec_preempt_count();
-        if (!ret) {
-                switch (cmp) {
-                case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
-                case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
-                case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
-                case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
-                case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
-                case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
-                default: ret = -ENOSYS;
-                }
-        }
-        return ret;
-}
 #endif
 #endif
diff --git a/include/asm-frv/mman.h b/include/asm-frv/mman.h
index c684720dfbdd..8af4a41c255e 100644
--- a/include/asm-frv/mman.h
+++ b/include/asm-frv/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-frv/signal.h b/include/asm-frv/signal.h
index d407bde57eca..67366894780f 100644
--- a/include/asm-frv/signal.h
+++ b/include/asm-frv/signal.h
@@ -151,7 +151,6 @@ typedef struct sigaltstack {
        size_t ss_size;
 } stack_t;
-extern int do_signal(struct pt_regs *regs, sigset_t *oldset);
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #ifdef __KERNEL__
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
new file mode 100644
index 000000000000..e0a28b925ef0
--- /dev/null
+++ b/include/asm-generic/atomic.h
@@ -0,0 +1,116 @@
+#ifndef _ASM_GENERIC_ATOMIC_H
+#define _ASM_GENERIC_ATOMIC_H
+/*
+ * Copyright (C) 2005 Silicon Graphics, Inc.
+ *      Christoph Lameter <clameter@sgi.com>
+ *
+ * Allows to provide arch independent atomic definitions without the need to
+ * edit all arch specific atomic.h files.
+ */
+/*
+ * Suppport for atomic_long_t
+ *
+ * Casts for parameters are avoided for existing atomic functions in order to
+ * avoid issues with cast-as-lval under gcc 4.x and other limitations that the
+ * macros of a platform may have.
+ */
+#if BITS_PER_LONG == 64
+typedef atomic64_t atomic_long_t;
+#define ATOMIC_LONG_INIT(i)     ATOMIC64_INIT(i)
+static inline long atomic_long_read(atomic_long_t *l)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        return (long)atomic64_read(v);
+}
+static inline void atomic_long_set(atomic_long_t *l, long i)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        atomic_set(v, i);
+}
+static inline void atomic_long_inc(atomic_long_t *l)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        atomic64_inc(v);
+}
+static inline void atomic_long_dec(atomic_long_t *l)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        atomic64_dec(v);
+}
+static inline void atomic_long_add(long i, atomic_long_t *l)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        atomic64_add(i, v);
+}
+static inline void atomic_long_sub(long i, atomic_long_t *l)
+{
+        atomic64_t *v = (atomic64_t *)l;
+        atomic64_sub(i, v);
+}
+#else
+typedef atomic_t atomic_long_t;
+#define ATOMIC_LONG_INIT(i)     ATOMIC_INIT(i)
+static inline long atomic_long_read(atomic_long_t *l)
+{
+        atomic_t *v = (atomic_t *)l;
+        return (long)atomic_read(v);
+}
+static inline void atomic_long_set(atomic_long_t *l, long i)
+{
+        atomic_t *v = (atomic_t *)l;
+        atomic_set(v, i);
+}
+static inline void atomic_long_inc(atomic_long_t *l)
+{
+        atomic_t *v = (atomic_t *)l;
+        atomic_inc(v);
+}
+static inline void atomic_long_dec(atomic_long_t *l)
+{
+        atomic_t *v = (atomic_t *)l;
+        atomic_dec(v);
+}
+static inline void atomic_long_add(long i, atomic_long_t *l)
+{
+        atomic_t *v = (atomic_t *)l;
+        atomic_add(i, v);
+}
+static inline void atomic_long_sub(long i, atomic_long_t *l)
+{
+        atomic_t *v = (atomic_t *)l;
+        atomic_sub(i, v);
+}
+#endif
+#endif
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 094d4917c1a9..35de20cf8fac 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -10,6 +10,8 @@
 #define ALIGN_FUNCTION()  . = ALIGN(8)
 #define RODATA                                                          \
+        . = ALIGN(4096);                                                \
+        __start_rodata = .;                                             \
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                *(.rodata) *(.rodata.*)                                 \
                *(__vermagic)           /* Kernel version magic */      \
@@ -74,6 +76,8 @@
        __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
                *(__ksymtab_strings)                                    \
        }                                                               \
+        __end_rodata = .;                                               \
+        . = ALIGN(4096);                                                \
                                                                        \
        /* Built-in module parameters. */                               \
        __param : AT(ADDR(__param) - LOAD_OFFSET) {                     \
diff --git a/include/asm-h8300/atomic.h b/include/asm-h8300/atomic.h
index f23d86819ea8..d891541e89c3 100644
--- a/include/asm-h8300/atomic.h
+++ b/include/asm-h8300/atomic.h
@@ -137,4 +137,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v)
 #define smp_mb__before_atomic_inc()    barrier()
 #define smp_mb__after_atomic_inc() barrier()
+#include <asm-generic/atomic.h>
 #endif /* __ARCH_H8300_ATOMIC __ */
diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h
index 5027181ed067..73065f5bda0e 100644
--- a/include/asm-h8300/irq.h
+++ b/include/asm-h8300/irq.h
@@ -61,11 +61,6 @@ static __inline__ int irq_canonicalize(int irq)
 extern void enable_irq(unsigned int);
 extern void disable_irq(unsigned int);
-/*
- * Some drivers want these entry points
- */
-#define enable_irq_nosync(x)    enable_irq(x)
 #define disable_irq_nosync(x)   disable_irq(x)
 struct irqaction;
diff --git a/include/asm-h8300/mman.h b/include/asm-h8300/mman.h
index 63f727a59850..744a8fb485c2 100644
--- a/include/asm-h8300/mman.h
+++ b/include/asm-h8300/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h
index c68557aa04b2..7a5472d77091 100644
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -254,4 +254,5 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 4807aa1d2e3d..65679aca4b22 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -332,9 +332,9 @@ static inline unsigned long __ffs(unsigned long word)
 * Returns the bit-number of the first set bit, not the number of the byte
 * containing a bit.
 */
-static inline int find_first_bit(const unsigned long *addr, unsigned size)
+static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
 {
-        int x = 0;
+        unsigned x = 0;
        while (x < size) {
                unsigned long val = *addr++;
@@ -367,11 +367,6 @@ static inline unsigned long ffz(unsigned long word)
        return word;
 }
-/*
- * fls: find last bit set.
- */
-#define fls(x) generic_fls(x)
 #define fls64(x)   generic_fls64(x)
 #ifdef __KERNEL__
@@ -415,6 +410,23 @@ static inline int ffs(int x)
 }
 /**
+ * fls - find last bit set
+ * @x: the word to search
+ *
+ * This is defined the same way as ffs.
+ */
+static inline int fls(int x)
+{
+        int r;
+        __asm__("bsrl %1,%0\n\t"
+                "jnz 1f\n\t"
+                "movl $-1,%0\n"
+                "1:" : "=r" (r) : "rm" (x));
+        return r+1;
+}
+/**
 * hweightN - returns the hamming weight of a N-bit word
 * @x: the word to weigh
 *
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h
index ea54540638d2..50233e0345fb 100644
--- a/include/asm-i386/bugs.h
+++ b/include/asm-i386/bugs.h
@@ -8,9 +8,6 @@
 *        <rreilova@ececs.uc.edu>
 *      - Channing Corn (tests & fixes),
 *      - Andrew D. Balsa (code cleanup).
- *
- *  Pentium III FXSR, SSE support
- *      Gareth Hughes <gareth@valinux.com>, May 2000
 */
 /*
@@ -76,25 +73,7 @@ static void __init check_fpu(void)
                return;
        }
-/* Enable FXSR and company _before_ testing for FP problems. */
+/* trap_init() enabled FXSR and company _before_ testing for FP problems here. */
-        /*
-         * Verify that the FXSAVE/FXRSTOR data will be 16-byte aligned.
-         */
-        if (offsetof(struct task_struct, thread.i387.fxsave) & 15) {
-                extern void __buggy_fxsr_alignment(void);
-                __buggy_fxsr_alignment();
-        }
-        if (cpu_has_fxsr) {
-                printk(KERN_INFO "Enabling fast FPU save and restore... ");
-                set_in_cr4(X86_CR4_OSFXSR);
-                printk("done.\n");
-        }
-        if (cpu_has_xmm) {
-                printk(KERN_INFO "Enabling unmasked SIMD FPU exception support... ");
-                set_in_cr4(X86_CR4_OSXMMEXCPT);
-                printk("done.\n");
-        }
        /* Test for the divl bug.. */
        __asm__("fninit\n\t"
                "fldl %1\n\t"
diff --git a/include/asm-i386/cacheflush.h b/include/asm-i386/cacheflush.h
index 2ea36dea37d9..7199f7b326f1 100644
--- a/include/asm-i386/cacheflush.h
+++ b/include/asm-i386/cacheflush.h
@@ -31,4 +31,8 @@ int change_page_attr(struct page *page, int numpages, pgprot_t prot);
 void kernel_map_pages(struct page *page, int numpages, int enable);
 #endif
+#ifdef CONFIG_DEBUG_RODATA
+void mark_rodata_ro(void);
+#endif
 #endif /* _I386_CACHEFLUSH_H */
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h
index 29b851a18c6e..494e73bca095 100644
--- a/include/asm-i386/desc.h
+++ b/include/asm-i386/desc.h
@@ -15,9 +15,6 @@
 #include <asm/mmu.h>
 extern struct desc_struct cpu_gdt_table[GDT_ENTRIES];
-DECLARE_PER_CPU(struct desc_struct, cpu_gdt_table[GDT_ENTRIES]);
-#define get_cpu_gdt_table(_cpu) (per_cpu(cpu_gdt_table,_cpu))
 DECLARE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]);
@@ -29,6 +26,11 @@ struct Xgt_desc_struct {
 extern struct Xgt_desc_struct idt_descr, cpu_gdt_descr[NR_CPUS];
+static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
+{
+        return ((struct desc_struct *)cpu_gdt_descr[cpu].address);
+}
 #define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8))
 #define load_LDT_desc() __asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8))
diff --git a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-i386/mach-bigsmp/mach_apic.h
index ba936d4daedb..18b19a773440 100644
--- a/include/asm-i386/mach-bigsmp/mach_apic.h
+++ b/include/asm-i386/mach-bigsmp/mach_apic.h
@@ -1,17 +1,10 @@
 #ifndef __ASM_MACH_APIC_H
 #define __ASM_MACH_APIC_H
-#include <asm/smp.h>
-#define SEQUENTIAL_APICID
+extern u8 bios_cpu_apicid[];
-#ifdef SEQUENTIAL_APICID
-#define xapic_phys_to_log_apicid(phys_apic) ( (1ul << ((phys_apic) & 0x3)) |\
+#define xapic_phys_to_log_apicid(cpu) (bios_cpu_apicid[cpu])
-                ((phys_apic<<2) & (~0xf)) )
-#elif CLUSTERED_APICID
-#define xapic_phys_to_log_apicid(phys_apic) ( (1ul << ((phys_apic) & 0x3)) |\
-                ((phys_apic) & (~0xf)) )
-#endif
-#define NO_BALANCE_IRQ (1)
 #define esr_disable (1)
 static inline int apic_id_registered(void)
@@ -19,7 +12,6 @@ static inline int apic_id_registered(void)
        return (1);
 }
-#define APIC_DFR_VALUE  (APIC_DFR_CLUSTER)
 /* Round robin the irqs amoung the online cpus */
 static inline cpumask_t target_cpus(void)
 { 
@@ -32,29 +24,34 @@ static inline cpumask_t target_cpus(void)
        } while (cpu >= NR_CPUS);
        return cpumask_of_cpu(cpu);
 }
-#define TARGET_CPUS     (target_cpus())
-#define INT_DELIVERY_MODE dest_Fixed
+#undef APIC_DEST_LOGICAL
-#define INT_DEST_MODE 1     /* logical delivery broadcast to all procs */
+#define APIC_DEST_LOGICAL       0
+#define TARGET_CPUS             (target_cpus())
+#define APIC_DFR_VALUE          (APIC_DFR_FLAT)
+#define INT_DELIVERY_MODE       (dest_Fixed)
+#define INT_DEST_MODE           (0)    /* phys delivery to target proc */
+#define NO_BALANCE_IRQ          (0)
+#define WAKE_SECONDARY_VIA_INIT
 static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
 {
-        return 0;
+        return (0);
 }
-/* we don't use the phys_cpu_present_map to indicate apicid presence */
+static inline unsigned long check_apicid_present(int bit)
-static inline unsigned long check_apicid_present(int bit) 
 {
-        return 1;
+        return (1);
 }
-#define apicid_cluster(apicid) (apicid & 0xF0)
+static inline unsigned long calculate_ldr(int cpu)
-static inline unsigned long calculate_ldr(unsigned long old)
 {
-        unsigned long id;
+        unsigned long val, id;
-        id = xapic_phys_to_log_apicid(hard_smp_processor_id());
+        val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
-        return ((old & ~APIC_LDR_MASK) | SET_APIC_LOGICAL_ID(id));
+        id = xapic_phys_to_log_apicid(cpu);
+        val |= SET_APIC_LOGICAL_ID(id);
+        return val;
 }
 /*
@@ -67,37 +64,35 @@ static inline unsigned long calculate_ldr(unsigned long old)
 static inline void init_apic_ldr(void)
 {
        unsigned long val;
+        int cpu = smp_processor_id();
        apic_write_around(APIC_DFR, APIC_DFR_VALUE);
-        val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
+        val = calculate_ldr(cpu);
-        val = calculate_ldr(val);
        apic_write_around(APIC_LDR, val);
 }
 static inline void clustered_apic_check(void)
 {
        printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
-                "Cluster", nr_ioapics);
+                "Physflat", nr_ioapics);
 }
 static inline int multi_timer_check(int apic, int irq)
 {
-        return 0;
+        return (0);
 }
 static inline int apicid_to_node(int logical_apicid)
 {
-        return 0;
+        return (0);
 }
-extern u8 bios_cpu_apicid[];
 static inline int cpu_present_to_apicid(int mps_cpu)
 {
        if (mps_cpu < NR_CPUS)
-                return (int)bios_cpu_apicid[mps_cpu];
+                return (int) bios_cpu_apicid[mps_cpu];
-        else
-                return BAD_APICID;
+        return BAD_APICID;
 }
 static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
@@ -109,10 +104,10 @@ extern u8 cpu_2_logical_apicid[];
 /* Mapping from cpu number to logical apicid */
 static inline int cpu_to_logical_apicid(int cpu)
 {
-       if (cpu >= NR_CPUS)
+        if (cpu >= NR_CPUS)
-               return BAD_APICID;
+                return BAD_APICID;
-       return (int)cpu_2_logical_apicid[cpu];
+        return cpu_physical_id(cpu);
- }
+}
 static inline int mpc_apic_id(struct mpc_config_processor *m,
                        struct mpc_config_translation *translation_record)
@@ -128,11 +123,9 @@ static inline int mpc_apic_id(struct mpc_config_processor *m,
 static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
 {
        /* For clustered we don't have a good way to do this yet - hack */
-        return physids_promote(0xFUL);
+        return physids_promote(0xFFL);
 }
-#define WAKE_SECONDARY_VIA_INIT
 static inline void setup_portio_remap(void)
 {
 }
diff --git a/include/asm-i386/mach-bigsmp/mach_apicdef.h b/include/asm-i386/mach-bigsmp/mach_apicdef.h
index 23e58b317c79..a58ab5a75c8c 100644
--- a/include/asm-i386/mach-bigsmp/mach_apicdef.h
+++ b/include/asm-i386/mach-bigsmp/mach_apicdef.h
@@ -1,11 +1,11 @@
 #ifndef __ASM_MACH_APICDEF_H
 #define __ASM_MACH_APICDEF_H
-#define         APIC_ID_MASK            (0x0F<<24)
+#define         APIC_ID_MASK            (0xFF<<24)
 static inline unsigned get_apic_id(unsigned long x) 
 { 
-        return (((x)>>24)&0x0F);
+        return (((x)>>24)&0xFF);
 } 
 #define         GET_APIC_ID(x)  get_apic_id(x)
diff --git a/include/asm-i386/mman.h b/include/asm-i386/mman.h
index 196619a83854..ba4941e6f643 100644
--- a/include/asm-i386/mman.h
+++ b/include/asm-i386/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 620a90641ea8..74f595d80579 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -76,11 +76,6 @@ static inline int pfn_to_nid(unsigned long pfn)
 * Following are macros that each numa implmentation must define.
 */
-/*
- * Given a kernel address, find the home node of the underlying memory.
- */
-#define kvaddr_to_nid(kaddr)    pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT)
 #define node_start_pfn(nid)     (NODE_DATA(nid)->node_start_pfn)
 #define node_end_pfn(nid)                                               \
 ({                                                                      \
diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h
index eb7f2b4234aa..424661d25bd3 100644
--- a/include/asm-i386/module.h
+++ b/include/asm-i386/module.h
@@ -52,8 +52,10 @@ struct mod_arch_specific
 #define MODULE_PROC_FAMILY "CYRIXIII "
 #elif defined CONFIG_MVIAC3_2
 #define MODULE_PROC_FAMILY "VIAC3-2 "
-#elif CONFIG_MGEODEGX1
+#elif defined CONFIG_MGEODEGX1
 #define MODULE_PROC_FAMILY "GEODEGX1 "
+#elif defined CONFIG_MGEODE_LX
+#define MODULE_PROC_FAMILY "GEODE "
 #else
 #error unknown processor family
 #endif
diff --git a/include/asm-i386/mpspec_def.h b/include/asm-i386/mpspec_def.h
index a961093dbf88..76feedf85a8a 100644
--- a/include/asm-i386/mpspec_def.h
+++ b/include/asm-i386/mpspec_def.h
@@ -75,7 +75,7 @@ struct mpc_config_bus
 {
        unsigned char mpc_type;
        unsigned char mpc_busid;
-        unsigned char mpc_bustype[6] __attribute((packed));
+        unsigned char mpc_bustype[6];
 };
 /* List of Bus Type string values, Intel MP Spec. */
diff --git a/include/asm-i386/segment.h b/include/asm-i386/segment.h
index bb5ff5b2c02e..faf995307b9e 100644
--- a/include/asm-i386/segment.h
+++ b/include/asm-i386/segment.h
@@ -91,6 +91,20 @@
 #define GDT_ENTRY_BOOT_DS               (GDT_ENTRY_BOOT_CS + 1)
 #define __BOOT_DS       (GDT_ENTRY_BOOT_DS * 8)
+/* The PnP BIOS entries in the GDT */
+#define GDT_ENTRY_PNPBIOS_CS32          (GDT_ENTRY_PNPBIOS_BASE + 0)
+#define GDT_ENTRY_PNPBIOS_CS16          (GDT_ENTRY_PNPBIOS_BASE + 1)
+#define GDT_ENTRY_PNPBIOS_DS            (GDT_ENTRY_PNPBIOS_BASE + 2)
+#define GDT_ENTRY_PNPBIOS_TS1           (GDT_ENTRY_PNPBIOS_BASE + 3)
+#define GDT_ENTRY_PNPBIOS_TS2           (GDT_ENTRY_PNPBIOS_BASE + 4)
+/* The PnP BIOS selectors */
+#define PNP_CS32   (GDT_ENTRY_PNPBIOS_CS32 * 8) /* segment for calling fn */
+#define PNP_CS16   (GDT_ENTRY_PNPBIOS_CS16 * 8) /* code segment for BIOS */
+#define PNP_DS     (GDT_ENTRY_PNPBIOS_DS * 8)   /* data segment for BIOS */
+#define PNP_TS1    (GDT_ENTRY_PNPBIOS_TS1 * 8)  /* transfer data segment */
+#define PNP_TS2    (GDT_ENTRY_PNPBIOS_TS2 * 8)  /* another data segment */
 /*
 * The interrupt descriptor table has room for 256 idt's,
 * the global descriptor table is dependent on the number
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 772f85da1206..9c0593b7a94e 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -54,23 +54,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t" \
        ); } while(0)
 #define set_base(ldt,base) _set_base( ((char *)&(ldt)) , (base) )
-#define set_limit(ldt,limit) _set_limit( ((char *)&(ldt)) , ((limit)-1)>>12 )
+#define set_limit(ldt,limit) _set_limit( ((char *)&(ldt)) , ((limit)-1) )
-static inline unsigned long _get_base(char * addr)
-{
-        unsigned long __base;
-        __asm__("movb %3,%%dh\n\t"
-                "movb %2,%%dl\n\t"
-                "shll $16,%%edx\n\t"
-                "movw %1,%%dx"
-                :"=&d" (__base)
-                :"m" (*((addr)+2)),
-                 "m" (*((addr)+4)),
-                 "m" (*((addr)+7)));
-        return __base;
-}
-#define get_base(ldt) _get_base( ((char *)&(ldt)) )
 /*
 * Load a segment. Fall back on loading the zero
@@ -140,6 +124,19 @@ static inline unsigned long _get_base(char * addr)
                :"=r" (__dummy)); \
        __dummy; \
 })
+#define read_cr4_safe() ({                            \
+        unsigned int __dummy;                         \
+        /* This could fault if %cr4 does not exist */ \
+        __asm__("1: movl %%cr4, %0              \n"   \
+                "2:                             \n"   \
+                ".section __ex_table,\"a\"      \n"   \
+                ".long 1b,2b                    \n"   \
+                ".previous                      \n"   \
+                : "=r" (__dummy): "0" (0));           \
+        __dummy;                                      \
+})
 #define write_cr4(x) \
        __asm__ __volatile__("movl %0,%%cr4": :"r" (x));
 #define stts() write_cr0(8 | read_cr0())
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 0f92e78dfea1..fe38b9a96233 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -256,7 +256,7 @@
 #define __NR_io_submit          248
 #define __NR_io_cancel          249
 #define __NR_fadvise64          250
-#define __NR_set_zone_reclaim   251
+/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
 #define __NR_exit_group         252
 #define __NR_lookup_dcookie     253
 #define __NR_epoll_create       254
diff --git a/include/asm-ia64/atomic.h b/include/asm-ia64/atomic.h
index 2fbebf85c31d..15cf7984c48e 100644
--- a/include/asm-ia64/atomic.h
+++ b/include/asm-ia64/atomic.h
@@ -192,4 +192,5 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* _ASM_IA64_ATOMIC_H */
diff --git a/include/asm-ia64/mman.h b/include/asm-ia64/mman.h
index 1c0a73af1461..828beb24a20e 100644
--- a/include/asm-ia64/mman.h
+++ b/include/asm-ia64/mman.h
@@ -43,6 +43,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 6d96a67439be..2bf543493cb8 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -265,7 +265,7 @@
 #define __NR_keyctl                     1273
 #define __NR_ioprio_set                 1274
 #define __NR_ioprio_get                 1275
-#define __NR_set_zone_reclaim           1276
+/* 1276 is available for reuse (was briefly sys_set_zone_reclaim) */
 #define __NR_inotify_init               1277
 #define __NR_inotify_add_watch          1278
 #define __NR_inotify_rm_watch           1279
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h
index e1dff9d6baad..b7f4d8aaeb46 100644
--- a/include/asm-m32r/assembler.h
+++ b/include/asm-m32r/assembler.h
@@ -52,7 +52,7 @@
        or3     \reg, \reg, #low(\x)
        .endm
-#if !defined(CONFIG_CHIP_M32102)
+#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
 #define STI(reg) STI_M reg
        .macro STI_M reg
        setpsw  #0x40       ->  nop
@@ -64,7 +64,7 @@
        clrpsw  #0x40       ->  nop
        ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1).
        .endm
-#else   /* CONFIG_CHIP_M32102 */
+#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 #define STI(reg) STI_M reg
        .macro STI_M reg
        mvfc    \reg, psw
@@ -191,12 +191,12 @@
        and  \reg, sp
        .endm
-#if !defined(CONFIG_CHIP_M32102)
+#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
        .macro  SWITCH_TO_KERNEL_STACK
        ; switch to kernel stack (spi)
        clrpsw  #0x80       ->  nop
        .endm
-#else   /* CONFIG_CHIP_M32102 */
+#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
        .macro  SWITCH_TO_KERNEL_STACK
        push    r0              ; save r0 for working
        mvfc    r0, psw
@@ -218,7 +218,7 @@
        .fillinsn
 2:
        .endm
-#endif  /* CONFIG_CHIP_M32102 */
+#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 #endif  /* __ASSEMBLY__ */
diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h
index ef1fb8ea4726..70761278b6cb 100644
--- a/include/asm-m32r/atomic.h
+++ b/include/asm-m32r/atomic.h
@@ -313,4 +313,5 @@ static __inline__ void atomic_set_mask(unsigned long  mask, atomic_t *addr)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif  /* _ASM_M32R_ATOMIC_H */
diff --git a/include/asm-m32r/cacheflush.h b/include/asm-m32r/cacheflush.h
index 46fc4c325108..e57427b6e249 100644
--- a/include/asm-m32r/cacheflush.h
+++ b/include/asm-m32r/cacheflush.h
@@ -7,7 +7,7 @@
 extern void _flush_cache_all(void);
 extern void _flush_cache_copyback_all(void);
-#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_OPSP)
+#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
diff --git a/include/asm-m32r/irq.h b/include/asm-m32r/irq.h
index 8ed77968ecb4..ca943954572a 100644
--- a/include/asm-m32r/irq.h
+++ b/include/asm-m32r/irq.h
@@ -65,6 +65,22 @@
 #define NR_IRQS \
        (OPSPUT_NUM_CPU_IRQ + OPSPUT_NUM_PLD_IRQ \
        + OPSPUT_NUM_LCD_PLD_IRQ + OPSPUT_NUM_LAN_PLD_IRQ)
+#elif defined(CONFIG_PLAT_M32104UT)
+/*
+ * IRQ definitions for M32104UT
+ *  M32104 Chip: 64 interrupts
+ *  ICU of M32104UT-on-board PLD: 32 interrupts cascaded to INT1# chip pin
+ */
+#define M32104UT_NUM_CPU_IRQ    (64)
+#define M32104UT_NUM_PLD_IRQ    (32)
+#define M32104UT_IRQ_BASE       0
+#define M32104UT_CPU_IRQ_BASE   M32104UT_IRQ_BASE
+#define M32104UT_PLD_IRQ_BASE   (M32104UT_CPU_IRQ_BASE + M32104UT_NUM_CPU_IRQ)
+#define NR_IRQS \
+    (M32104UT_NUM_CPU_IRQ + M32104UT_NUM_PLD_IRQ)
 #else
 #define NR_IRQS 64
 #endif
diff --git a/include/asm-m32r/m32102.h b/include/asm-m32r/m32102.h
index cb98101f4f6e..a1f0d1fe9eb8 100644
--- a/include/asm-m32r/m32102.h
+++ b/include/asm-m32r/m32102.h
@@ -11,7 +11,11 @@
 /*======================================================================*
 * Special Function Register
 *======================================================================*/
+#if !defined(CONFIG_CHIP_M32104)
 #define M32R_SFR_OFFSET  (0x00E00000)  /* 0x00E00000-0x00EFFFFF 1[MB] */
+#else
+#define M32R_SFR_OFFSET  (0x00700000)  /* 0x00700000-0x007FFFFF 1[MB] */
+#endif
 /*
 * Clock and Power Management registers.
@@ -100,7 +104,7 @@
 #define M32R_MFT5RLD_PORTL     (0x0C+M32R_MFT5_OFFSET)  /* MFT4 reload */
 #define M32R_MFT5CMPRLD_PORTL  (0x10+M32R_MFT5_OFFSET)  /* MFT4 compare reload */
-#ifdef CONFIG_CHIP_M32700
+#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32104)
 #define M32R_MFTCR_MFT0MSK  (1UL<<31)  /* b0 */
 #define M32R_MFTCR_MFT1MSK  (1UL<<30)  /* b1 */
 #define M32R_MFTCR_MFT2MSK  (1UL<<29)  /* b2 */
@@ -113,7 +117,7 @@
 #define M32R_MFTCR_MFT3EN   (1UL<<20)  /* b11 */
 #define M32R_MFTCR_MFT4EN   (1UL<<19)  /* b12 */
 #define M32R_MFTCR_MFT5EN   (1UL<<18)  /* b13 */
-#else   /* not CONFIG_CHIP_M32700 */
+#else   /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
 #define M32R_MFTCR_MFT0MSK  (1UL<<15)  /* b16 */
 #define M32R_MFTCR_MFT1MSK  (1UL<<14)  /* b17 */
 #define M32R_MFTCR_MFT2MSK  (1UL<<13)  /* b18 */
@@ -126,7 +130,7 @@
 #define M32R_MFTCR_MFT3EN   (1UL<<4)   /* b27 */
 #define M32R_MFTCR_MFT4EN   (1UL<<3)   /* b28 */
 #define M32R_MFTCR_MFT5EN   (1UL<<2)   /* b29 */
-#endif  /* not CONFIG_CHIP_M32700 */
+#endif  /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
 #define M32R_MFTMOD_CC_MASK    (1UL<<15)  /* b16 */
 #define M32R_MFTMOD_TCCR       (1UL<<13)  /* b18 */
@@ -241,8 +245,24 @@
 #define M32R_IRQ_MFT1    (17)  /* MFT1 */
 #define M32R_IRQ_MFT2    (18)  /* MFT2 */
 #define M32R_IRQ_MFT3    (19)  /* MFT3 */
-#define M32R_IRQ_MFT4    (20)  /* MFT4 */
+#ifdef CONFIG_CHIP_M32104
-#define M32R_IRQ_MFT5    (21)  /* MFT5 */
+#define M32R_IRQ_MFTX0   (24)  /* MFTX0 */
+#define M32R_IRQ_MFTX1   (25)  /* MFTX1 */
+#define M32R_IRQ_DMA0    (32)  /* DMA0 */
+#define M32R_IRQ_DMA1    (33)  /* DMA1 */
+#define M32R_IRQ_DMA2    (34)  /* DMA2 */
+#define M32R_IRQ_DMA3    (35)  /* DMA3 */
+#define M32R_IRQ_SIO0_R  (40)  /* SIO0 send    */
+#define M32R_IRQ_SIO0_S  (41)  /* SIO0 receive */
+#define M32R_IRQ_SIO1_R  (42)  /* SIO1 send    */
+#define M32R_IRQ_SIO1_S  (43)  /* SIO1 receive */
+#define M32R_IRQ_SIO2_R  (44)  /* SIO2 send    */
+#define M32R_IRQ_SIO2_S  (45)  /* SIO2 receive */
+#define M32R_IRQ_SIO3_R  (46)  /* SIO3 send    */
+#define M32R_IRQ_SIO3_S  (47)  /* SIO3 receive */
+#define M32R_IRQ_ADC     (56)  /* ADC */
+#define M32R_IRQ_PC      (57)  /* PC */
+#else /* ! M32104 */
 #define M32R_IRQ_DMA0    (32)  /* DMA0 */
 #define M32R_IRQ_DMA1    (33)  /* DMA1 */
 #define M32R_IRQ_SIO0_R  (48)  /* SIO0 send    */
@@ -255,6 +275,7 @@
 #define M32R_IRQ_SIO3_S  (55)  /* SIO3 receive */
 #define M32R_IRQ_SIO4_R  (56)  /* SIO4 send    */
 #define M32R_IRQ_SIO4_S  (57)  /* SIO4 receive */
+#endif /* ! M32104 */
 #ifdef CONFIG_SMP
 #define M32R_IRQ_IPI0    (56)
@@ -281,15 +302,12 @@
 #define M32R_FPGA_VERSION0_PORTL    (0x30+M32R_FPGA_TOP)
 #define M32R_FPGA_VERSION1_PORTL    (0x34+M32R_FPGA_TOP)
+#endif /* CONFIG_SMP */
 #ifndef __ASSEMBLY__
-/* For NETDEV WATCHDOG */
 typedef struct {
        unsigned long icucr;    /* ICU Control Register */
 } icu_data_t;
-extern icu_data_t icu_data[];
 #endif
-#endif /* CONFIG_SMP */
 #endif /* _M32102_H_ */
diff --git a/include/asm-m32r/m32104ut/m32104ut_pld.h b/include/asm-m32r/m32104ut/m32104ut_pld.h
new file mode 100644
index 000000000000..a4eac20553df
--- /dev/null
+++ b/include/asm-m32r/m32104ut/m32104ut_pld.h
@@ -0,0 +1,163 @@
+/*
+ * include/asm/m32104ut/m32104ut_pld.h
+ *
+ * Definitions for Programable Logic Device(PLD) on M32104UT board.
+ * Based on m32700ut_pld.h
+ *
+ * Copyright (c) 2002   Takeo Takahashi
+ * Copyright (c) 2005   Naoto Sugai
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file "COPYING" in the main directory of
+ * this archive for more details.
+ */
+#ifndef _M32104UT_M32104UT_PLD_H
+#define _M32104UT_M32104UT_PLD_H
+#include <linux/config.h>
+#if defined(CONFIG_PLAT_M32104UT)
+#define PLD_PLAT_BASE           0x02c00000
+#else
+#error "no platform configuration"
+#endif
+#ifndef __ASSEMBLY__
+/*
+ * C functions use non-cache address.
+ */
+#define PLD_BASE                (PLD_PLAT_BASE /* + NONCACHE_OFFSET */)
+#define __reg8                  (volatile unsigned char *)
+#define __reg16                 (volatile unsigned short *)
+#define __reg32                 (volatile unsigned int *)
+#else
+#define PLD_BASE                (PLD_PLAT_BASE + NONCACHE_OFFSET)
+#define __reg8
+#define __reg16
+#define __reg32
+#endif  /* __ASSEMBLY__ */
+/* CFC */
+#define PLD_CFRSTCR             __reg16(PLD_BASE + 0x0000)
+#define PLD_CFSTS               __reg16(PLD_BASE + 0x0002)
+#define PLD_CFIMASK             __reg16(PLD_BASE + 0x0004)
+#define PLD_CFBUFCR             __reg16(PLD_BASE + 0x0006)
+/* MMC */
+#define PLD_MMCCR               __reg16(PLD_BASE + 0x4000)
+#define PLD_MMCMOD              __reg16(PLD_BASE + 0x4002)
+#define PLD_MMCSTS              __reg16(PLD_BASE + 0x4006)
+#define PLD_MMCBAUR             __reg16(PLD_BASE + 0x400a)
+#define PLD_MMCCMDBCUT          __reg16(PLD_BASE + 0x400c)
+#define PLD_MMCCDTBCUT          __reg16(PLD_BASE + 0x400e)
+#define PLD_MMCDET              __reg16(PLD_BASE + 0x4010)
+#define PLD_MMCWP               __reg16(PLD_BASE + 0x4012)
+#define PLD_MMCWDATA            __reg16(PLD_BASE + 0x5000)
+#define PLD_MMCRDATA            __reg16(PLD_BASE + 0x6000)
+#define PLD_MMCCMDDATA          __reg16(PLD_BASE + 0x7000)
+#define PLD_MMCRSPDATA          __reg16(PLD_BASE + 0x7006)
+/* ICU
+ *  ICUISTS:    status register
+ *  ICUIREQ0:   request register
+ *  ICUIREQ1:   request register
+ *  ICUCR3:     control register for CFIREQ# interrupt
+ *  ICUCR4:     control register for CFC Card insert interrupt
+ *  ICUCR5:     control register for CFC Card eject interrupt
+ *  ICUCR6:     control register for external interrupt
+ *  ICUCR11:    control register for MMC Card insert/eject interrupt
+ *  ICUCR13:    control register for SC error interrupt
+ *  ICUCR14:    control register for SC receive interrupt
+ *  ICUCR15:    control register for SC send interrupt
+ */
+#define PLD_IRQ_INT0            (M32104UT_PLD_IRQ_BASE + 0)     /* None */
+#define PLD_IRQ_CFIREQ          (M32104UT_PLD_IRQ_BASE + 3)     /* CF IREQ */
+#define PLD_IRQ_CFC_INSERT      (M32104UT_PLD_IRQ_BASE + 4)     /* CF Insert */
+#define PLD_IRQ_CFC_EJECT       (M32104UT_PLD_IRQ_BASE + 5)     /* CF Eject */
+#define PLD_IRQ_EXINT           (M32104UT_PLD_IRQ_BASE + 6)     /* EXINT */
+#define PLD_IRQ_MMCCARD         (M32104UT_PLD_IRQ_BASE + 11)    /* MMC Insert/Eject */
+#define PLD_IRQ_SC_ERROR        (M32104UT_PLD_IRQ_BASE + 13)    /* SC error */
+#define PLD_IRQ_SC_RCV          (M32104UT_PLD_IRQ_BASE + 14)    /* SC receive */
+#define PLD_IRQ_SC_SND          (M32104UT_PLD_IRQ_BASE + 15)    /* SC send */
+#define PLD_ICUISTS             __reg16(PLD_BASE + 0x8002)
+#define PLD_ICUISTS_VECB_MASK   (0xf000)
+#define PLD_ICUISTS_VECB(x)     ((x) & PLD_ICUISTS_VECB_MASK)
+#define PLD_ICUISTS_ISN_MASK    (0x07c0)
+#define PLD_ICUISTS_ISN(x)      ((x) & PLD_ICUISTS_ISN_MASK)
+#define PLD_ICUCR3              __reg16(PLD_BASE + 0x8104)
+#define PLD_ICUCR4              __reg16(PLD_BASE + 0x8106)
+#define PLD_ICUCR5              __reg16(PLD_BASE + 0x8108)
+#define PLD_ICUCR6              __reg16(PLD_BASE + 0x810a)
+#define PLD_ICUCR11             __reg16(PLD_BASE + 0x8114)
+#define PLD_ICUCR13             __reg16(PLD_BASE + 0x8118)
+#define PLD_ICUCR14             __reg16(PLD_BASE + 0x811a)
+#define PLD_ICUCR15             __reg16(PLD_BASE + 0x811c)
+#define PLD_ICUCR_IEN           (0x1000)
+#define PLD_ICUCR_IREQ          (0x0100)
+#define PLD_ICUCR_ISMOD00       (0x0000)        /* Low edge */
+#define PLD_ICUCR_ISMOD01       (0x0010)        /* Low level */
+#define PLD_ICUCR_ISMOD02       (0x0020)        /* High edge */
+#define PLD_ICUCR_ISMOD03       (0x0030)        /* High level */
+#define PLD_ICUCR_ILEVEL0       (0x0000)
+#define PLD_ICUCR_ILEVEL1       (0x0001)
+#define PLD_ICUCR_ILEVEL2       (0x0002)
+#define PLD_ICUCR_ILEVEL3       (0x0003)
+#define PLD_ICUCR_ILEVEL4       (0x0004)
+#define PLD_ICUCR_ILEVEL5       (0x0005)
+#define PLD_ICUCR_ILEVEL6       (0x0006)
+#define PLD_ICUCR_ILEVEL7       (0x0007)
+/* Power Control of MMC and CF */
+#define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
+#define PLD_CPCR_CDP            0x0001
+/* LED Control
+ *
+ * 1: DIP swich side
+ * 2: Reset switch side
+ */
+#define PLD_IOLEDCR             __reg16(PLD_BASE + 0x14002)
+#define PLD_IOLED_1_ON          0x001
+#define PLD_IOLED_1_OFF         0x000
+#define PLD_IOLED_2_ON          0x002
+#define PLD_IOLED_2_OFF         0x000
+/* DIP Switch
+ *  0: Write-protect of Flash Memory (0:protected, 1:non-protected)
+ *  1: -
+ *  2: -
+ *  3: -
+ */
+#define PLD_IOSWSTS             __reg16(PLD_BASE + 0x14004)
+#define PLD_IOSWSTS_IOSW2       0x0200
+#define PLD_IOSWSTS_IOSW1       0x0100
+#define PLD_IOSWSTS_IOWP0       0x0001
+/* CRC */
+#define PLD_CRC7DATA            __reg16(PLD_BASE + 0x18000)
+#define PLD_CRC7INDATA          __reg16(PLD_BASE + 0x18002)
+#define PLD_CRC16DATA           __reg16(PLD_BASE + 0x18004)
+#define PLD_CRC16INDATA         __reg16(PLD_BASE + 0x18006)
+#define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
+#define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
+/* RTC */
+#define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
+#define PLD_RTCBAUR             __reg16(PLD_BASE + 0x1c002)
+#define PLD_RTCWRDATA           __reg16(PLD_BASE + 0x1c004)
+#define PLD_RTCRDDATA           __reg16(PLD_BASE + 0x1c006)
+#define PLD_RTCRSTODT           __reg16(PLD_BASE + 0x1c008)
+/* SIM Card */
+#define PLD_SCCR                __reg16(PLD_BASE + 0x38000)
+#define PLD_SCMOD               __reg16(PLD_BASE + 0x38004)
+#define PLD_SCSTS               __reg16(PLD_BASE + 0x38006)
+#define PLD_SCINTCR             __reg16(PLD_BASE + 0x38008)
+#define PLD_SCBAUR              __reg16(PLD_BASE + 0x3800a)
+#define PLD_SCTXB               __reg16(PLD_BASE + 0x3800c)
+#define PLD_SCRXB               __reg16(PLD_BASE + 0x3800e)
+#endif  /* _M32104UT_M32104UT_PLD_H */
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h
index ec142be00862..b133ca61acf1 100644
--- a/include/asm-m32r/m32r.h
+++ b/include/asm-m32r/m32r.h
@@ -14,7 +14,7 @@
 #include <asm/m32r_mp_fpga.h>
 #elif defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \
        || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \
-        || defined(CONFIG_CHIP_OPSP)
+        || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
 #include <asm/m32102.h>
 #endif
@@ -43,6 +43,10 @@
 #include <asm/m32700ut/m32700ut_pld.h>
 #endif
+#if defined(CONFIG_PLAT_M32104UT)
+#include <asm/m32104ut/m32104ut_pld.h>
+#endif  /* CONFIG_PLAT_M32104 */
 /*
 * M32R Register
 */
@@ -122,7 +126,7 @@
 #include <asm/page.h>
 #ifdef CONFIG_MMU
-#define NONCACHE_OFFSET  __PAGE_OFFSET+0x20000000
+#define NONCACHE_OFFSET  (__PAGE_OFFSET + 0x20000000)
 #else
 #define NONCACHE_OFFSET  __PAGE_OFFSET
 #endif /* CONFIG_MMU */
diff --git a/include/asm-m32r/mman.h b/include/asm-m32r/mman.h
index 011f6d9ec5cc..12e29747bc84 100644
--- a/include/asm-m32r/mman.h
+++ b/include/asm-m32r/mman.h
@@ -37,6 +37,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 5eee832b73a0..dcf619a0a0b0 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -69,12 +69,12 @@
 } while(0)
 /* Interrupt Control */
-#if !defined(CONFIG_CHIP_M32102)
+#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
 #define local_irq_enable() \
        __asm__ __volatile__ ("setpsw #0x40 -> nop": : :"memory")
 #define local_irq_disable() \
        __asm__ __volatile__ ("clrpsw #0x40 -> nop": : :"memory")
-#else   /* CONFIG_CHIP_M32102 */
+#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 static inline void local_irq_enable(void)
 {
        unsigned long tmpreg;
@@ -96,7 +96,7 @@ static inline void local_irq_disable(void)
                "mvtc   %0, psw \n\t"
        : "=&r" (tmpreg0), "=&r" (tmpreg1) : : "cbit", "memory");
 }
-#endif  /* CONFIG_CHIP_M32102 */
+#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 #define local_save_flags(x) \
        __asm__ __volatile__("mvfc %0,psw" : "=r"(x) : /* no input */)
@@ -105,13 +105,13 @@ static inline void local_irq_disable(void)
        __asm__ __volatile__("mvtc %0,psw" : /* no outputs */ \
                : "r" (x) : "cbit", "memory")
-#if !defined(CONFIG_CHIP_M32102)
+#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
 #define local_irq_save(x)                               \
        __asm__ __volatile__(                           \
                "mvfc   %0, psw;                \n\t"   \
                "clrpsw #0x40 -> nop;           \n\t"   \
                : "=r" (x) : /* no input */ : "memory")
-#else   /* CONFIG_CHIP_M32102 */
+#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 #define local_irq_save(x)                               \
        ({                                              \
                unsigned long tmpreg;                   \
@@ -124,7 +124,7 @@ static inline void local_irq_disable(void)
                        : "=r" (x), "=&r" (tmpreg)      \
                        : : "cbit", "memory");          \
        })
-#endif  /* CONFIG_CHIP_M32102 */
+#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
 #define irqs_disabled()                                 \
        ({                                              \
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index ac399e1f7bc0..39be87ca2a5a 100644
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -319,7 +319,7 @@ type name(void) \
 register long __scno __asm__ ("r7") = __NR_##name; \
 register long __res __asm__("r0"); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno) \
        : "memory"); \
@@ -332,7 +332,7 @@ type name(type1 arg1) \
 register long __scno __asm__ ("r7") = __NR_##name; \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res) \
        : "memory"); \
@@ -346,7 +346,7 @@ register long __scno __asm__ ("r7") = __NR_##name; \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2) \
        : "memory"); \
@@ -361,7 +361,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3) \
@@ -378,7 +378,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3), "r" (__arg4) \
@@ -397,7 +397,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-        "trap #" SYSCALL_VECTOR \
+        "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3), "r" (__arg4), "r" (__arg5) \
diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h
index e3c962eeabf3..b8a4e75d679d 100644
--- a/include/asm-m68k/atomic.h
+++ b/include/asm-m68k/atomic.h
@@ -157,4 +157,5 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* __ARCH_M68K_ATOMIC __ */
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 1f569905cb74..127ad190cf2d 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -70,8 +70,6 @@ static __inline__ int irq_canonicalize(int irq)
 extern void (*enable_irq)(unsigned int);
 extern void (*disable_irq)(unsigned int);
-#define disable_irq_nosync      disable_irq
 #define enable_irq_nosync       enable_irq
 struct pt_regs;
diff --git a/include/asm-m68k/mman.h b/include/asm-m68k/mman.h
index f831c4eeae6e..ea262ab88b3b 100644
--- a/include/asm-m68k/mman.h
+++ b/include/asm-m68k/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-m68knommu/atomic.h b/include/asm-m68knommu/atomic.h
index 3c1cc153c415..1702dbe9318c 100644
--- a/include/asm-m68knommu/atomic.h
+++ b/include/asm-m68knommu/atomic.h
@@ -143,4 +143,5 @@ static inline int atomic_sub_return(int i, atomic_t * v)
 #define atomic_dec_return(v) atomic_sub_return(1,(v))
 #define atomic_inc_return(v) atomic_add_return(1,(v))
+#include <asm-generic/atomic.h>
 #endif /* __ARCH_M68KNOMMU_ATOMIC __ */
diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h
index a08fa9b958da..20c48ec858a4 100644
--- a/include/asm-m68knommu/irq.h
+++ b/include/asm-m68knommu/irq.h
@@ -84,10 +84,8 @@ extern void (*mach_disable_irq)(unsigned int);
 /*
 * Some drivers want these entry points
 */
-#define enable_irq(x)   (mach_enable_irq  ? (*mach_enable_irq)(x)  : 0)
+#define enable_irq(x)   0
-#define disable_irq(x)  (mach_disable_irq ? (*mach_disable_irq)(x) : 0)
+#define disable_irq(x)  do { } while (0)
-#define enable_irq_nosync(x)    enable_irq(x)
 #define disable_irq_nosync(x)   disable_irq(x)
 struct irqaction;
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h
index 55c37c106ef0..92256e43a938 100644
--- a/include/asm-mips/atomic.h
+++ b/include/asm-mips/atomic.h
@@ -713,4 +713,5 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
 #define smp_mb__before_atomic_inc()     smp_mb()
 #define smp_mb__after_atomic_inc()      smp_mb()
+#include <asm-generic/atomic.h>
 #endif /* _ASM_ATOMIC_H */
diff --git a/include/asm-mips/mman.h b/include/asm-mips/mman.h
index 62060957ba93..dd17c8bd62a1 100644
--- a/include/asm-mips/mman.h
+++ b/include/asm-mips/mman.h
@@ -65,6 +65,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON       MAP_ANONYMOUS
diff --git a/include/asm-mips/riscos-syscall.h b/include/asm-mips/riscos-syscall.h
deleted file mode 100644
index 4d8eb15461eb..000000000000
--- a/include/asm-mips/riscos-syscall.h
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle
- */
-#ifndef _ASM_RISCOS_SYSCALL_H
-#define _ASM_RISCOS_SYSCALL_H
-/*
- * The syscalls 0 - 3999 are reserved for a down to the root syscall
- * compatibility with RISC/os and IRIX.  We'll see how to deal with the
- * various "real" BSD variants like Ultrix, NetBSD ...
- */
-/*
- * SVR4 syscalls are in the range from 1 to 999
- */
-#define __NR_SVR4                       0
-#define __NR_SVR4_syscall               (__NR_SVR4 +   0)
-#define __NR_SVR4_exit                  (__NR_SVR4 +   1)
-#define __NR_SVR4_fork                  (__NR_SVR4 +   2)
-#define __NR_SVR4_read                  (__NR_SVR4 +   3)
-#define __NR_SVR4_write                 (__NR_SVR4 +   4)
-#define __NR_SVR4_open                  (__NR_SVR4 +   5)
-#define __NR_SVR4_close                 (__NR_SVR4 +   6)
-#define __NR_SVR4_wait                  (__NR_SVR4 +   7)
-#define __NR_SVR4_creat                 (__NR_SVR4 +   8)
-#define __NR_SVR4_link                  (__NR_SVR4 +   9)
-#define __NR_SVR4_unlink                (__NR_SVR4 +  10)
-#define __NR_SVR4_exec                  (__NR_SVR4 +  11)
-#define __NR_SVR4_chdir                 (__NR_SVR4 +  12)
-#define __NR_SVR4_gtime                 (__NR_SVR4 +  13)
-#define __NR_SVR4_mknod                 (__NR_SVR4 +  14)
-#define __NR_SVR4_chmod                 (__NR_SVR4 +  15)
-#define __NR_SVR4_chown                 (__NR_SVR4 +  16)
-#define __NR_SVR4_sbreak                (__NR_SVR4 +  17)
-#define __NR_SVR4_stat                  (__NR_SVR4 +  18)
-#define __NR_SVR4_lseek                 (__NR_SVR4 +  19)
-#define __NR_SVR4_getpid                (__NR_SVR4 +  20)
-#define __NR_SVR4_mount                 (__NR_SVR4 +  21)
-#define __NR_SVR4_umount                (__NR_SVR4 +  22)
-#define __NR_SVR4_setuid                (__NR_SVR4 +  23)
-#define __NR_SVR4_getuid                (__NR_SVR4 +  24)
-#define __NR_SVR4_stime                 (__NR_SVR4 +  25)
-#define __NR_SVR4_ptrace                (__NR_SVR4 +  26)
-#define __NR_SVR4_alarm                 (__NR_SVR4 +  27)
-#define __NR_SVR4_fstat                 (__NR_SVR4 +  28)
-#define __NR_SVR4_pause                 (__NR_SVR4 +  29)
-#define __NR_SVR4_utime                 (__NR_SVR4 +  30)
-#define __NR_SVR4_stty                  (__NR_SVR4 +  31)
-#define __NR_SVR4_gtty                  (__NR_SVR4 +  32)
-#define __NR_SVR4_access                (__NR_SVR4 +  33)
-#define __NR_SVR4_nice                  (__NR_SVR4 +  34)
-#define __NR_SVR4_statfs                (__NR_SVR4 +  35)
-#define __NR_SVR4_sync                  (__NR_SVR4 +  36)
-#define __NR_SVR4_kill                  (__NR_SVR4 +  37)
-#define __NR_SVR4_fstatfs               (__NR_SVR4 +  38)
-#define __NR_SVR4_setpgrp               (__NR_SVR4 +  39)
-#define __NR_SVR4_cxenix                (__NR_SVR4 +  40)
-#define __NR_SVR4_dup                   (__NR_SVR4 +  41)
-#define __NR_SVR4_pipe                  (__NR_SVR4 +  42)
-#define __NR_SVR4_times                 (__NR_SVR4 +  43)
-#define __NR_SVR4_profil                (__NR_SVR4 +  44)
-#define __NR_SVR4_plock                 (__NR_SVR4 +  45)
-#define __NR_SVR4_setgid                (__NR_SVR4 +  46)
-#define __NR_SVR4_getgid                (__NR_SVR4 +  47)
-#define __NR_SVR4_sig                   (__NR_SVR4 +  48)
-#define __NR_SVR4_msgsys                (__NR_SVR4 +  49)
-#define __NR_SVR4_sysmips               (__NR_SVR4 +  50)
-#define __NR_SVR4_sysacct               (__NR_SVR4 +  51)
-#define __NR_SVR4_shmsys                (__NR_SVR4 +  52)
-#define __NR_SVR4_semsys                (__NR_SVR4 +  53)
-#define __NR_SVR4_ioctl                 (__NR_SVR4 +  54)
-#define __NR_SVR4_uadmin                (__NR_SVR4 +  55)
-#define __NR_SVR4_exch                  (__NR_SVR4 +  56)
-#define __NR_SVR4_utssys                (__NR_SVR4 +  57)
-#define __NR_SVR4_fsync                 (__NR_SVR4 +  58)
-#define __NR_SVR4_exece                 (__NR_SVR4 +  59)
-#define __NR_SVR4_umask                 (__NR_SVR4 +  60)
-#define __NR_SVR4_chroot                (__NR_SVR4 +  61)
-#define __NR_SVR4_fcntl                 (__NR_SVR4 +  62)
-#define __NR_SVR4_ulimit                (__NR_SVR4 +  63)
-#define __NR_SVR4_reserved1             (__NR_SVR4 +  64)
-#define __NR_SVR4_reserved2             (__NR_SVR4 +  65)
-#define __NR_SVR4_reserved3             (__NR_SVR4 +  66)
-#define __NR_SVR4_reserved4             (__NR_SVR4 +  67)
-#define __NR_SVR4_reserved5             (__NR_SVR4 +  68)
-#define __NR_SVR4_reserved6             (__NR_SVR4 +  69)
-#define __NR_SVR4_advfs                 (__NR_SVR4 +  70)
-#define __NR_SVR4_unadvfs               (__NR_SVR4 +  71)
-#define __NR_SVR4_unused1               (__NR_SVR4 +  72)
-#define __NR_SVR4_unused2               (__NR_SVR4 +  73)
-#define __NR_SVR4_rfstart               (__NR_SVR4 +  74)
-#define __NR_SVR4_unused3               (__NR_SVR4 +  75)
-#define __NR_SVR4_rdebug                (__NR_SVR4 +  76)
-#define __NR_SVR4_rfstop                (__NR_SVR4 +  77)
-#define __NR_SVR4_rfsys                 (__NR_SVR4 +  78)
-#define __NR_SVR4_rmdir                 (__NR_SVR4 +  79)
-#define __NR_SVR4_mkdir                 (__NR_SVR4 +  80)
-#define __NR_SVR4_getdents              (__NR_SVR4 +  81)
-#define __NR_SVR4_libattach             (__NR_SVR4 +  82)
-#define __NR_SVR4_libdetach             (__NR_SVR4 +  83)
-#define __NR_SVR4_sysfs                 (__NR_SVR4 +  84)
-#define __NR_SVR4_getmsg                (__NR_SVR4 +  85)
-#define __NR_SVR4_putmsg                (__NR_SVR4 +  86)
-#define __NR_SVR4_poll                  (__NR_SVR4 +  87)
-#define __NR_SVR4_lstat                 (__NR_SVR4 +  88)
-#define __NR_SVR4_symlink               (__NR_SVR4 +  89)
-#define __NR_SVR4_readlink              (__NR_SVR4 +  90)
-#define __NR_SVR4_setgroups             (__NR_SVR4 +  91)
-#define __NR_SVR4_getgroups             (__NR_SVR4 +  92)
-#define __NR_SVR4_fchmod                (__NR_SVR4 +  93)
-#define __NR_SVR4_fchown                (__NR_SVR4 +  94)
-#define __NR_SVR4_sigprocmask           (__NR_SVR4 +  95)
-#define __NR_SVR4_sigsuspend            (__NR_SVR4 +  96)
-#define __NR_SVR4_sigaltstack           (__NR_SVR4 +  97)
-#define __NR_SVR4_sigaction             (__NR_SVR4 +  98)
-#define __NR_SVR4_sigpending            (__NR_SVR4 +  99)
-#define __NR_SVR4_setcontext            (__NR_SVR4 + 100)
-#define __NR_SVR4_evsys                 (__NR_SVR4 + 101)
-#define __NR_SVR4_evtrapret             (__NR_SVR4 + 102)
-#define __NR_SVR4_statvfs               (__NR_SVR4 + 103)
-#define __NR_SVR4_fstatvfs              (__NR_SVR4 + 104)
-#define __NR_SVR4_reserved7             (__NR_SVR4 + 105)
-#define __NR_SVR4_nfssys                (__NR_SVR4 + 106)
-#define __NR_SVR4_waitid                (__NR_SVR4 + 107)
-#define __NR_SVR4_sigsendset            (__NR_SVR4 + 108)
-#define __NR_SVR4_hrtsys                (__NR_SVR4 + 109)
-#define __NR_SVR4_acancel               (__NR_SVR4 + 110)
-#define __NR_SVR4_async                 (__NR_SVR4 + 111)
-#define __NR_SVR4_priocntlset           (__NR_SVR4 + 112)
-#define __NR_SVR4_pathconf              (__NR_SVR4 + 113)
-#define __NR_SVR4_mincore               (__NR_SVR4 + 114)
-#define __NR_SVR4_mmap                  (__NR_SVR4 + 115)
-#define __NR_SVR4_mprotect              (__NR_SVR4 + 116)
-#define __NR_SVR4_munmap                (__NR_SVR4 + 117)
-#define __NR_SVR4_fpathconf             (__NR_SVR4 + 118)
-#define __NR_SVR4_vfork                 (__NR_SVR4 + 119)
-#define __NR_SVR4_fchdir                (__NR_SVR4 + 120)
-#define __NR_SVR4_readv                 (__NR_SVR4 + 121)
-#define __NR_SVR4_writev                (__NR_SVR4 + 122)
-#define __NR_SVR4_xstat                 (__NR_SVR4 + 123)
-#define __NR_SVR4_lxstat                (__NR_SVR4 + 124)
-#define __NR_SVR4_fxstat                (__NR_SVR4 + 125)
-#define __NR_SVR4_xmknod                (__NR_SVR4 + 126)
-#define __NR_SVR4_clocal                (__NR_SVR4 + 127)
-#define __NR_SVR4_setrlimit             (__NR_SVR4 + 128)
-#define __NR_SVR4_getrlimit             (__NR_SVR4 + 129)
-#define __NR_SVR4_lchown                (__NR_SVR4 + 130)
-#define __NR_SVR4_memcntl               (__NR_SVR4 + 131)
-#define __NR_SVR4_getpmsg               (__NR_SVR4 + 132)
-#define __NR_SVR4_putpmsg               (__NR_SVR4 + 133)
-#define __NR_SVR4_rename                (__NR_SVR4 + 134)
-#define __NR_SVR4_nuname                (__NR_SVR4 + 135)
-#define __NR_SVR4_setegid               (__NR_SVR4 + 136)
-#define __NR_SVR4_sysconf               (__NR_SVR4 + 137)
-#define __NR_SVR4_adjtime               (__NR_SVR4 + 138)
-#define __NR_SVR4_sysinfo               (__NR_SVR4 + 139)
-#define __NR_SVR4_reserved8             (__NR_SVR4 + 140)
-#define __NR_SVR4_seteuid               (__NR_SVR4 + 141)
-#define __NR_SVR4_PYRAMID_statis        (__NR_SVR4 + 142)
-#define __NR_SVR4_PYRAMID_tuning        (__NR_SVR4 + 143)
-#define __NR_SVR4_PYRAMID_forcerr       (__NR_SVR4 + 144)
-#define __NR_SVR4_PYRAMID_mpcntl        (__NR_SVR4 + 145)
-#define __NR_SVR4_reserved9             (__NR_SVR4 + 146)
-#define __NR_SVR4_reserved10            (__NR_SVR4 + 147)
-#define __NR_SVR4_reserved11            (__NR_SVR4 + 148)
-#define __NR_SVR4_reserved12            (__NR_SVR4 + 149)
-#define __NR_SVR4_reserved13            (__NR_SVR4 + 150)
-#define __NR_SVR4_reserved14            (__NR_SVR4 + 151)
-#define __NR_SVR4_reserved15            (__NR_SVR4 + 152)
-#define __NR_SVR4_reserved16            (__NR_SVR4 + 153)
-#define __NR_SVR4_reserved17            (__NR_SVR4 + 154)
-#define __NR_SVR4_reserved18            (__NR_SVR4 + 155)
-#define __NR_SVR4_reserved19            (__NR_SVR4 + 156)
-#define __NR_SVR4_reserved20            (__NR_SVR4 + 157)
-#define __NR_SVR4_reserved21            (__NR_SVR4 + 158)
-#define __NR_SVR4_reserved22            (__NR_SVR4 + 159)
-#define __NR_SVR4_reserved23            (__NR_SVR4 + 160)
-#define __NR_SVR4_reserved24            (__NR_SVR4 + 161)
-#define __NR_SVR4_reserved25            (__NR_SVR4 + 162)
-#define __NR_SVR4_reserved26            (__NR_SVR4 + 163)
-#define __NR_SVR4_reserved27            (__NR_SVR4 + 164)
-#define __NR_SVR4_reserved28            (__NR_SVR4 + 165)
-#define __NR_SVR4_reserved29            (__NR_SVR4 + 166)
-#define __NR_SVR4_reserved30            (__NR_SVR4 + 167)
-#define __NR_SVR4_reserved31            (__NR_SVR4 + 168)
-#define __NR_SVR4_reserved32            (__NR_SVR4 + 169)
-#define __NR_SVR4_reserved33            (__NR_SVR4 + 170)
-#define __NR_SVR4_reserved34            (__NR_SVR4 + 171)
-#define __NR_SVR4_reserved35            (__NR_SVR4 + 172)
-#define __NR_SVR4_reserved36            (__NR_SVR4 + 173)
-#define __NR_SVR4_reserved37            (__NR_SVR4 + 174)
-#define __NR_SVR4_reserved38            (__NR_SVR4 + 175)
-#define __NR_SVR4_reserved39            (__NR_SVR4 + 176)
-#define __NR_SVR4_reserved40            (__NR_SVR4 + 177)
-#define __NR_SVR4_reserved41            (__NR_SVR4 + 178)
-#define __NR_SVR4_reserved42            (__NR_SVR4 + 179)
-#define __NR_SVR4_reserved43            (__NR_SVR4 + 180)
-#define __NR_SVR4_reserved44            (__NR_SVR4 + 181)
-#define __NR_SVR4_reserved45            (__NR_SVR4 + 182)
-#define __NR_SVR4_reserved46            (__NR_SVR4 + 183)
-#define __NR_SVR4_reserved47            (__NR_SVR4 + 184)
-#define __NR_SVR4_reserved48            (__NR_SVR4 + 185)
-#define __NR_SVR4_reserved49            (__NR_SVR4 + 186)
-#define __NR_SVR4_reserved50            (__NR_SVR4 + 187)
-#define __NR_SVR4_reserved51            (__NR_SVR4 + 188)
-#define __NR_SVR4_reserved52            (__NR_SVR4 + 189)
-#define __NR_SVR4_reserved53            (__NR_SVR4 + 190)
-#define __NR_SVR4_reserved54            (__NR_SVR4 + 191)
-#define __NR_SVR4_reserved55            (__NR_SVR4 + 192)
-#define __NR_SVR4_reserved56            (__NR_SVR4 + 193)
-#define __NR_SVR4_reserved57            (__NR_SVR4 + 194)
-#define __NR_SVR4_reserved58            (__NR_SVR4 + 195)
-#define __NR_SVR4_reserved59            (__NR_SVR4 + 196)
-#define __NR_SVR4_reserved60            (__NR_SVR4 + 197)
-#define __NR_SVR4_reserved61            (__NR_SVR4 + 198)
-#define __NR_SVR4_reserved62            (__NR_SVR4 + 199)
-#define __NR_SVR4_reserved63            (__NR_SVR4 + 200)
-#define __NR_SVR4_aread                 (__NR_SVR4 + 201)
-#define __NR_SVR4_awrite                (__NR_SVR4 + 202)
-#define __NR_SVR4_listio                (__NR_SVR4 + 203)
-#define __NR_SVR4_mips_acancel          (__NR_SVR4 + 204)
-#define __NR_SVR4_astatus               (__NR_SVR4 + 205)
-#define __NR_SVR4_await                 (__NR_SVR4 + 206)
-#define __NR_SVR4_areadv                (__NR_SVR4 + 207)
-#define __NR_SVR4_awritev               (__NR_SVR4 + 208)
-#define __NR_SVR4_MIPS_reserved1        (__NR_SVR4 + 209)
-#define __NR_SVR4_MIPS_reserved2        (__NR_SVR4 + 210)
-#define __NR_SVR4_MIPS_reserved3        (__NR_SVR4 + 211)
-#define __NR_SVR4_MIPS_reserved4        (__NR_SVR4 + 212)
-#define __NR_SVR4_MIPS_reserved5        (__NR_SVR4 + 213)
-#define __NR_SVR4_MIPS_reserved6        (__NR_SVR4 + 214)
-#define __NR_SVR4_MIPS_reserved7        (__NR_SVR4 + 215)
-#define __NR_SVR4_MIPS_reserved8        (__NR_SVR4 + 216)
-#define __NR_SVR4_MIPS_reserved9        (__NR_SVR4 + 217)
-#define __NR_SVR4_MIPS_reserved10       (__NR_SVR4 + 218)
-#define __NR_SVR4_MIPS_reserved11       (__NR_SVR4 + 219)
-#define __NR_SVR4_MIPS_reserved12       (__NR_SVR4 + 220)
-#define __NR_SVR4_CDC_reserved1         (__NR_SVR4 + 221)
-#define __NR_SVR4_CDC_reserved2         (__NR_SVR4 + 222)
-#define __NR_SVR4_CDC_reserved3         (__NR_SVR4 + 223)
-#define __NR_SVR4_CDC_reserved4         (__NR_SVR4 + 224)
-#define __NR_SVR4_CDC_reserved5         (__NR_SVR4 + 225)
-#define __NR_SVR4_CDC_reserved6         (__NR_SVR4 + 226)
-#define __NR_SVR4_CDC_reserved7         (__NR_SVR4 + 227)
-#define __NR_SVR4_CDC_reserved8         (__NR_SVR4 + 228)
-#define __NR_SVR4_CDC_reserved9         (__NR_SVR4 + 229)
-#define __NR_SVR4_CDC_reserved10        (__NR_SVR4 + 230)
-#define __NR_SVR4_CDC_reserved11        (__NR_SVR4 + 231)
-#define __NR_SVR4_CDC_reserved12        (__NR_SVR4 + 232)
-#define __NR_SVR4_CDC_reserved13        (__NR_SVR4 + 233)
-#define __NR_SVR4_CDC_reserved14        (__NR_SVR4 + 234)
-#define __NR_SVR4_CDC_reserved15        (__NR_SVR4 + 235)
-#define __NR_SVR4_CDC_reserved16        (__NR_SVR4 + 236)
-#define __NR_SVR4_CDC_reserved17        (__NR_SVR4 + 237)
-#define __NR_SVR4_CDC_reserved18        (__NR_SVR4 + 238)
-#define __NR_SVR4_CDC_reserved19        (__NR_SVR4 + 239)
-#define __NR_SVR4_CDC_reserved20        (__NR_SVR4 + 240)
-/*
- * SYS V syscalls are in the range from 1000 to 1999
- */
-#define __NR_SYSV                       1000
-#define __NR_SYSV_syscall               (__NR_SYSV +   0)
-#define __NR_SYSV_exit                  (__NR_SYSV +   1)
-#define __NR_SYSV_fork                  (__NR_SYSV +   2)
-#define __NR_SYSV_read                  (__NR_SYSV +   3)
-#define __NR_SYSV_write                 (__NR_SYSV +   4)
-#define __NR_SYSV_open                  (__NR_SYSV +   5)
-#define __NR_SYSV_close                 (__NR_SYSV +   6)
-#define __NR_SYSV_wait                  (__NR_SYSV +   7)
-#define __NR_SYSV_creat                 (__NR_SYSV +   8)
-#define __NR_SYSV_link                  (__NR_SYSV +   9)
-#define __NR_SYSV_unlink                (__NR_SYSV +  10)
-#define __NR_SYSV_execv                 (__NR_SYSV +  11)
-#define __NR_SYSV_chdir                 (__NR_SYSV +  12)
-#define __NR_SYSV_time                  (__NR_SYSV +  13)
-#define __NR_SYSV_mknod                 (__NR_SYSV +  14)
-#define __NR_SYSV_chmod                 (__NR_SYSV +  15)
-#define __NR_SYSV_chown                 (__NR_SYSV +  16)
-#define __NR_SYSV_brk                   (__NR_SYSV +  17)
-#define __NR_SYSV_stat                  (__NR_SYSV +  18)
-#define __NR_SYSV_lseek                 (__NR_SYSV +  19)
-#define __NR_SYSV_getpid                (__NR_SYSV +  20)
-#define __NR_SYSV_mount                 (__NR_SYSV +  21)
-#define __NR_SYSV_umount                (__NR_SYSV +  22)
-#define __NR_SYSV_setuid                (__NR_SYSV +  23)
-#define __NR_SYSV_getuid                (__NR_SYSV +  24)
-#define __NR_SYSV_stime                 (__NR_SYSV +  25)
-#define __NR_SYSV_ptrace                (__NR_SYSV +  26)
-#define __NR_SYSV_alarm                 (__NR_SYSV +  27)
-#define __NR_SYSV_fstat                 (__NR_SYSV +  28)
-#define __NR_SYSV_pause                 (__NR_SYSV +  29)
-#define __NR_SYSV_utime                 (__NR_SYSV +  30)
-#define __NR_SYSV_stty                  (__NR_SYSV +  31)
-#define __NR_SYSV_gtty                  (__NR_SYSV +  32)
-#define __NR_SYSV_access                (__NR_SYSV +  33)
-#define __NR_SYSV_nice                  (__NR_SYSV +  34)
-#define __NR_SYSV_statfs                (__NR_SYSV +  35)
-#define __NR_SYSV_sync                  (__NR_SYSV +  36)
-#define __NR_SYSV_kill                  (__NR_SYSV +  37)
-#define __NR_SYSV_fstatfs               (__NR_SYSV +  38)
-#define __NR_SYSV_setpgrp               (__NR_SYSV +  39)
-#define __NR_SYSV_syssgi                (__NR_SYSV +  40)
-#define __NR_SYSV_dup                   (__NR_SYSV +  41)
-#define __NR_SYSV_pipe                  (__NR_SYSV +  42)
-#define __NR_SYSV_times                 (__NR_SYSV +  43)
-#define __NR_SYSV_profil                (__NR_SYSV +  44)
-#define __NR_SYSV_plock                 (__NR_SYSV +  45)
-#define __NR_SYSV_setgid                (__NR_SYSV +  46)
-#define __NR_SYSV_getgid                (__NR_SYSV +  47)
-#define __NR_SYSV_sig                   (__NR_SYSV +  48)
-#define __NR_SYSV_msgsys                (__NR_SYSV +  49)
-#define __NR_SYSV_sysmips               (__NR_SYSV +  50)
-#define __NR_SYSV_acct                  (__NR_SYSV +  51)
-#define __NR_SYSV_shmsys                (__NR_SYSV +  52)
-#define __NR_SYSV_semsys                (__NR_SYSV +  53)
-#define __NR_SYSV_ioctl                 (__NR_SYSV +  54)
-#define __NR_SYSV_uadmin                (__NR_SYSV +  55)
-#define __NR_SYSV_sysmp                 (__NR_SYSV +  56)
-#define __NR_SYSV_utssys                (__NR_SYSV +  57)
-#define __NR_SYSV_USG_reserved1         (__NR_SYSV +  58)
-#define __NR_SYSV_execve                (__NR_SYSV +  59)
-#define __NR_SYSV_umask                 (__NR_SYSV +  60)
-#define __NR_SYSV_chroot                (__NR_SYSV +  61)
-#define __NR_SYSV_fcntl                 (__NR_SYSV +  62)
-#define __NR_SYSV_ulimit                (__NR_SYSV +  63)
-#define __NR_SYSV_SAFARI4_reserved1     (__NR_SYSV +  64)
-#define __NR_SYSV_SAFARI4_reserved2     (__NR_SYSV +  65)
-#define __NR_SYSV_SAFARI4_reserved3     (__NR_SYSV +  66)
-#define __NR_SYSV_SAFARI4_reserved4     (__NR_SYSV +  67)
-#define __NR_SYSV_SAFARI4_reserved5     (__NR_SYSV +  68)
-#define __NR_SYSV_SAFARI4_reserved6     (__NR_SYSV +  69)
-#define __NR_SYSV_advfs                 (__NR_SYSV +  70)
-#define __NR_SYSV_unadvfs               (__NR_SYSV +  71)
-#define __NR_SYSV_rmount                (__NR_SYSV +  72)
-#define __NR_SYSV_rumount               (__NR_SYSV +  73)
-#define __NR_SYSV_rfstart               (__NR_SYSV +  74)
-#define __NR_SYSV_getrlimit64           (__NR_SYSV +  75)
-#define __NR_SYSV_setrlimit64           (__NR_SYSV +  76)
-#define __NR_SYSV_nanosleep             (__NR_SYSV +  77)
-#define __NR_SYSV_lseek64               (__NR_SYSV +  78)
-#define __NR_SYSV_rmdir                 (__NR_SYSV +  79)
-#define __NR_SYSV_mkdir                 (__NR_SYSV +  80)
-#define __NR_SYSV_getdents              (__NR_SYSV +  81)
-#define __NR_SYSV_sginap                (__NR_SYSV +  82)
-#define __NR_SYSV_sgikopt               (__NR_SYSV +  83)
-#define __NR_SYSV_sysfs                 (__NR_SYSV +  84)
-#define __NR_SYSV_getmsg                (__NR_SYSV +  85)
-#define __NR_SYSV_putmsg                (__NR_SYSV +  86)
-#define __NR_SYSV_poll                  (__NR_SYSV +  87)
-#define __NR_SYSV_sigreturn             (__NR_SYSV +  88)
-#define __NR_SYSV_accept                (__NR_SYSV +  89)
-#define __NR_SYSV_bind                  (__NR_SYSV +  90)
-#define __NR_SYSV_connect               (__NR_SYSV +  91)
-#define __NR_SYSV_gethostid             (__NR_SYSV +  92)
-#define __NR_SYSV_getpeername           (__NR_SYSV +  93)
-#define __NR_SYSV_getsockname           (__NR_SYSV +  94)
-#define __NR_SYSV_getsockopt            (__NR_SYSV +  95)
-#define __NR_SYSV_listen                (__NR_SYSV +  96)
-#define __NR_SYSV_recv                  (__NR_SYSV +  97)
-#define __NR_SYSV_recvfrom              (__NR_SYSV +  98)
-#define __NR_SYSV_recvmsg               (__NR_SYSV +  99)
-#define __NR_SYSV_select                (__NR_SYSV + 100)
-#define __NR_SYSV_send                  (__NR_SYSV + 101)
-#define __NR_SYSV_sendmsg               (__NR_SYSV + 102)
-#define __NR_SYSV_sendto                (__NR_SYSV + 103)
-#define __NR_SYSV_sethostid             (__NR_SYSV + 104)
-#define __NR_SYSV_setsockopt            (__NR_SYSV + 105)
-#define __NR_SYSV_shutdown              (__NR_SYSV + 106)
-#define __NR_SYSV_socket                (__NR_SYSV + 107)
-#define __NR_SYSV_gethostname           (__NR_SYSV + 108)
-#define __NR_SYSV_sethostname           (__NR_SYSV + 109)
-#define __NR_SYSV_getdomainname         (__NR_SYSV + 110)
-#define __NR_SYSV_setdomainname         (__NR_SYSV + 111)
-#define __NR_SYSV_truncate              (__NR_SYSV + 112)
-#define __NR_SYSV_ftruncate             (__NR_SYSV + 113)
-#define __NR_SYSV_rename                (__NR_SYSV + 114)
-#define __NR_SYSV_symlink               (__NR_SYSV + 115)
-#define __NR_SYSV_readlink              (__NR_SYSV + 116)
-#define __NR_SYSV_lstat                 (__NR_SYSV + 117)
-#define __NR_SYSV_nfsmount              (__NR_SYSV + 118)
-#define __NR_SYSV_nfssvc                (__NR_SYSV + 119)
-#define __NR_SYSV_getfh                 (__NR_SYSV + 120)
-#define __NR_SYSV_async_daemon          (__NR_SYSV + 121)
-#define __NR_SYSV_exportfs              (__NR_SYSV + 122)
-#define __NR_SYSV_setregid              (__NR_SYSV + 123)
-#define __NR_SYSV_setreuid              (__NR_SYSV + 124)
-#define __NR_SYSV_getitimer             (__NR_SYSV + 125)
-#define __NR_SYSV_setitimer             (__NR_SYSV + 126)
-#define __NR_SYSV_adjtime               (__NR_SYSV + 127)
-#define __NR_SYSV_BSD_getime            (__NR_SYSV + 128)
-#define __NR_SYSV_sproc                 (__NR_SYSV + 129)
-#define __NR_SYSV_prctl                 (__NR_SYSV + 130)
-#define __NR_SYSV_procblk               (__NR_SYSV + 131)
-#define __NR_SYSV_sprocsp               (__NR_SYSV + 132)
-#define __NR_SYSV_sgigsc                (__NR_SYSV + 133)
-#define __NR_SYSV_mmap                  (__NR_SYSV + 134)
-#define __NR_SYSV_munmap                (__NR_SYSV + 135)
-#define __NR_SYSV_mprotect              (__NR_SYSV + 136)
-#define __NR_SYSV_msync                 (__NR_SYSV + 137)
-#define __NR_SYSV_madvise               (__NR_SYSV + 138)
-#define __NR_SYSV_pagelock              (__NR_SYSV + 139)
-#define __NR_SYSV_getpagesize           (__NR_SYSV + 140)
-#define __NR_SYSV_quotactl              (__NR_SYSV + 141)
-#define __NR_SYSV_libdetach             (__NR_SYSV + 142)
-#define __NR_SYSV_BSDgetpgrp            (__NR_SYSV + 143)
-#define __NR_SYSV_BSDsetpgrp            (__NR_SYSV + 144)
-#define __NR_SYSV_vhangup               (__NR_SYSV + 145)
-#define __NR_SYSV_fsync                 (__NR_SYSV + 146)
-#define __NR_SYSV_fchdir                (__NR_SYSV + 147)
-#define __NR_SYSV_getrlimit             (__NR_SYSV + 148)
-#define __NR_SYSV_setrlimit             (__NR_SYSV + 149)
-#define __NR_SYSV_cacheflush            (__NR_SYSV + 150)
-#define __NR_SYSV_cachectl              (__NR_SYSV + 151)
-#define __NR_SYSV_fchown                (__NR_SYSV + 152)
-#define __NR_SYSV_fchmod                (__NR_SYSV + 153)
-#define __NR_SYSV_wait3                 (__NR_SYSV + 154)
-#define __NR_SYSV_socketpair            (__NR_SYSV + 155)
-#define __NR_SYSV_sysinfo               (__NR_SYSV + 156)
-#define __NR_SYSV_nuname                (__NR_SYSV + 157)
-#define __NR_SYSV_xstat                 (__NR_SYSV + 158)
-#define __NR_SYSV_lxstat                (__NR_SYSV + 159)
-#define __NR_SYSV_fxstat                (__NR_SYSV + 160)
-#define __NR_SYSV_xmknod                (__NR_SYSV + 161)
-#define __NR_SYSV_ksigaction            (__NR_SYSV + 162)
-#define __NR_SYSV_sigpending            (__NR_SYSV + 163)
-#define __NR_SYSV_sigprocmask           (__NR_SYSV + 164)
-#define __NR_SYSV_sigsuspend            (__NR_SYSV + 165)
-#define __NR_SYSV_sigpoll               (__NR_SYSV + 166)
-#define __NR_SYSV_swapctl               (__NR_SYSV + 167)
-#define __NR_SYSV_getcontext            (__NR_SYSV + 168)
-#define __NR_SYSV_setcontext            (__NR_SYSV + 169)
-#define __NR_SYSV_waitsys               (__NR_SYSV + 170)
-#define __NR_SYSV_sigstack              (__NR_SYSV + 171)
-#define __NR_SYSV_sigaltstack           (__NR_SYSV + 172)
-#define __NR_SYSV_sigsendset            (__NR_SYSV + 173)
-#define __NR_SYSV_statvfs               (__NR_SYSV + 174)
-#define __NR_SYSV_fstatvfs              (__NR_SYSV + 175)
-#define __NR_SYSV_getpmsg               (__NR_SYSV + 176)
-#define __NR_SYSV_putpmsg               (__NR_SYSV + 177)
-#define __NR_SYSV_lchown                (__NR_SYSV + 178)
-#define __NR_SYSV_priocntl              (__NR_SYSV + 179)
-#define __NR_SYSV_ksigqueue             (__NR_SYSV + 180)
-#define __NR_SYSV_readv                 (__NR_SYSV + 181)
-#define __NR_SYSV_writev                (__NR_SYSV + 182)
-#define __NR_SYSV_truncate64            (__NR_SYSV + 183)
-#define __NR_SYSV_ftruncate64           (__NR_SYSV + 184)
-#define __NR_SYSV_mmap64                (__NR_SYSV + 185)
-#define __NR_SYSV_dmi                   (__NR_SYSV + 186)
-#define __NR_SYSV_pread                 (__NR_SYSV + 187)
-#define __NR_SYSV_pwrite                (__NR_SYSV + 188)
-/*
- * BSD 4.3 syscalls are in the range from 2000 to 2999
- */
-#define __NR_BSD43                      2000
-#define __NR_BSD43_syscall              (__NR_BSD43 +   0)
-#define __NR_BSD43_exit                 (__NR_BSD43 +   1)
-#define __NR_BSD43_fork                 (__NR_BSD43 +   2)
-#define __NR_BSD43_read                 (__NR_BSD43 +   3)
-#define __NR_BSD43_write                (__NR_BSD43 +   4)
-#define __NR_BSD43_open                 (__NR_BSD43 +   5)
-#define __NR_BSD43_close                (__NR_BSD43 +   6)
-#define __NR_BSD43_wait                 (__NR_BSD43 +   7)
-#define __NR_BSD43_creat                (__NR_BSD43 +   8)
-#define __NR_BSD43_link                 (__NR_BSD43 +   9)
-#define __NR_BSD43_unlink               (__NR_BSD43 +  10)
-#define __NR_BSD43_exec                 (__NR_BSD43 +  11)
-#define __NR_BSD43_chdir                (__NR_BSD43 +  12)
-#define __NR_BSD43_time                 (__NR_BSD43 +  13)
-#define __NR_BSD43_mknod                (__NR_BSD43 +  14)
-#define __NR_BSD43_chmod                (__NR_BSD43 +  15)
-#define __NR_BSD43_chown                (__NR_BSD43 +  16)
-#define __NR_BSD43_sbreak               (__NR_BSD43 +  17)
-#define __NR_BSD43_oldstat              (__NR_BSD43 +  18)
-#define __NR_BSD43_lseek                (__NR_BSD43 +  19)
-#define __NR_BSD43_getpid               (__NR_BSD43 +  20)
-#define __NR_BSD43_oldmount             (__NR_BSD43 +  21)
-#define __NR_BSD43_umount               (__NR_BSD43 +  22)
-#define __NR_BSD43_setuid               (__NR_BSD43 +  23)
-#define __NR_BSD43_getuid               (__NR_BSD43 +  24)
-#define __NR_BSD43_stime                (__NR_BSD43 +  25)
-#define __NR_BSD43_ptrace               (__NR_BSD43 +  26)
-#define __NR_BSD43_alarm                (__NR_BSD43 +  27)
-#define __NR_BSD43_oldfstat             (__NR_BSD43 +  28)
-#define __NR_BSD43_pause                (__NR_BSD43 +  29)
-#define __NR_BSD43_utime                (__NR_BSD43 +  30)
-#define __NR_BSD43_stty                 (__NR_BSD43 +  31)
-#define __NR_BSD43_gtty                 (__NR_BSD43 +  32)
-#define __NR_BSD43_access               (__NR_BSD43 +  33)
-#define __NR_BSD43_nice                 (__NR_BSD43 +  34)
-#define __NR_BSD43_ftime                (__NR_BSD43 +  35)
-#define __NR_BSD43_sync                 (__NR_BSD43 +  36)
-#define __NR_BSD43_kill                 (__NR_BSD43 +  37)
-#define __NR_BSD43_stat                 (__NR_BSD43 +  38)
-#define __NR_BSD43_oldsetpgrp           (__NR_BSD43 +  39)
-#define __NR_BSD43_lstat                (__NR_BSD43 +  40)
-#define __NR_BSD43_dup                  (__NR_BSD43 +  41)
-#define __NR_BSD43_pipe                 (__NR_BSD43 +  42)
-#define __NR_BSD43_times                (__NR_BSD43 +  43)
-#define __NR_BSD43_profil               (__NR_BSD43 +  44)
-#define __NR_BSD43_msgsys               (__NR_BSD43 +  45)
-#define __NR_BSD43_setgid               (__NR_BSD43 +  46)
-#define __NR_BSD43_getgid               (__NR_BSD43 +  47)
-#define __NR_BSD43_ssig                 (__NR_BSD43 +  48)
-#define __NR_BSD43_reserved1            (__NR_BSD43 +  49)
-#define __NR_BSD43_reserved2            (__NR_BSD43 +  50)
-#define __NR_BSD43_sysacct              (__NR_BSD43 +  51)
-#define __NR_BSD43_phys                 (__NR_BSD43 +  52)
-#define __NR_BSD43_lock                 (__NR_BSD43 +  53)
-#define __NR_BSD43_ioctl                (__NR_BSD43 +  54)
-#define __NR_BSD43_reboot               (__NR_BSD43 +  55)
-#define __NR_BSD43_mpxchan              (__NR_BSD43 +  56)
-#define __NR_BSD43_symlink              (__NR_BSD43 +  57)
-#define __NR_BSD43_readlink             (__NR_BSD43 +  58)
-#define __NR_BSD43_execve               (__NR_BSD43 +  59)
-#define __NR_BSD43_umask                (__NR_BSD43 +  60)
-#define __NR_BSD43_chroot               (__NR_BSD43 +  61)
-#define __NR_BSD43_fstat                (__NR_BSD43 +  62)
-#define __NR_BSD43_reserved3            (__NR_BSD43 +  63)
-#define __NR_BSD43_getpagesize          (__NR_BSD43 +  64)
-#define __NR_BSD43_mremap               (__NR_BSD43 +  65)
-#define __NR_BSD43_vfork                (__NR_BSD43 +  66)
-#define __NR_BSD43_vread                (__NR_BSD43 +  67)
-#define __NR_BSD43_vwrite               (__NR_BSD43 +  68)
-#define __NR_BSD43_sbrk                 (__NR_BSD43 +  69)
-#define __NR_BSD43_sstk                 (__NR_BSD43 +  70)
-#define __NR_BSD43_mmap                 (__NR_BSD43 +  71)
-#define __NR_BSD43_vadvise              (__NR_BSD43 +  72)
-#define __NR_BSD43_munmap               (__NR_BSD43 +  73)
-#define __NR_BSD43_mprotect             (__NR_BSD43 +  74)
-#define __NR_BSD43_madvise              (__NR_BSD43 +  75)
-#define __NR_BSD43_vhangup              (__NR_BSD43 +  76)
-#define __NR_BSD43_vlimit               (__NR_BSD43 +  77)
-#define __NR_BSD43_mincore              (__NR_BSD43 +  78)
-#define __NR_BSD43_getgroups            (__NR_BSD43 +  79)
-#define __NR_BSD43_setgroups            (__NR_BSD43 +  80)
-#define __NR_BSD43_getpgrp              (__NR_BSD43 +  81)
-#define __NR_BSD43_setpgrp              (__NR_BSD43 +  82)
-#define __NR_BSD43_setitimer            (__NR_BSD43 +  83)
-#define __NR_BSD43_wait3                (__NR_BSD43 +  84)
-#define __NR_BSD43_swapon               (__NR_BSD43 +  85)
-#define __NR_BSD43_getitimer            (__NR_BSD43 +  86)
-#define __NR_BSD43_gethostname          (__NR_BSD43 +  87)
-#define __NR_BSD43_sethostname          (__NR_BSD43 +  88)
-#define __NR_BSD43_getdtablesize        (__NR_BSD43 +  89)
-#define __NR_BSD43_dup2                 (__NR_BSD43 +  90)
-#define __NR_BSD43_getdopt              (__NR_BSD43 +  91)
-#define __NR_BSD43_fcntl                (__NR_BSD43 +  92)
-#define __NR_BSD43_select               (__NR_BSD43 +  93)
-#define __NR_BSD43_setdopt              (__NR_BSD43 +  94)
-#define __NR_BSD43_fsync                (__NR_BSD43 +  95)
-#define __NR_BSD43_setpriority          (__NR_BSD43 +  96)
-#define __NR_BSD43_socket               (__NR_BSD43 +  97)
-#define __NR_BSD43_connect              (__NR_BSD43 +  98)
-#define __NR_BSD43_oldaccept            (__NR_BSD43 +  99)
-#define __NR_BSD43_getpriority          (__NR_BSD43 + 100)
-#define __NR_BSD43_send                 (__NR_BSD43 + 101)
-#define __NR_BSD43_recv                 (__NR_BSD43 + 102)
-#define __NR_BSD43_sigreturn            (__NR_BSD43 + 103)
-#define __NR_BSD43_bind                 (__NR_BSD43 + 104)
-#define __NR_BSD43_setsockopt           (__NR_BSD43 + 105)
-#define __NR_BSD43_listen               (__NR_BSD43 + 106)
-#define __NR_BSD43_vtimes               (__NR_BSD43 + 107)
-#define __NR_BSD43_sigvec               (__NR_BSD43 + 108)
-#define __NR_BSD43_sigblock             (__NR_BSD43 + 109)
-#define __NR_BSD43_sigsetmask           (__NR_BSD43 + 110)
-#define __NR_BSD43_sigpause             (__NR_BSD43 + 111)
-#define __NR_BSD43_sigstack             (__NR_BSD43 + 112)
-#define __NR_BSD43_oldrecvmsg           (__NR_BSD43 + 113)
-#define __NR_BSD43_oldsendmsg           (__NR_BSD43 + 114)
-#define __NR_BSD43_vtrace               (__NR_BSD43 + 115)
-#define __NR_BSD43_gettimeofday         (__NR_BSD43 + 116)
-#define __NR_BSD43_getrusage            (__NR_BSD43 + 117)
-#define __NR_BSD43_getsockopt           (__NR_BSD43 + 118)
-#define __NR_BSD43_reserved4            (__NR_BSD43 + 119)
-#define __NR_BSD43_readv                (__NR_BSD43 + 120)
-#define __NR_BSD43_writev               (__NR_BSD43 + 121)
-#define __NR_BSD43_settimeofday         (__NR_BSD43 + 122)
-#define __NR_BSD43_fchown               (__NR_BSD43 + 123)
-#define __NR_BSD43_fchmod               (__NR_BSD43 + 124)
-#define __NR_BSD43_oldrecvfrom          (__NR_BSD43 + 125)
-#define __NR_BSD43_setreuid             (__NR_BSD43 + 126)
-#define __NR_BSD43_setregid             (__NR_BSD43 + 127)
-#define __NR_BSD43_rename               (__NR_BSD43 + 128)
-#define __NR_BSD43_truncate             (__NR_BSD43 + 129)
-#define __NR_BSD43_ftruncate            (__NR_BSD43 + 130)
-#define __NR_BSD43_flock                (__NR_BSD43 + 131)
-#define __NR_BSD43_semsys               (__NR_BSD43 + 132)
-#define __NR_BSD43_sendto               (__NR_BSD43 + 133)
-#define __NR_BSD43_shutdown             (__NR_BSD43 + 134)
-#define __NR_BSD43_socketpair           (__NR_BSD43 + 135)
-#define __NR_BSD43_mkdir                (__NR_BSD43 + 136)
-#define __NR_BSD43_rmdir                (__NR_BSD43 + 137)
-#define __NR_BSD43_utimes               (__NR_BSD43 + 138)
-#define __NR_BSD43_sigcleanup           (__NR_BSD43 + 139)
-#define __NR_BSD43_adjtime              (__NR_BSD43 + 140)
-#define __NR_BSD43_oldgetpeername       (__NR_BSD43 + 141)
-#define __NR_BSD43_gethostid            (__NR_BSD43 + 142)
-#define __NR_BSD43_sethostid            (__NR_BSD43 + 143)
-#define __NR_BSD43_getrlimit            (__NR_BSD43 + 144)
-#define __NR_BSD43_setrlimit            (__NR_BSD43 + 145)
-#define __NR_BSD43_killpg               (__NR_BSD43 + 146)
-#define __NR_BSD43_shmsys               (__NR_BSD43 + 147)
-#define __NR_BSD43_quota                (__NR_BSD43 + 148)
-#define __NR_BSD43_qquota               (__NR_BSD43 + 149)
-#define __NR_BSD43_oldgetsockname       (__NR_BSD43 + 150)
-#define __NR_BSD43_sysmips              (__NR_BSD43 + 151)
-#define __NR_BSD43_cacheflush           (__NR_BSD43 + 152)
-#define __NR_BSD43_cachectl             (__NR_BSD43 + 153)
-#define __NR_BSD43_debug                (__NR_BSD43 + 154)
-#define __NR_BSD43_reserved5            (__NR_BSD43 + 155)
-#define __NR_BSD43_reserved6            (__NR_BSD43 + 156)
-#define __NR_BSD43_nfs_mount            (__NR_BSD43 + 157)
-#define __NR_BSD43_nfs_svc              (__NR_BSD43 + 158)
-#define __NR_BSD43_getdirentries        (__NR_BSD43 + 159)
-#define __NR_BSD43_statfs               (__NR_BSD43 + 160)
-#define __NR_BSD43_fstatfs              (__NR_BSD43 + 161)
-#define __NR_BSD43_unmount              (__NR_BSD43 + 162)
-#define __NR_BSD43_async_daemon         (__NR_BSD43 + 163)
-#define __NR_BSD43_nfs_getfh            (__NR_BSD43 + 164)
-#define __NR_BSD43_getdomainname        (__NR_BSD43 + 165)
-#define __NR_BSD43_setdomainname        (__NR_BSD43 + 166)
-#define __NR_BSD43_pcfs_mount           (__NR_BSD43 + 167)
-#define __NR_BSD43_quotactl             (__NR_BSD43 + 168)
-#define __NR_BSD43_oldexportfs          (__NR_BSD43 + 169)
-#define __NR_BSD43_smount               (__NR_BSD43 + 170)
-#define __NR_BSD43_mipshwconf           (__NR_BSD43 + 171)
-#define __NR_BSD43_exportfs             (__NR_BSD43 + 172)
-#define __NR_BSD43_nfsfh_open           (__NR_BSD43 + 173)
-#define __NR_BSD43_libattach            (__NR_BSD43 + 174)
-#define __NR_BSD43_libdetach            (__NR_BSD43 + 175)
-#define __NR_BSD43_accept               (__NR_BSD43 + 176)
-#define __NR_BSD43_reserved7            (__NR_BSD43 + 177)
-#define __NR_BSD43_reserved8            (__NR_BSD43 + 178)
-#define __NR_BSD43_recvmsg              (__NR_BSD43 + 179)
-#define __NR_BSD43_recvfrom             (__NR_BSD43 + 180)
-#define __NR_BSD43_sendmsg              (__NR_BSD43 + 181)
-#define __NR_BSD43_getpeername          (__NR_BSD43 + 182)
-#define __NR_BSD43_getsockname          (__NR_BSD43 + 183)
-#define __NR_BSD43_aread                (__NR_BSD43 + 184)
-#define __NR_BSD43_awrite               (__NR_BSD43 + 185)
-#define __NR_BSD43_listio               (__NR_BSD43 + 186)
-#define __NR_BSD43_acancel              (__NR_BSD43 + 187)
-#define __NR_BSD43_astatus              (__NR_BSD43 + 188)
-#define __NR_BSD43_await                (__NR_BSD43 + 189)
-#define __NR_BSD43_areadv               (__NR_BSD43 + 190)
-#define __NR_BSD43_awritev              (__NR_BSD43 + 191)
-/*
- * POSIX syscalls are in the range from 3000 to 3999
- */
-#define __NR_POSIX                      3000
-#define __NR_POSIX_syscall              (__NR_POSIX +   0)
-#define __NR_POSIX_exit                 (__NR_POSIX +   1)
-#define __NR_POSIX_fork                 (__NR_POSIX +   2)
-#define __NR_POSIX_read                 (__NR_POSIX +   3)
-#define __NR_POSIX_write                (__NR_POSIX +   4)
-#define __NR_POSIX_open                 (__NR_POSIX +   5)
-#define __NR_POSIX_close                (__NR_POSIX +   6)
-#define __NR_POSIX_wait                 (__NR_POSIX +   7)
-#define __NR_POSIX_creat                (__NR_POSIX +   8)
-#define __NR_POSIX_link                 (__NR_POSIX +   9)
-#define __NR_POSIX_unlink               (__NR_POSIX +  10)
-#define __NR_POSIX_exec                 (__NR_POSIX +  11)
-#define __NR_POSIX_chdir                (__NR_POSIX +  12)
-#define __NR_POSIX_gtime                (__NR_POSIX +  13)
-#define __NR_POSIX_mknod                (__NR_POSIX +  14)
-#define __NR_POSIX_chmod                (__NR_POSIX +  15)
-#define __NR_POSIX_chown                (__NR_POSIX +  16)
-#define __NR_POSIX_sbreak               (__NR_POSIX +  17)
-#define __NR_POSIX_stat                 (__NR_POSIX +  18)
-#define __NR_POSIX_lseek                (__NR_POSIX +  19)
-#define __NR_POSIX_getpid               (__NR_POSIX +  20)
-#define __NR_POSIX_mount                (__NR_POSIX +  21)
-#define __NR_POSIX_umount               (__NR_POSIX +  22)
-#define __NR_POSIX_setuid               (__NR_POSIX +  23)
-#define __NR_POSIX_getuid               (__NR_POSIX +  24)
-#define __NR_POSIX_stime                (__NR_POSIX +  25)
-#define __NR_POSIX_ptrace               (__NR_POSIX +  26)
-#define __NR_POSIX_alarm                (__NR_POSIX +  27)
-#define __NR_POSIX_fstat                (__NR_POSIX +  28)
-#define __NR_POSIX_pause                (__NR_POSIX +  29)
-#define __NR_POSIX_utime                (__NR_POSIX +  30)
-#define __NR_POSIX_stty                 (__NR_POSIX +  31)
-#define __NR_POSIX_gtty                 (__NR_POSIX +  32)
-#define __NR_POSIX_access               (__NR_POSIX +  33)
-#define __NR_POSIX_nice                 (__NR_POSIX +  34)
-#define __NR_POSIX_statfs               (__NR_POSIX +  35)
-#define __NR_POSIX_sync                 (__NR_POSIX +  36)
-#define __NR_POSIX_kill                 (__NR_POSIX +  37)
-#define __NR_POSIX_fstatfs              (__NR_POSIX +  38)
-#define __NR_POSIX_getpgrp              (__NR_POSIX +  39)
-#define __NR_POSIX_syssgi               (__NR_POSIX +  40)
-#define __NR_POSIX_dup                  (__NR_POSIX +  41)
-#define __NR_POSIX_pipe                 (__NR_POSIX +  42)
-#define __NR_POSIX_times                (__NR_POSIX +  43)
-#define __NR_POSIX_profil               (__NR_POSIX +  44)
-#define __NR_POSIX_lock                 (__NR_POSIX +  45)
-#define __NR_POSIX_setgid               (__NR_POSIX +  46)
-#define __NR_POSIX_getgid               (__NR_POSIX +  47)
-#define __NR_POSIX_sig                  (__NR_POSIX +  48)
-#define __NR_POSIX_msgsys               (__NR_POSIX +  49)
-#define __NR_POSIX_sysmips              (__NR_POSIX +  50)
-#define __NR_POSIX_sysacct              (__NR_POSIX +  51)
-#define __NR_POSIX_shmsys               (__NR_POSIX +  52)
-#define __NR_POSIX_semsys               (__NR_POSIX +  53)
-#define __NR_POSIX_ioctl                (__NR_POSIX +  54)
-#define __NR_POSIX_uadmin               (__NR_POSIX +  55)
-#define __NR_POSIX_exch                 (__NR_POSIX +  56)
-#define __NR_POSIX_utssys               (__NR_POSIX +  57)
-#define __NR_POSIX_USG_reserved1        (__NR_POSIX +  58)
-#define __NR_POSIX_exece                (__NR_POSIX +  59)
-#define __NR_POSIX_umask                (__NR_POSIX +  60)
-#define __NR_POSIX_chroot               (__NR_POSIX +  61)
-#define __NR_POSIX_fcntl                (__NR_POSIX +  62)
-#define __NR_POSIX_ulimit               (__NR_POSIX +  63)
-#define __NR_POSIX_SAFARI4_reserved1    (__NR_POSIX +  64)
-#define __NR_POSIX_SAFARI4_reserved2    (__NR_POSIX +  65)
-#define __NR_POSIX_SAFARI4_reserved3    (__NR_POSIX +  66)
-#define __NR_POSIX_SAFARI4_reserved4    (__NR_POSIX +  67)
-#define __NR_POSIX_SAFARI4_reserved5    (__NR_POSIX +  68)
-#define __NR_POSIX_SAFARI4_reserved6    (__NR_POSIX +  69)
-#define __NR_POSIX_advfs                (__NR_POSIX +  70)
-#define __NR_POSIX_unadvfs              (__NR_POSIX +  71)
-#define __NR_POSIX_rmount               (__NR_POSIX +  72)
-#define __NR_POSIX_rumount              (__NR_POSIX +  73)
-#define __NR_POSIX_rfstart              (__NR_POSIX +  74)
-#define __NR_POSIX_reserved1            (__NR_POSIX +  75)
-#define __NR_POSIX_rdebug               (__NR_POSIX +  76)
-#define __NR_POSIX_rfstop               (__NR_POSIX +  77)
-#define __NR_POSIX_rfsys                (__NR_POSIX +  78)
-#define __NR_POSIX_rmdir                (__NR_POSIX +  79)
-#define __NR_POSIX_mkdir                (__NR_POSIX +  80)
-#define __NR_POSIX_getdents             (__NR_POSIX +  81)
-#define __NR_POSIX_sginap               (__NR_POSIX +  82)
-#define __NR_POSIX_sgikopt              (__NR_POSIX +  83)
-#define __NR_POSIX_sysfs                (__NR_POSIX +  84)
-#define __NR_POSIX_getmsg               (__NR_POSIX +  85)
-#define __NR_POSIX_putmsg               (__NR_POSIX +  86)
-#define __NR_POSIX_poll                 (__NR_POSIX +  87)
-#define __NR_POSIX_sigreturn            (__NR_POSIX +  88)
-#define __NR_POSIX_accept               (__NR_POSIX +  89)
-#define __NR_POSIX_bind                 (__NR_POSIX +  90)
-#define __NR_POSIX_connect              (__NR_POSIX +  91)
-#define __NR_POSIX_gethostid            (__NR_POSIX +  92)
-#define __NR_POSIX_getpeername          (__NR_POSIX +  93)
-#define __NR_POSIX_getsockname          (__NR_POSIX +  94)
-#define __NR_POSIX_getsockopt           (__NR_POSIX +  95)
-#define __NR_POSIX_listen               (__NR_POSIX +  96)
-#define __NR_POSIX_recv                 (__NR_POSIX +  97)
-#define __NR_POSIX_recvfrom             (__NR_POSIX +  98)
-#define __NR_POSIX_recvmsg              (__NR_POSIX +  99)
-#define __NR_POSIX_select               (__NR_POSIX + 100)
-#define __NR_POSIX_send                 (__NR_POSIX + 101)
-#define __NR_POSIX_sendmsg              (__NR_POSIX + 102)
-#define __NR_POSIX_sendto               (__NR_POSIX + 103)
-#define __NR_POSIX_sethostid            (__NR_POSIX + 104)
-#define __NR_POSIX_setsockopt           (__NR_POSIX + 105)
-#define __NR_POSIX_shutdown             (__NR_POSIX + 106)
-#define __NR_POSIX_socket               (__NR_POSIX + 107)
-#define __NR_POSIX_gethostname          (__NR_POSIX + 108)
-#define __NR_POSIX_sethostname          (__NR_POSIX + 109)
-#define __NR_POSIX_getdomainname        (__NR_POSIX + 110)
-#define __NR_POSIX_setdomainname        (__NR_POSIX + 111)
-#define __NR_POSIX_truncate             (__NR_POSIX + 112)
-#define __NR_POSIX_ftruncate            (__NR_POSIX + 113)
-#define __NR_POSIX_rename               (__NR_POSIX + 114)
-#define __NR_POSIX_symlink              (__NR_POSIX + 115)
-#define __NR_POSIX_readlink             (__NR_POSIX + 116)
-#define __NR_POSIX_lstat                (__NR_POSIX + 117)
-#define __NR_POSIX_nfs_mount            (__NR_POSIX + 118)
-#define __NR_POSIX_nfs_svc              (__NR_POSIX + 119)
-#define __NR_POSIX_nfs_getfh            (__NR_POSIX + 120)
-#define __NR_POSIX_async_daemon         (__NR_POSIX + 121)
-#define __NR_POSIX_exportfs             (__NR_POSIX + 122)
-#define __NR_POSIX_SGI_setregid         (__NR_POSIX + 123)
-#define __NR_POSIX_SGI_setreuid         (__NR_POSIX + 124)
-#define __NR_POSIX_getitimer            (__NR_POSIX + 125)
-#define __NR_POSIX_setitimer            (__NR_POSIX + 126)
-#define __NR_POSIX_adjtime              (__NR_POSIX + 127)
-#define __NR_POSIX_SGI_bsdgettime       (__NR_POSIX + 128)
-#define __NR_POSIX_SGI_sproc            (__NR_POSIX + 129)
-#define __NR_POSIX_SGI_prctl            (__NR_POSIX + 130)
-#define __NR_POSIX_SGI_blkproc          (__NR_POSIX + 131)
-#define __NR_POSIX_SGI_reserved1        (__NR_POSIX + 132)
-#define __NR_POSIX_SGI_sgigsc           (__NR_POSIX + 133)
-#define __NR_POSIX_SGI_mmap             (__NR_POSIX + 134)
-#define __NR_POSIX_SGI_munmap           (__NR_POSIX + 135)
-#define __NR_POSIX_SGI_mprotect         (__NR_POSIX + 136)
-#define __NR_POSIX_SGI_msync            (__NR_POSIX + 137)
-#define __NR_POSIX_SGI_madvise          (__NR_POSIX + 138)
-#define __NR_POSIX_SGI_mpin             (__NR_POSIX + 139)
-#define __NR_POSIX_SGI_getpagesize      (__NR_POSIX + 140)
-#define __NR_POSIX_SGI_libattach        (__NR_POSIX + 141)
-#define __NR_POSIX_SGI_libdetach        (__NR_POSIX + 142)
-#define __NR_POSIX_SGI_getpgrp          (__NR_POSIX + 143)
-#define __NR_POSIX_SGI_setpgrp          (__NR_POSIX + 144)
-#define __NR_POSIX_SGI_reserved2        (__NR_POSIX + 145)
-#define __NR_POSIX_SGI_reserved3        (__NR_POSIX + 146)
-#define __NR_POSIX_SGI_reserved4        (__NR_POSIX + 147)
-#define __NR_POSIX_SGI_reserved5        (__NR_POSIX + 148)
-#define __NR_POSIX_SGI_reserved6        (__NR_POSIX + 149)
-#define __NR_POSIX_cacheflush           (__NR_POSIX + 150)
-#define __NR_POSIX_cachectl             (__NR_POSIX + 151)
-#define __NR_POSIX_fchown               (__NR_POSIX + 152)
-#define __NR_POSIX_fchmod               (__NR_POSIX + 153)
-#define __NR_POSIX_wait3                (__NR_POSIX + 154)
-#define __NR_POSIX_mmap                 (__NR_POSIX + 155)
-#define __NR_POSIX_munmap               (__NR_POSIX + 156)
-#define __NR_POSIX_madvise              (__NR_POSIX + 157)
-#define __NR_POSIX_BSD_getpagesize      (__NR_POSIX + 158)
-#define __NR_POSIX_setreuid             (__NR_POSIX + 159)
-#define __NR_POSIX_setregid             (__NR_POSIX + 160)
-#define __NR_POSIX_setpgid              (__NR_POSIX + 161)
-#define __NR_POSIX_getgroups            (__NR_POSIX + 162)
-#define __NR_POSIX_setgroups            (__NR_POSIX + 163)
-#define __NR_POSIX_gettimeofday         (__NR_POSIX + 164)
-#define __NR_POSIX_getrusage            (__NR_POSIX + 165)
-#define __NR_POSIX_getrlimit            (__NR_POSIX + 166)
-#define __NR_POSIX_setrlimit            (__NR_POSIX + 167)
-#define __NR_POSIX_waitpid              (__NR_POSIX + 168)
-#define __NR_POSIX_dup2                 (__NR_POSIX + 169)
-#define __NR_POSIX_reserved2            (__NR_POSIX + 170)
-#define __NR_POSIX_reserved3            (__NR_POSIX + 171)
-#define __NR_POSIX_reserved4            (__NR_POSIX + 172)
-#define __NR_POSIX_reserved5            (__NR_POSIX + 173)
-#define __NR_POSIX_reserved6            (__NR_POSIX + 174)
-#define __NR_POSIX_reserved7            (__NR_POSIX + 175)
-#define __NR_POSIX_reserved8            (__NR_POSIX + 176)
-#define __NR_POSIX_reserved9            (__NR_POSIX + 177)
-#define __NR_POSIX_reserved10           (__NR_POSIX + 178)
-#define __NR_POSIX_reserved11           (__NR_POSIX + 179)
-#define __NR_POSIX_reserved12           (__NR_POSIX + 180)
-#define __NR_POSIX_reserved13           (__NR_POSIX + 181)
-#define __NR_POSIX_reserved14           (__NR_POSIX + 182)
-#define __NR_POSIX_reserved15           (__NR_POSIX + 183)
-#define __NR_POSIX_reserved16           (__NR_POSIX + 184)
-#define __NR_POSIX_reserved17           (__NR_POSIX + 185)
-#define __NR_POSIX_reserved18           (__NR_POSIX + 186)
-#define __NR_POSIX_reserved19           (__NR_POSIX + 187)
-#define __NR_POSIX_reserved20           (__NR_POSIX + 188)
-#define __NR_POSIX_reserved21           (__NR_POSIX + 189)
-#define __NR_POSIX_reserved22           (__NR_POSIX + 190)
-#define __NR_POSIX_reserved23           (__NR_POSIX + 191)
-#define __NR_POSIX_reserved24           (__NR_POSIX + 192)
-#define __NR_POSIX_reserved25           (__NR_POSIX + 193)
-#define __NR_POSIX_reserved26           (__NR_POSIX + 194)
-#define __NR_POSIX_reserved27           (__NR_POSIX + 195)
-#define __NR_POSIX_reserved28           (__NR_POSIX + 196)
-#define __NR_POSIX_reserved29           (__NR_POSIX + 197)
-#define __NR_POSIX_reserved30           (__NR_POSIX + 198)
-#define __NR_POSIX_reserved31           (__NR_POSIX + 199)
-#define __NR_POSIX_reserved32           (__NR_POSIX + 200)
-#define __NR_POSIX_reserved33           (__NR_POSIX + 201)
-#define __NR_POSIX_reserved34           (__NR_POSIX + 202)
-#define __NR_POSIX_reserved35           (__NR_POSIX + 203)
-#define __NR_POSIX_reserved36           (__NR_POSIX + 204)
-#define __NR_POSIX_reserved37           (__NR_POSIX + 205)
-#define __NR_POSIX_reserved38           (__NR_POSIX + 206)
-#define __NR_POSIX_reserved39           (__NR_POSIX + 207)
-#define __NR_POSIX_reserved40           (__NR_POSIX + 208)
-#define __NR_POSIX_reserved41           (__NR_POSIX + 209)
-#define __NR_POSIX_reserved42           (__NR_POSIX + 210)
-#define __NR_POSIX_reserved43           (__NR_POSIX + 211)
-#define __NR_POSIX_reserved44           (__NR_POSIX + 212)
-#define __NR_POSIX_reserved45           (__NR_POSIX + 213)
-#define __NR_POSIX_reserved46           (__NR_POSIX + 214)
-#define __NR_POSIX_reserved47           (__NR_POSIX + 215)
-#define __NR_POSIX_reserved48           (__NR_POSIX + 216)
-#define __NR_POSIX_reserved49           (__NR_POSIX + 217)
-#define __NR_POSIX_reserved50           (__NR_POSIX + 218)
-#define __NR_POSIX_reserved51           (__NR_POSIX + 219)
-#define __NR_POSIX_reserved52           (__NR_POSIX + 220)
-#define __NR_POSIX_reserved53           (__NR_POSIX + 221)
-#define __NR_POSIX_reserved54           (__NR_POSIX + 222)
-#define __NR_POSIX_reserved55           (__NR_POSIX + 223)
-#define __NR_POSIX_reserved56           (__NR_POSIX + 224)
-#define __NR_POSIX_reserved57           (__NR_POSIX + 225)
-#define __NR_POSIX_reserved58           (__NR_POSIX + 226)
-#define __NR_POSIX_reserved59           (__NR_POSIX + 227)
-#define __NR_POSIX_reserved60           (__NR_POSIX + 228)
-#define __NR_POSIX_reserved61           (__NR_POSIX + 229)
-#define __NR_POSIX_reserved62           (__NR_POSIX + 230)
-#define __NR_POSIX_reserved63           (__NR_POSIX + 231)
-#define __NR_POSIX_reserved64           (__NR_POSIX + 232)
-#define __NR_POSIX_reserved65           (__NR_POSIX + 233)
-#define __NR_POSIX_reserved66           (__NR_POSIX + 234)
-#define __NR_POSIX_reserved67           (__NR_POSIX + 235)
-#define __NR_POSIX_reserved68           (__NR_POSIX + 236)
-#define __NR_POSIX_reserved69           (__NR_POSIX + 237)
-#define __NR_POSIX_reserved70           (__NR_POSIX + 238)
-#define __NR_POSIX_reserved71           (__NR_POSIX + 239)
-#define __NR_POSIX_reserved72           (__NR_POSIX + 240)
-#define __NR_POSIX_reserved73           (__NR_POSIX + 241)
-#define __NR_POSIX_reserved74           (__NR_POSIX + 242)
-#define __NR_POSIX_reserved75           (__NR_POSIX + 243)
-#define __NR_POSIX_reserved76           (__NR_POSIX + 244)
-#define __NR_POSIX_reserved77           (__NR_POSIX + 245)
-#define __NR_POSIX_reserved78           (__NR_POSIX + 246)
-#define __NR_POSIX_reserved79           (__NR_POSIX + 247)
-#define __NR_POSIX_reserved80           (__NR_POSIX + 248)
-#define __NR_POSIX_reserved81           (__NR_POSIX + 249)
-#define __NR_POSIX_reserved82           (__NR_POSIX + 250)
-#define __NR_POSIX_reserved83           (__NR_POSIX + 251)
-#define __NR_POSIX_reserved84           (__NR_POSIX + 252)
-#define __NR_POSIX_reserved85           (__NR_POSIX + 253)
-#define __NR_POSIX_reserved86           (__NR_POSIX + 254)
-#define __NR_POSIX_reserved87           (__NR_POSIX + 255)
-#define __NR_POSIX_reserved88           (__NR_POSIX + 256)
-#define __NR_POSIX_reserved89           (__NR_POSIX + 257)
-#define __NR_POSIX_reserved90           (__NR_POSIX + 258)
-#define __NR_POSIX_reserved91           (__NR_POSIX + 259)
-#define __NR_POSIX_netboot              (__NR_POSIX + 260)
-#define __NR_POSIX_netunboot            (__NR_POSIX + 261)
-#define __NR_POSIX_rdump                (__NR_POSIX + 262)
-#define __NR_POSIX_setsid               (__NR_POSIX + 263)
-#define __NR_POSIX_getmaxsig            (__NR_POSIX + 264)
-#define __NR_POSIX_sigpending           (__NR_POSIX + 265)
-#define __NR_POSIX_sigprocmask          (__NR_POSIX + 266)
-#define __NR_POSIX_sigsuspend           (__NR_POSIX + 267)
-#define __NR_POSIX_sigaction            (__NR_POSIX + 268)
-#define __NR_POSIX_MIPS_reserved1       (__NR_POSIX + 269)
-#define __NR_POSIX_MIPS_reserved2       (__NR_POSIX + 270)
-#define __NR_POSIX_MIPS_reserved3       (__NR_POSIX + 271)
-#define __NR_POSIX_MIPS_reserved4       (__NR_POSIX + 272)
-#define __NR_POSIX_MIPS_reserved5       (__NR_POSIX + 273)
-#define __NR_POSIX_MIPS_reserved6       (__NR_POSIX + 274)
-#define __NR_POSIX_MIPS_reserved7       (__NR_POSIX + 275)
-#define __NR_POSIX_MIPS_reserved8       (__NR_POSIX + 276)
-#define __NR_POSIX_MIPS_reserved9       (__NR_POSIX + 277)
-#define __NR_POSIX_MIPS_reserved10      (__NR_POSIX + 278)
-#define __NR_POSIX_MIPS_reserved11      (__NR_POSIX + 279)
-#define __NR_POSIX_TANDEM_reserved1     (__NR_POSIX + 280)
-#define __NR_POSIX_TANDEM_reserved2     (__NR_POSIX + 281)
-#define __NR_POSIX_TANDEM_reserved3     (__NR_POSIX + 282)
-#define __NR_POSIX_TANDEM_reserved4     (__NR_POSIX + 283)
-#define __NR_POSIX_TANDEM_reserved5     (__NR_POSIX + 284)
-#define __NR_POSIX_TANDEM_reserved6     (__NR_POSIX + 285)
-#define __NR_POSIX_TANDEM_reserved7     (__NR_POSIX + 286)
-#define __NR_POSIX_TANDEM_reserved8     (__NR_POSIX + 287)
-#define __NR_POSIX_TANDEM_reserved9     (__NR_POSIX + 288)
-#define __NR_POSIX_TANDEM_reserved10    (__NR_POSIX + 289)
-#define __NR_POSIX_TANDEM_reserved11    (__NR_POSIX + 290)
-#define __NR_POSIX_TANDEM_reserved12    (__NR_POSIX + 291)
-#define __NR_POSIX_TANDEM_reserved13    (__NR_POSIX + 292)
-#define __NR_POSIX_TANDEM_reserved14    (__NR_POSIX + 293)
-#define __NR_POSIX_TANDEM_reserved15    (__NR_POSIX + 294)
-#define __NR_POSIX_TANDEM_reserved16    (__NR_POSIX + 295)
-#define __NR_POSIX_TANDEM_reserved17    (__NR_POSIX + 296)
-#define __NR_POSIX_TANDEM_reserved18    (__NR_POSIX + 297)
-#define __NR_POSIX_TANDEM_reserved19    (__NR_POSIX + 298)
-#define __NR_POSIX_TANDEM_reserved20    (__NR_POSIX + 299)
-#define __NR_POSIX_SGI_reserved7        (__NR_POSIX + 300)
-#define __NR_POSIX_SGI_reserved8        (__NR_POSIX + 301)
-#define __NR_POSIX_SGI_reserved9        (__NR_POSIX + 302)
-#define __NR_POSIX_SGI_reserved10       (__NR_POSIX + 303)
-#define __NR_POSIX_SGI_reserved11       (__NR_POSIX + 304)
-#define __NR_POSIX_SGI_reserved12       (__NR_POSIX + 305)
-#define __NR_POSIX_SGI_reserved13       (__NR_POSIX + 306)
-#define __NR_POSIX_SGI_reserved14       (__NR_POSIX + 307)
-#define __NR_POSIX_SGI_reserved15       (__NR_POSIX + 308)
-#define __NR_POSIX_SGI_reserved16       (__NR_POSIX + 309)
-#define __NR_POSIX_SGI_reserved17       (__NR_POSIX + 310)
-#define __NR_POSIX_SGI_reserved18       (__NR_POSIX + 311)
-#define __NR_POSIX_SGI_reserved19       (__NR_POSIX + 312)
-#define __NR_POSIX_SGI_reserved20       (__NR_POSIX + 313)
-#define __NR_POSIX_SGI_reserved21       (__NR_POSIX + 314)
-#define __NR_POSIX_SGI_reserved22       (__NR_POSIX + 315)
-#define __NR_POSIX_SGI_reserved23       (__NR_POSIX + 316)
-#define __NR_POSIX_SGI_reserved24       (__NR_POSIX + 317)
-#define __NR_POSIX_SGI_reserved25       (__NR_POSIX + 318)
-#define __NR_POSIX_SGI_reserved26       (__NR_POSIX + 319)
-#endif /* _ASM_RISCOS_SYSCALL_H */
diff --git a/include/asm-parisc/atomic.h b/include/asm-parisc/atomic.h
index 983e9a2b6042..64ebd086c40d 100644
--- a/include/asm-parisc/atomic.h
+++ b/include/asm-parisc/atomic.h
@@ -216,4 +216,5 @@ static __inline__ int atomic_read(const atomic_t *v)
 #define smp_mb__before_atomic_inc()     smp_mb()
 #define smp_mb__after_atomic_inc()      smp_mb()
+#include <asm-generic/atomic.h>
 #endif
diff --git a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h
index e829607eb8bc..736b0abcac05 100644
--- a/include/asm-parisc/mman.h
+++ b/include/asm-parisc/mman.h
@@ -38,6 +38,7 @@
 #define MADV_SPACEAVAIL 5               /* insure that resources are reserved */
 #define MADV_VPS_PURGE  6               /* Purge pages from VM page cache */
 #define MADV_VPS_INHERIT 7              /* Inherit parents page size */
+#define MADV_REMOVE     8               /* remove these pages & resources */
 /* The range 12-64 is reserved for page size specification. */
 #define MADV_4K_PAGES   12              /* Use 4K pages  */
diff --git a/include/asm-powerpc/atomic.h b/include/asm-powerpc/atomic.h
index ec4b14468959..ae395a0632a6 100644
--- a/include/asm-powerpc/atomic.h
+++ b/include/asm-powerpc/atomic.h
@@ -402,5 +402,6 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
 #endif /* __powerpc64__ */
+#include <asm-generic/atomic.h>
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_ATOMIC_H_ */
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h
index f5e5342fcac5..a2e34c21b44f 100644
--- a/include/asm-powerpc/mman.h
+++ b/include/asm-powerpc/mman.h
@@ -44,6 +44,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-ppc/ibm_ocp.h b/include/asm-ppc/ibm_ocp.h
index 9c21de1ff4ed..ddce616f765a 100644
--- a/include/asm-ppc/ibm_ocp.h
+++ b/include/asm-ppc/ibm_ocp.h
@@ -63,7 +63,6 @@ struct ocp_func_emac_data {
        int     wol_irq;        /* WOL interrupt */
        int     mdio_idx;       /* EMAC idx of MDIO master or -1 */
        int     tah_idx;        /* TAH device index or -1 */
-        int     jumbo;          /* Jumbo frames capable flag */
        int     phy_mode;       /* PHY type or configurable mode */
        u8      mac_addr[6];    /* EMAC mac address */
        u32     phy_map;        /* EMAC phy map */
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 84ac6e258eef..df9cf6ed189d 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -27,6 +27,8 @@
 #if defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>
+#elif defined(CONFIG_PPC_MPC52xx)
+#include <asm/mpc52xx.h>
 #elif defined(CONFIG_8xx)
 #include <asm/mpc8xx.h>
 #elif defined(CONFIG_8260)
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
index e5f80c22fbfc..a055e0756b9d 100644
--- a/include/asm-ppc/mpc52xx.h
+++ b/include/asm-ppc/mpc52xx.h
@@ -29,6 +29,17 @@ struct pt_regs;
 #endif /* __ASSEMBLY__ */
+#ifdef CONFIG_PCI
+#define _IO_BASE        isa_io_base
+#define _ISA_MEM_BASE   isa_mem_base
+#define PCI_DRAM_OFFSET pci_dram_offset
+#else
+#define _IO_BASE        0
+#define _ISA_MEM_BASE   0
+#define PCI_DRAM_OFFSET 0
+#endif
 /* ======================================================================== */
 /* PPC Sys devices definition                                               */
 /* ======================================================================== */
@@ -107,7 +118,7 @@ enum ppc_sys_devices {
 #define MPC52xx_SDMA_IRQ_NUM    17
 #define MPC52xx_PERP_IRQ_NUM    23
-#define MPC52xx_CRIT_IRQ_BASE   0
+#define MPC52xx_CRIT_IRQ_BASE   1
 #define MPC52xx_MAIN_IRQ_BASE   (MPC52xx_CRIT_IRQ_BASE + MPC52xx_CRIT_IRQ_NUM)
 #define MPC52xx_SDMA_IRQ_BASE   (MPC52xx_MAIN_IRQ_BASE + MPC52xx_MAIN_IRQ_NUM)
 #define MPC52xx_PERP_IRQ_BASE   (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM)
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index b3bd4f679f72..d82aedf616fe 100644
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
@@ -5,7 +5,7 @@
 *  include/asm-s390/atomic.h
 *
 *  S390 version
- *    Copyright (C) 1999-2003 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright (C) 1999-2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
 *               Denis Joseph Barrow,
 *               Arnd Bergmann (arndb@de.ibm.com)
@@ -45,59 +45,57 @@ typedef struct {
 #define atomic_read(v)          ((v)->counter)
 #define atomic_set(v,i)         (((v)->counter) = (i))
-static __inline__ void atomic_add(int i, atomic_t * v)
-{
-               __CS_LOOP(v, i, "ar");
-}
 static __inline__ int atomic_add_return(int i, atomic_t * v)
 {
        return __CS_LOOP(v, i, "ar");
 }
-static __inline__ int atomic_add_negative(int i, atomic_t * v)
+#define atomic_add(_i, _v)              atomic_add_return(_i, _v)
-{
+#define atomic_add_negative(_i, _v)     (atomic_add_return(_i, _v) < 0)
-        return __CS_LOOP(v, i, "ar") < 0;
+#define atomic_inc(_v)                  atomic_add_return(1, _v)
-}
+#define atomic_inc_return(_v)           atomic_add_return(1, _v)
-static __inline__ void atomic_sub(int i, atomic_t * v)
+#define atomic_inc_and_test(_v)         (atomic_add_return(1, _v) == 0)
-{
-               __CS_LOOP(v, i, "sr");
-}
 static __inline__ int atomic_sub_return(int i, atomic_t * v)
 {
        return __CS_LOOP(v, i, "sr");
 }
-static __inline__ void atomic_inc(volatile atomic_t * v)
+#define atomic_sub(_i, _v)              atomic_sub_return(_i, _v)
-{
+#define atomic_sub_and_test(_i, _v)     (atomic_sub_return(_i, _v) == 0)
-               __CS_LOOP(v, 1, "ar");
+#define atomic_dec(_v)                  atomic_sub_return(1, _v)
-}
+#define atomic_dec_return(_v)           atomic_sub_return(1, _v)
-static __inline__ int atomic_inc_return(volatile atomic_t * v)
+#define atomic_dec_and_test(_v)         (atomic_sub_return(1, _v) == 0)
-{
-        return __CS_LOOP(v, 1, "ar");
-}
-static __inline__ int atomic_inc_and_test(volatile atomic_t * v)
-{
-        return __CS_LOOP(v, 1, "ar") == 0;
-}
-static __inline__ void atomic_dec(volatile atomic_t * v)
-{
-               __CS_LOOP(v, 1, "sr");
-}
-static __inline__ int atomic_dec_return(volatile atomic_t * v)
-{
-        return __CS_LOOP(v, 1, "sr");
-}
-static __inline__ int atomic_dec_and_test(volatile atomic_t * v)
-{
-        return __CS_LOOP(v, 1, "sr") == 0;
-}
 static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t * v)
 {
               __CS_LOOP(v, ~mask, "nr");
 }
 static __inline__ void atomic_set_mask(unsigned long mask, atomic_t * v)
 {
               __CS_LOOP(v, mask, "or");
 }
+static __inline__ int atomic_cmpxchg(atomic_t *v, int old, int new)
+{
+        __asm__ __volatile__("  cs   %0,%3,0(%2)\n"
+                             : "+d" (old), "=m" (v->counter)
+                             : "a" (v), "d" (new), "m" (v->counter)
+                             : "cc", "memory" );
+        return old;
+}
+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)
+                c = old;
+        return c != u;
+}
+#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 #undef __CS_LOOP
 #ifdef __s390x__
@@ -123,97 +121,67 @@ typedef struct {
 #define atomic64_read(v)          ((v)->counter)
 #define atomic64_set(v,i)         (((v)->counter) = (i))
-static __inline__ void atomic64_add(long long i, atomic64_t * v)
-{
-               __CSG_LOOP(v, i, "agr");
-}
 static __inline__ long long atomic64_add_return(long long i, atomic64_t * v)
 {
        return __CSG_LOOP(v, i, "agr");
 }
-static __inline__ long long atomic64_add_negative(long long i, atomic64_t * v)
+#define atomic64_add(_i, _v)            atomic64_add_return(_i, _v)
-{
+#define atomic64_add_negative(_i, _v)   (atomic64_add_return(_i, _v) < 0)
-        return __CSG_LOOP(v, i, "agr") < 0;
+#define atomic64_inc(_v)                atomic64_add_return(1, _v)
-}
+#define atomic64_inc_return(_v)         atomic64_add_return(1, _v)
-static __inline__ void atomic64_sub(long long i, atomic64_t * v)
+#define atomic64_inc_and_test(_v)       (atomic64_add_return(1, _v) == 0)
-{
-               __CSG_LOOP(v, i, "sgr");
+static __inline__ long long atomic64_sub_return(long long i, atomic64_t * v)
-}
-static __inline__ void atomic64_inc(volatile atomic64_t * v)
-{
-               __CSG_LOOP(v, 1, "agr");
-}
-static __inline__ long long atomic64_inc_return(volatile atomic64_t * v)
-{
-        return __CSG_LOOP(v, 1, "agr");
-}
-static __inline__ long long atomic64_inc_and_test(volatile atomic64_t * v)
-{
-        return __CSG_LOOP(v, 1, "agr") == 0;
-}
-static __inline__ void atomic64_dec(volatile atomic64_t * v)
-{
-               __CSG_LOOP(v, 1, "sgr");
-}
-static __inline__ long long atomic64_dec_return(volatile atomic64_t * v)
-{
-        return __CSG_LOOP(v, 1, "sgr");
-}
-static __inline__ long long atomic64_dec_and_test(volatile atomic64_t * v)
 {
-        return __CSG_LOOP(v, 1, "sgr") == 0;
+        return __CSG_LOOP(v, i, "sgr");
 }
+#define atomic64_sub(_i, _v)            atomic64_sub_return(_i, _v)
+#define atomic64_sub_and_test(_i, _v)   (atomic64_sub_return(_i, _v) == 0)
+#define atomic64_dec(_v)                atomic64_sub_return(1, _v)
+#define atomic64_dec_return(_v)         atomic64_sub_return(1, _v)
+#define atomic64_dec_and_test(_v)       (atomic64_sub_return(1, _v) == 0)
 static __inline__ void atomic64_clear_mask(unsigned long mask, atomic64_t * v)
 {
               __CSG_LOOP(v, ~mask, "ngr");
 }
 static __inline__ void atomic64_set_mask(unsigned long mask, atomic64_t * v)
 {
               __CSG_LOOP(v, mask, "ogr");
 }
-#undef __CSG_LOOP
+static __inline__ long long atomic64_cmpxchg(atomic64_t *v,
-#endif
+                                             long long old, long long new)
+{
-/*
+        __asm__ __volatile__("  csg  %0,%3,0(%2)\n"
-  returns 0  if expected_oldval==value in *v ( swap was successful )
+                             : "+d" (old), "=m" (v->counter)
-  returns 1  if unsuccessful.
+                             : "a" (v), "d" (new), "m" (v->counter)
+                             : "cc", "memory" );
+        return old;
+}
-  This is non-portable, use bitops or spinlocks instead!
+static __inline__ int atomic64_add_unless(atomic64_t *v,
-*/
+                                          long long a, long long u)
-static __inline__ int
-atomic_compare_and_swap(int expected_oldval,int new_val,atomic_t *v)
 {
-        int retval;
+        long long c, old;
-        __asm__ __volatile__(
+        c = atomic64_read(v);
-                "  lr   %0,%3\n"
+        while (c != u && (old = atomic64_cmpxchg(v, c, c + a)) != c)
-                "  cs   %0,%4,0(%2)\n"
+                c = old;
-                "  ipm  %0\n"
+        return c != u;
-                "  srl  %0,28\n"
-                "0:"
-                : "=&d" (retval), "=m" (v->counter)
-                : "a" (v), "d" (expected_oldval) , "d" (new_val),
-                  "m" (v->counter) : "cc", "memory" );
-        return retval;
 }
-#define atomic_cmpxchg(v, o, n) (atomic_compare_and_swap((o), (n), &((v)->counter)))
+#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-#define atomic_add_unless(v, a, u)                              \
+#undef __CSG_LOOP
-({                                                              \
+#endif
-        int c, old;                                             \
-        c = atomic_read(v);                                     \
-        while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
-                c = old;                                        \
-        c != (u);                                               \
-})
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 #define smp_mb__before_atomic_dec()     smp_mb()
 #define smp_mb__after_atomic_dec()      smp_mb()
 #define smp_mb__before_atomic_inc()     smp_mb()
 #define smp_mb__after_atomic_inc()      smp_mb()
+#include <asm-generic/atomic.h>
 #endif /* __KERNEL__ */
 #endif /* __ARCH_S390_ATOMIC__  */
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h
index 3eb231af5d51..12456cb2f882 100644
--- a/include/asm-s390/ccwdev.h
+++ b/include/asm-s390/ccwdev.h
@@ -185,8 +185,5 @@ extern struct ccw_device *ccw_device_probe_console(void);
 extern int _ccw_device_get_device_number(struct ccw_device *);
 extern int _ccw_device_get_subchannel_number(struct ccw_device *);
-extern struct device *s390_root_dev_register(const char *);
-extern void s390_root_dev_unregister(struct device *);
 extern void *ccw_device_get_chp_desc(struct ccw_device *, int);
 #endif /* _S390_CCWDEV_H_ */
diff --git a/include/asm-s390/mman.h b/include/asm-s390/mman.h
index ea86bd12204f..c8d5409b5d56 100644
--- a/include/asm-s390/mman.h
+++ b/include/asm-s390/mman.h
@@ -43,6 +43,7 @@
 #define MADV_SEQUENTIAL        0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED  0x3              /* pre-fault pages */
 #define MADV_DONTNEED  0x4              /* discard these pages */
+#define MADV_REMOVE    0x5              /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h
index 0ddf0a8ef8de..7bc15f0231db 100644
--- a/include/asm-s390/qdio.h
+++ b/include/asm-s390/qdio.h
@@ -195,12 +195,14 @@ struct qdr {
 /*
 * queue information block (QIB)
 */
-#define QIB_AC_INBOUND_PCI_SUPPORTED 0x80
+#define QIB_AC_INBOUND_PCI_SUPPORTED    0x80
-#define QIB_AC_OUTBOUND_PCI_SUPPORTED 0x40
+#define QIB_AC_OUTBOUND_PCI_SUPPORTED   0x40
+#define QIB_RFLAGS_ENABLE_QEBSM         0x80
 struct qib {
        unsigned int  qfmt    :  8;     /* queue format */
        unsigned int  pfmt    :  8;     /* impl. dep. parameter format */
-        unsigned int  res1    :  8;     /* reserved */
+        unsigned int  rflags  :  8;     /* QEBSM */
        unsigned int  ac      :  8;     /* adapter characteristics */
        unsigned int  res2;             /* reserved */
 #ifdef QDIO_32_BIT
diff --git a/include/asm-s390/s390_rdev.h b/include/asm-s390/s390_rdev.h
new file mode 100644
index 000000000000..3ad78f2b9c48
--- /dev/null
+++ b/include/asm-s390/s390_rdev.h
@@ -0,0 +1,15 @@
+/*
+ *  include/asm-s390/ccwdev.h
+ *
+ *    Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Author(s): Cornelia Huck <cohuck@de.ibm.com>
+ *               Carsten Otte  <cotte@de.ibm.com>
+ *
+ *  Interface for s390 root device
+ */
+#ifndef _S390_RDEV_H_
+#define _S390_RDEV_H_
+extern struct device *s390_root_dev_register(const char *);
+extern void s390_root_dev_unregister(struct device *);
+#endif /* _S390_RDEV_H_ */
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
index 10a619da4761..be104f21c70a 100644
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
@@ -61,8 +61,10 @@
 #define segment_eq(a,b) ((a).ar4 == (b).ar4)
-#define __access_ok(addr,size) (1)
+static inline int __access_ok(const void *addr, unsigned long size)
+{
+        return 1;
+}
 #define access_ok(type,addr,size) __access_ok(addr,size)
 /*
@@ -206,25 +208,25 @@ extern int __put_user_bad(void) __attribute__((noreturn));
        case 1: {                                               \
                unsigned char __x;                              \
                __get_user_asm(__x, ptr, __gu_err);             \
-                (x) = (__typeof__(*(ptr))) __x;                 \
+                (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 2: {                                               \
                unsigned short __x;                             \
                __get_user_asm(__x, ptr, __gu_err);             \
-                (x) = (__typeof__(*(ptr))) __x;                 \
+                (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 4: {                                               \
                unsigned int __x;                               \
                __get_user_asm(__x, ptr, __gu_err);             \
-                (x) = (__typeof__(*(ptr))) __x;                 \
+                (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 8: {                                               \
                unsigned long long __x;                         \
                __get_user_asm(__x, ptr, __gu_err);             \
-                (x) = (__typeof__(*(ptr))) __x;                 \
+                (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        default:                                                \
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index f97d92691f17..2861cdc243ad 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -539,7 +539,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,    \
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
-# ifdef CONFIG_ARCH_S390_31
+# ifndef CONFIG_64BIT
 #   define __ARCH_WANT_STAT64
 #   define __ARCH_WANT_SYS_TIME
 # endif
diff --git a/include/asm-s390/vtoc.h b/include/asm-s390/vtoc.h
index 41d369f38b0e..d1de5b7ebb0b 100644
--- a/include/asm-s390/vtoc.h
+++ b/include/asm-s390/vtoc.h
@@ -176,4 +176,28 @@ struct vtoc_format7_label
        struct vtoc_cchhb DS7PTRDS; /* pointer to next FMT7 DSCB */
 } __attribute__ ((packed));
+struct vtoc_cms_label {
+        u8 label_id[4];         /* Label identifier */
+        u8 vol_id[6];           /* Volid */
+        u16 version_id;         /* Version identifier */
+        u32 block_size;         /* Disk block size */
+        u32 origin_ptr;         /* Disk origin pointer */
+        u32 usable_count;       /* Number of usable cylinders/blocks */
+        u32 formatted_count;    /* Maximum number of formatted cylinders/
+                                 * blocks */
+        u32 block_count;        /* Disk size in CMS blocks */
+        u32 used_count;         /* Number of CMS blocks in use */
+        u32 fst_size;           /* File Status Table (FST) size */
+        u32 fst_count;          /* Number of FSTs per CMS block */
+        u8 format_date[6];      /* Disk FORMAT date */
+        u8 reserved1[2];
+        u32 disk_offset;        /* Disk offset when reserved*/
+        u32 map_block;          /* Allocation Map Block with next hole */
+        u32 hblk_disp;          /* Displacement into HBLK data of next hole */
+        u32 user_disp;          /* Displacement into user part of Allocation
+                                 * map */
+        u8 reserved2[4];
+        u8 segment_name[8];     /* Name of shared segment */
+} __attribute__ ((packed));
 #endif /* _ASM_S390_VTOC_H */
diff --git a/include/asm-sh/atomic.h b/include/asm-sh/atomic.h
index aabfd334462c..618d8e0de348 100644
--- a/include/asm-sh/atomic.h
+++ b/include/asm-sh/atomic.h
@@ -140,4 +140,5 @@ static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* __ASM_SH_ATOMIC_H */
diff --git a/include/asm-sh/mman.h b/include/asm-sh/mman.h
index 3ebab5f79db7..693bd55a3710 100644
--- a/include/asm-sh/mman.h
+++ b/include/asm-sh/mman.h
@@ -35,6 +35,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-sh64/atomic.h b/include/asm-sh64/atomic.h
index 927a2bc27b30..f3ce5c0df13a 100644
--- a/include/asm-sh64/atomic.h
+++ b/include/asm-sh64/atomic.h
@@ -152,4 +152,5 @@ static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* __ASM_SH64_ATOMIC_H */
diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h
index 62bec7ad271c..accb4967e9d2 100644
--- a/include/asm-sparc/atomic.h
+++ b/include/asm-sparc/atomic.h
@@ -159,4 +159,5 @@ static inline int __atomic24_sub(int i, atomic24_t *v)
 #endif /* !(__KERNEL__) */
+#include <asm-generic/atomic.h>
 #endif /* !(__ARCH_SPARC_ATOMIC__) */
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h
index 138eb81dd70d..98435ad8619e 100644
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
@@ -54,6 +54,7 @@
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
 #define MADV_FREE       0x5             /* (Solaris) contents can be freed */
+#define MADV_REMOVE     0x6             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-sparc64/atomic.h b/include/asm-sparc64/atomic.h
index 3789fe315992..11f5aa5d108c 100644
--- a/include/asm-sparc64/atomic.h
+++ b/include/asm-sparc64/atomic.h
@@ -96,4 +96,5 @@ extern int atomic64_sub_ret(int, atomic64_t *);
 #define smp_mb__after_atomic_inc()      barrier()
 #endif
+#include <asm-generic/atomic.h>
 #endif /* !(__ARCH_SPARC64_ATOMIC__) */
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h
index 01cecf54357b..cb4b6156194d 100644
--- a/include/asm-sparc64/mman.h
+++ b/include/asm-sparc64/mman.h
@@ -54,6 +54,7 @@
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
 #define MADV_FREE       0x5             /* (Solaris) contents can be freed */
+#define MADV_REMOVE     0x6             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-v850/atomic.h b/include/asm-v850/atomic.h
index bede3172ce7f..f5b9ab6f4e70 100644
--- a/include/asm-v850/atomic.h
+++ b/include/asm-v850/atomic.h
@@ -126,4 +126,5 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* __V850_ATOMIC_H__ */
diff --git a/include/asm-v850/mman.h b/include/asm-v850/mman.h
index e2b90081b56f..edc79965193a 100644
--- a/include/asm-v850/mman.h
+++ b/include/asm-v850/mman.h
@@ -32,6 +32,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86_64/atomic.h
index 50db9f39274f..72eb071488c7 100644
--- a/include/asm-x86_64/atomic.h
+++ b/include/asm-x86_64/atomic.h
@@ -424,4 +424,5 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif
diff --git a/include/asm-x86_64/cacheflush.h b/include/asm-x86_64/cacheflush.h
index b3189fb229d1..d32f7f58752a 100644
--- a/include/asm-x86_64/cacheflush.h
+++ b/include/asm-x86_64/cacheflush.h
@@ -27,4 +27,8 @@ void global_flush_tlb(void);
 int change_page_attr(struct page *page, int numpages, pgprot_t prot);
 int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot);
+#ifdef CONFIG_DEBUG_RODATA
+void mark_rodata_ro(void);
+#endif
 #endif /* _X8664_CACHEFLUSH_H */
diff --git a/include/asm-x86_64/mman.h b/include/asm-x86_64/mman.h
index 78e60a4fd4ee..d0e97b74f735 100644
--- a/include/asm-x86_64/mman.h
+++ b/include/asm-x86_64/mman.h
@@ -36,6 +36,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON        MAP_ANONYMOUS
diff --git a/include/asm-x86_64/mpspec.h b/include/asm-x86_64/mpspec.h
index 6f8a17d105ab..10248a9a0582 100644
--- a/include/asm-x86_64/mpspec.h
+++ b/include/asm-x86_64/mpspec.h
@@ -76,7 +76,7 @@ struct mpc_config_bus
 {
        unsigned char mpc_type;
        unsigned char mpc_busid;
-        unsigned char mpc_bustype[6] __attribute((packed));
+        unsigned char mpc_bustype[6];
 };
 /* List of Bus Type string values, Intel MP Spec. */
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index ecf58c7c1650..02888d7a496f 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -122,6 +122,8 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
 #define pte_same(a, b)          ((a).pte == (b).pte)
+#define pte_pgprot(a)   (__pgprot((a).pte & ~PHYSICAL_PAGE_MASK))
 #define PMD_SIZE        (1UL << PMD_SHIFT)
 #define PMD_MASK        (~(PMD_SIZE-1))
 #define PUD_SIZE        (1UL << PUD_SHIFT)
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
index 85348e02ad2e..b34cc2ee222b 100644
--- a/include/asm-x86_64/system.h
+++ b/include/asm-x86_64/system.h
@@ -315,6 +315,8 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 #define local_irq_enable()      __asm__ __volatile__("sti": : :"memory")
 /* used in the idle loop; sti takes one instruction cycle to complete */
 #define safe_halt()             __asm__ __volatile__("sti; hlt": : :"memory")
+/* used when interrupts are already enabled or to shutdown the processor */
+#define halt()                  __asm__ __volatile__("hlt": : :"memory")
 #define irqs_disabled()                 \
 ({                                      \
diff --git a/include/asm-xtensa/atomic.h b/include/asm-xtensa/atomic.h
index 3670cc7695da..e2ce06b101ad 100644
--- a/include/asm-xtensa/atomic.h
+++ b/include/asm-xtensa/atomic.h
@@ -286,6 +286,7 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
 #endif /* __KERNEL__ */
 #endif /* _XTENSA_ATOMIC_H */
diff --git a/include/asm-xtensa/mman.h b/include/asm-xtensa/mman.h
index 9a95a45df996..082a7504925e 100644
--- a/include/asm-xtensa/mman.h
+++ b/include/asm-xtensa/mman.h
@@ -72,6 +72,7 @@
 #define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
 #define MADV_WILLNEED   0x3             /* pre-fault pages */
 #define MADV_DONTNEED   0x4             /* discard these pages */
+#define MADV_REMOVE     0x5             /* remove these pages & resources */
 /* compatibility flags */
 #define MAP_ANON       MAP_ANONYMOUS
diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index 26f6ec38577a..a3dae1803f45 100644
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -35,7 +35,6 @@ struct user_key_payload {
 extern struct key_type key_type_user;
 extern int user_instantiate(struct key *key, const void *data, size_t datalen);
-extern int user_duplicate(struct key *key, const struct key *source);
 extern int user_update(struct key *key, const void *data, size_t datalen);
 extern int user_match(const struct key *key, const void *criterion);
 extern void user_destroy(struct key *key);
diff --git a/include/linux/ata.h b/include/linux/ata.h
index d2873b732bb1..94f77cce27fa 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -129,6 +129,7 @@ enum {
        ATA_CMD_READ_EXT        = 0x25,
        ATA_CMD_WRITE           = 0xCA,
        ATA_CMD_WRITE_EXT       = 0x35,
+        ATA_CMD_WRITE_FUA_EXT   = 0x3D,
        ATA_CMD_PIO_READ        = 0x20,
        ATA_CMD_PIO_READ_EXT    = 0x24,
        ATA_CMD_PIO_WRITE       = 0x30,
@@ -137,10 +138,13 @@ enum {
        ATA_CMD_READ_MULTI_EXT  = 0x29,
        ATA_CMD_WRITE_MULTI     = 0xC5,
        ATA_CMD_WRITE_MULTI_EXT = 0x39,
+        ATA_CMD_WRITE_MULTI_FUA_EXT = 0xCE,
        ATA_CMD_SET_FEATURES    = 0xEF,
        ATA_CMD_PACKET          = 0xA0,
        ATA_CMD_VERIFY          = 0x40,
        ATA_CMD_VERIFY_EXT      = 0x42,
+        ATA_CMD_STANDBYNOW1     = 0xE0,
+        ATA_CMD_IDLEIMMEDIATE   = 0xE1,
        ATA_CMD_INIT_DEV_PARAMS = 0x91,
        /* SETFEATURES stuff */
@@ -192,6 +196,7 @@ enum {
        ATA_TFLAG_DEVICE        = (1 << 2), /* enable r/w to device reg */
        ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
        ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
+        ATA_TFLAG_FUA           = (1 << 5), /* enable FUA */
 };
 enum ata_tf_protocols {
@@ -245,7 +250,8 @@ struct ata_taskfile {
 #define ata_id_is_sata(id)      ((id)[93] == 0)
 #define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
 #define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
-#define ata_id_has_flush(id) ((id)[83] & (1 << 12))
+#define ata_id_has_fua(id)      ((id)[84] & (1 << 6))
+#define ata_id_has_flush(id)    ((id)[83] & (1 << 12))
 #define ata_id_has_flush_ext(id) ((id)[83] & (1 << 13))
 #define ata_id_has_lba48(id)    ((id)[83] & (1 << 10))
 #define ata_id_has_wcache(id)   ((id)[82] & (1 << 5))
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a18500d196e1..fb0985377421 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -102,7 +102,7 @@ void copy_io_context(struct io_context **pdst, struct io_context **psrc);
 void swap_io_context(struct io_context **ioc1, struct io_context **ioc2);
 struct request;
-typedef void (rq_end_io_fn)(struct request *);
+typedef void (rq_end_io_fn)(struct request *, int);
 struct request_list {
        int count[2];
@@ -207,6 +207,7 @@ enum rq_flag_bits {
        __REQ_SORTED,           /* elevator knows about this request */
        __REQ_SOFTBARRIER,      /* may not be passed by ioscheduler */
        __REQ_HARDBARRIER,      /* may not be passed by drive either */
+        __REQ_FUA,              /* forced unit access */
        __REQ_CMD,              /* is a regular fs rw request */
        __REQ_NOMERGE,          /* don't touch this for merging */
        __REQ_STARTED,          /* drive already may have started this one */
@@ -230,9 +231,7 @@ enum rq_flag_bits {
        __REQ_PM_SUSPEND,       /* suspend request */
        __REQ_PM_RESUME,        /* resume request */
        __REQ_PM_SHUTDOWN,      /* shutdown request */
-        __REQ_BAR_PREFLUSH,     /* barrier pre-flush done */
+        __REQ_ORDERED_COLOR,    /* is before or after barrier */
-        __REQ_BAR_POSTFLUSH,    /* barrier post-flush */
-        __REQ_BAR_FLUSH,        /* rq is the flush request */
        __REQ_NR_BITS,          /* stops here */
 };
@@ -241,6 +240,7 @@ enum rq_flag_bits {
 #define REQ_SORTED      (1 << __REQ_SORTED)
 #define REQ_SOFTBARRIER (1 << __REQ_SOFTBARRIER)
 #define REQ_HARDBARRIER (1 << __REQ_HARDBARRIER)
+#define REQ_FUA         (1 << __REQ_FUA)
 #define REQ_CMD         (1 << __REQ_CMD)
 #define REQ_NOMERGE     (1 << __REQ_NOMERGE)
 #define REQ_STARTED     (1 << __REQ_STARTED)
@@ -260,9 +260,7 @@ enum rq_flag_bits {
 #define REQ_PM_SUSPEND  (1 << __REQ_PM_SUSPEND)
 #define REQ_PM_RESUME   (1 << __REQ_PM_RESUME)
 #define REQ_PM_SHUTDOWN (1 << __REQ_PM_SHUTDOWN)
-#define REQ_BAR_PREFLUSH        (1 << __REQ_BAR_PREFLUSH)
+#define REQ_ORDERED_COLOR       (1 << __REQ_ORDERED_COLOR)
-#define REQ_BAR_POSTFLUSH       (1 << __REQ_BAR_POSTFLUSH)
-#define REQ_BAR_FLUSH   (1 << __REQ_BAR_FLUSH)
 /*
 * State information carried for REQ_PM_SUSPEND and REQ_PM_RESUME
@@ -292,8 +290,7 @@ struct bio_vec;
 typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *);
 typedef void (activity_fn) (void *data, int rw);
 typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *);
-typedef int (prepare_flush_fn) (request_queue_t *, struct request *);
+typedef void (prepare_flush_fn) (request_queue_t *, struct request *);
-typedef void (end_flush_fn) (request_queue_t *, struct request *);
 enum blk_queue_state {
        Queue_down,
@@ -335,7 +332,6 @@ struct request_queue
        activity_fn             *activity_fn;
        issue_flush_fn          *issue_flush_fn;
        prepare_flush_fn        *prepare_flush_fn;
-        end_flush_fn            *end_flush_fn;
        /*
         * Dispatch queue sorting
@@ -420,14 +416,11 @@ struct request_queue
        /*
         * reserved for flush operations
         */
-        struct request          *flush_rq;
+        unsigned int            ordered, next_ordered, ordseq;
-        unsigned char           ordered;
+        int                     orderr, ordcolor;
-};
+        struct request          pre_flush_rq, bar_rq, post_flush_rq;
+        struct request          *orig_bar_rq;
-enum {
+        unsigned int            bi_size;
-        QUEUE_ORDERED_NONE,
-        QUEUE_ORDERED_TAG,
-        QUEUE_ORDERED_FLUSH,
 };
 #define RQ_INACTIVE             (-1)
@@ -445,12 +438,51 @@ enum {
 #define QUEUE_FLAG_REENTER      6       /* Re-entrancy avoidance */
 #define QUEUE_FLAG_PLUGGED      7       /* queue is plugged */
 #define QUEUE_FLAG_ELVSWITCH    8       /* don't use elevator, just do FIFO */
-#define QUEUE_FLAG_FLUSH        9       /* doing barrier flush sequence */
+enum {
+        /*
+         * Hardbarrier is supported with one of the following methods.
+         *
+         * NONE         : hardbarrier unsupported
+         * DRAIN        : ordering by draining is enough
+         * DRAIN_FLUSH  : ordering by draining w/ pre and post flushes
+         * DRAIN_FUA    : ordering by draining w/ pre flush and FUA write
+         * TAG          : ordering by tag is enough
+         * TAG_FLUSH    : ordering by tag w/ pre and post flushes
+         * TAG_FUA      : ordering by tag w/ pre flush and FUA write
+         */
+        QUEUE_ORDERED_NONE      = 0x00,
+        QUEUE_ORDERED_DRAIN     = 0x01,
+        QUEUE_ORDERED_TAG       = 0x02,
+        QUEUE_ORDERED_PREFLUSH  = 0x10,
+        QUEUE_ORDERED_POSTFLUSH = 0x20,
+        QUEUE_ORDERED_FUA       = 0x40,
+        QUEUE_ORDERED_DRAIN_FLUSH = QUEUE_ORDERED_DRAIN |
+                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
+        QUEUE_ORDERED_DRAIN_FUA = QUEUE_ORDERED_DRAIN |
+                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
+        QUEUE_ORDERED_TAG_FLUSH = QUEUE_ORDERED_TAG |
+                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
+        QUEUE_ORDERED_TAG_FUA   = QUEUE_ORDERED_TAG |
+                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
+        /*
+         * Ordered operation sequence
+         */
+        QUEUE_ORDSEQ_STARTED    = 0x01, /* flushing in progress */
+        QUEUE_ORDSEQ_DRAIN      = 0x02, /* waiting for the queue to be drained */
+        QUEUE_ORDSEQ_PREFLUSH   = 0x04, /* pre-flushing in progress */
+        QUEUE_ORDSEQ_BAR        = 0x08, /* original barrier req in progress */
+        QUEUE_ORDSEQ_POSTFLUSH  = 0x10, /* post-flushing in progress */
+        QUEUE_ORDSEQ_DONE       = 0x20,
+};
 #define blk_queue_plugged(q)    test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
 #define blk_queue_tagged(q)     test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
 #define blk_queue_stopped(q)    test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
-#define blk_queue_flushing(q)   test_bit(QUEUE_FLAG_FLUSH, &(q)->queue_flags)
+#define blk_queue_flushing(q)   ((q)->ordseq)
 #define blk_fs_request(rq)      ((rq)->flags & REQ_CMD)
 #define blk_pc_request(rq)      ((rq)->flags & REQ_BLOCK_PC)
@@ -466,8 +498,7 @@ enum {
 #define blk_sorted_rq(rq)       ((rq)->flags & REQ_SORTED)
 #define blk_barrier_rq(rq)      ((rq)->flags & REQ_HARDBARRIER)
-#define blk_barrier_preflush(rq)        ((rq)->flags & REQ_BAR_PREFLUSH)
+#define blk_fua_rq(rq)          ((rq)->flags & REQ_FUA)
-#define blk_barrier_postflush(rq)       ((rq)->flags & REQ_BAR_POSTFLUSH)
 #define list_entry_rq(ptr)      list_entry((ptr), struct request, queuelist)
@@ -560,7 +591,7 @@ extern void register_disk(struct gendisk *dev);
 extern void generic_make_request(struct bio *bio);
 extern void blk_put_request(struct request *);
 extern void __blk_put_request(request_queue_t *, struct request *);
-extern void blk_end_sync_rq(struct request *rq);
+extern void blk_end_sync_rq(struct request *rq, int error);
 extern void blk_attempt_remerge(request_queue_t *, struct request *);
 extern struct request *blk_get_request(request_queue_t *, int, gfp_t);
 extern void blk_insert_request(request_queue_t *, struct request *, int, void *);
@@ -582,8 +613,7 @@ extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_io
 extern int blk_execute_rq(request_queue_t *, struct gendisk *,
                          struct request *, int);
 extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,
-                                  struct request *, int,
+                                  struct request *, int, rq_end_io_fn *);
-                                  void (*done)(struct request *));
 static inline request_queue_t *bdev_get_queue(struct block_device *bdev)
 {
@@ -614,7 +644,7 @@ static inline void blk_run_address_space(struct address_space *mapping)
 */
 extern int end_that_request_first(struct request *, int, int);
 extern int end_that_request_chunk(struct request *, int, int);
-extern void end_that_request_last(struct request *);
+extern void end_that_request_last(struct request *, int);
 extern void end_request(struct request *req, int uptodate);
 /*
@@ -665,11 +695,12 @@ extern void blk_queue_prep_rq(request_queue_t *, prep_rq_fn *pfn);
 extern void blk_queue_merge_bvec(request_queue_t *, merge_bvec_fn *);
 extern void blk_queue_dma_alignment(request_queue_t *, int);
 extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev);
-extern void blk_queue_ordered(request_queue_t *, int);
+extern int blk_queue_ordered(request_queue_t *, unsigned, prepare_flush_fn *);
 extern void blk_queue_issue_flush_fn(request_queue_t *, issue_flush_fn *);
-extern struct request *blk_start_pre_flush(request_queue_t *,struct request *);
+extern int blk_do_ordered(request_queue_t *, struct request **);
-extern int blk_complete_barrier_rq(request_queue_t *, struct request *, int);
+extern unsigned blk_ordered_cur_seq(request_queue_t *);
-extern int blk_complete_barrier_rq_locked(request_queue_t *, struct request *, int);
+extern unsigned blk_ordered_req_seq(struct request *);
+extern void blk_ordered_complete_seq(request_queue_t *, unsigned, int);
 extern int blk_rq_map_sg(request_queue_t *, struct request *, struct scatterlist *);
 extern void blk_dump_rq_flags(struct request *, char *);
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 3b03b0b868dd..993da8cc9706 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -43,50 +43,38 @@ typedef struct bootmem_data {
 extern unsigned long __init bootmem_bootmap_pages (unsigned long);
 extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);
 extern void __init free_bootmem (unsigned long addr, unsigned long size);
-extern void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);
+extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
+extern void * __init __alloc_bootmem_low(unsigned long size,
+                                         unsigned long align,
+                                         unsigned long goal);
+extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat,
+                                              unsigned long size,
+                                              unsigned long align,
+                                              unsigned long goal);
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 extern void __init reserve_bootmem (unsigned long addr, unsigned long size);
 #define alloc_bootmem(x) \
        __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low(x) \
-        __alloc_bootmem((x), SMP_CACHE_BYTES, 0)
+        __alloc_bootmem_low((x), SMP_CACHE_BYTES, 0)
 #define alloc_bootmem_pages(x) \
        __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages(x) \
-        __alloc_bootmem((x), PAGE_SIZE, 0)
+        __alloc_bootmem_low((x), PAGE_SIZE, 0)
-#define alloc_bootmem_limit(x, limit)                                           \
-        __alloc_bootmem_limit((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))
-#define alloc_bootmem_low_limit(x, limit)                       \
-        __alloc_bootmem_limit((x), SMP_CACHE_BYTES, 0, (limit))
-#define alloc_bootmem_pages_limit(x, limit)                                     \
-        __alloc_bootmem_limit((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))
-#define alloc_bootmem_low_pages_limit(x, limit)         \
-        __alloc_bootmem_limit((x), PAGE_SIZE, 0, (limit))
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 extern unsigned long __init free_all_bootmem (void);
+extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);
 extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);
 extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);
 extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);
 extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);
-extern void * __init __alloc_bootmem_node_limit (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 #define alloc_bootmem_node(pgdat, x) \
        __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages_node(pgdat, x) \
        __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages_node(pgdat, x) \
-        __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, 0)
+        __alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0)
-#define alloc_bootmem_node_limit(pgdat, x, limit)                               \
-        __alloc_bootmem_node_limit((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))
-#define alloc_bootmem_pages_node_limit(pgdat, x, limit)                         \
-        __alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))
-#define alloc_bootmem_low_pages_node_limit(pgdat, x, limit)             \
-        __alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, 0, (limit))
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
@@ -123,15 +111,5 @@ extern void *__init alloc_large_system_hash(const char *tablename,
 #endif
 extern int __initdata hashdist;         /* Distribute hashes across NUMA nodes? */
-static inline void *__alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal)
-{
-        return __alloc_bootmem_limit(size, align, goal, 0);
-}
-static inline void *__alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align,
-                                     unsigned long goal)
-{
-        return __alloc_bootmem_node_limit(pgdat, size, align, goal, 0);
-}
 #endif /* _LINUX_BOOTMEM_H */
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
new file mode 100644
index 000000000000..acffb8c9073a
--- /dev/null
+++ b/include/linux/configfs.h
@@ -0,0 +1,205 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * configfs.h - definitions for the device driver filesystem
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ *
+ * Based on sysfs:
+ *      sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
+ *
+ * Based on kobject.h:
+ *      Copyright (c) 2002-2003 Patrick Mochel
+ *      Copyright (c) 2002-2003 Open Source Development Labs
+ *
+ * configfs Copyright (C) 2005 Oracle.  All rights reserved.
+ *
+ * Please read Documentation/filesystems/configfs.txt before using the
+ * configfs interface, ESPECIALLY the parts about reference counts and
+ * item destructors.
+ */
+#ifndef _CONFIGFS_H_
+#define _CONFIGFS_H_
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/kref.h>
+#include <asm/atomic.h>
+#include <asm/semaphore.h>
+#define CONFIGFS_ITEM_NAME_LEN  20
+struct module;
+struct configfs_item_operations;
+struct configfs_group_operations;
+struct configfs_attribute;
+struct configfs_subsystem;
+struct config_item {
+        char                    *ci_name;
+        char                    ci_namebuf[CONFIGFS_ITEM_NAME_LEN];
+        struct kref             ci_kref;
+        struct list_head        ci_entry;
+        struct config_item      *ci_parent;
+        struct config_group     *ci_group;
+        struct config_item_type *ci_type;
+        struct dentry           *ci_dentry;
+};
+extern int config_item_set_name(struct config_item *, const char *, ...);
+static inline char *config_item_name(struct config_item * item)
+{
+        return item->ci_name;
+}
+extern void config_item_init(struct config_item *);
+extern void config_item_init_type_name(struct config_item *item,
+                                       const char *name,
+                                       struct config_item_type *type);
+extern void config_item_cleanup(struct config_item *);
+extern struct config_item * config_item_get(struct config_item *);
+extern void config_item_put(struct config_item *);
+struct config_item_type {
+        struct module                           *ct_owner;
+        struct configfs_item_operations         *ct_item_ops;
+        struct configfs_group_operations        *ct_group_ops;
+        struct configfs_attribute               **ct_attrs;
+};
+/**
+ *      group - a group of config_items of a specific type, belonging
+ *      to a specific subsystem.
+ */
+struct config_group {
+        struct config_item              cg_item;
+        struct list_head                cg_children;
+        struct configfs_subsystem       *cg_subsys;
+        struct config_group             **default_groups;
+};
+extern void config_group_init(struct config_group *group);
+extern void config_group_init_type_name(struct config_group *group,
+                                        const char *name,
+                                        struct config_item_type *type);
+static inline struct config_group *to_config_group(struct config_item *item)
+{
+        return item ? container_of(item,struct config_group,cg_item) : NULL;
+}
+static inline struct config_group *config_group_get(struct config_group *group)
+{
+        return group ? to_config_group(config_item_get(&group->cg_item)) : NULL;
+}
+static inline void config_group_put(struct config_group *group)
+{
+        config_item_put(&group->cg_item);
+}
+extern struct config_item *config_group_find_obj(struct config_group *, const char *);
+struct configfs_attribute {
+        char                    *ca_name;
+        struct module           *ca_owner;
+        mode_t                  ca_mode;
+};
+/*
+ * If allow_link() exists, the item can symlink(2) out to other
+ * items.  If the item is a group, it may support mkdir(2).
+ * Groups supply one of make_group() and make_item().  If the
+ * group supports make_group(), one can create group children.  If it
+ * supports make_item(), one can create config_item children.  If it has
+ * default_groups on group->default_groups, it has automatically created
+ * group children.  default_groups may coexist alongsize make_group() or
+ * make_item(), but if the group wishes to have only default_groups
+ * children (disallowing mkdir(2)), it need not provide either function.
+ * If the group has commit(), it supports pending and commited (active)
+ * items.
+ */
+struct configfs_item_operations {
+        void (*release)(struct config_item *);
+        ssize_t (*show_attribute)(struct config_item *, struct configfs_attribute *,char *);
+        ssize_t (*store_attribute)(struct config_item *,struct configfs_attribute *,const char *, size_t);
+        int (*allow_link)(struct config_item *src, struct config_item *target);
+        int (*drop_link)(struct config_item *src, struct config_item *target);
+};
+struct configfs_group_operations {
+        struct config_item *(*make_item)(struct config_group *group, const char *name);
+        struct config_group *(*make_group)(struct config_group *group, const char *name);
+        int (*commit_item)(struct config_item *item);
+        void (*drop_item)(struct config_group *group, struct config_item *item);
+};
+/**
+ * Use these macros to make defining attributes easier. See include/linux/device.h
+ * for examples..
+ */
+#if 0
+#define __ATTR(_name,_mode,_show,_store) { \
+        .attr = {.ca_name = __stringify(_name), .ca_mode = _mode, .ca_owner = THIS_MODULE },    \
+        .show   = _show,                                        \
+        .store  = _store,                                       \
+}
+#define __ATTR_RO(_name) { \
+        .attr   = { .ca_name = __stringify(_name), .ca_mode = 0444, .ca_owner = THIS_MODULE },  \
+        .show   = _name##_show, \
+}
+#define __ATTR_NULL { .attr = { .name = NULL } }
+#define attr_name(_attr) (_attr).attr.name
+#endif
+struct configfs_subsystem {
+        struct config_group     su_group;
+        struct semaphore        su_sem;
+};
+static inline struct configfs_subsystem *to_configfs_subsystem(struct config_group *group)
+{
+        return group ?
+                container_of(group, struct configfs_subsystem, su_group) :
+                NULL;
+}
+int configfs_register_subsystem(struct configfs_subsystem *subsys);
+void configfs_unregister_subsystem(struct configfs_subsystem *subsys);
+#endif  /* __KERNEL__ */
+#endif /* _CONFIGFS_H_ */
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index f5eb6b6cd109..fa75ba0d635e 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -272,9 +272,9 @@ typedef char ioctl_struct[308];
 #define DM_TARGET_MSG    _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        4
+#define DM_VERSION_MINOR        5
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2005-01-12)"
+#define DM_VERSION_EXTRA        "-ioctl (2005-10-04)"
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
@@ -301,8 +301,13 @@ typedef char ioctl_struct[308];
 #define DM_BUFFER_FULL_FLAG     (1 << 8) /* Out */
 /*
- * Set this to improve performance when you aren't going to use open_count
+ * Set this to improve performance when you aren't going to use open_count.
 */
 #define DM_SKIP_BDGET_FLAG      (1 << 9) /* In */
+/*
+ * Set this to avoid attempting to freeze any filesystem when suspending.
+ */
+#define DM_SKIP_LOCKFS_FLAG     (1 << 10) /* In */
 #endif                          /* _LINUX_DM_IOCTL_H */
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index a74c27e460ba..fb80fa44c4dd 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -130,6 +130,7 @@ extern int elv_try_last_merge(request_queue_t *, struct bio *);
 #define ELEVATOR_INSERT_FRONT   1
 #define ELEVATOR_INSERT_BACK    2
 #define ELEVATOR_INSERT_SORT    3
+#define ELEVATOR_INSERT_REQUEUE 4
 /*
 * return values from elevator_may_queue_fn
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cc35b6ac778d..115e72be25d0 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -302,6 +302,37 @@ struct iattr {
 */
 #include <linux/quota.h>
+/** 
+ * enum positive_aop_returns - aop return codes with specific semantics
+ *
+ * @AOP_WRITEPAGE_ACTIVATE: Informs the caller that page writeback has
+ *                          completed, that the page is still locked, and
+ *                          should be considered active.  The VM uses this hint
+ *                          to return the page to the active list -- it won't
+ *                          be a candidate for writeback again in the near
+ *                          future.  Other callers must be careful to unlock
+ *                          the page if they get this return.  Returned by
+ *                          writepage(); 
+ *
+ * @AOP_TRUNCATED_PAGE: The AOP method that was handed a locked page has
+ *                      unlocked it and the page might have been truncated.
+ *                      The caller should back up to acquiring a new page and
+ *                      trying again.  The aop will be taking reasonable
+ *                      precautions not to livelock.  If the caller held a page
+ *                      reference, it should drop it before retrying.  Returned
+ *                      by readpage(), prepare_write(), and commit_write().
+ *
+ * address_space_operation functions return these large constants to indicate
+ * special semantics to the caller.  These are much larger than the bytes in a
+ * page to allow for functions that return the number of bytes operated on in a
+ * given page.
+ */
+enum positive_aop_returns {
+        AOP_WRITEPAGE_ACTIVATE  = 0x80000,
+        AOP_TRUNCATED_PAGE      = 0x80001,
+};
 /*
 * oh the beauties of C type declarations.
 */
@@ -1019,6 +1050,7 @@ struct inode_operations {
        ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
        ssize_t (*listxattr) (struct dentry *, char *, size_t);
        int (*removexattr) (struct dentry *, const char *);
+        void (*truncate_range)(struct inode *, loff_t, loff_t);
 };
 struct seq_file;
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index b76b558b03d4..528959c52f1b 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -14,7 +14,7 @@
 #define FUSE_KERNEL_VERSION 7
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 3
+#define FUSE_KERNEL_MINOR_VERSION 5
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -53,6 +53,9 @@ struct fuse_kstatfs {
        __u64   ffree;
        __u32   bsize;
        __u32   namelen;
+        __u32   frsize;
+        __u32   padding;
+        __u32   spare[6];
 };
 #define FATTR_MODE      (1 << 0)
@@ -105,12 +108,8 @@ enum fuse_opcode {
        FUSE_CREATE        = 35
 };
-/* Conservative buffer size for the client */
+/* The read buffer is required to be at least 8k, but may be much larger */
-#define FUSE_MAX_IN 8192
+#define FUSE_MIN_READ_BUFFER 8192
-#define FUSE_NAME_MAX 1024
-#define FUSE_SYMLINK_MAX 4096
-#define FUSE_XATTR_SIZE_MAX 4096
 struct fuse_entry_out {
        __u64   nodeid;         /* Inode ID */
@@ -213,6 +212,8 @@ struct fuse_write_out {
        __u32   padding;
 };
+#define FUSE_COMPAT_STATFS_SIZE 48
 struct fuse_statfs_out {
        struct fuse_kstatfs st;
 };
@@ -243,9 +244,16 @@ struct fuse_access_in {
        __u32   padding;
 };
-struct fuse_init_in_out {
+struct fuse_init_in {
+        __u32   major;
+        __u32   minor;
+};
+struct fuse_init_out {
        __u32   major;
        __u32   minor;
+        __u32   unused[3];
+        __u32   max_write;
 };
 struct fuse_in_header {
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 1056717ee501..68d82ad6b17c 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -22,7 +22,7 @@ int hugetlb_report_meminfo(char *);
 int hugetlb_report_node_meminfo(int, char *);
 int is_hugepage_mem_enough(size_t);
 unsigned long hugetlb_total_pages(void);
-struct page *alloc_huge_page(void);
+struct page *alloc_huge_page(struct vm_area_struct *, unsigned long);
 void free_huge_page(struct page *);
 int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                        unsigned long address, int write_access);
@@ -97,7 +97,7 @@ static inline unsigned long hugetlb_total_pages(void)
 #define is_hugepage_only_range(mm, addr, len)   0
 #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \
                                                do { } while (0)
-#define alloc_huge_page()                       ({ NULL; })
+#define alloc_huge_page(vma, addr)              ({ NULL; })
 #define free_huge_page(p)                       ({ (void)(p); BUG(); })
 #define hugetlb_fault(mm, vma, addr, write)     ({ BUG(); 0; })
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index d79c8a4bc4f8..9ba806796667 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>    /* work_struct */
+#include <linux/mempool.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>      /* Needed for MUTEX init macros */
@@ -38,6 +39,355 @@
 #define I2O_QUEUE_EMPTY         0xffffffff
 /*
+ *      Cache strategies
+ */
+/*      The NULL strategy leaves everything up to the controller. This tends to be a
+ *      pessimal but functional choice.
+ */
+#define CACHE_NULL              0
+/*      Prefetch data when reading. We continually attempt to load the next 32 sectors
+ *      into the controller cache.
+ */
+#define CACHE_PREFETCH          1
+/*      Prefetch data when reading. We sometimes attempt to load the next 32 sectors
+ *      into the controller cache. When an I/O is less <= 8K we assume its probably
+ *      not sequential and don't prefetch (default)
+ */
+#define CACHE_SMARTFETCH        2
+/*      Data is written to the cache and then out on to the disk. The I/O must be
+ *      physically on the medium before the write is acknowledged (default without
+ *      NVRAM)
+ */
+#define CACHE_WRITETHROUGH      17
+/*      Data is written to the cache and then out on to the disk. The controller
+ *      is permitted to write back the cache any way it wants. (default if battery
+ *      backed NVRAM is present). It can be useful to set this for swap regardless of
+ *      battery state.
+ */
+#define CACHE_WRITEBACK         18
+/*      Optimise for under powered controllers, especially on RAID1 and RAID0. We
+ *      write large I/O's directly to disk bypassing the cache to avoid the extra
+ *      memory copy hits. Small writes are writeback cached
+ */
+#define CACHE_SMARTBACK         19
+/*      Optimise for under powered controllers, especially on RAID1 and RAID0. We
+ *      write large I/O's directly to disk bypassing the cache to avoid the extra
+ *      memory copy hits. Small writes are writethrough cached. Suitable for devices
+ *      lacking battery backup
+ */
+#define CACHE_SMARTTHROUGH      20
+/*
+ *      Ioctl structures
+ */
+#define         BLKI2OGRSTRAT   _IOR('2', 1, int)
+#define         BLKI2OGWSTRAT   _IOR('2', 2, int)
+#define         BLKI2OSRSTRAT   _IOW('2', 3, int)
+#define         BLKI2OSWSTRAT   _IOW('2', 4, int)
+/*
+ *      I2O Function codes
+ */
+/*
+ *      Executive Class
+ */
+#define I2O_CMD_ADAPTER_ASSIGN          0xB3
+#define I2O_CMD_ADAPTER_READ            0xB2
+#define I2O_CMD_ADAPTER_RELEASE         0xB5
+#define I2O_CMD_BIOS_INFO_SET           0xA5
+#define I2O_CMD_BOOT_DEVICE_SET         0xA7
+#define I2O_CMD_CONFIG_VALIDATE         0xBB
+#define I2O_CMD_CONN_SETUP              0xCA
+#define I2O_CMD_DDM_DESTROY             0xB1
+#define I2O_CMD_DDM_ENABLE              0xD5
+#define I2O_CMD_DDM_QUIESCE             0xC7
+#define I2O_CMD_DDM_RESET               0xD9
+#define I2O_CMD_DDM_SUSPEND             0xAF
+#define I2O_CMD_DEVICE_ASSIGN           0xB7
+#define I2O_CMD_DEVICE_RELEASE          0xB9
+#define I2O_CMD_HRT_GET                 0xA8
+#define I2O_CMD_ADAPTER_CLEAR           0xBE
+#define I2O_CMD_ADAPTER_CONNECT         0xC9
+#define I2O_CMD_ADAPTER_RESET           0xBD
+#define I2O_CMD_LCT_NOTIFY              0xA2
+#define I2O_CMD_OUTBOUND_INIT           0xA1
+#define I2O_CMD_PATH_ENABLE             0xD3
+#define I2O_CMD_PATH_QUIESCE            0xC5
+#define I2O_CMD_PATH_RESET              0xD7
+#define I2O_CMD_STATIC_MF_CREATE        0xDD
+#define I2O_CMD_STATIC_MF_RELEASE       0xDF
+#define I2O_CMD_STATUS_GET              0xA0
+#define I2O_CMD_SW_DOWNLOAD             0xA9
+#define I2O_CMD_SW_UPLOAD               0xAB
+#define I2O_CMD_SW_REMOVE               0xAD
+#define I2O_CMD_SYS_ENABLE              0xD1
+#define I2O_CMD_SYS_MODIFY              0xC1
+#define I2O_CMD_SYS_QUIESCE             0xC3
+#define I2O_CMD_SYS_TAB_SET             0xA3
+/*
+ * Utility Class
+ */
+#define I2O_CMD_UTIL_NOP                0x00
+#define I2O_CMD_UTIL_ABORT              0x01
+#define I2O_CMD_UTIL_CLAIM              0x09
+#define I2O_CMD_UTIL_RELEASE            0x0B
+#define I2O_CMD_UTIL_PARAMS_GET         0x06
+#define I2O_CMD_UTIL_PARAMS_SET         0x05
+#define I2O_CMD_UTIL_EVT_REGISTER       0x13
+#define I2O_CMD_UTIL_EVT_ACK            0x14
+#define I2O_CMD_UTIL_CONFIG_DIALOG      0x10
+#define I2O_CMD_UTIL_DEVICE_RESERVE     0x0D
+#define I2O_CMD_UTIL_DEVICE_RELEASE     0x0F
+#define I2O_CMD_UTIL_LOCK               0x17
+#define I2O_CMD_UTIL_LOCK_RELEASE       0x19
+#define I2O_CMD_UTIL_REPLY_FAULT_NOTIFY 0x15
+/*
+ * SCSI Host Bus Adapter Class
+ */
+#define I2O_CMD_SCSI_EXEC               0x81
+#define I2O_CMD_SCSI_ABORT              0x83
+#define I2O_CMD_SCSI_BUSRESET           0x27
+/*
+ * Bus Adapter Class
+ */
+#define I2O_CMD_BUS_ADAPTER_RESET       0x85
+#define I2O_CMD_BUS_RESET               0x87
+#define I2O_CMD_BUS_SCAN                0x89
+#define I2O_CMD_BUS_QUIESCE             0x8b
+/*
+ * Random Block Storage Class
+ */
+#define I2O_CMD_BLOCK_READ              0x30
+#define I2O_CMD_BLOCK_WRITE             0x31
+#define I2O_CMD_BLOCK_CFLUSH            0x37
+#define I2O_CMD_BLOCK_MLOCK             0x49
+#define I2O_CMD_BLOCK_MUNLOCK           0x4B
+#define I2O_CMD_BLOCK_MMOUNT            0x41
+#define I2O_CMD_BLOCK_MEJECT            0x43
+#define I2O_CMD_BLOCK_POWER             0x70
+#define I2O_CMD_PRIVATE                 0xFF
+/* Command status values  */
+#define I2O_CMD_IN_PROGRESS     0x01
+#define I2O_CMD_REJECTED        0x02
+#define I2O_CMD_FAILED          0x03
+#define I2O_CMD_COMPLETED       0x04
+/* I2O API function return values */
+#define I2O_RTN_NO_ERROR                        0
+#define I2O_RTN_NOT_INIT                        1
+#define I2O_RTN_FREE_Q_EMPTY                    2
+#define I2O_RTN_TCB_ERROR                       3
+#define I2O_RTN_TRANSACTION_ERROR               4
+#define I2O_RTN_ADAPTER_ALREADY_INIT            5
+#define I2O_RTN_MALLOC_ERROR                    6
+#define I2O_RTN_ADPTR_NOT_REGISTERED            7
+#define I2O_RTN_MSG_REPLY_TIMEOUT               8
+#define I2O_RTN_NO_STATUS                       9
+#define I2O_RTN_NO_FIRM_VER                     10
+#define I2O_RTN_NO_LINK_SPEED                   11
+/* Reply message status defines for all messages */
+#define I2O_REPLY_STATUS_SUCCESS                        0x00
+#define I2O_REPLY_STATUS_ABORT_DIRTY                    0x01
+#define I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER         0x02
+#define I2O_REPLY_STATUS_ABORT_PARTIAL_TRANSFER         0x03
+#define I2O_REPLY_STATUS_ERROR_DIRTY                    0x04
+#define I2O_REPLY_STATUS_ERROR_NO_DATA_TRANSFER         0x05
+#define I2O_REPLY_STATUS_ERROR_PARTIAL_TRANSFER         0x06
+#define I2O_REPLY_STATUS_PROCESS_ABORT_DIRTY            0x08
+#define I2O_REPLY_STATUS_PROCESS_ABORT_NO_DATA_TRANSFER 0x09
+#define I2O_REPLY_STATUS_PROCESS_ABORT_PARTIAL_TRANSFER 0x0A
+#define I2O_REPLY_STATUS_TRANSACTION_ERROR              0x0B
+#define I2O_REPLY_STATUS_PROGRESS_REPORT                0x80
+/* Status codes and Error Information for Parameter functions */
+#define I2O_PARAMS_STATUS_SUCCESS               0x00
+#define I2O_PARAMS_STATUS_BAD_KEY_ABORT         0x01
+#define I2O_PARAMS_STATUS_BAD_KEY_CONTINUE      0x02
+#define I2O_PARAMS_STATUS_BUFFER_FULL           0x03
+#define I2O_PARAMS_STATUS_BUFFER_TOO_SMALL      0x04
+#define I2O_PARAMS_STATUS_FIELD_UNREADABLE      0x05
+#define I2O_PARAMS_STATUS_FIELD_UNWRITEABLE     0x06
+#define I2O_PARAMS_STATUS_INSUFFICIENT_FIELDS   0x07
+#define I2O_PARAMS_STATUS_INVALID_GROUP_ID      0x08
+#define I2O_PARAMS_STATUS_INVALID_OPERATION     0x09
+#define I2O_PARAMS_STATUS_NO_KEY_FIELD          0x0A
+#define I2O_PARAMS_STATUS_NO_SUCH_FIELD         0x0B
+#define I2O_PARAMS_STATUS_NON_DYNAMIC_GROUP     0x0C
+#define I2O_PARAMS_STATUS_OPERATION_ERROR       0x0D
+#define I2O_PARAMS_STATUS_SCALAR_ERROR          0x0E
+#define I2O_PARAMS_STATUS_TABLE_ERROR           0x0F
+#define I2O_PARAMS_STATUS_WRONG_GROUP_TYPE      0x10
+/* DetailedStatusCode defines for Executive, DDM, Util and Transaction error
+ * messages: Table 3-2 Detailed Status Codes.*/
+#define I2O_DSC_SUCCESS                        0x0000
+#define I2O_DSC_BAD_KEY                        0x0002
+#define I2O_DSC_TCL_ERROR                      0x0003
+#define I2O_DSC_REPLY_BUFFER_FULL              0x0004
+#define I2O_DSC_NO_SUCH_PAGE                   0x0005
+#define I2O_DSC_INSUFFICIENT_RESOURCE_SOFT     0x0006
+#define I2O_DSC_INSUFFICIENT_RESOURCE_HARD     0x0007
+#define I2O_DSC_CHAIN_BUFFER_TOO_LARGE         0x0009
+#define I2O_DSC_UNSUPPORTED_FUNCTION           0x000A
+#define I2O_DSC_DEVICE_LOCKED                  0x000B
+#define I2O_DSC_DEVICE_RESET                   0x000C
+#define I2O_DSC_INAPPROPRIATE_FUNCTION         0x000D
+#define I2O_DSC_INVALID_INITIATOR_ADDRESS      0x000E
+#define I2O_DSC_INVALID_MESSAGE_FLAGS          0x000F
+#define I2O_DSC_INVALID_OFFSET                 0x0010
+#define I2O_DSC_INVALID_PARAMETER              0x0011
+#define I2O_DSC_INVALID_REQUEST                0x0012
+#define I2O_DSC_INVALID_TARGET_ADDRESS         0x0013
+#define I2O_DSC_MESSAGE_TOO_LARGE              0x0014
+#define I2O_DSC_MESSAGE_TOO_SMALL              0x0015
+#define I2O_DSC_MISSING_PARAMETER              0x0016
+#define I2O_DSC_TIMEOUT                        0x0017
+#define I2O_DSC_UNKNOWN_ERROR                  0x0018
+#define I2O_DSC_UNKNOWN_FUNCTION               0x0019
+#define I2O_DSC_UNSUPPORTED_VERSION            0x001A
+#define I2O_DSC_DEVICE_BUSY                    0x001B
+#define I2O_DSC_DEVICE_NOT_AVAILABLE           0x001C
+/* DetailedStatusCode defines for Block Storage Operation: Table 6-7 Detailed
+   Status Codes.*/
+#define I2O_BSA_DSC_SUCCESS               0x0000
+#define I2O_BSA_DSC_MEDIA_ERROR           0x0001
+#define I2O_BSA_DSC_ACCESS_ERROR          0x0002
+#define I2O_BSA_DSC_DEVICE_FAILURE        0x0003
+#define I2O_BSA_DSC_DEVICE_NOT_READY      0x0004
+#define I2O_BSA_DSC_MEDIA_NOT_PRESENT     0x0005
+#define I2O_BSA_DSC_MEDIA_LOCKED          0x0006
+#define I2O_BSA_DSC_MEDIA_FAILURE         0x0007
+#define I2O_BSA_DSC_PROTOCOL_FAILURE      0x0008
+#define I2O_BSA_DSC_BUS_FAILURE           0x0009
+#define I2O_BSA_DSC_ACCESS_VIOLATION      0x000A
+#define I2O_BSA_DSC_WRITE_PROTECTED       0x000B
+#define I2O_BSA_DSC_DEVICE_RESET          0x000C
+#define I2O_BSA_DSC_VOLUME_CHANGED        0x000D
+#define I2O_BSA_DSC_TIMEOUT               0x000E
+/* FailureStatusCodes, Table 3-3 Message Failure Codes */
+#define I2O_FSC_TRANSPORT_SERVICE_SUSPENDED             0x81
+#define I2O_FSC_TRANSPORT_SERVICE_TERMINATED            0x82
+#define I2O_FSC_TRANSPORT_CONGESTION                    0x83
+#define I2O_FSC_TRANSPORT_FAILURE                       0x84
+#define I2O_FSC_TRANSPORT_STATE_ERROR                   0x85
+#define I2O_FSC_TRANSPORT_TIME_OUT                      0x86
+#define I2O_FSC_TRANSPORT_ROUTING_FAILURE               0x87
+#define I2O_FSC_TRANSPORT_INVALID_VERSION               0x88
+#define I2O_FSC_TRANSPORT_INVALID_OFFSET                0x89
+#define I2O_FSC_TRANSPORT_INVALID_MSG_FLAGS             0x8A
+#define I2O_FSC_TRANSPORT_FRAME_TOO_SMALL               0x8B
+#define I2O_FSC_TRANSPORT_FRAME_TOO_LARGE               0x8C
+#define I2O_FSC_TRANSPORT_INVALID_TARGET_ID             0x8D
+#define I2O_FSC_TRANSPORT_INVALID_INITIATOR_ID          0x8E
+#define I2O_FSC_TRANSPORT_INVALID_INITIATOR_CONTEXT     0x8F
+#define I2O_FSC_TRANSPORT_UNKNOWN_FAILURE               0xFF
+/* Device Claim Types */
+#define I2O_CLAIM_PRIMARY                                       0x01000000
+#define I2O_CLAIM_MANAGEMENT                                    0x02000000
+#define I2O_CLAIM_AUTHORIZED                                    0x03000000
+#define I2O_CLAIM_SECONDARY                                     0x04000000
+/* Message header defines for VersionOffset */
+#define I2OVER15        0x0001
+#define I2OVER20        0x0002
+/* Default is 1.5 */
+#define I2OVERSION      I2OVER15
+#define SGL_OFFSET_0    I2OVERSION
+#define SGL_OFFSET_4    (0x0040 | I2OVERSION)
+#define SGL_OFFSET_5    (0x0050 | I2OVERSION)
+#define SGL_OFFSET_6    (0x0060 | I2OVERSION)
+#define SGL_OFFSET_7    (0x0070 | I2OVERSION)
+#define SGL_OFFSET_8    (0x0080 | I2OVERSION)
+#define SGL_OFFSET_9    (0x0090 | I2OVERSION)
+#define SGL_OFFSET_10   (0x00A0 | I2OVERSION)
+#define SGL_OFFSET_11   (0x00B0 | I2OVERSION)
+#define SGL_OFFSET_12   (0x00C0 | I2OVERSION)
+#define SGL_OFFSET(x)   (((x)<<4) | I2OVERSION)
+/* Transaction Reply Lists (TRL) Control Word structure */
+#define TRL_SINGLE_FIXED_LENGTH         0x00
+#define TRL_SINGLE_VARIABLE_LENGTH      0x40
+#define TRL_MULTIPLE_FIXED_LENGTH       0x80
+ /* msg header defines for MsgFlags */
+#define MSG_STATIC      0x0100
+#define MSG_64BIT_CNTXT 0x0200
+#define MSG_MULTI_TRANS 0x1000
+#define MSG_FAIL        0x2000
+#define MSG_FINAL       0x4000
+#define MSG_REPLY       0x8000
+ /* minimum size msg */
+#define THREE_WORD_MSG_SIZE     0x00030000
+#define FOUR_WORD_MSG_SIZE      0x00040000
+#define FIVE_WORD_MSG_SIZE      0x00050000
+#define SIX_WORD_MSG_SIZE       0x00060000
+#define SEVEN_WORD_MSG_SIZE     0x00070000
+#define EIGHT_WORD_MSG_SIZE     0x00080000
+#define NINE_WORD_MSG_SIZE      0x00090000
+#define TEN_WORD_MSG_SIZE       0x000A0000
+#define ELEVEN_WORD_MSG_SIZE    0x000B0000
+#define I2O_MESSAGE_SIZE(x)     ((x)<<16)
+/* special TID assignments */
+#define ADAPTER_TID             0
+#define HOST_TID                1
+/* outbound queue defines */
+#define I2O_MAX_OUTBOUND_MSG_FRAMES     128
+#define I2O_OUTBOUND_MSG_FRAME_SIZE     128     /* in 32-bit words */
+/* inbound queue definitions */
+#define I2O_MSG_INPOOL_MIN              32
+#define I2O_INBOUND_MSG_FRAME_SIZE      128     /* in 32-bit words */
+#define I2O_POST_WAIT_OK        0
+#define I2O_POST_WAIT_TIMEOUT   -ETIMEDOUT
+#define I2O_CONTEXT_LIST_MIN_LENGTH     15
+#define I2O_CONTEXT_LIST_USED           0x01
+#define I2O_CONTEXT_LIST_DELETED        0x02
+/* timeouts */
+#define I2O_TIMEOUT_INIT_OUTBOUND_QUEUE 15
+#define I2O_TIMEOUT_MESSAGE_GET         5
+#define I2O_TIMEOUT_RESET               30
+#define I2O_TIMEOUT_STATUS_GET          5
+#define I2O_TIMEOUT_LCT_GET             360
+#define I2O_TIMEOUT_SCSI_SCB_ABORT      240
+/* retries */
+#define I2O_HRT_GET_TRIES               3
+#define I2O_LCT_GET_TRIES               3
+/* defines for max_sectors and max_phys_segments */
+#define I2O_MAX_SECTORS                 1024
+#define I2O_MAX_SECTORS_LIMITED         128
+#define I2O_MAX_PHYS_SEGMENTS           MAX_PHYS_SEGMENTS
+/*
 *      Message structures
 */
 struct i2o_message {
@@ -58,6 +408,12 @@ struct i2o_message {
        u32 body[0];
 };
+/* MFA and I2O message used by mempool */
+struct i2o_msg_mfa {
+        u32 mfa;                /* MFA returned by the controller */
+        struct i2o_message msg; /* I2O message */
+};
 /*
 *      Each I2O device entity has one of these. There is one per device.
 */
@@ -130,6 +486,15 @@ struct i2o_dma {
 };
 /*
+ *      Contains slab cache and mempool information
+ */
+struct i2o_pool {
+        char *name;
+        kmem_cache_t *slab;
+        mempool_t *mempool;
+};
+/*
 *      Contains IO mapped address information
 */
 struct i2o_io {
@@ -174,8 +539,6 @@ struct i2o_controller {
        void __iomem *irq_status;       /* Interrupt status register address */
        void __iomem *irq_mask; /* Interrupt mask register address */
-        /* Dynamic LCT related data */
        struct i2o_dma status;  /* IOP status block */
        struct i2o_dma hrt;     /* HW Resource Table */
@@ -188,6 +551,8 @@ struct i2o_controller {
        struct i2o_io in_queue; /* inbound message queue Host->IOP */
        struct i2o_dma out_queue;       /* outbound message queue IOP->Host */
+        struct i2o_pool in_msg; /* mempool for inbound messages */
        unsigned int battery:1; /* Has a battery backup */
        unsigned int io_alloc:1;        /* An I/O resource was allocated */
        unsigned int mem_alloc:1;       /* A memory resource was allocated */
@@ -196,7 +561,6 @@ struct i2o_controller {
        struct resource mem_resource;   /* Mem resource allocated to the IOP */
        struct device device;
-        struct class_device *classdev;  /* I2O controller class device */
        struct i2o_device *exec;        /* Executive */
 #if BITS_PER_LONG == 64
        spinlock_t context_list_lock;   /* lock for context_list */
@@ -247,16 +611,13 @@ struct i2o_sys_tbl {
 extern struct list_head i2o_controllers;
 /* Message functions */
-static inline u32 i2o_msg_get(struct i2o_controller *,
+static inline struct i2o_message *i2o_msg_get(struct i2o_controller *);
-                              struct i2o_message __iomem **);
+extern struct i2o_message *i2o_msg_get_wait(struct i2o_controller *, int);
-extern u32 i2o_msg_get_wait(struct i2o_controller *,
+static inline void i2o_msg_post(struct i2o_controller *, struct i2o_message *);
-                            struct i2o_message __iomem **, int);
+static inline int i2o_msg_post_wait(struct i2o_controller *,
-static inline void i2o_msg_post(struct i2o_controller *, u32);
+                                    struct i2o_message *, unsigned long);
-static inline int i2o_msg_post_wait(struct i2o_controller *, u32,
+extern int i2o_msg_post_wait_mem(struct i2o_controller *, struct i2o_message *,
-                                    unsigned long);
+                                 unsigned long, struct i2o_dma *);
-extern int i2o_msg_post_wait_mem(struct i2o_controller *, u32, unsigned long,
-                                 struct i2o_dma *);
-extern void i2o_msg_nop(struct i2o_controller *, u32);
 static inline void i2o_flush_reply(struct i2o_controller *, u32);
 /* IOP functions */
@@ -384,10 +745,10 @@ static inline u16 i2o_sg_tablesize(struct i2o_controller *c, u16 body_size)
 static inline dma_addr_t i2o_dma_map_single(struct i2o_controller *c, void *ptr,
                                            size_t size,
                                            enum dma_data_direction direction,
-                                            u32 __iomem ** sg_ptr)
+                                            u32 ** sg_ptr)
 {
        u32 sg_flags;
-        u32 __iomem *mptr = *sg_ptr;
+        u32 *mptr = *sg_ptr;
        dma_addr_t dma_addr;
        switch (direction) {
@@ -405,16 +766,16 @@ static inline dma_addr_t i2o_dma_map_single(struct i2o_controller *c, void *ptr,
        if (!dma_mapping_error(dma_addr)) {
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
                if ((sizeof(dma_addr_t) > 4) && c->pae_support) {
-                        writel(0x7C020002, mptr++);
+                        *mptr++ = cpu_to_le32(0x7C020002);
-                        writel(PAGE_SIZE, mptr++);
+                        *mptr++ = cpu_to_le32(PAGE_SIZE);
                }
 #endif
-                writel(sg_flags | size, mptr++);
+                *mptr++ = cpu_to_le32(sg_flags | size);
-                writel(i2o_dma_low(dma_addr), mptr++);
+                *mptr++ = cpu_to_le32(i2o_dma_low(dma_addr));
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
                if ((sizeof(dma_addr_t) > 4) && c->pae_support)
-                        writel(i2o_dma_high(dma_addr), mptr++);
+                        *mptr++ = cpu_to_le32(i2o_dma_high(dma_addr));
 #endif
                *sg_ptr = mptr;
        }
@@ -439,10 +800,10 @@ static inline dma_addr_t i2o_dma_map_single(struct i2o_controller *c, void *ptr,
 static inline int i2o_dma_map_sg(struct i2o_controller *c,
                                 struct scatterlist *sg, int sg_count,
                                 enum dma_data_direction direction,
-                                 u32 __iomem ** sg_ptr)
+                                 u32 ** sg_ptr)
 {
        u32 sg_flags;
-        u32 __iomem *mptr = *sg_ptr;
+        u32 *mptr = *sg_ptr;
        switch (direction) {
        case DMA_TO_DEVICE:
@@ -461,19 +822,19 @@ static inline int i2o_dma_map_sg(struct i2o_controller *c,
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
        if ((sizeof(dma_addr_t) > 4) && c->pae_support) {
-                writel(0x7C020002, mptr++);
+                *mptr++ = cpu_to_le32(0x7C020002);
-                writel(PAGE_SIZE, mptr++);
+                *mptr++ = cpu_to_le32(PAGE_SIZE);
        }
 #endif
        while (sg_count-- > 0) {
                if (!sg_count)
                        sg_flags |= 0xC0000000;
-                writel(sg_flags | sg_dma_len(sg), mptr++);
+                *mptr++ = cpu_to_le32(sg_flags | sg_dma_len(sg));
-                writel(i2o_dma_low(sg_dma_address(sg)), mptr++);
+                *mptr++ = cpu_to_le32(i2o_dma_low(sg_dma_address(sg)));
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
                if ((sizeof(dma_addr_t) > 4) && c->pae_support)
-                        writel(i2o_dma_high(sg_dma_address(sg)), mptr++);
+                        *mptr++ = cpu_to_le32(i2o_dma_high(sg_dma_address(sg)));
 #endif
                sg++;
        }
@@ -563,6 +924,64 @@ static inline int i2o_dma_realloc(struct device *dev, struct i2o_dma *addr,
        return 0;
 };
+/*
+ *      i2o_pool_alloc - Allocate an slab cache and mempool
+ *      @mempool: pointer to struct i2o_pool to write data into.
+ *      @name: name which is used to identify cache
+ *      @size: size of each object
+ *      @min_nr: minimum number of objects
+ *
+ *      First allocates a slab cache with name and size. Then allocates a
+ *      mempool which uses the slab cache for allocation and freeing.
+ *
+ *      Returns 0 on success or negative error code on failure.
+ */
+static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
+                                 size_t size, int min_nr)
+{
+        pool->name = kmalloc(strlen(name) + 1, GFP_KERNEL);
+        if (!pool->name)
+                goto exit;
+        strcpy(pool->name, name);
+        pool->slab =
+            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL,
+                              NULL);
+        if (!pool->slab)
+                goto free_name;
+        pool->mempool =
+            mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab,
+                           pool->slab);
+        if (!pool->mempool)
+                goto free_slab;
+        return 0;
+      free_slab:
+        kmem_cache_destroy(pool->slab);
+      free_name:
+        kfree(pool->name);
+      exit:
+        return -ENOMEM;
+};
+/*
+ *      i2o_pool_free - Free slab cache and mempool again
+ *      @mempool: pointer to struct i2o_pool which should be freed
+ *
+ *      Note that you have to return all objects to the mempool again before
+ *      calling i2o_pool_free().
+ */
+static inline void i2o_pool_free(struct i2o_pool *pool)
+{
+        mempool_destroy(pool->mempool);
+        kmem_cache_destroy(pool->slab);
+        kfree(pool->name);
+};
 /* I2O driver (OSM) functions */
 extern int i2o_driver_register(struct i2o_driver *);
 extern void i2o_driver_unregister(struct i2o_driver *);
@@ -638,39 +1057,89 @@ extern int i2o_exec_lct_get(struct i2o_controller *);
 #define kobj_to_i2o_device(kobj) to_i2o_device(container_of(kobj, struct device, kobj))
 /**
+ *      i2o_out_to_virt - Turn an I2O message to a virtual address
+ *      @c: controller
+ *      @m: message engine value
+ *
+ *      Turn a receive message from an I2O controller bus address into
+ *      a Linux virtual address. The shared page frame is a linear block
+ *      so we simply have to shift the offset. This function does not
+ *      work for sender side messages as they are ioremap objects
+ *      provided by the I2O controller.
+ */
+static inline struct i2o_message *i2o_msg_out_to_virt(struct i2o_controller *c,
+                                                      u32 m)
+{
+        BUG_ON(m < c->out_queue.phys
+               || m >= c->out_queue.phys + c->out_queue.len);
+        return c->out_queue.virt + (m - c->out_queue.phys);
+};
+/**
+ *      i2o_msg_in_to_virt - Turn an I2O message to a virtual address
+ *      @c: controller
+ *      @m: message engine value
+ *
+ *      Turn a send message from an I2O controller bus address into
+ *      a Linux virtual address. The shared page frame is a linear block
+ *      so we simply have to shift the offset. This function does not
+ *      work for receive side messages as they are kmalloc objects
+ *      in a different pool.
+ */
+static inline struct i2o_message __iomem *i2o_msg_in_to_virt(struct
+                                                             i2o_controller *c,
+                                                             u32 m)
+{
+        return c->in_queue.virt + m;
+};
+/**
 *      i2o_msg_get - obtain an I2O message from the IOP
 *      @c: I2O controller
- *      @msg: pointer to a I2O message pointer
 *
- *      This function tries to get a message slot. If no message slot is
+ *      This function tries to get a message frame. If no message frame is
 *      available do not wait until one is availabe (see also i2o_msg_get_wait).
+ *      The returned pointer to the message frame is not in I/O memory, it is
+ *      allocated from a mempool. But because a MFA is allocated from the
+ *      controller too it is guaranteed that i2o_msg_post() will never fail.
 *
- *      On a success the message is returned and the pointer to the message is
+ *      On a success a pointer to the message frame is returned. If the message
- *      set in msg. The returned message is the physical page frame offset
+ *      queue is empty -EBUSY is returned and if no memory is available -ENOMEM
- *      address from the read port (see the i2o spec). If no message is
+ *      is returned.
- *      available returns I2O_QUEUE_EMPTY and msg is leaved untouched.
 */
-static inline u32 i2o_msg_get(struct i2o_controller *c,
+static inline struct i2o_message *i2o_msg_get(struct i2o_controller *c)
-                              struct i2o_message __iomem ** msg)
 {
-        u32 m = readl(c->in_port);
+        struct i2o_msg_mfa *mmsg = mempool_alloc(c->in_msg.mempool, GFP_ATOMIC);
+        if (!mmsg)
-        if (m != I2O_QUEUE_EMPTY)
+                return ERR_PTR(-ENOMEM);
-                *msg = c->in_queue.virt + m;
+        mmsg->mfa = readl(c->in_port);
+        if (mmsg->mfa == I2O_QUEUE_EMPTY) {
+                mempool_free(mmsg, c->in_msg.mempool);
+                return ERR_PTR(-EBUSY);
+        }
-        return m;
+        return &mmsg->msg;
 };
 /**
 *      i2o_msg_post - Post I2O message to I2O controller
 *      @c: I2O controller to which the message should be send
- *      @m: the message identifier
+ *      @msg: message returned by i2o_msg_get()
 *
- *      Post the message to the I2O controller.
+ *      Post the message to the I2O controller and return immediately.
 */
-static inline void i2o_msg_post(struct i2o_controller *c, u32 m)
+static inline void i2o_msg_post(struct i2o_controller *c,
+                                struct i2o_message *msg)
 {
-        writel(m, c->in_port);
+        struct i2o_msg_mfa *mmsg;
+        mmsg = container_of(msg, struct i2o_msg_mfa, msg);
+        memcpy_toio(i2o_msg_in_to_virt(c, mmsg->mfa), msg,
+                    (le32_to_cpu(msg->u.head[0]) >> 16) << 2);
+        writel(mmsg->mfa, c->in_port);
+        mempool_free(mmsg, c->in_msg.mempool);
 };
 /**
@@ -685,62 +1154,66 @@ static inline void i2o_msg_post(struct i2o_controller *c, u32 m)
 *
 *      Returns 0 on success or negative error code on failure.
 */
-static inline int i2o_msg_post_wait(struct i2o_controller *c, u32 m,
+static inline int i2o_msg_post_wait(struct i2o_controller *c,
+                                    struct i2o_message *msg,
                                    unsigned long timeout)
 {
-        return i2o_msg_post_wait_mem(c, m, timeout, NULL);
+        return i2o_msg_post_wait_mem(c, msg, timeout, NULL);
 };
 /**
- *      i2o_flush_reply - Flush reply from I2O controller
+ *      i2o_msg_nop_mfa - Returns a fetched MFA back to the controller
- *      @c: I2O controller
+ *      @c: I2O controller from which the MFA was fetched
- *      @m: the message identifier
+ *      @mfa: MFA which should be returned
 *
- *      The I2O controller must be informed that the reply message is not needed
+ *      This function must be used for preserved messages, because i2o_msg_nop()
- *      anymore. If you forget to flush the reply, the message frame can't be
+ *      also returns the allocated memory back to the msg_pool mempool.
- *      used by the controller anymore and is therefore lost.
 */
-static inline void i2o_flush_reply(struct i2o_controller *c, u32 m)
+static inline void i2o_msg_nop_mfa(struct i2o_controller *c, u32 mfa)
 {
-        writel(m, c->out_port);
+        struct i2o_message __iomem *msg;
+        u32 nop[3] = {
+                THREE_WORD_MSG_SIZE | SGL_OFFSET_0,
+                I2O_CMD_UTIL_NOP << 24 | HOST_TID << 12 | ADAPTER_TID,
+                0x00000000
+        };
+        msg = i2o_msg_in_to_virt(c, mfa);
+        memcpy_toio(msg, nop, sizeof(nop));
+        writel(mfa, c->in_port);
 };
 /**
- *      i2o_out_to_virt - Turn an I2O message to a virtual address
+ *      i2o_msg_nop - Returns a message which is not used
- *      @c: controller
+ *      @c: I2O controller from which the message was created
- *      @m: message engine value
+ *      @msg: message which should be returned
 *
- *      Turn a receive message from an I2O controller bus address into
+ *      If you fetch a message via i2o_msg_get, and can't use it, you must
- *      a Linux virtual address. The shared page frame is a linear block
+ *      return the message with this function. Otherwise the MFA is lost as well
- *      so we simply have to shift the offset. This function does not
+ *      as the allocated memory from the mempool.
- *      work for sender side messages as they are ioremap objects
- *      provided by the I2O controller.
 */
-static inline struct i2o_message *i2o_msg_out_to_virt(struct i2o_controller *c,
+static inline void i2o_msg_nop(struct i2o_controller *c,
-                                                      u32 m)
+                               struct i2o_message *msg)
 {
-        BUG_ON(m < c->out_queue.phys
+        struct i2o_msg_mfa *mmsg;
-               || m >= c->out_queue.phys + c->out_queue.len);
+        mmsg = container_of(msg, struct i2o_msg_mfa, msg);
-        return c->out_queue.virt + (m - c->out_queue.phys);
+        i2o_msg_nop_mfa(c, mmsg->mfa);
+        mempool_free(mmsg, c->in_msg.mempool);
 };
 /**
- *      i2o_msg_in_to_virt - Turn an I2O message to a virtual address
+ *      i2o_flush_reply - Flush reply from I2O controller
- *      @c: controller
+ *      @c: I2O controller
- *      @m: message engine value
+ *      @m: the message identifier
 *
- *      Turn a send message from an I2O controller bus address into
+ *      The I2O controller must be informed that the reply message is not needed
- *      a Linux virtual address. The shared page frame is a linear block
+ *      anymore. If you forget to flush the reply, the message frame can't be
- *      so we simply have to shift the offset. This function does not
+ *      used by the controller anymore and is therefore lost.
- *      work for receive side messages as they are kmalloc objects
- *      in a different pool.
 */
-static inline struct i2o_message __iomem *i2o_msg_in_to_virt(struct
+static inline void i2o_flush_reply(struct i2o_controller *c, u32 m)
-                                                             i2o_controller *c,
-                                                             u32 m)
 {
-        return c->in_queue.virt + m;
+        writel(m, c->out_port);
 };
 /*
@@ -779,350 +1252,5 @@ extern void i2o_dump_message(struct i2o_message *);
 extern void i2o_dump_hrt(struct i2o_controller *c);
 extern void i2o_debug_state(struct i2o_controller *c);
-/*
- *      Cache strategies
- */
-/*      The NULL strategy leaves everything up to the controller. This tends to be a
- *      pessimal but functional choice.
- */
-#define CACHE_NULL              0
-/*      Prefetch data when reading. We continually attempt to load the next 32 sectors
- *      into the controller cache.
- */
-#define CACHE_PREFETCH          1
-/*      Prefetch data when reading. We sometimes attempt to load the next 32 sectors
- *      into the controller cache. When an I/O is less <= 8K we assume its probably
- *      not sequential and don't prefetch (default)
- */
-#define CACHE_SMARTFETCH        2
-/*      Data is written to the cache and then out on to the disk. The I/O must be
- *      physically on the medium before the write is acknowledged (default without
- *      NVRAM)
- */
-#define CACHE_WRITETHROUGH      17
-/*      Data is written to the cache and then out on to the disk. The controller
- *      is permitted to write back the cache any way it wants. (default if battery
- *      backed NVRAM is present). It can be useful to set this for swap regardless of
- *      battery state.
- */
-#define CACHE_WRITEBACK         18
-/*      Optimise for under powered controllers, especially on RAID1 and RAID0. We
- *      write large I/O's directly to disk bypassing the cache to avoid the extra
- *      memory copy hits. Small writes are writeback cached
- */
-#define CACHE_SMARTBACK         19
-/*      Optimise for under powered controllers, especially on RAID1 and RAID0. We
- *      write large I/O's directly to disk bypassing the cache to avoid the extra
- *      memory copy hits. Small writes are writethrough cached. Suitable for devices
- *      lacking battery backup
- */
-#define CACHE_SMARTTHROUGH      20
-/*
- *      Ioctl structures
- */
-#define         BLKI2OGRSTRAT   _IOR('2', 1, int)
-#define         BLKI2OGWSTRAT   _IOR('2', 2, int)
-#define         BLKI2OSRSTRAT   _IOW('2', 3, int)
-#define         BLKI2OSWSTRAT   _IOW('2', 4, int)
-/*
- *      I2O Function codes
- */
-/*
- *      Executive Class
- */
-#define I2O_CMD_ADAPTER_ASSIGN          0xB3
-#define I2O_CMD_ADAPTER_READ            0xB2
-#define I2O_CMD_ADAPTER_RELEASE         0xB5
-#define I2O_CMD_BIOS_INFO_SET           0xA5
-#define I2O_CMD_BOOT_DEVICE_SET         0xA7
-#define I2O_CMD_CONFIG_VALIDATE         0xBB
-#define I2O_CMD_CONN_SETUP              0xCA
-#define I2O_CMD_DDM_DESTROY             0xB1
-#define I2O_CMD_DDM_ENABLE              0xD5
-#define I2O_CMD_DDM_QUIESCE             0xC7
-#define I2O_CMD_DDM_RESET               0xD9
-#define I2O_CMD_DDM_SUSPEND             0xAF
-#define I2O_CMD_DEVICE_ASSIGN           0xB7
-#define I2O_CMD_DEVICE_RELEASE          0xB9
-#define I2O_CMD_HRT_GET                 0xA8
-#define I2O_CMD_ADAPTER_CLEAR           0xBE
-#define I2O_CMD_ADAPTER_CONNECT         0xC9
-#define I2O_CMD_ADAPTER_RESET           0xBD
-#define I2O_CMD_LCT_NOTIFY              0xA2
-#define I2O_CMD_OUTBOUND_INIT           0xA1
-#define I2O_CMD_PATH_ENABLE             0xD3
-#define I2O_CMD_PATH_QUIESCE            0xC5
-#define I2O_CMD_PATH_RESET              0xD7
-#define I2O_CMD_STATIC_MF_CREATE        0xDD
-#define I2O_CMD_STATIC_MF_RELEASE       0xDF
-#define I2O_CMD_STATUS_GET              0xA0
-#define I2O_CMD_SW_DOWNLOAD             0xA9
-#define I2O_CMD_SW_UPLOAD               0xAB
-#define I2O_CMD_SW_REMOVE               0xAD
-#define I2O_CMD_SYS_ENABLE              0xD1
-#define I2O_CMD_SYS_MODIFY              0xC1
-#define I2O_CMD_SYS_QUIESCE             0xC3
-#define I2O_CMD_SYS_TAB_SET             0xA3
-/*
- * Utility Class
- */
-#define I2O_CMD_UTIL_NOP                0x00
-#define I2O_CMD_UTIL_ABORT              0x01
-#define I2O_CMD_UTIL_CLAIM              0x09
-#define I2O_CMD_UTIL_RELEASE            0x0B
-#define I2O_CMD_UTIL_PARAMS_GET         0x06
-#define I2O_CMD_UTIL_PARAMS_SET         0x05
-#define I2O_CMD_UTIL_EVT_REGISTER       0x13
-#define I2O_CMD_UTIL_EVT_ACK            0x14
-#define I2O_CMD_UTIL_CONFIG_DIALOG      0x10
-#define I2O_CMD_UTIL_DEVICE_RESERVE     0x0D
-#define I2O_CMD_UTIL_DEVICE_RELEASE     0x0F
-#define I2O_CMD_UTIL_LOCK               0x17
-#define I2O_CMD_UTIL_LOCK_RELEASE       0x19
-#define I2O_CMD_UTIL_REPLY_FAULT_NOTIFY 0x15
-/*
- * SCSI Host Bus Adapter Class
- */
-#define I2O_CMD_SCSI_EXEC               0x81
-#define I2O_CMD_SCSI_ABORT              0x83
-#define I2O_CMD_SCSI_BUSRESET           0x27
-/*
- * Bus Adapter Class
- */
-#define I2O_CMD_BUS_ADAPTER_RESET       0x85
-#define I2O_CMD_BUS_RESET               0x87
-#define I2O_CMD_BUS_SCAN                0x89
-#define I2O_CMD_BUS_QUIESCE             0x8b
-/*
- * Random Block Storage Class
- */
-#define I2O_CMD_BLOCK_READ              0x30
-#define I2O_CMD_BLOCK_WRITE             0x31
-#define I2O_CMD_BLOCK_CFLUSH            0x37
-#define I2O_CMD_BLOCK_MLOCK             0x49
-#define I2O_CMD_BLOCK_MUNLOCK           0x4B
-#define I2O_CMD_BLOCK_MMOUNT            0x41
-#define I2O_CMD_BLOCK_MEJECT            0x43
-#define I2O_CMD_BLOCK_POWER             0x70
-#define I2O_CMD_PRIVATE                 0xFF
-/* Command status values  */
-#define I2O_CMD_IN_PROGRESS     0x01
-#define I2O_CMD_REJECTED        0x02
-#define I2O_CMD_FAILED          0x03
-#define I2O_CMD_COMPLETED       0x04
-/* I2O API function return values */
-#define I2O_RTN_NO_ERROR                        0
-#define I2O_RTN_NOT_INIT                        1
-#define I2O_RTN_FREE_Q_EMPTY                    2
-#define I2O_RTN_TCB_ERROR                       3
-#define I2O_RTN_TRANSACTION_ERROR               4
-#define I2O_RTN_ADAPTER_ALREADY_INIT            5
-#define I2O_RTN_MALLOC_ERROR                    6
-#define I2O_RTN_ADPTR_NOT_REGISTERED            7
-#define I2O_RTN_MSG_REPLY_TIMEOUT               8
-#define I2O_RTN_NO_STATUS                       9
-#define I2O_RTN_NO_FIRM_VER                     10
-#define I2O_RTN_NO_LINK_SPEED                   11
-/* Reply message status defines for all messages */
-#define I2O_REPLY_STATUS_SUCCESS                        0x00
-#define I2O_REPLY_STATUS_ABORT_DIRTY                    0x01
-#define I2O_REPLY_STATUS_ABORT_NO_DATA_TRANSFER         0x02
-#define I2O_REPLY_STATUS_ABORT_PARTIAL_TRANSFER         0x03
-#define I2O_REPLY_STATUS_ERROR_DIRTY                    0x04
-#define I2O_REPLY_STATUS_ERROR_NO_DATA_TRANSFER         0x05
-#define I2O_REPLY_STATUS_ERROR_PARTIAL_TRANSFER         0x06
-#define I2O_REPLY_STATUS_PROCESS_ABORT_DIRTY            0x08
-#define I2O_REPLY_STATUS_PROCESS_ABORT_NO_DATA_TRANSFER 0x09
-#define I2O_REPLY_STATUS_PROCESS_ABORT_PARTIAL_TRANSFER 0x0A
-#define I2O_REPLY_STATUS_TRANSACTION_ERROR              0x0B
-#define I2O_REPLY_STATUS_PROGRESS_REPORT                0x80
-/* Status codes and Error Information for Parameter functions */
-#define I2O_PARAMS_STATUS_SUCCESS               0x00
-#define I2O_PARAMS_STATUS_BAD_KEY_ABORT         0x01
-#define I2O_PARAMS_STATUS_BAD_KEY_CONTINUE      0x02
-#define I2O_PARAMS_STATUS_BUFFER_FULL           0x03
-#define I2O_PARAMS_STATUS_BUFFER_TOO_SMALL      0x04
-#define I2O_PARAMS_STATUS_FIELD_UNREADABLE      0x05
-#define I2O_PARAMS_STATUS_FIELD_UNWRITEABLE     0x06
-#define I2O_PARAMS_STATUS_INSUFFICIENT_FIELDS   0x07
-#define I2O_PARAMS_STATUS_INVALID_GROUP_ID      0x08
-#define I2O_PARAMS_STATUS_INVALID_OPERATION     0x09
-#define I2O_PARAMS_STATUS_NO_KEY_FIELD          0x0A
-#define I2O_PARAMS_STATUS_NO_SUCH_FIELD         0x0B
-#define I2O_PARAMS_STATUS_NON_DYNAMIC_GROUP     0x0C
-#define I2O_PARAMS_STATUS_OPERATION_ERROR       0x0D
-#define I2O_PARAMS_STATUS_SCALAR_ERROR          0x0E
-#define I2O_PARAMS_STATUS_TABLE_ERROR           0x0F
-#define I2O_PARAMS_STATUS_WRONG_GROUP_TYPE      0x10
-/* DetailedStatusCode defines for Executive, DDM, Util and Transaction error
- * messages: Table 3-2 Detailed Status Codes.*/
-#define I2O_DSC_SUCCESS                        0x0000
-#define I2O_DSC_BAD_KEY                        0x0002
-#define I2O_DSC_TCL_ERROR                      0x0003
-#define I2O_DSC_REPLY_BUFFER_FULL              0x0004
-#define I2O_DSC_NO_SUCH_PAGE                   0x0005
-#define I2O_DSC_INSUFFICIENT_RESOURCE_SOFT     0x0006
-#define I2O_DSC_INSUFFICIENT_RESOURCE_HARD     0x0007
-#define I2O_DSC_CHAIN_BUFFER_TOO_LARGE         0x0009
-#define I2O_DSC_UNSUPPORTED_FUNCTION           0x000A
-#define I2O_DSC_DEVICE_LOCKED                  0x000B
-#define I2O_DSC_DEVICE_RESET                   0x000C
-#define I2O_DSC_INAPPROPRIATE_FUNCTION         0x000D
-#define I2O_DSC_INVALID_INITIATOR_ADDRESS      0x000E
-#define I2O_DSC_INVALID_MESSAGE_FLAGS          0x000F
-#define I2O_DSC_INVALID_OFFSET                 0x0010
-#define I2O_DSC_INVALID_PARAMETER              0x0011
-#define I2O_DSC_INVALID_REQUEST                0x0012
-#define I2O_DSC_INVALID_TARGET_ADDRESS         0x0013
-#define I2O_DSC_MESSAGE_TOO_LARGE              0x0014
-#define I2O_DSC_MESSAGE_TOO_SMALL              0x0015
-#define I2O_DSC_MISSING_PARAMETER              0x0016
-#define I2O_DSC_TIMEOUT                        0x0017
-#define I2O_DSC_UNKNOWN_ERROR                  0x0018
-#define I2O_DSC_UNKNOWN_FUNCTION               0x0019
-#define I2O_DSC_UNSUPPORTED_VERSION            0x001A
-#define I2O_DSC_DEVICE_BUSY                    0x001B
-#define I2O_DSC_DEVICE_NOT_AVAILABLE           0x001C
-/* DetailedStatusCode defines for Block Storage Operation: Table 6-7 Detailed
-   Status Codes.*/
-#define I2O_BSA_DSC_SUCCESS               0x0000
-#define I2O_BSA_DSC_MEDIA_ERROR           0x0001
-#define I2O_BSA_DSC_ACCESS_ERROR          0x0002
-#define I2O_BSA_DSC_DEVICE_FAILURE        0x0003
-#define I2O_BSA_DSC_DEVICE_NOT_READY      0x0004
-#define I2O_BSA_DSC_MEDIA_NOT_PRESENT     0x0005
-#define I2O_BSA_DSC_MEDIA_LOCKED          0x0006
-#define I2O_BSA_DSC_MEDIA_FAILURE         0x0007
-#define I2O_BSA_DSC_PROTOCOL_FAILURE      0x0008
-#define I2O_BSA_DSC_BUS_FAILURE           0x0009
-#define I2O_BSA_DSC_ACCESS_VIOLATION      0x000A
-#define I2O_BSA_DSC_WRITE_PROTECTED       0x000B
-#define I2O_BSA_DSC_DEVICE_RESET          0x000C
-#define I2O_BSA_DSC_VOLUME_CHANGED        0x000D
-#define I2O_BSA_DSC_TIMEOUT               0x000E
-/* FailureStatusCodes, Table 3-3 Message Failure Codes */
-#define I2O_FSC_TRANSPORT_SERVICE_SUSPENDED             0x81
-#define I2O_FSC_TRANSPORT_SERVICE_TERMINATED            0x82
-#define I2O_FSC_TRANSPORT_CONGESTION                    0x83
-#define I2O_FSC_TRANSPORT_FAILURE                       0x84
-#define I2O_FSC_TRANSPORT_STATE_ERROR                   0x85
-#define I2O_FSC_TRANSPORT_TIME_OUT                      0x86
-#define I2O_FSC_TRANSPORT_ROUTING_FAILURE               0x87
-#define I2O_FSC_TRANSPORT_INVALID_VERSION               0x88
-#define I2O_FSC_TRANSPORT_INVALID_OFFSET                0x89
-#define I2O_FSC_TRANSPORT_INVALID_MSG_FLAGS             0x8A
-#define I2O_FSC_TRANSPORT_FRAME_TOO_SMALL               0x8B
-#define I2O_FSC_TRANSPORT_FRAME_TOO_LARGE               0x8C
-#define I2O_FSC_TRANSPORT_INVALID_TARGET_ID             0x8D
-#define I2O_FSC_TRANSPORT_INVALID_INITIATOR_ID          0x8E
-#define I2O_FSC_TRANSPORT_INVALID_INITIATOR_CONTEXT     0x8F
-#define I2O_FSC_TRANSPORT_UNKNOWN_FAILURE               0xFF
-/* Device Claim Types */
-#define I2O_CLAIM_PRIMARY                                       0x01000000
-#define I2O_CLAIM_MANAGEMENT                                    0x02000000
-#define I2O_CLAIM_AUTHORIZED                                    0x03000000
-#define I2O_CLAIM_SECONDARY                                     0x04000000
-/* Message header defines for VersionOffset */
-#define I2OVER15        0x0001
-#define I2OVER20        0x0002
-/* Default is 1.5 */
-#define I2OVERSION      I2OVER15
-#define SGL_OFFSET_0    I2OVERSION
-#define SGL_OFFSET_4    (0x0040 | I2OVERSION)
-#define SGL_OFFSET_5    (0x0050 | I2OVERSION)
-#define SGL_OFFSET_6    (0x0060 | I2OVERSION)
-#define SGL_OFFSET_7    (0x0070 | I2OVERSION)
-#define SGL_OFFSET_8    (0x0080 | I2OVERSION)
-#define SGL_OFFSET_9    (0x0090 | I2OVERSION)
-#define SGL_OFFSET_10   (0x00A0 | I2OVERSION)
-#define SGL_OFFSET_11   (0x00B0 | I2OVERSION)
-#define SGL_OFFSET_12   (0x00C0 | I2OVERSION)
-#define SGL_OFFSET(x)   (((x)<<4) | I2OVERSION)
-/* Transaction Reply Lists (TRL) Control Word structure */
-#define TRL_SINGLE_FIXED_LENGTH         0x00
-#define TRL_SINGLE_VARIABLE_LENGTH      0x40
-#define TRL_MULTIPLE_FIXED_LENGTH       0x80
- /* msg header defines for MsgFlags */
-#define MSG_STATIC      0x0100
-#define MSG_64BIT_CNTXT 0x0200
-#define MSG_MULTI_TRANS 0x1000
-#define MSG_FAIL        0x2000
-#define MSG_FINAL       0x4000
-#define MSG_REPLY       0x8000
- /* minimum size msg */
-#define THREE_WORD_MSG_SIZE     0x00030000
-#define FOUR_WORD_MSG_SIZE      0x00040000
-#define FIVE_WORD_MSG_SIZE      0x00050000
-#define SIX_WORD_MSG_SIZE       0x00060000
-#define SEVEN_WORD_MSG_SIZE     0x00070000
-#define EIGHT_WORD_MSG_SIZE     0x00080000
-#define NINE_WORD_MSG_SIZE      0x00090000
-#define TEN_WORD_MSG_SIZE       0x000A0000
-#define ELEVEN_WORD_MSG_SIZE    0x000B0000
-#define I2O_MESSAGE_SIZE(x)     ((x)<<16)
-/* special TID assignments */
-#define ADAPTER_TID             0
-#define HOST_TID                1
-/* outbound queue defines */
-#define I2O_MAX_OUTBOUND_MSG_FRAMES     128
-#define I2O_OUTBOUND_MSG_FRAME_SIZE     128     /* in 32-bit words */
-#define I2O_POST_WAIT_OK        0
-#define I2O_POST_WAIT_TIMEOUT   -ETIMEDOUT
-#define I2O_CONTEXT_LIST_MIN_LENGTH     15
-#define I2O_CONTEXT_LIST_USED           0x01
-#define I2O_CONTEXT_LIST_DELETED        0x02
-/* timeouts */
-#define I2O_TIMEOUT_INIT_OUTBOUND_QUEUE 15
-#define I2O_TIMEOUT_MESSAGE_GET         5
-#define I2O_TIMEOUT_RESET               30
-#define I2O_TIMEOUT_STATUS_GET          5
-#define I2O_TIMEOUT_LCT_GET             360
-#define I2O_TIMEOUT_SCSI_SCB_ABORT      240
-/* retries */
-#define I2O_HRT_GET_TRIES               3
-#define I2O_LCT_GET_TRIES               3
-/* defines for max_sectors and max_phys_segments */
-#define I2O_MAX_SECTORS                 1024
-#define I2O_MAX_SECTORS_LIMITED         256
-#define I2O_MAX_PHYS_SEGMENTS           MAX_PHYS_SEGMENTS
 #endif                          /* __KERNEL__ */
 #endif                          /* _I2O_H */
diff --git a/include/linux/irq.h b/include/linux/irq.h
index f04ba20712a2..6c5d4c898ccb 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <linux/smp.h>
-#if !defined(CONFIG_ARCH_S390)
+#if !defined(CONFIG_S390)
 #include <linux/linkage.h>
 #include <linux/cache.h>
@@ -221,6 +221,17 @@ extern void note_interrupt(unsigned int irq, irq_desc_t *desc,
 extern int can_request_irq(unsigned int irq, unsigned long irqflags);
 extern void init_irq_proc(void);
+#ifdef CONFIG_AUTO_IRQ_AFFINITY
+extern int select_smp_affinity(unsigned int irq);
+#else
+static inline int
+select_smp_affinity(unsigned int irq)
+{
+        return 1;
+}
+#endif
 #endif
 extern hw_irq_controller no_irq_type;  /* needed in every arch ? */
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index dcde7adfdce5..558cb4c26ec9 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -498,6 +498,12 @@ struct transaction_s
        struct journal_head     *t_checkpoint_list;
        /*
+         * Doubly-linked circular list of all buffers submitted for IO while
+         * checkpointing. [j_list_lock]
+         */
+        struct journal_head     *t_checkpoint_io_list;
+        /*
         * Doubly-linked circular list of temporary buffers currently undergoing
         * IO in the log [j_list_lock]
         */
@@ -843,7 +849,7 @@ extern void journal_commit_transaction(journal_t *);
 /* Checkpoint list management */
 int __journal_clean_checkpoint_list(journal_t *journal);
-void __journal_remove_checkpoint(struct journal_head *);
+int __journal_remove_checkpoint(struct journal_head *);
 void __journal_insert_checkpoint(struct journal_head *, transaction_t *);
 /* Buffer IO */
diff --git a/include/linux/key.h b/include/linux/key.h
index 53513a3be53b..4d189e51bc6c 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -193,14 +193,6 @@ struct key_type {
         */
        int (*instantiate)(struct key *key, const void *data, size_t datalen);
-        /* duplicate a key of this type (optional)
-         * - the source key will be locked against change
-         * - the new description will be attached
-         * - the quota will have been adjusted automatically from
-         *   source->quotalen
-         */
-        int (*duplicate)(struct key *key, const struct key *source);
        /* update a key of this type (optional)
         * - this method should call key_payload_reserve() to recalculate the
         *   quota consumption
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e828e172ccbf..a43c95f8f968 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -124,6 +124,8 @@ enum {
        ATA_FLAG_DEBUGMSG       = (1 << 10),
        ATA_FLAG_NO_ATAPI       = (1 << 11), /* No ATAPI support */
+        ATA_FLAG_SUSPENDED      = (1 << 12), /* port is suspended */
        ATA_QCFLAG_ACTIVE       = (1 << 1), /* cmd not yet ack'd to scsi lyer */
        ATA_QCFLAG_SG           = (1 << 3), /* have s/g table? */
        ATA_QCFLAG_SINGLE       = (1 << 4), /* no s/g, just a single buffer */
@@ -436,6 +438,8 @@ extern void ata_std_ports(struct ata_ioports *ioaddr);
 extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                             unsigned int n_ports);
 extern void ata_pci_remove_one (struct pci_dev *pdev);
+extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
+extern int ata_pci_device_resume(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
 extern int ata_device_add(const struct ata_probe_ent *ent);
 extern void ata_host_set_remove(struct ata_host_set *host_set);
@@ -445,6 +449,10 @@ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
 extern int ata_scsi_error(struct Scsi_Host *host);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
+extern int ata_scsi_device_resume(struct scsi_device *);
+extern int ata_scsi_device_suspend(struct scsi_device *);
+extern int ata_device_resume(struct ata_port *, struct ata_device *);
+extern int ata_device_suspend(struct ata_port *, struct ata_device *);
 extern int ata_ratelimit(void);
 /*
@@ -480,7 +488,8 @@ extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
 extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eng_timeout(struct ata_port *ap);
-extern void ata_scsi_simulate(u16 *id, struct scsi_cmnd *cmd,
+extern void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev,
+                              struct scsi_cmnd *cmd,
                              void (*done)(struct scsi_cmnd *));
 extern int ata_std_bios_param(struct scsi_device *sdev,
                              struct block_device *bdev,
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 8b67cf837ca9..ed00b278cb93 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -110,14 +110,6 @@ static inline int mpol_equal(struct mempolicy *a, struct mempolicy *b)
 #define mpol_set_vma_default(vma) ((vma)->vm_policy = NULL)
 /*
- * Hugetlb policy. i386 hugetlb so far works with node numbers
- * instead of zone lists, so give it special interfaces for now.
- */
-extern int mpol_first_node(struct vm_area_struct *vma, unsigned long addr);
-extern int mpol_node_valid(int nid, struct vm_area_struct *vma,
-                        unsigned long addr);
-/*
 * Tree of shared policies for a shared memory region.
 * Maintain the policies in a pseudo mm that contains vmas. The vmas
 * carry the policy. As a special twist the pseudo mm is indexed in pages, not
@@ -156,6 +148,16 @@ extern void numa_default_policy(void);
 extern void numa_policy_init(void);
 extern void numa_policy_rebind(const nodemask_t *old, const nodemask_t *new);
 extern struct mempolicy default_policy;
+extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,
+                unsigned long addr);
+extern int policy_zone;
+static inline void check_highest_zone(int k)
+{
+        if (k > policy_zone)
+                policy_zone = k;
+}
 #else
@@ -182,17 +184,6 @@ static inline struct mempolicy *mpol_copy(struct mempolicy *old)
        return NULL;
 }
-static inline int mpol_first_node(struct vm_area_struct *vma, unsigned long a)
-{
-        return numa_node_id();
-}
-static inline int
-mpol_node_valid(int nid, struct vm_area_struct *vma, unsigned long a)
-{
-        return 1;
-}
 struct shared_policy {};
 static inline int mpol_set_shared_policy(struct shared_policy *info,
@@ -232,6 +223,15 @@ static inline void numa_policy_rebind(const nodemask_t *old,
 {
 }
+static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma,
+                unsigned long addr)
+{
+        return NODE_DATA(0)->node_zonelists + gfp_zone(GFP_HIGHUSER);
+}
+static inline void check_highest_zone(int k)
+{
+}
 #endif /* CONFIG_NUMA */
 #endif /* __KERNEL__ */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a06a84d347fb..bc01fff3aa01 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -634,14 +634,38 @@ struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
 int shmem_lock(struct file *file, int lock, struct user_struct *user);
 #else
 #define shmem_nopage filemap_nopage
-#define shmem_lock(a, b, c)     ({0;})  /* always in memory, no need to lock */
-#define shmem_set_policy(a, b)  (0)
+static inline int shmem_lock(struct file *file, int lock,
-#define shmem_get_policy(a, b)  (NULL)
+                             struct user_struct *user)
+{
+        return 0;
+}
+static inline int shmem_set_policy(struct vm_area_struct *vma,
+                                   struct mempolicy *new)
+{
+        return 0;
+}
+static inline struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
+                                                 unsigned long addr)
+{
+        return NULL;
+}
 #endif
 struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);
+extern int shmem_mmap(struct file *file, struct vm_area_struct *vma);
 int shmem_zero_setup(struct vm_area_struct *);
+#ifndef CONFIG_MMU
+extern unsigned long shmem_get_unmapped_area(struct file *file,
+                                             unsigned long addr,
+                                             unsigned long len,
+                                             unsigned long pgoff,
+                                             unsigned long flags);
+#endif
 static inline int can_do_mlock(void)
 {
        if (capable(CAP_IPC_LOCK))
@@ -690,14 +714,31 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
 }
 extern int vmtruncate(struct inode * inode, loff_t offset);
+extern int vmtruncate_range(struct inode * inode, loff_t offset, loff_t end);
 extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot);
 extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot);
-extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
-static inline int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, int write_access)
+#ifdef CONFIG_MMU
+extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma,
+                        unsigned long address, int write_access);
+static inline int handle_mm_fault(struct mm_struct *mm,
+                        struct vm_area_struct *vma, unsigned long address,
+                        int write_access)
 {
-        return __handle_mm_fault(mm, vma, address, write_access) & (~VM_FAULT_WRITE);
+        return __handle_mm_fault(mm, vma, address, write_access) &
+                                (~VM_FAULT_WRITE);
 }
+#else
+static inline int handle_mm_fault(struct mm_struct *mm,
+                        struct vm_area_struct *vma, unsigned long address,
+                        int write_access)
+{
+        /* should never happen if there's no MMU */
+        BUG();
+        return VM_FAULT_SIGBUS;
+}
+#endif
 extern int make_pages_present(unsigned long addr, unsigned long end);
 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
@@ -896,6 +937,8 @@ extern unsigned long do_brk(unsigned long, unsigned long);
 /* filemap.c */
 extern unsigned long page_unuse(struct page *);
 extern void truncate_inode_pages(struct address_space *, loff_t);
+extern void truncate_inode_pages_range(struct address_space *,
+                                       loff_t lstart, loff_t lend);
 /* generic vm_area_ops exported for stackable file systems */
 extern struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int *);
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 9f22090df7dd..c34f4a2c62f8 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -46,7 +46,6 @@ struct zone_padding {
 struct per_cpu_pages {
        int count;              /* number of pages in the list */
-        int low;                /* low watermark, refill needed */
        int high;               /* high watermark, emptying needed */
        int batch;              /* chunk size for buddy add/remove */
        struct list_head list;  /* the list of pages */
@@ -389,6 +388,11 @@ static inline struct zone *next_zone(struct zone *zone)
 #define for_each_zone(zone) \
        for (zone = pgdat_list->node_zones; zone; zone = next_zone(zone))
+static inline int populated_zone(struct zone *zone)
+{
+        return (!!zone->present_pages);
+}
 static inline int is_highmem_idx(int idx)
 {
        return (idx == ZONE_HIGHMEM);
@@ -398,6 +402,7 @@ static inline int is_normal_idx(int idx)
 {
        return (idx == ZONE_NORMAL);
 }
 /**
 * is_highmem - helper function to quickly check if a struct zone is a 
 *              highmem zone or not.  This is an attempt to keep references
@@ -414,6 +419,16 @@ static inline int is_normal(struct zone *zone)
        return zone == zone->zone_pgdat->node_zones + ZONE_NORMAL;
 }
+static inline int is_dma32(struct zone *zone)
+{
+        return zone == zone->zone_pgdat->node_zones + ZONE_DMA32;
+}
+static inline int is_dma(struct zone *zone)
+{
+        return zone == zone->zone_pgdat->node_zones + ZONE_DMA;
+}
 /* These two functions are used to setup the per zone pages min values */
 struct ctl_table;
 struct file;
@@ -435,7 +450,6 @@ extern struct pglist_data contig_page_data;
 #define NODE_DATA(nid)          (&contig_page_data)
 #define NODE_MEM_MAP(nid)       mem_map
 #define MAX_NODES_SHIFT         1
-#define pfn_to_nid(pfn)         (0)
 #else /* CONFIG_NEED_MULTIPLE_NODES */
@@ -470,6 +484,10 @@ extern struct pglist_data contig_page_data;
 #define early_pfn_to_nid(nid)  (0UL)
 #endif
+#ifdef CONFIG_FLATMEM
+#define pfn_to_nid(pfn)         (0)
+#endif
 #define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT)
 #define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT)
@@ -564,11 +582,6 @@ static inline int valid_section_nr(unsigned long nr)
        return valid_section(__nr_to_section(nr));
 }
-/*
- * Given a kernel address, find the home node of the underlying memory.
- */
-#define kvaddr_to_nid(kaddr)    pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT)
 static inline struct mem_section *__pfn_to_section(unsigned long pfn)
 {
        return __nr_to_section(pfn_to_section_nr(pfn));
@@ -598,13 +611,14 @@ static inline int pfn_valid(unsigned long pfn)
 * this restriction.
 */
 #ifdef CONFIG_NUMA
-#define pfn_to_nid              early_pfn_to_nid
+#define pfn_to_nid(pfn)                                                 \
-#endif
-#define pfn_to_pgdat(pfn)                                               \
 ({                                                                      \
-        NODE_DATA(pfn_to_nid(pfn));                                     \
+        unsigned long __pfn_to_nid_pfn = (pfn);                         \
+        page_to_nid(pfn_to_page(__pfn_to_nid_pfn));                     \
 })
+#else
+#define pfn_to_nid(pfn)         (0)
+#endif
 #define early_pfn_valid(pfn)    pfn_valid(pfn)
 void sparse_init(void);
@@ -613,12 +627,6 @@ void sparse_init(void);
 #define sparse_index_init(_sec, _nid)  do {} while (0)
 #endif /* CONFIG_SPARSEMEM */
-#ifdef CONFIG_NODES_SPAN_OTHER_NODES
-#define early_pfn_in_nid(pfn, nid)      (early_pfn_to_nid(pfn) == (nid))
-#else
-#define early_pfn_in_nid(pfn, nid)      (1)
-#endif
 #ifndef early_pfn_valid
 #define early_pfn_valid(pfn)    (1)
 #endif
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 090e210e98f0..f95d51fae733 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -37,18 +37,26 @@ enum {
 /* userspace doesn't need the nbd_device structure */
 #ifdef __KERNEL__
+#include <linux/wait.h>
 /* values for flags field */
 #define NBD_READ_ONLY 0x0001
 #define NBD_WRITE_NOCHK 0x0002
+struct request;
 struct nbd_device {
        int flags;
        int harderror;          /* Code of hard error                   */
        struct socket * sock;
        struct file * file;     /* If == NULL, device is not ready, yet */
        int magic;
        spinlock_t queue_lock;
        struct list_head queue_head;/* Requests are added here...       */
+        struct request *active_req;
+        wait_queue_head_t active_wq;
        struct semaphore tx_lock;
        struct gendisk *disk;
        int blksize;
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
index 130d4f588a37..3f4f7142bbe3 100644
--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@@ -88,10 +88,12 @@ struct nfsd_readdirargs {
 struct nfsd_attrstat {
        struct svc_fh           fh;
+        struct kstat            stat;
 };
 struct nfsd_diropres  {
        struct svc_fh           fh;
+        struct kstat            stat;
 };
 struct nfsd_readlinkres {
@@ -101,6 +103,7 @@ struct nfsd_readlinkres {
 struct nfsd_readres {
        struct svc_fh           fh;
        unsigned long           count;
+        struct kstat            stat;
 };
 struct nfsd_readdirres {
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
index 3c2a71b43bac..a4322741f8b9 100644
--- a/include/linux/nfsd/xdr3.h
+++ b/include/linux/nfsd/xdr3.h
@@ -126,6 +126,7 @@ struct nfsd3_setaclargs {
 struct nfsd3_attrstat {
        __u32                   status;
        struct svc_fh           fh;
+        struct kstat            stat;
 };
 /* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 343083fec258..d52999c43336 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -79,13 +79,23 @@
 /*
 * Global page accounting.  One instance per CPU.  Only unsigned longs are
 * allowed.
+ *
+ * - Fields can be modified with xxx_page_state and xxx_page_state_zone at
+ * any time safely (which protects the instance from modification by
+ * interrupt.
+ * - The __xxx_page_state variants can be used safely when interrupts are
+ * disabled.
+ * - The __xxx_page_state variants can be used if the field is only
+ * modified from process context, or only modified from interrupt context.
+ * In this case, the field should be commented here.
 */
 struct page_state {
        unsigned long nr_dirty;         /* Dirty writeable pages */
        unsigned long nr_writeback;     /* Pages under writeback */
        unsigned long nr_unstable;      /* NFS unstable pages */
        unsigned long nr_page_table_pages;/* Pages used for pagetables */
-        unsigned long nr_mapped;        /* mapped into pagetables */
+        unsigned long nr_mapped;        /* mapped into pagetables.
+                                         * only modified from process context */
        unsigned long nr_slab;          /* In slab */
 #define GET_PAGE_STATE_LAST nr_slab
@@ -97,32 +107,40 @@ struct page_state {
        unsigned long pgpgout;          /* Disk writes */
        unsigned long pswpin;           /* swap reads */
        unsigned long pswpout;          /* swap writes */
-        unsigned long pgalloc_high;     /* page allocations */
+        unsigned long pgalloc_high;     /* page allocations */
        unsigned long pgalloc_normal;
+        unsigned long pgalloc_dma32;
        unsigned long pgalloc_dma;
        unsigned long pgfree;           /* page freeings */
        unsigned long pgactivate;       /* pages moved inactive->active */
        unsigned long pgdeactivate;     /* pages moved active->inactive */
        unsigned long pgfault;          /* faults (major+minor) */
        unsigned long pgmajfault;       /* faults (major only) */
        unsigned long pgrefill_high;    /* inspected in refill_inactive_zone */
        unsigned long pgrefill_normal;
+        unsigned long pgrefill_dma32;
        unsigned long pgrefill_dma;
        unsigned long pgsteal_high;     /* total highmem pages reclaimed */
        unsigned long pgsteal_normal;
+        unsigned long pgsteal_dma32;
        unsigned long pgsteal_dma;
        unsigned long pgscan_kswapd_high;/* total highmem pages scanned */
        unsigned long pgscan_kswapd_normal;
+        unsigned long pgscan_kswapd_dma32;
        unsigned long pgscan_kswapd_dma;
        unsigned long pgscan_direct_high;/* total highmem pages scanned */
        unsigned long pgscan_direct_normal;
+        unsigned long pgscan_direct_dma32;
        unsigned long pgscan_direct_dma;
-        unsigned long pginodesteal;     /* pages reclaimed via inode freeing */
+        unsigned long pginodesteal;     /* pages reclaimed via inode freeing */
        unsigned long slabs_scanned;    /* slab objects scanned */
        unsigned long kswapd_steal;     /* pages reclaimed by kswapd */
        unsigned long kswapd_inodesteal;/* reclaimed via kswapd inode freeing */
@@ -136,31 +154,54 @@ struct page_state {
 extern void get_page_state(struct page_state *ret);
 extern void get_page_state_node(struct page_state *ret, int node);
 extern void get_full_page_state(struct page_state *ret);
-extern unsigned long __read_page_state(unsigned long offset);
+extern unsigned long read_page_state_offset(unsigned long offset);
-extern void __mod_page_state(unsigned long offset, unsigned long delta);
+extern void mod_page_state_offset(unsigned long offset, unsigned long delta);
+extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
 #define read_page_state(member) \
-        __read_page_state(offsetof(struct page_state, member))
+        read_page_state_offset(offsetof(struct page_state, member))
 #define mod_page_state(member, delta)   \
-        __mod_page_state(offsetof(struct page_state, member), (delta))
+        mod_page_state_offset(offsetof(struct page_state, member), (delta))
-#define inc_page_state(member)  mod_page_state(member, 1UL)
+#define __mod_page_state(member, delta) \
-#define dec_page_state(member)  mod_page_state(member, 0UL - 1)
+        __mod_page_state_offset(offsetof(struct page_state, member), (delta))
-#define add_page_state(member,delta) mod_page_state(member, (delta))
-#define sub_page_state(member,delta) mod_page_state(member, 0UL - (delta))
+#define inc_page_state(member)          mod_page_state(member, 1UL)
+#define dec_page_state(member)          mod_page_state(member, 0UL - 1)
-#define mod_page_state_zone(zone, member, delta)                                \
+#define add_page_state(member,delta)    mod_page_state(member, (delta))
-        do {                                                                    \
+#define sub_page_state(member,delta)    mod_page_state(member, 0UL - (delta))
-                unsigned offset;                                                \
-                if (is_highmem(zone))                                           \
+#define __inc_page_state(member)        __mod_page_state(member, 1UL)
-                        offset = offsetof(struct page_state, member##_high);    \
+#define __dec_page_state(member)        __mod_page_state(member, 0UL - 1)
-                else if (is_normal(zone))                                       \
+#define __add_page_state(member,delta)  __mod_page_state(member, (delta))
-                        offset = offsetof(struct page_state, member##_normal);  \
+#define __sub_page_state(member,delta)  __mod_page_state(member, 0UL - (delta))
-                else                                                            \
-                        offset = offsetof(struct page_state, member##_dma);     \
+#define page_state(member) (*__page_state(offsetof(struct page_state, member)))
-                __mod_page_state(offset, (delta));                              \
-        } while (0)
+#define state_zone_offset(zone, member)                                 \
+({                                                                      \
+        unsigned offset;                                                \
+        if (is_highmem(zone))                                           \
+                offset = offsetof(struct page_state, member##_high);    \
+        else if (is_normal(zone))                                       \
+                offset = offsetof(struct page_state, member##_normal);  \
+        else if (is_dma32(zone))                                        \
+                offset = offsetof(struct page_state, member##_dma32);   \
+        else                                                            \
+                offset = offsetof(struct page_state, member##_dma);     \
+        offset;                                                         \
+})
+#define __mod_page_state_zone(zone, member, delta)                      \
+ do {                                                                   \
+        __mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
+ } while (0)
+#define mod_page_state_zone(zone, member, delta)                        \
+ do {                                                                   \
+        mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
+ } while (0)
 /*
 * Manipulation of page state flags
diff --git a/include/linux/parport.h b/include/linux/parport.h
index d2a4d9e1e6d1..f7ff0b0c4031 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -242,7 +242,6 @@ enum ieee1284_phase {
        IEEE1284_PH_FWD_IDLE,
        IEEE1284_PH_TERMINATE,
        IEEE1284_PH_NEGOTIATION,
-        IEEE1284_PH_HBUSY_DNA,
        IEEE1284_PH_REV_IDLE,
        IEEE1284_PH_HBUSY_DAVAIL,
        IEEE1284_PH_REV_DATA,
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index c6f762470879..1cc0f6b1a49a 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -79,13 +79,13 @@ static __inline__ unsigned char parport_pc_read_data(struct parport *p)
 }
 #ifdef DEBUG_PARPORT
-extern __inline__ void dump_parport_state (char *str, struct parport *p)
+static inline void dump_parport_state (char *str, struct parport *p)
 {
        /* here's hoping that reading these ports won't side-effect anything underneath */
        unsigned char ecr = inb (ECONTROL (p));
        unsigned char dcr = inb (CONTROL (p));
        unsigned char dsr = inb (STATUS (p));
-        static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
+        static const char *const ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
        const struct parport_pc_private *priv = p->physport->private_data;
        int i;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 96a0403f61f6..a213e999de31 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -394,6 +394,13 @@
 #define PCI_DEVICE_ID_NS_87410          0xd001
 #define PCI_DEVICE_ID_NS_CS5535_IDE     0x002d
+#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
+#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_CS5535_IDE          0x002d
+#define PCI_DEVICE_ID_NS_CS5535_AUDIO        0x002e
+#define PCI_DEVICE_ID_NS_CS5535_USB          0x002f
+#define PCI_DEVICE_ID_NS_CS5535_VIDEO        0x0030
 #define PCI_VENDOR_ID_TSENG             0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2      0x3202
 #define PCI_DEVICE_ID_TSENG_W32P_b      0x3205
@@ -496,6 +503,9 @@
 #define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A
+#define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081
+#define PCI_DEVICE_ID_AMD_LX_AES    0x2082
 #define PCI_VENDOR_ID_TRIDENT           0x1023
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index 13e7c4b62367..b6e0bcad84e1 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -71,8 +71,8 @@
 */
 #define MD_PATCHLEVEL_VERSION           3
-extern int register_md_personality (int p_num, mdk_personality_t *p);
+extern int register_md_personality (struct mdk_personality *p);
-extern int unregister_md_personality (int p_num);
+extern int unregister_md_personality (struct mdk_personality *p);
 extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev),
                                mddev_t *mddev, const char *name);
 extern void md_unregister_thread (mdk_thread_t *thread);
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 46629a275ba9..617b9506c760 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -18,62 +18,19 @@
 /* and dm-bio-list.h is not under include/linux because.... ??? */
 #include "../../../drivers/md/dm-bio-list.h"
-#define MD_RESERVED       0UL
-#define LINEAR            1UL
-#define RAID0             2UL
-#define RAID1             3UL
-#define RAID5             4UL
-#define TRANSLUCENT       5UL
-#define HSM               6UL
-#define MULTIPATH         7UL
-#define RAID6             8UL
-#define RAID10            9UL
-#define FAULTY            10UL
-#define MAX_PERSONALITY   11UL
 #define LEVEL_MULTIPATH         (-4)
 #define LEVEL_LINEAR            (-1)
 #define LEVEL_FAULTY            (-5)
+/* we need a value for 'no level specified' and 0
+ * means 'raid0', so we need something else.  This is
+ * for internal use only
+ */
+#define LEVEL_NONE              (-1000000)
 #define MaxSector (~(sector_t)0)
 #define MD_THREAD_NAME_MAX 14
-static inline int pers_to_level (int pers)
-{
-        switch (pers) {
-                case FAULTY:            return LEVEL_FAULTY;
-                case MULTIPATH:         return LEVEL_MULTIPATH;
-                case HSM:               return -3;
-                case TRANSLUCENT:       return -2;
-                case LINEAR:            return LEVEL_LINEAR;
-                case RAID0:             return 0;
-                case RAID1:             return 1;
-                case RAID5:             return 5;
-                case RAID6:             return 6;
-                case RAID10:            return 10;
-        }
-        BUG();
-        return MD_RESERVED;
-}
-static inline int level_to_pers (int level)
-{
-        switch (level) {
-                case LEVEL_FAULTY: return FAULTY;
-                case LEVEL_MULTIPATH: return MULTIPATH;
-                case -3: return HSM;
-                case -2: return TRANSLUCENT;
-                case LEVEL_LINEAR: return LINEAR;
-                case 0: return RAID0;
-                case 1: return RAID1;
-                case 4:
-                case 5: return RAID5;
-                case 6: return RAID6;
-                case 10: return RAID10;
-        }
-        return MD_RESERVED;
-}
 typedef struct mddev_s mddev_t;
 typedef struct mdk_rdev_s mdk_rdev_t;
@@ -138,14 +95,16 @@ struct mdk_rdev_s
        atomic_t        read_errors;    /* number of consecutive read errors that
                                         * we have tried to ignore.
                                         */
+        atomic_t        corrected_errors; /* number of corrected read errors,
+                                           * for reporting to userspace and storing
+                                           * in superblock.
+                                           */
 };
-typedef struct mdk_personality_s mdk_personality_t;
 struct mddev_s
 {
        void                            *private;
-        mdk_personality_t               *pers;
+        struct mdk_personality          *pers;
        dev_t                           unit;
        int                             md_minor;
        struct list_head                disks;
@@ -164,6 +123,7 @@ struct mddev_s
        int                             chunk_size;
        time_t                          ctime, utime;
        int                             level, layout;
+        char                            clevel[16];
        int                             raid_disks;
        int                             max_disks;
        sector_t                        size; /* used size of component devices */
@@ -183,6 +143,11 @@ struct mddev_s
        sector_t                        resync_mismatches; /* count of sectors where
                                                            * parity/replica mismatch found
                                                            */
+        /* if zero, use the system-wide default */
+        int                             sync_speed_min;
+        int                             sync_speed_max;
+        int                             ok_start_degraded;
        /* recovery/resync flags 
         * NEEDED:   we might need to start a resync/recover
         * RUNNING:  a thread is running, or about to be started
@@ -265,9 +230,11 @@ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sect
        atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
 }
-struct mdk_personality_s
+struct mdk_personality
 {
        char *name;
+        int level;
+        struct list_head list;
        struct module *owner;
        int (*make_request)(request_queue_t *q, struct bio *bio);
        int (*run)(mddev_t *mddev);
@@ -305,8 +272,6 @@ static inline char * mdname (mddev_t * mddev)
        return mddev->gendisk ? mddev->gendisk->disk_name : "mdX";
 }
-extern mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr);
 /*
 * iterates through some rdev ringlist. It's safe to remove the
 * current 'rdev'. Dont touch 'tmp' though.
@@ -366,5 +331,10 @@ do {									\
        __wait_event_lock_irq(wq, condition, lock, cmd);                \
 } while (0)
+static inline void safe_put_page(struct page *p)
+{
+        if (p) put_page(p);
+}
 #endif
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index 292b98f2b408..9d5494aaac0f 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -45,6 +45,8 @@ struct r1_private_data_s {
        spinlock_t              resync_lock;
        int                     nr_pending;
+        int                     nr_waiting;
+        int                     nr_queued;
        int                     barrier;
        sector_t                next_resync;
        int                     fullsync;  /* set to 1 if a full sync is needed,
@@ -52,11 +54,12 @@ struct r1_private_data_s {
                                            * Cleared when a sync completes.
                                            */
-        wait_queue_head_t       wait_idle;
+        wait_queue_head_t       wait_barrier;
-        wait_queue_head_t       wait_resume;
        struct pool_info        *poolinfo;
+        struct page             *tmppage;
        mempool_t *r1bio_pool;
        mempool_t *r1buf_pool;
 };
@@ -106,6 +109,13 @@ struct r1bio_s {
        /* DO NOT PUT ANY NEW FIELDS HERE - bios array is contiguously alloced*/
 };
+/* when we get a read error on a read-only array, we redirect to another
+ * device without failing the first device, or trying to over-write to
+ * correct the read error.  To keep track of bad blocks on a per-bio
+ * level, we store IO_BLOCKED in the appropriate 'bios' pointer
+ */
+#define IO_BLOCKED ((struct bio*)1)
 /* bits for r1bio.state */
 #define R1BIO_Uptodate  0
 #define R1BIO_IsSync    1
diff --git a/include/linux/raid/raid10.h b/include/linux/raid/raid10.h
index 60708789c8f9..b1103298a8c2 100644
--- a/include/linux/raid/raid10.h
+++ b/include/linux/raid/raid10.h
@@ -35,18 +35,26 @@ struct r10_private_data_s {
        sector_t chunk_mask;
        struct list_head        retry_list;
-        /* for use when syncing mirrors: */
+        /* queue pending writes and submit them on unplug */
+        struct bio_list         pending_bio_list;
        spinlock_t              resync_lock;
        int nr_pending;
+        int nr_waiting;
+        int nr_queued;
        int barrier;
        sector_t                next_resync;
+        int                     fullsync;  /* set to 1 if a full sync is needed,
+                                            * (fresh device added).
+                                            * Cleared when a sync completes.
+                                            */
-        wait_queue_head_t       wait_idle;
+        wait_queue_head_t       wait_barrier;
-        wait_queue_head_t       wait_resume;
        mempool_t *r10bio_pool;
        mempool_t *r10buf_pool;
+        struct page             *tmppage;
 };
 typedef struct r10_private_data_s conf_t;
@@ -96,8 +104,16 @@ struct r10bio_s {
        } devs[0];
 };
+/* when we get a read error on a read-only array, we redirect to another
+ * device without failing the first device, or trying to over-write to
+ * correct the read error.  To keep track of bad blocks on a per-bio
+ * level, we store IO_BLOCKED in the appropriate 'bios' pointer
+ */
+#define IO_BLOCKED ((struct bio*)1)
 /* bits for r10bio.state */
 #define R10BIO_Uptodate 0
 #define R10BIO_IsSync   1
 #define R10BIO_IsRecover 2
+#define R10BIO_Degraded 3
 #endif
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index f025ba6fb14c..394da8207b34 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -126,7 +126,7 @@
 */
 struct stripe_head {
-        struct stripe_head      *hash_next, **hash_pprev; /* hash pointers */
+        struct hlist_node       hash;
        struct list_head        lru;                    /* inactive_list or handle_list */
        struct raid5_private_data       *raid_conf;
        sector_t                sector;                 /* sector of this row */
@@ -152,7 +152,6 @@ struct stripe_head {
 #define R5_Insync       3       /* rdev && rdev->in_sync at start */
 #define R5_Wantread     4       /* want to schedule a read */
 #define R5_Wantwrite    5
-#define R5_Syncio       6       /* this io need to be accounted as resync io */
 #define R5_Overlap      7       /* There is a pending overlapping request on this block */
 #define R5_ReadError    8       /* seen a read error here recently */
 #define R5_ReWrite      9       /* have tried to over-write the readerror */
@@ -205,7 +204,7 @@ struct disk_info {
 };
 struct raid5_private_data {
-        struct stripe_head      **stripe_hashtbl;
+        struct hlist_head       *stripe_hashtbl;
        mddev_t                 *mddev;
        struct disk_info        *spare;
        int                     chunk_size, level, algorithm;
@@ -228,6 +227,8 @@ struct raid5_private_data {
                                            * Cleared when a sync completes.
                                            */
+        struct page             *spare_page; /* Used when checking P/Q in raid6 */
        /*
         * Free stripes pool
         */
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index e0a4faa9610c..953b6df5d037 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -5,6 +5,16 @@ struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev);
 struct super_block *ramfs_get_sb(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data);
+#ifndef CONFIG_MMU
+extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
+                                                   unsigned long addr,
+                                                   unsigned long len,
+                                                   unsigned long pgoff,
+                                                   unsigned long flags);
+extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);
+#endif
 extern struct file_operations ramfs_file_operations;
 extern struct vm_operations_struct generic_file_vm_ops;
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 33261f1d2239..9d6fbeef2104 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -71,6 +71,7 @@ void __anon_vma_link(struct vm_area_struct *);
 * rmap interfaces called when adding or removing pte of page
 */
 void page_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long);
+void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned long);
 void page_add_file_rmap(struct page *);
 void page_remove_rmap(struct page *);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index b0ad6f30679e..7da33619d5d0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -254,25 +254,12 @@ extern void arch_unmap_area_topdown(struct mm_struct *, unsigned long);
 * The mm counters are not protected by its page_table_lock,
 * so must be incremented atomically.
 */
-#ifdef ATOMIC64_INIT
+#define set_mm_counter(mm, member, value) atomic_long_set(&(mm)->_##member, value)
-#define set_mm_counter(mm, member, value) atomic64_set(&(mm)->_##member, value)
+#define get_mm_counter(mm, member) ((unsigned long)atomic_long_read(&(mm)->_##member))
-#define get_mm_counter(mm, member) ((unsigned long)atomic64_read(&(mm)->_##member))
+#define add_mm_counter(mm, member, value) atomic_long_add(value, &(mm)->_##member)
-#define add_mm_counter(mm, member, value) atomic64_add(value, &(mm)->_##member)
+#define inc_mm_counter(mm, member) atomic_long_inc(&(mm)->_##member)
-#define inc_mm_counter(mm, member) atomic64_inc(&(mm)->_##member)
+#define dec_mm_counter(mm, member) atomic_long_dec(&(mm)->_##member)
-#define dec_mm_counter(mm, member) atomic64_dec(&(mm)->_##member)
+typedef atomic_long_t mm_counter_t;
-typedef atomic64_t mm_counter_t;
-#else /* !ATOMIC64_INIT */
-/*
- * The counters wrap back to 0 at 2^32 * PAGE_SIZE,
- * that is, at 16TB if using 4kB page size.
- */
-#define set_mm_counter(mm, member, value) atomic_set(&(mm)->_##member, value)
-#define get_mm_counter(mm, member) ((unsigned long)atomic_read(&(mm)->_##member))
-#define add_mm_counter(mm, member, value) atomic_add(value, &(mm)->_##member)
-#define inc_mm_counter(mm, member) atomic_inc(&(mm)->_##member)
-#define dec_mm_counter(mm, member) atomic_dec(&(mm)->_##member)
-typedef atomic_t mm_counter_t;
-#endif /* !ATOMIC64_INIT */
 #else  /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
 /*
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index a61c04f804b2..5dc94e777fab 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -14,11 +14,7 @@
 typedef struct pbe {
        unsigned long address;          /* address of the copy */
        unsigned long orig_address;     /* original address of page */
-        swp_entry_t swap_address;       
+        struct pbe *next;
-        struct pbe *next;       /* also used as scratch space at
-                                 * end of page (see link, diskpage)
-                                 */
 } suspend_pagedir_t;
 #define for_each_pbe(pbe, pblist) \
@@ -77,6 +73,6 @@ unsigned long get_safe_page(gfp_t gfp_mask);
 * XXX: We try to keep some more pages free so that I/O operations succeed
 * without paging. Might this be more?
 */
-#define PAGES_FOR_IO    512
+#define PAGES_FOR_IO    1024
 #endif /* _LINUX_SWSUSP_H */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 508668f840b6..556617bcf7ac 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -172,7 +172,6 @@ extern void swap_setup(void);
 /* linux/mm/vmscan.c */
 extern int try_to_free_pages(struct zone **, gfp_t);
-extern int zone_reclaim(struct zone *, gfp_t, unsigned int);
 extern int shrink_all_memory(int);
 extern int vm_swappiness;
@@ -210,6 +209,7 @@ 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 int swap_duplicate(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
 extern void swap_free(swp_entry_t);
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 343d883d69c5..64a36ba43b2f 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -60,12 +60,6 @@ struct writeback_control {
 };
 /*
- * ->writepage() return values (make these much larger than a pagesize, in
- * case some fs is returning number-of-bytes-written from writepage)
- */
-#define WRITEPAGE_ACTIVATE      0x80000 /* IO was not started: activate page */
-/*
 * fs/fs-writeback.c
 */     
 void writeback_inodes(struct writeback_control *wbc);
diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index 850dfa877fda..02e26c1672bf 100644
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -15,7 +15,6 @@ struct scsi_driver {
        void (*rescan)(struct device *);
        int (*issue_flush)(struct device *, sector_t *);
        int (*prepare_flush)(struct request_queue *, struct request *);
-        void (*end_flush)(struct request_queue *, struct request *);
 };
 #define to_scsi_driver(drv) \
        container_of((drv), struct scsi_driver, gendrv)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 6cbb1982ed03..230bc55c0bfa 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -296,6 +296,12 @@ struct scsi_host_template {
        int (*proc_info)(struct Scsi_Host *, char *, char **, off_t, int, int);
        /*
+         * suspend support
+         */
+        int (*resume)(struct scsi_device *);
+        int (*suspend)(struct scsi_device *);
+        /*
         * Name of proc directory
         */
        char *proc_name;
@@ -392,7 +398,6 @@ struct scsi_host_template {
        /*
         * ordered write support
         */
-        unsigned ordered_flush:1;
        unsigned ordered_tag:1;
        /*