Merge branch 'master'

Conflicts: drivers/scsi/libata-scsi.c include/linux/libata.h
author: Jeff Garzik <jeff@garzik.org> 2006-04-11 12:51:40 -0400
committer: Jeff Garzik <jeff@garzik.org> 2006-04-11 12:51:40 -0400
commit: 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch)
tree: eddf856286234f28cac747d20eb59d918e1bc8b5 /include
parent: c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff)
parent: a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff)
105 files changed, 1586 insertions, 544 deletions
diff --git a/include/asm-alpha/numnodes.h b/include/asm-alpha/numnodes.h
deleted file mode 100644
index cd425827e4f3..000000000000
--- a/include/asm-alpha/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-/* Max 128 Nodes - Marvel */
-#define NODES_SHIFT     7
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-arm/arch-cl7500/hardware.h b/include/asm-arm/arch-cl7500/hardware.h
index 2339b764f69f..1adfd18e6154 100644
--- a/include/asm-arm/arch-cl7500/hardware.h
+++ b/include/asm-arm/arch-cl7500/hardware.h
@@ -53,16 +53,12 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
-#define FLUSH_BASE              0xdf000000
 #define VIDC_BASE               (void __iomem *)0xe0400000
 #define IOMD_BASE               IOMEM(0xe0200000)
 #define IOC_BASE                IOMEM(0xe0200000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
 #define PCIO_BASE               IOMEM(0xe0010000)
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 /* in/out bias for the ISA slot region */
diff --git a/include/asm-arm/arch-cl7500/memory.h b/include/asm-arm/arch-cl7500/memory.h
index 34f40a6cec30..3178140e24ca 100644
--- a/include/asm-arm/arch-cl7500/memory.h
+++ b/include/asm-arm/arch-cl7500/memory.h
@@ -26,4 +26,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
 #endif
diff --git a/include/asm-arm/arch-ebsa110/debug-macro.S b/include/asm-arm/arch-ebsa110/debug-macro.S
index f61cadabe0ec..9213bfe4831d 100644
--- a/include/asm-arm/arch-ebsa110/debug-macro.S
+++ b/include/asm-arm/arch-ebsa110/debug-macro.S
@@ -18,4 +18,4 @@
 #define UART_SHIFT      2
 #define FLOW_CONTROL
-#include <asm/hardware/debug-8250.h>
+#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-ebsa110/hardware.h b/include/asm-arm/arch-ebsa110/hardware.h
index 4e41c2358f4e..3ce864def41e 100644
--- a/include/asm-arm/arch-ebsa110/hardware.h
+++ b/include/asm-arm/arch-ebsa110/hardware.h
@@ -57,9 +57,6 @@
 /*
 * RAM definitions
 */
-#define FLUSH_BASE_PHYS         0x40000000
-#define FLUSH_BASE              0xdf000000
 #define UNCACHEABLE_ADDR        0xff000000      /* IRQ_STAT */
 #endif
diff --git a/include/asm-arm/arch-ebsa110/memory.h b/include/asm-arm/arch-ebsa110/memory.h
index 02f144520c10..c7c500e176d0 100644
--- a/include/asm-arm/arch-ebsa110/memory.h
+++ b/include/asm-arm/arch-ebsa110/memory.h
@@ -28,4 +28,10 @@
 #define __virt_to_bus(x)        (x)
 #define __bus_to_virt(x)        (x)
+/*
+ * Cache flushing area - SRAM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
 #endif
diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/include/asm-arm/arch-ebsa110/uncompress.h
index 66b19c7fd908..ae5b775eb0b7 100644
--- a/include/asm-arm/arch-ebsa110/uncompress.h
+++ b/include/asm-arm/arch-ebsa110/uncompress.h
@@ -10,7 +10,7 @@
 #include <linux/serial_reg.h>
-#define SERIAL_BASE     ((unsigned char *)0xfe000be0)
+#define SERIAL_BASE     ((unsigned char *)0xf0000be0)
 /*
 * This does not append a newline
diff --git a/include/asm-arm/arch-ebsa285/hardware.h b/include/asm-arm/arch-ebsa285/hardware.h
index 2ef2200f108c..ec51fe92483b 100644
--- a/include/asm-arm/arch-ebsa285/hardware.h
+++ b/include/asm-arm/arch-ebsa285/hardware.h
@@ -48,9 +48,6 @@
 #define PCICFG0_SIZE            0x01000000
 #define PCICFG0_BASE            0xfa000000
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0xf9000000
 #define PCIMEM_SIZE             0x01000000
 #define PCIMEM_BASE             0xf0000000
@@ -61,9 +58,6 @@
 #define PCIMEM_SIZE             0x80000000
 #define PCIMEM_BASE             0x80000000
-#define FLUSH_SIZE              0x00100000
-#define FLUSH_BASE              0x7e000000
 #define WFLUSH_SIZE             0x01000000
 #define WFLUSH_BASE             0x7d000000
@@ -94,7 +88,6 @@
 #define XBUS_SWITCH_J17_11      ((*XBUS_SWITCH) & (1 << 5))
 #define XBUS_SWITCH_J17_9       ((*XBUS_SWITCH) & (1 << 6))
-#define FLUSH_BASE_PHYS         0x50000000
 #define UNCACHEABLE_ADDR        (ARMCSR_BASE + 0x108)
diff --git a/include/asm-arm/arch-ebsa285/memory.h b/include/asm-arm/arch-ebsa285/memory.h
index 09e335cd687d..99181ffc7e27 100644
--- a/include/asm-arm/arch-ebsa285/memory.h
+++ b/include/asm-arm/arch-ebsa285/memory.h
@@ -49,12 +49,22 @@ extern unsigned long __bus_to_virt(unsigned long);
 #define TASK_SIZE               UL(0xbf000000)
 #define PAGE_OFFSET             UL(0xc0000000)
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0xf9000000
 #elif defined(CONFIG_ARCH_CO285)
 /* Task size and page offset at 1.5GB */
 #define TASK_SIZE               UL(0x5f000000)
 #define PAGE_OFFSET             UL(0x60000000)
+/*
+ * Cache flushing area.
+ */
+#define FLUSH_BASE              0x7e000000
 #else
 #error "Undefined footbridge architecture"
@@ -72,4 +82,6 @@ extern unsigned long __bus_to_virt(unsigned long);
 */
 #define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)
+#define FLUSH_BASE_PHYS         0x50000000
 #endif
diff --git a/include/asm-arm/arch-ixp23xx/debug-macro.S b/include/asm-arm/arch-ixp23xx/debug-macro.S
index eb99fd69fd24..2b25e640247d 100644
--- a/include/asm-arm/arch-ixp23xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp23xx/debug-macro.S
@@ -17,6 +17,9 @@
                tst     \rx, #1                         @ mmu enabled?
                ldreq   \rx, =IXP23XX_PERIPHERAL_PHYS   @ physical
                ldrne   \rx, =IXP23XX_PERIPHERAL_VIRT   @ virtual
+#ifdef __ARMEB__
+                orr     \rx, \rx, #0x00000003
+#endif
                .endm
 #define UART_SHIFT      2
diff --git a/include/asm-arm/arch-l7200/hardware.h b/include/asm-arm/arch-l7200/hardware.h
index b755079befab..2ab43f3a4a8d 100644
--- a/include/asm-arm/arch-l7200/hardware.h
+++ b/include/asm-arm/arch-l7200/hardware.h
@@ -52,9 +52,6 @@
 #define ISA_SIZE                0x20000000
 #define ISA_BASE                0xe0000000
-#define FLUSH_BASE_PHYS         0x40000000      /* ROM */
-#define FLUSH_BASE              0xdf000000
 #define PCIO_BASE               IO_BASE
 #endif
diff --git a/include/asm-arm/arch-l7200/memory.h b/include/asm-arm/arch-l7200/memory.h
index 9e50a171f78a..402df637e740 100644
--- a/include/asm-arm/arch-l7200/memory.h
+++ b/include/asm-arm/arch-l7200/memory.h
@@ -20,4 +20,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x40000000
+#define FLUSH_BASE              0xdf000000
 #endif
diff --git a/include/asm-arm/arch-lh7a40x/memory.h b/include/asm-arm/arch-lh7a40x/memory.h
index c92bcb837629..9f1a58cbf407 100644
--- a/include/asm-arm/arch-lh7a40x/memory.h
+++ b/include/asm-arm/arch-lh7a40x/memory.h
@@ -31,8 +31,6 @@
 #ifdef CONFIG_DISCONTIGMEM
-#define NODES_SHIFT     4       /* Up to 16 nodes */
 /*
 * Given a kernel address, find the home node of the underlying memory.
 */
diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h
index 9d7f87375aa7..7480f4e8d974 100644
--- a/include/asm-arm/arch-rpc/hardware.h
+++ b/include/asm-arm/arch-rpc/hardware.h
@@ -46,7 +46,6 @@
 #define SCREEN_END              0xdfc00000
 #define SCREEN_BASE             0xdf800000
-#define FLUSH_BASE              0xdf000000
 #define UNCACHEABLE_ADDR        0xdf010000
 /*
@@ -59,8 +58,6 @@
 #define PCIO_BASE               IOMEM(0xe0010000)
 #define FLOPPYDMA_BASE          IOMEM(0xe002a000)
-#define FLUSH_BASE_PHYS         0x00000000      /* ROM */
 #define vidc_writel(val)        __raw_writel(val, VIDC_BASE)
 #define IO_EC_EASI_BASE         0x81400000
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h
index 0592cb3f0c74..303c424ce673 100644
--- a/include/asm-arm/arch-rpc/memory.h
+++ b/include/asm-arm/arch-rpc/memory.h
@@ -30,4 +30,10 @@
 #define __virt_to_bus(x) __virt_to_phys(x)
 #define __bus_to_virt(x) __phys_to_virt(x)
+/*
+ * Cache flushing area - ROM
+ */
+#define FLUSH_BASE_PHYS         0x00000000
+#define FLUSH_BASE              0xdf000000
 #endif
diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h b/include/asm-arm/arch-s3c2410/leds-gpio.h
new file mode 100644
index 000000000000..f07ed040622b
--- /dev/null
+++ b/include/asm-arm/arch-s3c2410/leds-gpio.h
@@ -0,0 +1,28 @@
+/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h
+ *
+ * (c) 2006 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C24XX - LEDs GPIO connector
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#ifndef __ASM_ARCH_LEDSGPIO_H
+#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h"
+#define S3C24XX_LEDF_ACTLOW     (1<<0)          /* LED is on when GPIO low */
+#define S3C24XX_LEDF_TRISTATE   (1<<1)          /* tristate to turn off */
+struct s3c24xx_led_platdata {
+        unsigned int             gpio;
+        unsigned int             flags;
+        char                    *name;
+        char                    *def_trigger;
+};
+#endif /* __ASM_ARCH_LEDSGPIO_H */
diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h
index 28711aaa4968..ee008a5484f3 100644
--- a/include/asm-arm/arch-sa1100/hardware.h
+++ b/include/asm-arm/arch-sa1100/hardware.h
@@ -14,10 +14,6 @@
 #include <linux/config.h>
-/* Flushing areas */
-#define FLUSH_BASE_PHYS         0xe0000000      /* SA1100 zero bank */
-#define FLUSH_BASE              0xf5000000
-#define FLUSH_BASE_MINICACHE    0xf5800000
 #define UNCACHEABLE_ADDR        0xfa050000
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h
index 018a9f0e3986..a29fac1387ca 100644
--- a/include/asm-arm/arch-sa1100/memory.h
+++ b/include/asm-arm/arch-sa1100/memory.h
@@ -91,4 +91,11 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes);
 #endif
+/*
+ * Cache flushing area - SA1100 zero bank
+ */
+#define FLUSH_BASE_PHYS         0xe0000000
+#define FLUSH_BASE              0xf5000000
+#define FLUSH_BASE_MINICACHE    0xf5100000
 #endif
diff --git a/include/asm-arm/arch-shark/hardware.h b/include/asm-arm/arch-shark/hardware.h
index 4d35f8c154c3..ecba45260898 100644
--- a/include/asm-arm/arch-shark/hardware.h
+++ b/include/asm-arm/arch-shark/hardware.h
@@ -17,11 +17,6 @@
 */
 #define IO_BASE                 0xe0000000
-/*
- * RAM definitions
- */
-#define FLUSH_BASE_PHYS         0x80000000
 #else
 #define IO_BASE                 0
@@ -33,7 +28,6 @@
 #define ROMCARD_SIZE            0x08000000
 #define ROMCARD_START           0x10000000
-#define FLUSH_BASE              0xdf000000
 #define PCIO_BASE               0xe0000000
diff --git a/include/asm-arm/arch-shark/memory.h b/include/asm-arm/arch-shark/memory.h
index 95a29b4bc5d0..6968d6103ea0 100644
--- a/include/asm-arm/arch-shark/memory.h
+++ b/include/asm-arm/arch-shark/memory.h
@@ -39,4 +39,10 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
 #define __virt_to_bus(x)        __virt_to_phys(x)
 #define __bus_to_virt(x)        __phys_to_virt(x)
+/*
+ * Cache flushing area
+ */
+#define FLUSH_BASE_PHYS         0x80000000
+#define FLUSH_BASE              0xdf000000
 #endif
diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index 6246bf83627d..52bae088a185 100644
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
@@ -26,7 +26,9 @@
 struct vfp_hard_struct {
        __u64 fpregs[16];
+#if __LINUX_ARM_ARCH__ < 6
        __u32 fpmx_state;
+#endif
        __u32 fpexc;
        __u32 fpscr;
        /*
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 2b3cf69b3ed9..209289407595 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -172,10 +172,10 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
 *  virt_addr_valid(k)  indicates whether a virtual address is valid
 */
 #ifndef CONFIG_DISCONTIGMEM
-#define ARCH_PFN_OFFSET         (PHYS_PFN_OFFSET)
+#define ARCH_PFN_OFFSET         PHYS_PFN_OFFSET
 #define pfn_valid(pfn)          ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
-#define virt_to_page(kaddr)     (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
+#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)  ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
 #define PHYS_TO_NID(addr)       (0)
@@ -187,8 +187,8 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
 * around in memory.
 */
 #include <linux/numa.h>
-#define arch_pfn_to_nid(pfn)    (PFN_TO_NID(pfn))
+#define arch_pfn_to_nid(pfn)    PFN_TO_NID(pfn)
-#define arch_local_page_offset(pfn, nid) (LOCAL_MAP_NR((pfn) << PAGE_OFFSET))
+#define arch_local_page_offset(pfn, nid) LOCAL_MAP_NR((pfn) << PAGE_SHIFT)
 #define pfn_valid(pfn)                                          \
        ({                                                      \
diff --git a/include/asm-arm/numnodes.h b/include/asm-arm/numnodes.h
deleted file mode 100644
index 8df36818ebc9..000000000000
--- a/include/asm-arm/numnodes.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  linux/include/asm-arm/numnodes.h
- *
- *  Copyright (C) 2002 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-/* This declaration for the size of the NUMA (CONFIG_DISCONTIGMEM)
- * memory node table is the default.
- *
- * A good place to override this value is include/asm/arch/memory.h.
- */
-#ifndef __ASM_ARM_NUMNODES_H
-#define __ASM_ARM_NUMNODES_H
-#include <asm/memory.h>
-#ifndef NODES_SHIFT
-# define NODES_SHIFT    2       /* Normally, Max 4 Nodes */
-#endif
-#endif
diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
index 15bd6e74c9cf..27fe028b4e72 100644
--- a/include/asm-arm/vfpmacros.h
+++ b/include/asm-arm/vfpmacros.h
@@ -16,10 +16,18 @@
        @ read all the working registers back into the VFP
        .macro  VFPFLDMIA, base
+#if __LINUX_ARM_ARCH__ < 6
        LDC     p11, cr0, [\base],#33*4             @ FLDMIAX \base!, {d0-d15}
+#else
+        LDC     p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d0-d15}
+#endif
        .endm
        @ write all the working registers out of the VFP
        .macro  VFPFSTMIA, base
+#if __LINUX_ARM_ARCH__ < 6
        STC     p11, cr0, [\base],#33*4             @ FSTMIAX \base!, {d0-d15}
+#else
+        STC     p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d0-d15}
+#endif
        .endm
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index 1d63c2aa8ec2..b1c593b6dbff 100644
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -8,7 +8,6 @@
 */
 extern struct task_struct *resume(struct task_struct *prev, struct task_struct *next, int);
-#define prepare_to_switch()     do { } while(0)
 #define switch_to(prev,next,last) last = resume(prev,next, \
                                         (int)&((struct task_struct *)0)->thread)
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h
index 2627bbdf8a11..bb2dfe480213 100644
--- a/include/asm-cris/unistd.h
+++ b/include/asm-cris/unistd.h
@@ -288,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index f72ff0c4dc0b..1734ed91bcdc 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -18,8 +18,6 @@
 struct thread_struct;
-#define prepare_to_switch()    do { } while(0)
 /*
 * switch_to(prev, next) should switch from task `prev' to `next'
 * `prev' will never be the same as `next'.
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index 322531caa484..2662a3e12dc4 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -289,7 +289,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index dfe96c7121cf..8e81cf665e75 100644
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -4,8 +4,6 @@
 #include <linux/config.h> /* get configuration macros */
 #include <linux/linkage.h>
-#define prepare_to_switch()     do { } while(0)
 /*
 * switch_to(n) should switch tasks to task ptr, first checking that
 * ptr isn't the current task, in which case it does nothing.  This
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 56a4a5686c88..adb05159379b 100644
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -285,7 +285,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
index ff9ac8d19eb2..288233fd77d7 100644
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
@@ -139,6 +139,8 @@ void switch_ipi_to_APIC_timer(void *cpumask);
 extern int timer_over_8254;
+extern int modern_apic(void);
 #else /* !CONFIG_X86_LOCAL_APIC */
 static inline void lapic_shutdown(void) { }
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index edf65be21a92..ca82acb8cb1f 100644
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -35,6 +35,10 @@ struct e820map {
 };
 extern struct e820map e820;
+extern int e820_all_mapped(unsigned long start, unsigned long end,
+                           unsigned type);
 #endif/*!__ASSEMBLY__*/
 #endif/*__E820_HEADER*/
diff --git a/include/asm-i386/hpet.h b/include/asm-i386/hpet.h
index 16ef9f996e3f..7f1a8a6ee32f 100644
--- a/include/asm-i386/hpet.h
+++ b/include/asm-i386/hpet.h
@@ -89,6 +89,7 @@
 * then 32 bit HPET counter wrapsaround in less than 0.5 sec.
 */
 #define HPET_MIN_PERIOD (100000UL)
+#define HPET_TICK_RATE  (HZ * 100000UL)
 extern unsigned long hpet_tick;         /* hpet clks count per tick */
 extern unsigned long hpet_address;      /* hpet memory map physical address */
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h
index 62113d3bfdc2..770bf6da8c3d 100644
--- a/include/asm-i386/mpspec.h
+++ b/include/asm-i386/mpspec.h
@@ -18,7 +18,6 @@ extern void find_smp_config (void);
 extern void get_smp_config (void);
 extern int nr_ioapics;
 extern int apic_version [MAX_APICS];
-extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_irq_entries;
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
diff --git a/include/asm-i386/numnodes.h b/include/asm-i386/numnodes.h
deleted file mode 100644
index a61f38c8176f..000000000000
--- a/include/asm-i386/numnodes.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-#include <linux/config.h>
-#ifdef CONFIG_X86_NUMAQ
-/* Max 16 Nodes */
-#define NODES_SHIFT     4
-#elif defined(CONFIG_ACPI_SRAT)
-/* Max 8 Nodes */
-#define NODES_SHIFT     3
-#endif /* CONFIG_X86_NUMAQ */
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 2e7f3e257fdd..6a8dd83c350f 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -288,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 /* #define __NR_sys_setaltroot  285 */
 #define __NR_add_key            286
@@ -318,8 +318,8 @@
 #define __NR_unshare            310
 #define __NR_set_robust_list    311
 #define __NR_get_robust_list    312
-#define __NR_sys_splice         313
+#define __NR_splice             313
-#define __NR_sys_sync_file_range 314
+#define __NR_sync_file_range    314
 #define NR_syscalls 315
diff --git a/include/asm-ia64/acpi-ext.h b/include/asm-ia64/acpi-ext.h
index 56d2ddc97b30..734d137dda6e 100644
--- a/include/asm-ia64/acpi-ext.h
+++ b/include/asm-ia64/acpi-ext.h
@@ -1,12 +1,15 @@
 /*
- * ia64/platform/hp/common/hp_acpi.h
+ * (c) Copyright 2003, 2006 Hewlett-Packard Development Company, L.P.
+ *      Alex Williamson <alex.williamson@hp.com>
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
 *
- * Copyright (C) 2003 Hewlett-Packard
+ * This program is free software; you can redistribute it and/or modify
- * Copyright (C) Alex Williamson
+ * it under the terms of the GNU General Public License version 2 as
- * Copyright (C) Bjorn Helgaas
+ * published by the Free Software Foundation.
 *
 * Vendor specific extensions to ACPI.
 */
 #ifndef _ASM_IA64_ACPI_EXT_H
 #define _ASM_IA64_ACPI_EXT_H
diff --git a/include/asm-ia64/kdebug.h b/include/asm-ia64/kdebug.h
index 218c458ab60c..c195a9ad1255 100644
--- a/include/asm-ia64/kdebug.h
+++ b/include/asm-ia64/kdebug.h
@@ -58,6 +58,8 @@ enum die_val {
        DIE_MCA_RENDZVOUS_ENTER,
        DIE_MCA_RENDZVOUS_PROCESS,
        DIE_MCA_RENDZVOUS_LEAVE,
+        DIE_MCA_NEW_TIMEOUT,
+        DIE_INIT_ENTER,
        DIE_INIT_MONARCH_ENTER,
        DIE_INIT_MONARCH_PROCESS,
        DIE_INIT_MONARCH_LEAVE,
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index bfbbb8da79c7..9c5389b7e623 100644
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -148,6 +148,11 @@ extern int  ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *)
 extern void ia64_unreg_MCA_extension(void);
 extern u64 ia64_get_rnat(u64 *);
+struct ia64_mca_notify_die {
+        struct ia64_sal_os_state *sos;
+        int *monarch_cpu;
+};
 #else   /* __ASSEMBLY__ */
 #define IA64_MCA_CORRECTED      0x0     /* Error has been corrected by OS_MCA */
diff --git a/include/asm-ia64/mutex.h b/include/asm-ia64/mutex.h
index 5a3224f6af38..bed73a643a56 100644
--- a/include/asm-ia64/mutex.h
+++ b/include/asm-ia64/mutex.h
@@ -84,7 +84,7 @@ __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))
 static inline int
 __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
 {
-        if (likely(cmpxchg_acq(count, 1, 0)) == 1)
+        if (cmpxchg_acq(count, 1, 0) == 1)
                return 1;
        return 0;
 }
diff --git a/include/asm-ia64/numnodes.h b/include/asm-ia64/numnodes.h
deleted file mode 100644
index e9d356f549d9..000000000000
--- a/include/asm-ia64/numnodes.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-#ifdef CONFIG_IA64_DIG
-/* Max 8 Nodes */
-#  define NODES_SHIFT   3
-#elif defined(CONFIG_IA64_HP_ZX1) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB)
-/* Max 32 Nodes */
-#  define NODES_SHIFT   5
-#elif defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_GENERIC)
-#  if CONFIG_IA64_NR_NODES == 256
-#    define NODES_SHIFT 8
-#  elif CONFIG_IA64_NR_NODES <= 512
-#    define NODES_SHIFT    9
-#  elif CONFIG_IA64_NR_NODES <= 1024
-#    define NODES_SHIFT    10
-#  endif
-#endif
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 36070c1014d8..1c749acca021 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -286,12 +286,15 @@
 /* 1294, 1295 reserved for pselect/ppoll */
 #define __NR_unshare                    1296
 #define __NR_splice                     1297
+#define __NR_set_robust_list            1298
+#define __NR_get_robust_list            1299
+#define __NR_sync_file_range            1300
 #ifdef __KERNEL__
 #include <linux/config.h>
-#define NR_syscalls                     274 /* length of syscall table */
+#define NR_syscalls                     277 /* length of syscall table */
 #define __ARCH_WANT_SYS_RT_SIGACTION
diff --git a/include/asm-ia64/vga.h b/include/asm-ia64/vga.h
index bc3349ffc505..091177cda223 100644
--- a/include/asm-ia64/vga.h
+++ b/include/asm-ia64/vga.h
@@ -17,7 +17,7 @@
 extern unsigned long vga_console_iobase;
 extern unsigned long vga_console_membase;
-#define VGA_MAP_MEM(x)  ((unsigned long) ioremap(vga_console_membase + (x), 0))
+#define VGA_MAP_MEM(x)  ((unsigned long) ioremap_nocache(vga_console_membase + (x), 0))
 #define vga_readb(x)    (*(x))
 #define vga_writeb(x,y) (*(y) = (x))
diff --git a/include/asm-m32r/numnodes.h b/include/asm-m32r/numnodes.h
deleted file mode 100644
index 479a39d49f83..000000000000
--- a/include/asm-m32r/numnodes.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ASM_NUMNODES_H_
-#define _ASM_NUMNODES_H_
-#include <linux/config.h>
-#ifdef CONFIG_DISCONTIGMEM
-#if defined(CONFIG_CHIP_M32700)
-#define NODES_SHIFT     1       /* Max 2 Nodes */
-#endif  /* CONFIG_CHIP_M32700 */
-#endif  /* CONFIG_DISCONTIGMEM */
-#endif  /* _ASM_NUMNODES_H_ */
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index 7885b7df84a2..1184293e5712 100644
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -67,7 +67,8 @@ extern volatile int cpu_2_physid[NR_CPUS];
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 extern cpumask_t cpu_callout_map;
-#define cpu_possible_map cpu_callout_map
+extern cpumask_t cpu_possible_map;
+extern cpumask_t cpu_present_map;
 static __inline__ int hard_smp_processor_id(void)
 {
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index d6a2c613be68..c5ab5da56d21 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -22,10 +22,6 @@
 * `next' and `prev' should be struct task_struct, but it isn't always defined
 */
-#ifndef CONFIG_SMP
-#define prepare_to_switch()  do { } while(0)
-#endif  /* not CONFIG_SMP */
 #define switch_to(prev, next, last)  do { \
        register unsigned long  arg0 __asm__ ("r0") = (unsigned long)prev; \
        register unsigned long  arg1 __asm__ ("r1") = (unsigned long)next; \
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h
index e8ae61956a51..819cc28a94f7 100644
--- a/include/asm-m32r/uaccess.h
+++ b/include/asm-m32r/uaccess.h
@@ -5,17 +5,9 @@
 *  linux/include/asm-m32r/uaccess.h
 *
 *  M32R version.
- *    Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ *    Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
 */
-#undef UACCESS_DEBUG
-#ifdef UACCESS_DEBUG
-#define UAPRINTK(args...) printk(args)
-#else
-#define UAPRINTK(args...)
-#endif /* UACCESS_DEBUG */
 /*
 * User space memory access functions
 */
@@ -38,27 +30,29 @@
 #define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
 #ifdef CONFIG_MMU
 #define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
 #define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-#else
-#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
-#define USER_DS         MAKE_MM_SEG(0xFFFFFFFF)
-#endif /* CONFIG_MMU */
 #define get_ds()        (KERNEL_DS)
-#ifdef CONFIG_MMU
 #define get_fs()        (current_thread_info()->addr_limit)
 #define set_fs(x)       (current_thread_info()->addr_limit = (x))
-#else
+#else /* not CONFIG_MMU */
+#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFF)
+#define USER_DS         MAKE_MM_SEG(0xFFFFFFFF)
+#define get_ds()        (KERNEL_DS)
 static inline mm_segment_t get_fs(void)
 {
-  return USER_DS;
+        return USER_DS;
 }
 static inline void set_fs(mm_segment_t s)
 {
 }
-#endif /* CONFIG_MMU */
+#endif /* not CONFIG_MMU */
 #define segment_eq(a,b) ((a).seg == (b).seg)
@@ -83,9 +77,9 @@ static inline void set_fs(mm_segment_t s)
                "       subx    %0, %0\n"                               \
                "       cmpu    %4, %1\n"                               \
                "       subx    %0, %5\n"                               \
-                : "=&r"(flag), "=r"(sum)                                \
+                : "=&r" (flag), "=r" (sum)                              \
-                : "1"(addr), "r"((int)(size)),                          \
+                : "1" (addr), "r" ((int)(size)),                        \
-                  "r"(current_thread_info()->addr_limit.seg), "r"(0)    \
+                  "r" (current_thread_info()->addr_limit.seg), "r" (0)  \
                : "cbit" );                                             \
        flag; })
@@ -113,10 +107,10 @@ static inline void set_fs(mm_segment_t s)
 #else
 static inline int access_ok(int type, const void *addr, unsigned long size)
 {
-  extern unsigned long memory_start, memory_end;
+        extern unsigned long memory_start, memory_end;
-  unsigned long val = (unsigned long)addr;
+        unsigned long val = (unsigned long)addr;
-  return ((val >= memory_start) && ((val + size) < memory_end));
+        return ((val >= memory_start) && ((val + size) < memory_end));
 }
 #endif /* CONFIG_MMU */
@@ -155,39 +149,6 @@ extern int fixup_exception(struct pt_regs *regs);
 * accesses to the same area of user memory).
 */
-extern void __get_user_1(void);
-extern void __get_user_2(void);
-extern void __get_user_4(void);
-#ifndef MODULE
-#define __get_user_x(size,ret,x,ptr)                                    \
-        __asm__ __volatile__(                                           \
-                "       mv      r0, %0\n"                               \
-                "       mv      r1, %1\n"                               \
-                "       bl __get_user_" #size "\n"                      \
-                "       mv      %0, r0\n"                               \
-                "       mv      %1, r1\n"                               \
-                : "=r"(ret), "=r"(x)                                    \
-                : "0"(ptr)                                              \
-                : "r0", "r1", "r14" )
-#else /* MODULE */
-/*
- * Use "jl" instead of "bl" for MODULE
- */
-#define __get_user_x(size,ret,x,ptr)                                    \
-        __asm__ __volatile__(                                           \
-                "       mv      r0, %0\n"                               \
-                "       mv      r1, %1\n"                               \
-                "       seth    lr, #high(__get_user_" #size ")\n"      \
-                "       or3     lr, lr, #low(__get_user_" #size ")\n"   \
-                "       jl      lr\n"                                   \
-                "       mv      %0, r0\n"                               \
-                "       mv      %1, r1\n"                               \
-                : "=r"(ret), "=r"(x)                                    \
-                : "0"(ptr)                                              \
-                : "r0", "r1", "r14" )
-#endif
 /* Careful: we have to cast the result to the type of the pointer for sign
   reasons */
 /**
@@ -208,20 +169,7 @@ extern void __get_user_4(void);
 * On error, the variable @x is set to zero.
 */
 #define get_user(x,ptr)                                                 \
-({      int __ret_gu;                                                   \
+        __get_user_check((x),(ptr),sizeof(*(ptr)))
-        unsigned long __val_gu;                                         \
-        __chk_user_ptr(ptr);                                            \
-        switch(sizeof (*(ptr))) {                                       \
-        case 1:  __get_user_x(1,__ret_gu,__val_gu,ptr); break;          \
-        case 2:  __get_user_x(2,__ret_gu,__val_gu,ptr); break;          \
-        case 4:  __get_user_x(4,__ret_gu,__val_gu,ptr); break;          \
-        default: __get_user_x(X,__ret_gu,__val_gu,ptr); break;          \
-        }                                                               \
-        (x) = (__typeof__(*(ptr)))__val_gu;                             \
-        __ret_gu;                                                       \
-})
-extern void __put_user_bad(void);
 /**
 * put_user: - Write a simple value into user space.
@@ -240,8 +188,7 @@ extern void __put_user_bad(void);
 * Returns zero on success, or -EFAULT on error.
 */
 #define put_user(x,ptr)                                                 \
-  __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+        __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 /**
 * __get_user: - Get a simple variable from user space, with less checking.
@@ -264,8 +211,64 @@ extern void __put_user_bad(void);
 * On error, the variable @x is set to zero.
 */
 #define __get_user(x,ptr) \
-  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+        __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+#define __get_user_nocheck(x,ptr,size)                                  \
+({                                                                      \
+        long __gu_err = 0;                                              \
+        unsigned long __gu_val;                                         \
+        might_sleep();                                                  \
+        __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+#define __get_user_check(x,ptr,size)                                    \
+({                                                                      \
+        long __gu_err = -EFAULT;                                        \
+        unsigned long __gu_val = 0;                                     \
+        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);             \
+        might_sleep();                                                  \
+        if (access_ok(VERIFY_READ,__gu_addr,size))                      \
+                __get_user_size(__gu_val,__gu_addr,(size),__gu_err);    \
+        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        __gu_err;                                                       \
+})
+extern long __get_user_bad(void);
+#define __get_user_size(x,ptr,size,retval)                              \
+do {                                                                    \
+        retval = 0;                                                     \
+        __chk_user_ptr(ptr);                                            \
+        switch (size) {                                                 \
+          case 1: __get_user_asm(x,ptr,retval,"ub"); break;             \
+          case 2: __get_user_asm(x,ptr,retval,"uh"); break;             \
+          case 4: __get_user_asm(x,ptr,retval,""); break;               \
+          default: (x) = __get_user_bad();                              \
+        }                                                               \
+} while (0)
+#define __get_user_asm(x, addr, err, itype)                             \
+        __asm__ __volatile__(                                           \
+                "       .fillinsn\n"                                    \
+                "1:     ld"itype" %1,@%2\n"                             \
+                "       .fillinsn\n"                                    \
+                "2:\n"                                                  \
+                ".section .fixup,\"ax\"\n"                              \
+                "       .balign 4\n"                                    \
+                "3:     ldi %0,%3\n"                                    \
+                "       seth r14,#high(2b)\n"                           \
+                "       or3 r14,r14,#low(2b)\n"                         \
+                "       jmp r14\n"                                      \
+                ".previous\n"                                           \
+                ".section __ex_table,\"a\"\n"                           \
+                "       .balign 4\n"                                    \
+                "       .long 1b,3b\n"                                  \
+                ".previous"                                             \
+                : "=&r" (err), "=&r" (x)                                \
+                : "r" (addr), "i" (-EFAULT), "0" (err)                  \
+                : "r14", "memory")
 /**
 * __put_user: - Write a simple value into user space, with less checking.
@@ -287,11 +290,13 @@ extern void __put_user_bad(void);
 * Returns zero on success, or -EFAULT on error.
 */
 #define __put_user(x,ptr) \
-  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+        __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 #define __put_user_nocheck(x,ptr,size)                                  \
 ({                                                                      \
        long __pu_err;                                                  \
+        might_sleep();                                                  \
        __put_user_size((x),(ptr),(size),__pu_err);                     \
        __pu_err;                                                       \
 })
@@ -308,28 +313,28 @@ extern void __put_user_bad(void);
 })
 #if defined(__LITTLE_ENDIAN__)
-#define __put_user_u64(x, addr, err)                                    \
+#define __put_user_u64(x, addr, err)                                    \
-        __asm__ __volatile__(                                           \
+        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
+                "       .fillinsn\n"                                    \
-                "1:     st %L1,@%2\n"                                    \
+                "1:     st %L1,@%2\n"                                   \
-                "       .fillinsn\n"                                    \
+                "       .fillinsn\n"                                    \
-                "2:     st %H1,@(4,%2)\n"                                \
+                "2:     st %H1,@(4,%2)\n"                               \
-                "       .fillinsn\n"                                    \
+                "       .fillinsn\n"                                    \
-                "3:\n"                                                  \
+                "3:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
+                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
+                "       .balign 4\n"                                    \
-                "4:     ldi %0,%3\n"                                    \
+                "4:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(3b)\n"                           \
+                "       seth r14,#high(3b)\n"                           \
-                "       or3 r14,r14,#low(3b)\n"                         \
+                "       or3 r14,r14,#low(3b)\n"                         \
-                "       jmp r14\n"                                      \
+                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
+                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
+                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
+                "       .balign 4\n"                                    \
-                "       .long 1b,4b\n"                                  \
+                "       .long 1b,4b\n"                                  \
-                "       .long 2b,4b\n"                                  \
+                "       .long 2b,4b\n"                                  \
-                ".previous"                                             \
+                ".previous"                                             \
-                : "=&r"(err)                                             \
+                : "=&r" (err)                                           \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
                : "r14", "memory")
 #elif defined(__BIG_ENDIAN__)
@@ -353,13 +358,15 @@ extern void __put_user_bad(void);
                "       .long 1b,4b\n"                                  \
                "       .long 2b,4b\n"                                  \
                ".previous"                                             \
-                : "=&r"(err)                                            \
+                : "=&r" (err)                                           \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
                : "r14", "memory")
 #else
 #error no endian defined
 #endif
+extern void __put_user_bad(void);
 #define __put_user_size(x,ptr,size,retval)                              \
 do {                                                                    \
        retval = 0;                                                     \
@@ -398,52 +405,8 @@ struct __large_struct { unsigned long buf[100]; };
                "       .balign 4\n"                                    \
                "       .long 1b,3b\n"                                  \
                ".previous"                                             \
-                : "=&r"(err)                                            \
+                : "=&r" (err)                                           \
-                : "r"(x), "r"(addr), "i"(-EFAULT), "0"(err)             \
+                : "r" (x), "r" (addr), "i" (-EFAULT), "0" (err)         \
-                : "r14", "memory")
-#define __get_user_nocheck(x,ptr,size)                                  \
-({                                                                      \
-        long __gu_err;                                                  \
-        unsigned long __gu_val;                                         \
-        __get_user_size(__gu_val,(ptr),(size),__gu_err);                \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
-        __gu_err;                                                       \
-})
-extern long __get_user_bad(void);
-#define __get_user_size(x,ptr,size,retval)                              \
-do {                                                                    \
-        retval = 0;                                                     \
-        __chk_user_ptr(ptr);                                            \
-        switch (size) {                                                 \
-          case 1: __get_user_asm(x,ptr,retval,"ub"); break;             \
-          case 2: __get_user_asm(x,ptr,retval,"uh"); break;             \
-          case 4: __get_user_asm(x,ptr,retval,""); break;               \
-          default: (x) = __get_user_bad();                              \
-        }                                                               \
-} while (0)
-#define __get_user_asm(x, addr, err, itype)                             \
-        __asm__ __volatile__(                                           \
-                "       .fillinsn\n"                                    \
-                "1:     ld"itype" %1,@%2\n"                             \
-                "       .fillinsn\n"                                    \
-                "2:\n"                                                  \
-                ".section .fixup,\"ax\"\n"                              \
-                "       .balign 4\n"                                    \
-                "3:     ldi %0,%3\n"                                    \
-                "       seth r14,#high(2b)\n"                           \
-                "       or3 r14,r14,#low(2b)\n"                         \
-                "       jmp r14\n"                                      \
-                ".previous\n"                                           \
-                ".section __ex_table,\"a\"\n"                           \
-                "       .balign 4\n"                                    \
-                "       .long 1b,3b\n"                                  \
-                ".previous"                                             \
-                : "=&r"(err), "=&r"(x)                                  \
-                : "r"(addr), "i"(-EFAULT), "0"(err)                     \
                : "r14", "memory")
 /*
@@ -453,7 +416,6 @@ do {									\
 * anything, so this is accurate.
 */
 /*
 * Copy To/From Userspace
 */
@@ -511,8 +473,9 @@ do {									\
                "       .long 2b,9b\n"                                  \
                "       .long 3b,9b\n"                                  \
                ".previous\n"                                           \
-                : "=&r"(__dst), "=&r"(__src), "=&r"(size), "=&r"(__c)   \
+                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
-                : "0"(to), "1"(from), "2"(size), "3"(size / 4)          \
+                  "=&r" (__c)                                           \
+                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
                : "r14", "memory");                                     \
 } while (0)
@@ -573,8 +536,9 @@ do {									\
                "       .long 2b,7b\n"                                  \
                "       .long 3b,7b\n"                                  \
                ".previous\n"                                           \
-                : "=&r"(__dst), "=&r"(__src), "=&r"(size), "=&r"(__c)   \
+                : "=&r" (__dst), "=&r" (__src), "=&r" (size),           \
-                : "0"(to), "1"(from), "2"(size), "3"(size / 4)          \
+                  "=&r" (__c)                                           \
+                : "0" (to), "1" (from), "2" (size), "3" (size / 4)      \
                : "r14", "memory");                                     \
 } while (0)
@@ -676,7 +640,7 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon
 #define copy_from_user(to,from,n)                       \
 ({                                                      \
        might_sleep();                                  \
-__generic_copy_from_user((to),(from),(n));      \
+        __generic_copy_from_user((to),(from),(n));      \
 })
 long __must_check strncpy_from_user(char *dst, const char __user *src,
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index 39be87ca2a5a..be0eb014c3b0 100644
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -292,7 +292,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 #define NR_syscalls 285
diff --git a/include/asm-mips/numnodes.h b/include/asm-mips/numnodes.h
deleted file mode 100644
index 4f00c16ceeb0..000000000000
--- a/include/asm-mips/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-/* Max 128 Nodes */
-#define NODES_SHIFT     6
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-parisc/numnodes.h b/include/asm-parisc/numnodes.h
deleted file mode 100644
index 6c67651efd1c..000000000000
--- a/include/asm-parisc/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-/* Max 8 Nodes */
-#define NODES_SHIFT     3
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-powerpc/numnodes.h b/include/asm-powerpc/numnodes.h
deleted file mode 100644
index e138edae09dd..000000000000
--- a/include/asm-powerpc/numnodes.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_POWERPC_MAX_NUMNODES_H
-#define _ASM_POWERPC_MAX_NUMNODES_H
-#ifdef __KERNEL__
-/* Max 16 Nodes */
-#define NODES_SHIFT     4
-#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_MAX_NUMNODES_H */
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index de1d9926aa60..399bf02894dd 100644
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
@@ -1,6 +1,8 @@
 #ifndef __ARCH_S390_ATOMIC__
 #define __ARCH_S390_ATOMIC__
+#include <linux/compiler.h>
 /*
 *  include/asm-s390/atomic.h
 *
diff --git a/include/asm-s390/ebcdic.h b/include/asm-s390/ebcdic.h
index 4cbc336e4d60..15fd2eda6c90 100644
--- a/include/asm-s390/ebcdic.h
+++ b/include/asm-s390/ebcdic.h
@@ -14,12 +14,12 @@
 #include <types.h>
 #endif
-extern __u8 _ascebc_500[];   /* ASCII -> EBCDIC 500 conversion table */
+extern __u8 _ascebc_500[256];   /* ASCII -> EBCDIC 500 conversion table */
-extern __u8 _ebcasc_500[];   /* EBCDIC 500 -> ASCII conversion table */
+extern __u8 _ebcasc_500[256];   /* EBCDIC 500 -> ASCII conversion table */
-extern __u8 _ascebc[];   /* ASCII -> EBCDIC conversion table */
+extern __u8 _ascebc[256];   /* ASCII -> EBCDIC conversion table */
-extern __u8 _ebcasc[];   /* EBCDIC -> ASCII conversion table */
+extern __u8 _ebcasc[256];   /* EBCDIC -> ASCII conversion table */
-extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */
+extern __u8 _ebc_tolower[256]; /* EBCDIC -> lowercase */
-extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */
+extern __u8 _ebc_toupper[256]; /* EBCDIC -> uppercase */
 static inline void
 codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
diff --git a/include/asm-sh/numnodes.h b/include/asm-sh/numnodes.h
deleted file mode 100644
index f73e85b72ecb..000000000000
--- a/include/asm-sh/numnodes.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_MAX_NUMNODES_H
-#define _ASM_MAX_NUMNODES_H
-/* Max 2 Nodes */
-#define NODES_SHIFT     1
-#endif /* _ASM_MAX_NUMNODES_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index f2c8e14d1fd9..05520cebda12 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -290,7 +290,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     283
+#define __NR_kexec_load         283
 #define __NR_waitid             284
 #define __NR_add_key            285
 #define __NR_request_key        286
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
index 2a1cfa404ea4..1f8f394ae371 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh64/unistd.h
@@ -333,7 +333,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_sys_kexec_load     311
+#define __NR_kexec_load         311
 #define __NR_waitid             312
 #define __NR_add_key            313
 #define __NR_request_key        314
diff --git a/include/asm-sparc/vga.h b/include/asm-sparc/vga.h
new file mode 100644
index 000000000000..c69d5b2ba19a
--- /dev/null
+++ b/include/asm-sparc/vga.h
@@ -0,0 +1,33 @@
+/*
+ *      Access to VGA videoram
+ *
+ *      (c) 1998 Martin Mares <mj@ucw.cz>
+ */
+#ifndef _LINUX_ASM_VGA_H_
+#define _LINUX_ASM_VGA_H_
+#include <asm/types.h>
+#define VT_BUF_HAVE_RW
+#undef scr_writew
+#undef scr_readw
+static inline void scr_writew(u16 val, u16 *addr)
+{
+        BUG_ON((long) addr >= 0);
+        *addr = val;
+}
+static inline u16 scr_readw(const u16 *addr)
+{
+        BUG_ON((long) addr >= 0);
+        return *addr;
+}
+#define VGA_MAP_MEM(x,s) (x)
+#endif
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h
index 82032e159a76..baef13b58952 100644
--- a/include/asm-sparc64/percpu.h
+++ b/include/asm-sparc64/percpu.h
@@ -26,7 +26,7 @@ register unsigned long __local_per_cpu_offset asm("g5");
 #define percpu_modcopy(pcpudst, src, size)                      \
 do {                                                            \
        unsigned int __i;                                       \
-        for_each_cpu(__i)                                       \
+        for_each_possible_cpu(__i)                              \
                memcpy((pcpudst)+__per_cpu_offset(__i),         \
                       (src), (size));                          \
 } while (0)
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h
index 30656c962d74..6e2528bb0083 100644
--- a/include/asm-um/ptrace-i386.h
+++ b/include/asm-um/ptrace-i386.h
@@ -56,6 +56,9 @@ extern int do_get_thread_area_tt(struct user_desc *info);
 extern int arch_switch_tls_skas(struct task_struct *from, struct task_struct *to);
 extern int arch_switch_tls_tt(struct task_struct *from, struct task_struct *to);
+extern void arch_switch_to_tt(struct task_struct *from, struct task_struct *to);
+extern void arch_switch_to_skas(struct task_struct *from, struct task_struct *to);
 static inline int do_get_thread_area(struct user_desc *info)
 {
        return CHOOSE_MODE_PROC(do_get_thread_area_tt, do_get_thread_area_skas, info);
diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 107decbd6e6c..7091af4b7866 100644
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -18,8 +18,6 @@
 #include <asm/ptrace.h>
-#define prepare_to_switch()     do { } while (0)
 /*
 * switch_to(n) should switch tasks to task ptr, first checking that
 * ptr isn't the current task, in which case it does nothing.
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h
index 8dcc32665240..93b51df51687 100644
--- a/include/asm-x86_64/e820.h
+++ b/include/asm-x86_64/e820.h
@@ -47,7 +47,8 @@ extern void contig_e820_setup(void);
 extern unsigned long e820_end_of_ram(void);
 extern void e820_reserve_resources(void);
 extern void e820_print_map(char *who);
-extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);
+extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
+extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
 extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);
 extern void e820_setup_gap(void);
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h
index 08b75c15269a..18ff7ee9e774 100644
--- a/include/asm-x86_64/hpet.h
+++ b/include/asm-x86_64/hpet.h
@@ -51,6 +51,8 @@
 #define HPET_TN_ROUTE_SHIFT     9
+#define HPET_TICK_RATE (HZ * 100000UL)
 extern int is_hpet_enabled(void);
 extern int hpet_rtc_timer_init(void);
 extern int oem_force_hpet_timer(void);
diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86_64/ia32_unistd.h
index eeb2bcd635de..b4f4b172b15a 100644
--- a/include/asm-x86_64/ia32_unistd.h
+++ b/include/asm-x86_64/ia32_unistd.h
@@ -317,6 +317,4 @@
 #define __NR_ia32_ppoll                 309
 #define __NR_ia32_unshare               310
-#define IA32_NR_syscalls 315    /* must be > than biggest syscall! */
 #endif /* _ASM_X86_64_IA32_UNISTD_H_ */
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
index cafdfb37f0d8..a05da8a50bfd 100644
--- a/include/asm-x86_64/io.h
+++ b/include/asm-x86_64/io.h
@@ -177,7 +177,7 @@ static inline __u16 __readw(const volatile void __iomem *addr)
 {
        return *(__force volatile __u16 *)addr;
 }
-static inline __u32 __readl(const volatile void __iomem *addr)
+static __always_inline __u32 __readl(const volatile void __iomem *addr)
 {
        return *(__force volatile __u32 *)addr;
 }
diff --git a/include/asm-x86_64/mce.h b/include/asm-x86_64/mce.h
index 5d298b799a9f..7229785094e3 100644
--- a/include/asm-x86_64/mce.h
+++ b/include/asm-x86_64/mce.h
@@ -70,6 +70,9 @@ struct mce_log {
 #define MCE_THRESHOLD_BASE      MCE_EXTENDED_BANK + 1 /* MCE_AMD */
 #define MCE_THRESHOLD_DRAM_ECC  MCE_THRESHOLD_BASE + 4
+#ifdef __KERNEL__
+#include <asm/atomic.h>
 void mce_log(struct mce *m);
 #ifdef CONFIG_X86_MCE_INTEL
 void mce_intel_feature_init(struct cpuinfo_x86 *c);
@@ -87,4 +90,8 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)
 }
 #endif
+extern atomic_t mce_entry;
+#endif
 #endif
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h
index f6cbb4cbb5a3..1cc92fe02503 100644
--- a/include/asm-x86_64/numa.h
+++ b/include/asm-x86_64/numa.h
@@ -2,7 +2,6 @@
 #define _ASM_X8664_NUMA_H 1
 #include <linux/nodemask.h>
-#include <asm/numnodes.h>
 struct bootnode {
        u64 start,end; 
@@ -18,6 +17,8 @@ extern void numa_init_array(void);
 extern int numa_off;
 extern void numa_set_node(int cpu, int node);
+extern void srat_reserve_add_area(int nodeid);
+extern int hotadd_percent;
 extern unsigned char apicid_to_node[256];
 #ifdef CONFIG_NUMA
diff --git a/include/asm-x86_64/numnodes.h b/include/asm-x86_64/numnodes.h
deleted file mode 100644
index 32be16b8ae96..000000000000
--- a/include/asm-x86_64/numnodes.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_X8664_NUMNODES_H
-#define _ASM_X8664_NUMNODES_H 1
-#include <linux/config.h>
-#ifdef CONFIG_NUMA
-#define NODES_SHIFT     6
-#else
-#define NODES_SHIFT     0
-#endif
-#endif
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h
index f18443fcdf04..b9e5320b7625 100644
--- a/include/asm-x86_64/timex.h
+++ b/include/asm-x86_64/timex.h
@@ -33,7 +33,7 @@ static __always_inline cycles_t get_cycles_sync(void)
        unsigned eax;
        /* Don't do an additional sync on CPUs where we know
           RDTSC is already synchronous. */
-        alternative_io(ASM_NOP2, "cpuid", X86_FEATURE_SYNC_RDTSC,
+        alternative_io("cpuid", ASM_NOP2, X86_FEATURE_SYNC_RDTSC,
                          "=a" (eax), "0" (1) : "ebx","ecx","edx","memory");
        rdtscll(ret);
        return ret;
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index 9284867f1cb9..b29f7ae6a08a 100644
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -111,8 +111,6 @@ extern void *_switch_to(void *last, void *next);
 #endif  /* __ASSEMBLY__ */
-#define prepare_to_switch()     do { } while(0)
 #define switch_to(prev,next,last)               \
 do {                                            \
        clear_cpenable();                       \
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index de3eb8d8ae26..da2d107fe2cf 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -45,6 +45,7 @@ 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 (unsigned long size, unsigned long align, unsigned long goal);
+extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal);
 extern void * __init __alloc_bootmem_low(unsigned long size,
                                         unsigned long align,
                                         unsigned long goal);
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 9b4751aecc23..ff61817082fa 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -21,7 +21,7 @@ enum dma_data_direction {
 #define DMA_30BIT_MASK  0x000000003fffffffULL
 #define DMA_29BIT_MASK  0x000000001fffffffULL
 #define DMA_28BIT_MASK  0x000000000fffffffULL
-#define DMA_24BIT_MASK 0x0000000000ffffffULL
+#define DMA_24BIT_MASK  0x0000000000ffffffULL
 #include <asm/dma-mapping.h>
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1e9ebaba07b7..162c6e57307a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -762,7 +762,7 @@ extern int fcntl_getlease(struct file *filp);
 #define SYNC_FILE_RANGE_WRITE           2
 #define SYNC_FILE_RANGE_WAIT_AFTER      4
 extern int do_sync_file_range(struct file *file, loff_t offset, loff_t endbyte,
-                        int flags);
+                        unsigned int flags);
 /* fs/locks.c */
 extern void locks_init_lock(struct file_lock *);
@@ -1039,8 +1039,8 @@ struct file_operations {
        int (*check_flags)(int);
        int (*dir_notify)(struct file *filp, unsigned long arg);
        int (*flock) (struct file *, int, struct file_lock *);
-        ssize_t (*splice_write)(struct inode *, struct file *, size_t, unsigned int);
+        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int);
-        ssize_t (*splice_read)(struct file *, struct inode *, size_t, unsigned int);
+        ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);
 };
 struct inode_operations {
@@ -1611,8 +1611,17 @@ extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor
 extern void do_generic_mapping_read(struct address_space *mapping,
                                    struct file_ra_state *, struct file *,
                                    loff_t *, read_descriptor_t *, read_actor_t);
-extern ssize_t generic_file_splice_read(struct file *, struct inode *, size_t, unsigned int);
-extern ssize_t generic_file_splice_write(struct inode *, struct file *, size_t, unsigned int);
+/* fs/splice.c */
+extern ssize_t generic_file_splice_read(struct file *,
+                struct pipe_inode_info *, size_t, unsigned int);
+extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
+                struct file *, size_t, unsigned int);
+extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+                struct file *out, size_t len, unsigned int flags);
+extern long do_splice_direct(struct file *in, struct file *out,
+                size_t len, unsigned int flags);
 extern void
 file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
 extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 7851e6b520cf..3ac452945a7d 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -57,6 +57,8 @@ struct vm_area_struct;
                        __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \
                        __GFP_NOMEMALLOC|__GFP_HARDWALL)
+/* This equals 0, but use constants in case they ever change */
+#define GFP_NOWAIT      (GFP_ATOMIC & ~__GFP_HIGH)
 /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */
 #define GFP_ATOMIC      (__GFP_HIGH)
 #define GFP_NOIO        (__GFP_WAIT)
diff --git a/include/linux/init.h b/include/linux/init.h
index ed0ac7c39fdc..93dcbe1abb4c 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -245,7 +245,8 @@ void __init parse_early_param(void);
 #define __cpuexitdata   __exitdata
 #endif
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+        || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
 #define __meminit
 #define __meminitdata
 #define __memexit
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 99905e180532..043376920f51 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -36,6 +36,8 @@
 /* LATCH is used in the interval timer and ftape setup. */
 #define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)  /* For divider */
+#define LATCH_HPET ((HPET_TICK_RATE + HZ/2) / HZ)
 /* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, the we can
 * improve accuracy by shifting LSH bits, hence calculating:
 *     (NOM << LSH) / DEN
@@ -51,9 +53,13 @@
 /* HZ is the requested value. ACTHZ is actual HZ ("<< 8" is for accuracy) */
 #define ACTHZ (SH_DIV (CLOCK_TICK_RATE, LATCH, 8))
+#define ACTHZ_HPET (SH_DIV (HPET_TICK_RATE, LATCH_HPET, 8))
 /* TICK_NSEC is the time between ticks in nsec assuming real ACTHZ */
 #define TICK_NSEC (SH_DIV (1000000UL * 1000, ACTHZ, 8))
+#define TICK_NSEC_HPET (SH_DIV(1000000UL * 1000, ACTHZ_HPET, 8))
 /* TICK_USEC is the time between ticks in usec assuming fake USER_HZ */
 #define TICK_USEC ((1000000UL + USER_HZ/2) / USER_HZ)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a3720f973ea5..e1bd0842f6a1 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -176,7 +176,7 @@ static inline void console_verbose(void)
 extern void bust_spinlocks(int yes);
 extern int oops_in_progress;            /* If set, an oops, panic(), BUG() or die() is in progress */
-extern __deprecated_for_modules int panic_timeout;
+extern int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 4617e75903b0..dc23c7c639f3 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -19,39 +19,38 @@ struct class_device;
 */
 enum led_brightness {
-        LED_OFF = 0,
+        LED_OFF         = 0,
-        LED_HALF = 127,
+        LED_HALF        = 127,
-        LED_FULL = 255,
+        LED_FULL        = 255,
 };
 struct led_classdev {
-        const char *name;
+        const char              *name;
-        int brightness;
+        int                      brightness;
-        int flags;
+        int                      flags;
-#define LED_SUSPENDED       (1 << 0)
-        /* A function to set the brightness of the led */
+#define LED_SUSPENDED           (1 << 0)
-        void (*brightness_set)(struct led_classdev *led_cdev,
-                                enum led_brightness brightness);
-        struct class_device *class_dev;
+        /* Set LED brightness level */
-        /* LED Device linked list */
+        void            (*brightness_set)(struct led_classdev *led_cdev,
-        struct list_head node;
+                                          enum led_brightness brightness);
+        struct class_device     *class_dev;
+        struct list_head         node;                  /* LED Device list */
+        char                    *default_trigger;       /* Trigger to use */
-        /* Trigger data */
-        char *default_trigger;
 #ifdef CONFIG_LEDS_TRIGGERS
-        rwlock_t trigger_lock;
        /* Protects the trigger data below */
+        rwlock_t                 trigger_lock;
-        struct led_trigger *trigger;
+        struct led_trigger      *trigger;
-        struct list_head trig_list;
+        struct list_head         trig_list;
-        void *trigger_data;
+        void                    *trigger_data;
 #endif
 };
 extern int led_classdev_register(struct device *parent,
-                                struct led_classdev *led_cdev);
+                                 struct led_classdev *led_cdev);
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
@@ -65,16 +64,16 @@ extern void led_classdev_resume(struct led_classdev *led_cdev);
 struct led_trigger {
        /* Trigger Properties */
-        const char *name;
+        const char       *name;
-        void (*activate)(struct led_classdev *led_cdev);
+        void            (*activate)(struct led_classdev *led_cdev);
-        void (*deactivate)(struct led_classdev *led_cdev);
+        void            (*deactivate)(struct led_classdev *led_cdev);
        /* LEDs under control by this trigger (for simple triggers) */
-        rwlock_t leddev_list_lock;
+        rwlock_t          leddev_list_lock;
-        struct list_head led_cdevs;
+        struct list_head  led_cdevs;
        /* Link to next registered trigger */
-        struct list_head next_trig;
+        struct list_head  next_trig;
 };
 /* Registration functions for complex triggers */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 03231cb6b406..a7161d42d18f 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -530,6 +530,8 @@ extern void ata_host_set_remove(struct ata_host_set *host_set);
 extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
+extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
+extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 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 *);
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 968b1aa3732c..4ca3e6ad03ec 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -58,8 +58,6 @@ extern int add_one_highpage(struct page *page, int pfn, int bad_ppro);
 /* need some defines for these for archs that don't support it */
 extern void online_page(struct page *page);
 /* VM interface that may be used by firmware interface */
-extern int add_memory(u64 start, u64 size);
-extern int remove_memory(u64 start, u64 size);
 extern int online_pages(unsigned long, unsigned long);
 /* reasonably generic interface to expand the physical pages in a zone  */
@@ -92,11 +90,6 @@ static inline int mhp_notimplemented(const char *func)
        return -ENOSYS;
 }
-static inline int __add_pages(struct zone *zone, unsigned long start_pfn,
-        unsigned long nr_pages)
-{
-        return mhp_notimplemented(__FUNCTION__);
-}
 #endif /* ! CONFIG_MEMORY_HOTPLUG */
 static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
        unsigned long nr_pages)
@@ -105,4 +98,11 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
        dump_stack();
        return -ENOSYS;
 }
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+        || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+extern int add_memory(u64 start, u64 size);
+extern int remove_memory(u64 start, u64 size);
+#endif
 #endif /* __LINUX_MEMORY_HOTPLUG_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6aa016f1d3ae..1154684209a4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -229,10 +229,9 @@ struct page {
                unsigned long private;          /* Mapping-private opaque data:
                                                 * usually used for buffer_heads
                                                 * if PagePrivate set; used for
-                                                 * swp_entry_t if PageSwapCache.
+                                                 * swp_entry_t if PageSwapCache;
-                                                 * When page is free, this
                                                 * indicates order in the buddy
-                                                 * system.
+                                                 * system if PG_buddy is set.
                                                 */
                struct address_space *mapping;  /* If low bit clear, points to
                                                 * inode address_space, or NULL.
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 412e52ca9720..b31a9bca9361 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -110,6 +110,8 @@ struct nf_info
 /* Function to register/unregister hook points. */
 int nf_register_hook(struct nf_hook_ops *reg);
 void nf_unregister_hook(struct nf_hook_ops *reg);
+int nf_register_hooks(struct nf_hook_ops *reg, unsigned int n);
+void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n);
 /* Functions to register get/setsockopt ranges (non-inclusive).  You
   need to check permissions yourself! */
@@ -281,16 +283,42 @@ extern void nf_invalidate_cache(int pf);
   Returns true or false. */
 extern int skb_make_writable(struct sk_buff **pskb, unsigned int writable_len);
-struct nf_queue_rerouter {
+struct nf_afinfo {
-        void (*save)(const struct sk_buff *skb, struct nf_info *info);
+        unsigned short  family;
-        int (*reroute)(struct sk_buff **skb, const struct nf_info *info);
+        unsigned int    (*checksum)(struct sk_buff *skb, unsigned int hook,
-        int rer_size;
+                                    unsigned int dataoff, u_int8_t protocol);
+        void            (*saveroute)(const struct sk_buff *skb,
+                                     struct nf_info *info);
+        int             (*reroute)(struct sk_buff **skb,
+                                   const struct nf_info *info);
+        int             route_key_size;
 };
-#define nf_info_reroute(x) ((void *)x + sizeof(struct nf_info))
+extern struct nf_afinfo *nf_afinfo[];
+static inline struct nf_afinfo *nf_get_afinfo(unsigned short family)
+{
+        return rcu_dereference(nf_afinfo[family]);
+}
+static inline unsigned int
+nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,
+            u_int8_t protocol, unsigned short family)
+{
+        struct nf_afinfo *afinfo;
+        unsigned int csum = 0;
+        rcu_read_lock();
+        afinfo = nf_get_afinfo(family);
+        if (afinfo)
+                csum = afinfo->checksum(skb, hook, dataoff, protocol);
+        rcu_read_unlock();
+        return csum;
+}
-extern int nf_register_queue_rerouter(int pf, struct nf_queue_rerouter *rer);
+extern int nf_register_afinfo(struct nf_afinfo *afinfo);
-extern int nf_unregister_queue_rerouter(int pf);
+extern void nf_unregister_afinfo(struct nf_afinfo *afinfo);
+#define nf_info_reroute(x) ((void *)x + sizeof(struct nf_info))
 #include <net/flow.h>
 extern void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 43c09d790b83..85301c5e8d24 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -80,6 +80,8 @@ enum nf_ip_hook_priorities {
 #ifdef __KERNEL__
 extern int ip_route_me_harder(struct sk_buff **pskb);
 extern int ip_xfrm_me_harder(struct sk_buff **pskb);
+extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
+                                   unsigned int dataoff, u_int8_t protocol);
 #endif /*__KERNEL__*/
 #endif /*__LINUX_IP_NETFILTER_H*/
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_h323.h b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
index 0987cea53840..eace86bd2adb 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -3,6 +3,8 @@
 #ifdef __KERNEL__
+#include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h>
 #define RAS_PORT 1719
 #define Q931_PORT 1720
 #define H323_RTP_CHANNEL_MAX 4  /* Audio, video, FAX and other */
@@ -25,6 +27,56 @@ struct ip_ct_h323_master {
        };
 };
+struct ip_conntrack_expect;
+extern int get_h225_addr(unsigned char *data, TransportAddress * addr,
+                         u_int32_t * ip, u_int16_t * port);
+extern void ip_conntrack_h245_expect(struct ip_conntrack *new,
+                                     struct ip_conntrack_expect *this);
+extern void ip_conntrack_q931_expect(struct ip_conntrack *new,
+                                     struct ip_conntrack_expect *this);
+extern int (*set_h245_addr_hook) (struct sk_buff ** pskb,
+                                  unsigned char **data, int dataoff,
+                                  H245_TransportAddress * addr,
+                                  u_int32_t ip, u_int16_t port);
+extern int (*set_h225_addr_hook) (struct sk_buff ** pskb,
+                                  unsigned char **data, int dataoff,
+                                  TransportAddress * addr,
+                                  u_int32_t ip, u_int16_t port);
+extern int (*set_sig_addr_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress * addr, int count);
+extern int (*set_ras_addr_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress * addr, int count);
+extern int (*nat_rtp_rtcp_hook) (struct sk_buff ** pskb,
+                                 struct ip_conntrack * ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data, int dataoff,
+                                 H245_TransportAddress * addr,
+                                 u_int16_t port, u_int16_t rtp_port,
+                                 struct ip_conntrack_expect * rtp_exp,
+                                 struct ip_conntrack_expect * rtcp_exp);
+extern int (*nat_t120_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             H245_TransportAddress * addr, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
+extern int (*nat_h245_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             TransportAddress * addr, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
+extern int (*nat_q931_hook) (struct sk_buff ** pskb, struct ip_conntrack * ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, TransportAddress * addr,
+                             int idx, u_int16_t port,
+                             struct ip_conntrack_expect * exp);
 #endif
 #endif
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
new file mode 100644
index 000000000000..0bd828081c0c
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+ * ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323
+ *                                   conntrack/NAT module.
+ *
+ * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@hotmail.com>
+ *
+ * This source code is licensed under General Public License version 2.
+ *
+ *
+ * This library is based on H.225 version 4, H.235 version 2 and H.245
+ * version 7. It is extremely optimized to decode only the absolutely
+ * necessary objects in a signal for Linux kernel NAT module use, so don't
+ * expect it to be a full ASN.1 library.
+ *
+ * Features:
+ *
+ * 1. Small. The total size of code plus data is less than 20 KB (IA32).
+ * 2. Fast. Decoding Netmeeting's Setup signal 1 million times on a PIII 866
+ *    takes only 3.9 seconds.
+ * 3. No memory allocation. It uses a static object. No need to initialize or
+ *    cleanup.
+ * 4. Thread safe.
+ * 5. Support embedded architectures that has no misaligned memory access
+ *    support.
+ *
+ * Limitations:
+ *
+ * 1. At most 30 faststart entries. Actually this is limited by ethernet's MTU.
+ *    If a Setup signal contains more than 30 faststart, the packet size will
+ *    very likely exceed the MTU size, then the TPKT will be fragmented. I
+ *    don't know how to handle this in a Netfilter module. Anybody can help?
+ *    Although I think 30 is enough for most of the cases.
+ * 2. IPv4 addresses only.
+ *
+ ****************************************************************************/
+#ifndef _IP_CONNTRACK_HELPER_H323_ASN1_H_
+#define _IP_CONNTRACK_HELPER_H323_ASN1_H_
+/*****************************************************************************
+ * H.323 Types
+ ****************************************************************************/
+#include "ip_conntrack_helper_h323_types.h"
+typedef struct {
+        enum {
+                Q931_NationalEscape = 0x00,
+                Q931_Alerting = 0x01,
+                Q931_CallProceeding = 0x02,
+                Q931_Connect = 0x07,
+                Q931_ConnectAck = 0x0F,
+                Q931_Progress = 0x03,
+                Q931_Setup = 0x05,
+                Q931_SetupAck = 0x0D,
+                Q931_Resume = 0x26,
+                Q931_ResumeAck = 0x2E,
+                Q931_ResumeReject = 0x22,
+                Q931_Suspend = 0x25,
+                Q931_SuspendAck = 0x2D,
+                Q931_SuspendReject = 0x21,
+                Q931_UserInformation = 0x20,
+                Q931_Disconnect = 0x45,
+                Q931_Release = 0x4D,
+                Q931_ReleaseComplete = 0x5A,
+                Q931_Restart = 0x46,
+                Q931_RestartAck = 0x4E,
+                Q931_Segment = 0x60,
+                Q931_CongestionCtrl = 0x79,
+                Q931_Information = 0x7B,
+                Q931_Notify = 0x6E,
+                Q931_Status = 0x7D,
+                Q931_StatusEnquiry = 0x75,
+                Q931_Facility = 0x62
+        } MessageType;
+        H323_UserInformation UUIE;
+} Q931;
+/*****************************************************************************
+ * Decode Functions Return Codes
+ ****************************************************************************/
+#define H323_ERROR_NONE 0       /* Decoded successfully */
+#define H323_ERROR_STOP 1       /* Decoding stopped, not really an error */
+#define H323_ERROR_BOUND -1
+#define H323_ERROR_RANGE -2
+/*****************************************************************************
+ * Decode Functions
+ ****************************************************************************/
+int DecodeRasMessage(unsigned char *buf, size_t sz, RasMessage * ras);
+int DecodeQ931(unsigned char *buf, size_t sz, Q931 * q931);
+int DecodeMultimediaSystemControlMessage(unsigned char *buf, size_t sz,
+                                         MultimediaSystemControlMessage *
+                                         mscm);
+#endif
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
new file mode 100644
index 000000000000..cc98f7aa5abe
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
@@ -0,0 +1,938 @@
+/* Generated by Jing Min Zhao's ASN.1 parser, Mar 15 2006
+ *
+ * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
+ *
+ * This source code is licensed under General Public License version 2.
+ */
+typedef struct TransportAddress_ipAddress {     /* SEQUENCE */
+        int options;            /* No use */
+        unsigned ip;
+} TransportAddress_ipAddress;
+typedef struct TransportAddress {       /* CHOICE */
+        enum {
+                eTransportAddress_ipAddress,
+                eTransportAddress_ipSourceRoute,
+                eTransportAddress_ipxAddress,
+                eTransportAddress_ip6Address,
+                eTransportAddress_netBios,
+                eTransportAddress_nsap,
+                eTransportAddress_nonStandardAddress,
+        } choice;
+        union {
+                TransportAddress_ipAddress ipAddress;
+        };
+} TransportAddress;
+typedef struct DataProtocolCapability { /* CHOICE */
+        enum {
+                eDataProtocolCapability_nonStandard,
+                eDataProtocolCapability_v14buffered,
+                eDataProtocolCapability_v42lapm,
+                eDataProtocolCapability_hdlcFrameTunnelling,
+                eDataProtocolCapability_h310SeparateVCStack,
+                eDataProtocolCapability_h310SingleVCStack,
+                eDataProtocolCapability_transparent,
+                eDataProtocolCapability_segmentationAndReassembly,
+                eDataProtocolCapability_hdlcFrameTunnelingwSAR,
+                eDataProtocolCapability_v120,
+                eDataProtocolCapability_separateLANStack,
+                eDataProtocolCapability_v76wCompression,
+                eDataProtocolCapability_tcp,
+                eDataProtocolCapability_udp,
+        } choice;
+} DataProtocolCapability;
+typedef struct DataApplicationCapability_application {  /* CHOICE */
+        enum {
+                eDataApplicationCapability_application_nonStandard,
+                eDataApplicationCapability_application_t120,
+                eDataApplicationCapability_application_dsm_cc,
+                eDataApplicationCapability_application_userData,
+                eDataApplicationCapability_application_t84,
+                eDataApplicationCapability_application_t434,
+                eDataApplicationCapability_application_h224,
+                eDataApplicationCapability_application_nlpid,
+                eDataApplicationCapability_application_dsvdControl,
+                eDataApplicationCapability_application_h222DataPartitioning,
+                eDataApplicationCapability_application_t30fax,
+                eDataApplicationCapability_application_t140,
+                eDataApplicationCapability_application_t38fax,
+                eDataApplicationCapability_application_genericDataCapability,
+        } choice;
+        union {
+                DataProtocolCapability t120;
+        };
+} DataApplicationCapability_application;
+typedef struct DataApplicationCapability {      /* SEQUENCE */
+        int options;            /* No use */
+        DataApplicationCapability_application application;
+} DataApplicationCapability;
+typedef struct DataType {       /* CHOICE */
+        enum {
+                eDataType_nonStandard,
+                eDataType_nullData,
+                eDataType_videoData,
+                eDataType_audioData,
+                eDataType_data,
+                eDataType_encryptionData,
+                eDataType_h235Control,
+                eDataType_h235Media,
+                eDataType_multiplexedStream,
+        } choice;
+        union {
+                DataApplicationCapability data;
+        };
+} DataType;
+typedef struct UnicastAddress_iPAddress {       /* SEQUENCE */
+        int options;            /* No use */
+        unsigned network;
+} UnicastAddress_iPAddress;
+typedef struct UnicastAddress { /* CHOICE */
+        enum {
+                eUnicastAddress_iPAddress,
+                eUnicastAddress_iPXAddress,
+                eUnicastAddress_iP6Address,
+                eUnicastAddress_netBios,
+                eUnicastAddress_iPSourceRouteAddress,
+                eUnicastAddress_nsap,
+                eUnicastAddress_nonStandardAddress,
+        } choice;
+        union {
+                UnicastAddress_iPAddress iPAddress;
+        };
+} UnicastAddress;
+typedef struct H245_TransportAddress {  /* CHOICE */
+        enum {
+                eH245_TransportAddress_unicastAddress,
+                eH245_TransportAddress_multicastAddress,
+        } choice;
+        union {
+                UnicastAddress unicastAddress;
+        };
+} H245_TransportAddress;
+typedef struct H2250LogicalChannelParameters {  /* SEQUENCE */
+        enum {
+                eH2250LogicalChannelParameters_nonStandard = (1 << 31),
+                eH2250LogicalChannelParameters_associatedSessionID =
+                    (1 << 30),
+                eH2250LogicalChannelParameters_mediaChannel = (1 << 29),
+                eH2250LogicalChannelParameters_mediaGuaranteedDelivery =
+                    (1 << 28),
+                eH2250LogicalChannelParameters_mediaControlChannel =
+                    (1 << 27),
+                eH2250LogicalChannelParameters_mediaControlGuaranteedDelivery
+                    = (1 << 26),
+                eH2250LogicalChannelParameters_silenceSuppression = (1 << 25),
+                eH2250LogicalChannelParameters_destination = (1 << 24),
+                eH2250LogicalChannelParameters_dynamicRTPPayloadType =
+                    (1 << 23),
+                eH2250LogicalChannelParameters_mediaPacketization = (1 << 22),
+                eH2250LogicalChannelParameters_transportCapability =
+                    (1 << 21),
+                eH2250LogicalChannelParameters_redundancyEncoding = (1 << 20),
+                eH2250LogicalChannelParameters_source = (1 << 19),
+        } options;
+        H245_TransportAddress mediaChannel;
+        H245_TransportAddress mediaControlChannel;
+} H2250LogicalChannelParameters;
+typedef struct OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters { /* CHOICE */
+        enum {
+                eOpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h222LogicalChannelParameters,
+                eOpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h223LogicalChannelParameters,
+                eOpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_v76LogicalChannelParameters,
+                eOpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters,
+                eOpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_none,
+        } choice;
+        union {
+                H2250LogicalChannelParameters h2250LogicalChannelParameters;
+        };
+} OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters;
+typedef struct OpenLogicalChannel_forwardLogicalChannelParameters {     /* SEQUENCE */
+        enum {
+                eOpenLogicalChannel_forwardLogicalChannelParameters_portNumber
+                    = (1 << 31),
+                eOpenLogicalChannel_forwardLogicalChannelParameters_forwardLogicalChannelDependency
+                    = (1 << 30),
+                eOpenLogicalChannel_forwardLogicalChannelParameters_replacementFor
+                    = (1 << 29),
+        } options;
+        DataType dataType;
+        OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters
+            multiplexParameters;
+} OpenLogicalChannel_forwardLogicalChannelParameters;
+typedef struct OpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters { /* CHOICE */
+        enum {
+                eOpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters_h223LogicalChannelParameters,
+                eOpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters_v76LogicalChannelParameters,
+                eOpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters,
+        } choice;
+        union {
+                H2250LogicalChannelParameters h2250LogicalChannelParameters;
+        };
+} OpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters;
+typedef struct OpenLogicalChannel_reverseLogicalChannelParameters {     /* SEQUENCE */
+        enum {
+                eOpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters
+                    = (1 << 31),
+                eOpenLogicalChannel_reverseLogicalChannelParameters_reverseLogicalChannelDependency
+                    = (1 << 30),
+                eOpenLogicalChannel_reverseLogicalChannelParameters_replacementFor
+                    = (1 << 29),
+        } options;
+        OpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters
+            multiplexParameters;
+} OpenLogicalChannel_reverseLogicalChannelParameters;
+typedef struct NetworkAccessParameters_networkAddress { /* CHOICE */
+        enum {
+                eNetworkAccessParameters_networkAddress_q2931Address,
+                eNetworkAccessParameters_networkAddress_e164Address,
+                eNetworkAccessParameters_networkAddress_localAreaAddress,
+        } choice;
+        union {
+                H245_TransportAddress localAreaAddress;
+        };
+} NetworkAccessParameters_networkAddress;
+typedef struct NetworkAccessParameters {        /* SEQUENCE */
+        enum {
+                eNetworkAccessParameters_distribution = (1 << 31),
+                eNetworkAccessParameters_externalReference = (1 << 30),
+                eNetworkAccessParameters_t120SetupProcedure = (1 << 29),
+        } options;
+        NetworkAccessParameters_networkAddress networkAddress;
+} NetworkAccessParameters;
+typedef struct OpenLogicalChannel {     /* SEQUENCE */
+        enum {
+                eOpenLogicalChannel_reverseLogicalChannelParameters =
+                    (1 << 31),
+                eOpenLogicalChannel_separateStack = (1 << 30),
+                eOpenLogicalChannel_encryptionSync = (1 << 29),
+        } options;
+        OpenLogicalChannel_forwardLogicalChannelParameters
+            forwardLogicalChannelParameters;
+        OpenLogicalChannel_reverseLogicalChannelParameters
+            reverseLogicalChannelParameters;
+        NetworkAccessParameters separateStack;
+} OpenLogicalChannel;
+typedef struct Setup_UUIE_fastStart {   /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Setup_UUIE_fastStart;
+typedef struct Setup_UUIE {     /* SEQUENCE */
+        enum {
+                eSetup_UUIE_h245Address = (1 << 31),
+                eSetup_UUIE_sourceAddress = (1 << 30),
+                eSetup_UUIE_destinationAddress = (1 << 29),
+                eSetup_UUIE_destCallSignalAddress = (1 << 28),
+                eSetup_UUIE_destExtraCallInfo = (1 << 27),
+                eSetup_UUIE_destExtraCRV = (1 << 26),
+                eSetup_UUIE_callServices = (1 << 25),
+                eSetup_UUIE_sourceCallSignalAddress = (1 << 24),
+                eSetup_UUIE_remoteExtensionAddress = (1 << 23),
+                eSetup_UUIE_callIdentifier = (1 << 22),
+                eSetup_UUIE_h245SecurityCapability = (1 << 21),
+                eSetup_UUIE_tokens = (1 << 20),
+                eSetup_UUIE_cryptoTokens = (1 << 19),
+                eSetup_UUIE_fastStart = (1 << 18),
+                eSetup_UUIE_mediaWaitForConnect = (1 << 17),
+                eSetup_UUIE_canOverlapSend = (1 << 16),
+                eSetup_UUIE_endpointIdentifier = (1 << 15),
+                eSetup_UUIE_multipleCalls = (1 << 14),
+                eSetup_UUIE_maintainConnection = (1 << 13),
+                eSetup_UUIE_connectionParameters = (1 << 12),
+                eSetup_UUIE_language = (1 << 11),
+                eSetup_UUIE_presentationIndicator = (1 << 10),
+                eSetup_UUIE_screeningIndicator = (1 << 9),
+                eSetup_UUIE_serviceControl = (1 << 8),
+                eSetup_UUIE_symmetricOperationRequired = (1 << 7),
+                eSetup_UUIE_capacity = (1 << 6),
+                eSetup_UUIE_circuitInfo = (1 << 5),
+                eSetup_UUIE_desiredProtocols = (1 << 4),
+                eSetup_UUIE_neededFeatures = (1 << 3),
+                eSetup_UUIE_desiredFeatures = (1 << 2),
+                eSetup_UUIE_supportedFeatures = (1 << 1),
+                eSetup_UUIE_parallelH245Control = (1 << 0),
+        } options;
+        TransportAddress h245Address;
+        TransportAddress destCallSignalAddress;
+        TransportAddress sourceCallSignalAddress;
+        Setup_UUIE_fastStart fastStart;
+} Setup_UUIE;
+typedef struct CallProceeding_UUIE_fastStart {  /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} CallProceeding_UUIE_fastStart;
+typedef struct CallProceeding_UUIE {    /* SEQUENCE */
+        enum {
+                eCallProceeding_UUIE_h245Address = (1 << 31),
+                eCallProceeding_UUIE_callIdentifier = (1 << 30),
+                eCallProceeding_UUIE_h245SecurityMode = (1 << 29),
+                eCallProceeding_UUIE_tokens = (1 << 28),
+                eCallProceeding_UUIE_cryptoTokens = (1 << 27),
+                eCallProceeding_UUIE_fastStart = (1 << 26),
+                eCallProceeding_UUIE_multipleCalls = (1 << 25),
+                eCallProceeding_UUIE_maintainConnection = (1 << 24),
+                eCallProceeding_UUIE_fastConnectRefused = (1 << 23),
+                eCallProceeding_UUIE_featureSet = (1 << 22),
+        } options;
+        TransportAddress h245Address;
+        CallProceeding_UUIE_fastStart fastStart;
+} CallProceeding_UUIE;
+typedef struct Connect_UUIE_fastStart { /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Connect_UUIE_fastStart;
+typedef struct Connect_UUIE {   /* SEQUENCE */
+        enum {
+                eConnect_UUIE_h245Address = (1 << 31),
+                eConnect_UUIE_callIdentifier = (1 << 30),
+                eConnect_UUIE_h245SecurityMode = (1 << 29),
+                eConnect_UUIE_tokens = (1 << 28),
+                eConnect_UUIE_cryptoTokens = (1 << 27),
+                eConnect_UUIE_fastStart = (1 << 26),
+                eConnect_UUIE_multipleCalls = (1 << 25),
+                eConnect_UUIE_maintainConnection = (1 << 24),
+                eConnect_UUIE_language = (1 << 23),
+                eConnect_UUIE_connectedAddress = (1 << 22),
+                eConnect_UUIE_presentationIndicator = (1 << 21),
+                eConnect_UUIE_screeningIndicator = (1 << 20),
+                eConnect_UUIE_fastConnectRefused = (1 << 19),
+                eConnect_UUIE_serviceControl = (1 << 18),
+                eConnect_UUIE_capacity = (1 << 17),
+                eConnect_UUIE_featureSet = (1 << 16),
+        } options;
+        TransportAddress h245Address;
+        Connect_UUIE_fastStart fastStart;
+} Connect_UUIE;
+typedef struct Alerting_UUIE_fastStart {        /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Alerting_UUIE_fastStart;
+typedef struct Alerting_UUIE {  /* SEQUENCE */
+        enum {
+                eAlerting_UUIE_h245Address = (1 << 31),
+                eAlerting_UUIE_callIdentifier = (1 << 30),
+                eAlerting_UUIE_h245SecurityMode = (1 << 29),
+                eAlerting_UUIE_tokens = (1 << 28),
+                eAlerting_UUIE_cryptoTokens = (1 << 27),
+                eAlerting_UUIE_fastStart = (1 << 26),
+                eAlerting_UUIE_multipleCalls = (1 << 25),
+                eAlerting_UUIE_maintainConnection = (1 << 24),
+                eAlerting_UUIE_alertingAddress = (1 << 23),
+                eAlerting_UUIE_presentationIndicator = (1 << 22),
+                eAlerting_UUIE_screeningIndicator = (1 << 21),
+                eAlerting_UUIE_fastConnectRefused = (1 << 20),
+                eAlerting_UUIE_serviceControl = (1 << 19),
+                eAlerting_UUIE_capacity = (1 << 18),
+                eAlerting_UUIE_featureSet = (1 << 17),
+        } options;
+        TransportAddress h245Address;
+        Alerting_UUIE_fastStart fastStart;
+} Alerting_UUIE;
+typedef struct Information_UUIE_fastStart {     /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Information_UUIE_fastStart;
+typedef struct Information_UUIE {       /* SEQUENCE */
+        enum {
+                eInformation_UUIE_callIdentifier = (1 << 31),
+                eInformation_UUIE_tokens = (1 << 30),
+                eInformation_UUIE_cryptoTokens = (1 << 29),
+                eInformation_UUIE_fastStart = (1 << 28),
+                eInformation_UUIE_fastConnectRefused = (1 << 27),
+                eInformation_UUIE_circuitInfo = (1 << 26),
+        } options;
+        Information_UUIE_fastStart fastStart;
+} Information_UUIE;
+typedef struct FacilityReason { /* CHOICE */
+        enum {
+                eFacilityReason_routeCallToGatekeeper,
+                eFacilityReason_callForwarded,
+                eFacilityReason_routeCallToMC,
+                eFacilityReason_undefinedReason,
+                eFacilityReason_conferenceListChoice,
+                eFacilityReason_startH245,
+                eFacilityReason_noH245,
+                eFacilityReason_newTokens,
+                eFacilityReason_featureSetUpdate,
+                eFacilityReason_forwardedElements,
+                eFacilityReason_transportedInformation,
+        } choice;
+} FacilityReason;
+typedef struct Facility_UUIE_fastStart {        /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Facility_UUIE_fastStart;
+typedef struct Facility_UUIE {  /* SEQUENCE */
+        enum {
+                eFacility_UUIE_alternativeAddress = (1 << 31),
+                eFacility_UUIE_alternativeAliasAddress = (1 << 30),
+                eFacility_UUIE_conferenceID = (1 << 29),
+                eFacility_UUIE_callIdentifier = (1 << 28),
+                eFacility_UUIE_destExtraCallInfo = (1 << 27),
+                eFacility_UUIE_remoteExtensionAddress = (1 << 26),
+                eFacility_UUIE_tokens = (1 << 25),
+                eFacility_UUIE_cryptoTokens = (1 << 24),
+                eFacility_UUIE_conferences = (1 << 23),
+                eFacility_UUIE_h245Address = (1 << 22),
+                eFacility_UUIE_fastStart = (1 << 21),
+                eFacility_UUIE_multipleCalls = (1 << 20),
+                eFacility_UUIE_maintainConnection = (1 << 19),
+                eFacility_UUIE_fastConnectRefused = (1 << 18),
+                eFacility_UUIE_serviceControl = (1 << 17),
+                eFacility_UUIE_circuitInfo = (1 << 16),
+                eFacility_UUIE_featureSet = (1 << 15),
+                eFacility_UUIE_destinationInfo = (1 << 14),
+                eFacility_UUIE_h245SecurityMode = (1 << 13),
+        } options;
+        FacilityReason reason;
+        TransportAddress h245Address;
+        Facility_UUIE_fastStart fastStart;
+} Facility_UUIE;
+typedef struct Progress_UUIE_fastStart {        /* SEQUENCE OF */
+        int count;
+        OpenLogicalChannel item[30];
+} Progress_UUIE_fastStart;
+typedef struct Progress_UUIE {  /* SEQUENCE */
+        enum {
+                eProgress_UUIE_h245Address = (1 << 31),
+                eProgress_UUIE_h245SecurityMode = (1 << 30),
+                eProgress_UUIE_tokens = (1 << 29),
+                eProgress_UUIE_cryptoTokens = (1 << 28),
+                eProgress_UUIE_fastStart = (1 << 27),
+                eProgress_UUIE_multipleCalls = (1 << 26),
+                eProgress_UUIE_maintainConnection = (1 << 25),
+                eProgress_UUIE_fastConnectRefused = (1 << 24),
+        } options;
+        TransportAddress h245Address;
+        Progress_UUIE_fastStart fastStart;
+} Progress_UUIE;
+typedef struct H323_UU_PDU_h323_message_body {  /* CHOICE */
+        enum {
+                eH323_UU_PDU_h323_message_body_setup,
+                eH323_UU_PDU_h323_message_body_callProceeding,
+                eH323_UU_PDU_h323_message_body_connect,
+                eH323_UU_PDU_h323_message_body_alerting,
+                eH323_UU_PDU_h323_message_body_information,
+                eH323_UU_PDU_h323_message_body_releaseComplete,
+                eH323_UU_PDU_h323_message_body_facility,
+                eH323_UU_PDU_h323_message_body_progress,
+                eH323_UU_PDU_h323_message_body_empty,
+                eH323_UU_PDU_h323_message_body_status,
+                eH323_UU_PDU_h323_message_body_statusInquiry,
+                eH323_UU_PDU_h323_message_body_setupAcknowledge,
+                eH323_UU_PDU_h323_message_body_notify,
+        } choice;
+        union {
+                Setup_UUIE setup;
+                CallProceeding_UUIE callProceeding;
+                Connect_UUIE connect;
+                Alerting_UUIE alerting;
+                Information_UUIE information;
+                Facility_UUIE facility;
+                Progress_UUIE progress;
+        };
+} H323_UU_PDU_h323_message_body;
+typedef struct RequestMessage { /* CHOICE */
+        enum {
+                eRequestMessage_nonStandard,
+                eRequestMessage_masterSlaveDetermination,
+                eRequestMessage_terminalCapabilitySet,
+                eRequestMessage_openLogicalChannel,
+                eRequestMessage_closeLogicalChannel,
+                eRequestMessage_requestChannelClose,
+                eRequestMessage_multiplexEntrySend,
+                eRequestMessage_requestMultiplexEntry,
+                eRequestMessage_requestMode,
+                eRequestMessage_roundTripDelayRequest,
+                eRequestMessage_maintenanceLoopRequest,
+                eRequestMessage_communicationModeRequest,
+                eRequestMessage_conferenceRequest,
+                eRequestMessage_multilinkRequest,
+                eRequestMessage_logicalChannelRateRequest,
+        } choice;
+        union {
+                OpenLogicalChannel openLogicalChannel;
+        };
+} RequestMessage;
+typedef struct OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters {      /* CHOICE */
+        enum {
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters_h222LogicalChannelParameters,
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters,
+        } choice;
+        union {
+                H2250LogicalChannelParameters h2250LogicalChannelParameters;
+        };
+} OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters;
+typedef struct OpenLogicalChannelAck_reverseLogicalChannelParameters {  /* SEQUENCE */
+        enum {
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters_portNumber
+                    = (1 << 31),
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters
+                    = (1 << 30),
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters_replacementFor
+                    = (1 << 29),
+        } options;
+        OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters
+            multiplexParameters;
+} OpenLogicalChannelAck_reverseLogicalChannelParameters;
+typedef struct H2250LogicalChannelAckParameters {       /* SEQUENCE */
+        enum {
+                eH2250LogicalChannelAckParameters_nonStandard = (1 << 31),
+                eH2250LogicalChannelAckParameters_sessionID = (1 << 30),
+                eH2250LogicalChannelAckParameters_mediaChannel = (1 << 29),
+                eH2250LogicalChannelAckParameters_mediaControlChannel =
+                    (1 << 28),
+                eH2250LogicalChannelAckParameters_dynamicRTPPayloadType =
+                    (1 << 27),
+                eH2250LogicalChannelAckParameters_flowControlToZero =
+                    (1 << 26),
+                eH2250LogicalChannelAckParameters_portNumber = (1 << 25),
+        } options;
+        H245_TransportAddress mediaChannel;
+        H245_TransportAddress mediaControlChannel;
+} H2250LogicalChannelAckParameters;
+typedef struct OpenLogicalChannelAck_forwardMultiplexAckParameters {    /* CHOICE */
+        enum {
+                eOpenLogicalChannelAck_forwardMultiplexAckParameters_h2250LogicalChannelAckParameters,
+        } choice;
+        union {
+                H2250LogicalChannelAckParameters
+                    h2250LogicalChannelAckParameters;
+        };
+} OpenLogicalChannelAck_forwardMultiplexAckParameters;
+typedef struct OpenLogicalChannelAck {  /* SEQUENCE */
+        enum {
+                eOpenLogicalChannelAck_reverseLogicalChannelParameters =
+                    (1 << 31),
+                eOpenLogicalChannelAck_separateStack = (1 << 30),
+                eOpenLogicalChannelAck_forwardMultiplexAckParameters =
+                    (1 << 29),
+                eOpenLogicalChannelAck_encryptionSync = (1 << 28),
+        } options;
+        OpenLogicalChannelAck_reverseLogicalChannelParameters
+            reverseLogicalChannelParameters;
+        OpenLogicalChannelAck_forwardMultiplexAckParameters
+            forwardMultiplexAckParameters;
+} OpenLogicalChannelAck;
+typedef struct ResponseMessage {        /* CHOICE */
+        enum {
+                eResponseMessage_nonStandard,
+                eResponseMessage_masterSlaveDeterminationAck,
+                eResponseMessage_masterSlaveDeterminationReject,
+                eResponseMessage_terminalCapabilitySetAck,
+                eResponseMessage_terminalCapabilitySetReject,
+                eResponseMessage_openLogicalChannelAck,
+                eResponseMessage_openLogicalChannelReject,
+                eResponseMessage_closeLogicalChannelAck,
+                eResponseMessage_requestChannelCloseAck,
+                eResponseMessage_requestChannelCloseReject,
+                eResponseMessage_multiplexEntrySendAck,
+                eResponseMessage_multiplexEntrySendReject,
+                eResponseMessage_requestMultiplexEntryAck,
+                eResponseMessage_requestMultiplexEntryReject,
+                eResponseMessage_requestModeAck,
+                eResponseMessage_requestModeReject,
+                eResponseMessage_roundTripDelayResponse,
+                eResponseMessage_maintenanceLoopAck,
+                eResponseMessage_maintenanceLoopReject,
+                eResponseMessage_communicationModeResponse,
+                eResponseMessage_conferenceResponse,
+                eResponseMessage_multilinkResponse,
+                eResponseMessage_logicalChannelRateAcknowledge,
+                eResponseMessage_logicalChannelRateReject,
+        } choice;
+        union {
+                OpenLogicalChannelAck openLogicalChannelAck;
+        };
+} ResponseMessage;
+typedef struct MultimediaSystemControlMessage { /* CHOICE */
+        enum {
+                eMultimediaSystemControlMessage_request,
+                eMultimediaSystemControlMessage_response,
+                eMultimediaSystemControlMessage_command,
+                eMultimediaSystemControlMessage_indication,
+        } choice;
+        union {
+                RequestMessage request;
+                ResponseMessage response;
+        };
+} MultimediaSystemControlMessage;
+typedef struct H323_UU_PDU_h245Control {        /* SEQUENCE OF */
+        int count;
+        MultimediaSystemControlMessage item[4];
+} H323_UU_PDU_h245Control;
+typedef struct H323_UU_PDU {    /* SEQUENCE */
+        enum {
+                eH323_UU_PDU_nonStandardData = (1 << 31),
+                eH323_UU_PDU_h4501SupplementaryService = (1 << 30),
+                eH323_UU_PDU_h245Tunneling = (1 << 29),
+                eH323_UU_PDU_h245Control = (1 << 28),
+                eH323_UU_PDU_nonStandardControl = (1 << 27),
+                eH323_UU_PDU_callLinkage = (1 << 26),
+                eH323_UU_PDU_tunnelledSignallingMessage = (1 << 25),
+                eH323_UU_PDU_provisionalRespToH245Tunneling = (1 << 24),
+                eH323_UU_PDU_stimulusControl = (1 << 23),
+                eH323_UU_PDU_genericData = (1 << 22),
+        } options;
+        H323_UU_PDU_h323_message_body h323_message_body;
+        H323_UU_PDU_h245Control h245Control;
+} H323_UU_PDU;
+typedef struct H323_UserInformation {   /* SEQUENCE */
+        enum {
+                eH323_UserInformation_user_data = (1 << 31),
+        } options;
+        H323_UU_PDU h323_uu_pdu;
+} H323_UserInformation;
+typedef struct GatekeeperRequest {      /* SEQUENCE */
+        enum {
+                eGatekeeperRequest_nonStandardData = (1 << 31),
+                eGatekeeperRequest_gatekeeperIdentifier = (1 << 30),
+                eGatekeeperRequest_callServices = (1 << 29),
+                eGatekeeperRequest_endpointAlias = (1 << 28),
+                eGatekeeperRequest_alternateEndpoints = (1 << 27),
+                eGatekeeperRequest_tokens = (1 << 26),
+                eGatekeeperRequest_cryptoTokens = (1 << 25),
+                eGatekeeperRequest_authenticationCapability = (1 << 24),
+                eGatekeeperRequest_algorithmOIDs = (1 << 23),
+                eGatekeeperRequest_integrity = (1 << 22),
+                eGatekeeperRequest_integrityCheckValue = (1 << 21),
+                eGatekeeperRequest_supportsAltGK = (1 << 20),
+                eGatekeeperRequest_featureSet = (1 << 19),
+                eGatekeeperRequest_genericData = (1 << 18),
+        } options;
+        TransportAddress rasAddress;
+} GatekeeperRequest;
+typedef struct GatekeeperConfirm {      /* SEQUENCE */
+        enum {
+                eGatekeeperConfirm_nonStandardData = (1 << 31),
+                eGatekeeperConfirm_gatekeeperIdentifier = (1 << 30),
+                eGatekeeperConfirm_alternateGatekeeper = (1 << 29),
+                eGatekeeperConfirm_authenticationMode = (1 << 28),
+                eGatekeeperConfirm_tokens = (1 << 27),
+                eGatekeeperConfirm_cryptoTokens = (1 << 26),
+                eGatekeeperConfirm_algorithmOID = (1 << 25),
+                eGatekeeperConfirm_integrity = (1 << 24),
+                eGatekeeperConfirm_integrityCheckValue = (1 << 23),
+                eGatekeeperConfirm_featureSet = (1 << 22),
+                eGatekeeperConfirm_genericData = (1 << 21),
+        } options;
+        TransportAddress rasAddress;
+} GatekeeperConfirm;
+typedef struct RegistrationRequest_callSignalAddress {  /* SEQUENCE OF */
+        int count;
+        TransportAddress item[10];
+} RegistrationRequest_callSignalAddress;
+typedef struct RegistrationRequest_rasAddress { /* SEQUENCE OF */
+        int count;
+        TransportAddress item[10];
+} RegistrationRequest_rasAddress;
+typedef struct RegistrationRequest {    /* SEQUENCE */
+        enum {
+                eRegistrationRequest_nonStandardData = (1 << 31),
+                eRegistrationRequest_terminalAlias = (1 << 30),
+                eRegistrationRequest_gatekeeperIdentifier = (1 << 29),
+                eRegistrationRequest_alternateEndpoints = (1 << 28),
+                eRegistrationRequest_timeToLive = (1 << 27),
+                eRegistrationRequest_tokens = (1 << 26),
+                eRegistrationRequest_cryptoTokens = (1 << 25),
+                eRegistrationRequest_integrityCheckValue = (1 << 24),
+                eRegistrationRequest_keepAlive = (1 << 23),
+                eRegistrationRequest_endpointIdentifier = (1 << 22),
+                eRegistrationRequest_willSupplyUUIEs = (1 << 21),
+                eRegistrationRequest_maintainConnection = (1 << 20),
+                eRegistrationRequest_alternateTransportAddresses = (1 << 19),
+                eRegistrationRequest_additiveRegistration = (1 << 18),
+                eRegistrationRequest_terminalAliasPattern = (1 << 17),
+                eRegistrationRequest_supportsAltGK = (1 << 16),
+                eRegistrationRequest_usageReportingCapability = (1 << 15),
+                eRegistrationRequest_multipleCalls = (1 << 14),
+                eRegistrationRequest_supportedH248Packages = (1 << 13),
+                eRegistrationRequest_callCreditCapability = (1 << 12),
+                eRegistrationRequest_capacityReportingCapability = (1 << 11),
+                eRegistrationRequest_capacity = (1 << 10),
+                eRegistrationRequest_featureSet = (1 << 9),
+                eRegistrationRequest_genericData = (1 << 8),
+        } options;
+        RegistrationRequest_callSignalAddress callSignalAddress;
+        RegistrationRequest_rasAddress rasAddress;
+        unsigned timeToLive;
+} RegistrationRequest;
+typedef struct RegistrationConfirm_callSignalAddress {  /* SEQUENCE OF */
+        int count;
+        TransportAddress item[10];
+} RegistrationConfirm_callSignalAddress;
+typedef struct RegistrationConfirm {    /* SEQUENCE */
+        enum {
+                eRegistrationConfirm_nonStandardData = (1 << 31),
+                eRegistrationConfirm_terminalAlias = (1 << 30),
+                eRegistrationConfirm_gatekeeperIdentifier = (1 << 29),
+                eRegistrationConfirm_alternateGatekeeper = (1 << 28),
+                eRegistrationConfirm_timeToLive = (1 << 27),
+                eRegistrationConfirm_tokens = (1 << 26),
+                eRegistrationConfirm_cryptoTokens = (1 << 25),
+                eRegistrationConfirm_integrityCheckValue = (1 << 24),
+                eRegistrationConfirm_willRespondToIRR = (1 << 23),
+                eRegistrationConfirm_preGrantedARQ = (1 << 22),
+                eRegistrationConfirm_maintainConnection = (1 << 21),
+                eRegistrationConfirm_serviceControl = (1 << 20),
+                eRegistrationConfirm_supportsAdditiveRegistration = (1 << 19),
+                eRegistrationConfirm_terminalAliasPattern = (1 << 18),
+                eRegistrationConfirm_supportedPrefixes = (1 << 17),
+                eRegistrationConfirm_usageSpec = (1 << 16),
+                eRegistrationConfirm_featureServerAlias = (1 << 15),
+                eRegistrationConfirm_capacityReportingSpec = (1 << 14),
+                eRegistrationConfirm_featureSet = (1 << 13),
+                eRegistrationConfirm_genericData = (1 << 12),
+        } options;
+        RegistrationConfirm_callSignalAddress callSignalAddress;
+        unsigned timeToLive;
+} RegistrationConfirm;
+typedef struct UnregistrationRequest_callSignalAddress {        /* SEQUENCE OF */
+        int count;
+        TransportAddress item[10];
+} UnregistrationRequest_callSignalAddress;
+typedef struct UnregistrationRequest {  /* SEQUENCE */
+        enum {
+                eUnregistrationRequest_endpointAlias = (1 << 31),
+                eUnregistrationRequest_nonStandardData = (1 << 30),
+                eUnregistrationRequest_endpointIdentifier = (1 << 29),
+                eUnregistrationRequest_alternateEndpoints = (1 << 28),
+                eUnregistrationRequest_gatekeeperIdentifier = (1 << 27),
+                eUnregistrationRequest_tokens = (1 << 26),
+                eUnregistrationRequest_cryptoTokens = (1 << 25),
+                eUnregistrationRequest_integrityCheckValue = (1 << 24),
+                eUnregistrationRequest_reason = (1 << 23),
+                eUnregistrationRequest_endpointAliasPattern = (1 << 22),
+                eUnregistrationRequest_supportedPrefixes = (1 << 21),
+                eUnregistrationRequest_alternateGatekeeper = (1 << 20),
+                eUnregistrationRequest_genericData = (1 << 19),
+        } options;
+        UnregistrationRequest_callSignalAddress callSignalAddress;
+} UnregistrationRequest;
+typedef struct AdmissionRequest {       /* SEQUENCE */
+        enum {
+                eAdmissionRequest_callModel = (1 << 31),
+                eAdmissionRequest_destinationInfo = (1 << 30),
+                eAdmissionRequest_destCallSignalAddress = (1 << 29),
+                eAdmissionRequest_destExtraCallInfo = (1 << 28),
+                eAdmissionRequest_srcCallSignalAddress = (1 << 27),
+                eAdmissionRequest_nonStandardData = (1 << 26),
+                eAdmissionRequest_callServices = (1 << 25),
+                eAdmissionRequest_canMapAlias = (1 << 24),
+                eAdmissionRequest_callIdentifier = (1 << 23),
+                eAdmissionRequest_srcAlternatives = (1 << 22),
+                eAdmissionRequest_destAlternatives = (1 << 21),
+                eAdmissionRequest_gatekeeperIdentifier = (1 << 20),
+                eAdmissionRequest_tokens = (1 << 19),
+                eAdmissionRequest_cryptoTokens = (1 << 18),
+                eAdmissionRequest_integrityCheckValue = (1 << 17),
+                eAdmissionRequest_transportQOS = (1 << 16),
+                eAdmissionRequest_willSupplyUUIEs = (1 << 15),
+                eAdmissionRequest_callLinkage = (1 << 14),
+                eAdmissionRequest_gatewayDataRate = (1 << 13),
+                eAdmissionRequest_capacity = (1 << 12),
+                eAdmissionRequest_circuitInfo = (1 << 11),
+                eAdmissionRequest_desiredProtocols = (1 << 10),
+                eAdmissionRequest_desiredTunnelledProtocol = (1 << 9),
+                eAdmissionRequest_featureSet = (1 << 8),
+                eAdmissionRequest_genericData = (1 << 7),
+        } options;
+        TransportAddress destCallSignalAddress;
+        TransportAddress srcCallSignalAddress;
+} AdmissionRequest;
+typedef struct AdmissionConfirm {       /* SEQUENCE */
+        enum {
+                eAdmissionConfirm_irrFrequency = (1 << 31),
+                eAdmissionConfirm_nonStandardData = (1 << 30),
+                eAdmissionConfirm_destinationInfo = (1 << 29),
+                eAdmissionConfirm_destExtraCallInfo = (1 << 28),
+                eAdmissionConfirm_destinationType = (1 << 27),
+                eAdmissionConfirm_remoteExtensionAddress = (1 << 26),
+                eAdmissionConfirm_alternateEndpoints = (1 << 25),
+                eAdmissionConfirm_tokens = (1 << 24),
+                eAdmissionConfirm_cryptoTokens = (1 << 23),
+                eAdmissionConfirm_integrityCheckValue = (1 << 22),
+                eAdmissionConfirm_transportQOS = (1 << 21),
+                eAdmissionConfirm_willRespondToIRR = (1 << 20),
+                eAdmissionConfirm_uuiesRequested = (1 << 19),
+                eAdmissionConfirm_language = (1 << 18),
+                eAdmissionConfirm_alternateTransportAddresses = (1 << 17),
+                eAdmissionConfirm_useSpecifiedTransport = (1 << 16),
+                eAdmissionConfirm_circuitInfo = (1 << 15),
+                eAdmissionConfirm_usageSpec = (1 << 14),
+                eAdmissionConfirm_supportedProtocols = (1 << 13),
+                eAdmissionConfirm_serviceControl = (1 << 12),
+                eAdmissionConfirm_multipleCalls = (1 << 11),
+                eAdmissionConfirm_featureSet = (1 << 10),
+                eAdmissionConfirm_genericData = (1 << 9),
+        } options;
+        TransportAddress destCallSignalAddress;
+} AdmissionConfirm;
+typedef struct LocationRequest {        /* SEQUENCE */
+        enum {
+                eLocationRequest_endpointIdentifier = (1 << 31),
+                eLocationRequest_nonStandardData = (1 << 30),
+                eLocationRequest_sourceInfo = (1 << 29),
+                eLocationRequest_canMapAlias = (1 << 28),
+                eLocationRequest_gatekeeperIdentifier = (1 << 27),
+                eLocationRequest_tokens = (1 << 26),
+                eLocationRequest_cryptoTokens = (1 << 25),
+                eLocationRequest_integrityCheckValue = (1 << 24),
+                eLocationRequest_desiredProtocols = (1 << 23),
+                eLocationRequest_desiredTunnelledProtocol = (1 << 22),
+                eLocationRequest_featureSet = (1 << 21),
+                eLocationRequest_genericData = (1 << 20),
+                eLocationRequest_hopCount = (1 << 19),
+                eLocationRequest_circuitInfo = (1 << 18),
+        } options;
+        TransportAddress replyAddress;
+} LocationRequest;
+typedef struct LocationConfirm {        /* SEQUENCE */
+        enum {
+                eLocationConfirm_nonStandardData = (1 << 31),
+                eLocationConfirm_destinationInfo = (1 << 30),
+                eLocationConfirm_destExtraCallInfo = (1 << 29),
+                eLocationConfirm_destinationType = (1 << 28),
+                eLocationConfirm_remoteExtensionAddress = (1 << 27),
+                eLocationConfirm_alternateEndpoints = (1 << 26),
+                eLocationConfirm_tokens = (1 << 25),
+                eLocationConfirm_cryptoTokens = (1 << 24),
+                eLocationConfirm_integrityCheckValue = (1 << 23),
+                eLocationConfirm_alternateTransportAddresses = (1 << 22),
+                eLocationConfirm_supportedProtocols = (1 << 21),
+                eLocationConfirm_multipleCalls = (1 << 20),
+                eLocationConfirm_featureSet = (1 << 19),
+                eLocationConfirm_genericData = (1 << 18),
+                eLocationConfirm_circuitInfo = (1 << 17),
+                eLocationConfirm_serviceControl = (1 << 16),
+        } options;
+        TransportAddress callSignalAddress;
+        TransportAddress rasAddress;
+} LocationConfirm;
+typedef struct InfoRequestResponse_callSignalAddress {  /* SEQUENCE OF */
+        int count;
+        TransportAddress item[10];
+} InfoRequestResponse_callSignalAddress;
+typedef struct InfoRequestResponse {    /* SEQUENCE */
+        enum {
+                eInfoRequestResponse_nonStandardData = (1 << 31),
+                eInfoRequestResponse_endpointAlias = (1 << 30),
+                eInfoRequestResponse_perCallInfo = (1 << 29),
+                eInfoRequestResponse_tokens = (1 << 28),
+                eInfoRequestResponse_cryptoTokens = (1 << 27),
+                eInfoRequestResponse_integrityCheckValue = (1 << 26),
+                eInfoRequestResponse_needResponse = (1 << 25),
+                eInfoRequestResponse_capacity = (1 << 24),
+                eInfoRequestResponse_irrStatus = (1 << 23),
+                eInfoRequestResponse_unsolicited = (1 << 22),
+                eInfoRequestResponse_genericData = (1 << 21),
+        } options;
+        TransportAddress rasAddress;
+        InfoRequestResponse_callSignalAddress callSignalAddress;
+} InfoRequestResponse;
+typedef struct RasMessage {     /* CHOICE */
+        enum {
+                eRasMessage_gatekeeperRequest,
+                eRasMessage_gatekeeperConfirm,
+                eRasMessage_gatekeeperReject,
+                eRasMessage_registrationRequest,
+                eRasMessage_registrationConfirm,
+                eRasMessage_registrationReject,
+                eRasMessage_unregistrationRequest,
+                eRasMessage_unregistrationConfirm,
+                eRasMessage_unregistrationReject,
+                eRasMessage_admissionRequest,
+                eRasMessage_admissionConfirm,
+                eRasMessage_admissionReject,
+                eRasMessage_bandwidthRequest,
+                eRasMessage_bandwidthConfirm,
+                eRasMessage_bandwidthReject,
+                eRasMessage_disengageRequest,
+                eRasMessage_disengageConfirm,
+                eRasMessage_disengageReject,
+                eRasMessage_locationRequest,
+                eRasMessage_locationConfirm,
+                eRasMessage_locationReject,
+                eRasMessage_infoRequest,
+                eRasMessage_infoRequestResponse,
+                eRasMessage_nonStandardMessage,
+                eRasMessage_unknownMessageResponse,
+                eRasMessage_requestInProgress,
+                eRasMessage_resourcesAvailableIndicate,
+                eRasMessage_resourcesAvailableConfirm,
+                eRasMessage_infoRequestAck,
+                eRasMessage_infoRequestNak,
+                eRasMessage_serviceControlIndication,
+                eRasMessage_serviceControlResponse,
+        } choice;
+        union {
+                GatekeeperRequest gatekeeperRequest;
+                GatekeeperConfirm gatekeeperConfirm;
+                RegistrationRequest registrationRequest;
+                RegistrationConfirm registrationConfirm;
+                UnregistrationRequest unregistrationRequest;
+                AdmissionRequest admissionRequest;
+                AdmissionConfirm admissionConfirm;
+                LocationRequest locationRequest;
+                LocationConfirm locationConfirm;
+                InfoRequestResponse infoRequestResponse;
+        };
+} RasMessage;
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 14f2bd010884..52a7b9e76428 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -73,6 +73,9 @@ enum nf_ip6_hook_priorities {
 };
 #ifdef CONFIG_NETFILTER
+extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
+                                    unsigned int dataoff, u_int8_t protocol);
 extern int ipv6_netfilter_init(void);
 extern void ipv6_netfilter_fini(void);
 #else /* CONFIG_NETFILTER */
diff --git a/include/linux/numa.h b/include/linux/numa.h
index f0c539bd3cfc..e481feb1bfd8 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -3,11 +3,9 @@
 #include <linux/config.h>
-#ifndef CONFIG_FLATMEM
+#ifdef CONFIG_NODES_SHIFT
-#include <asm/numnodes.h>
+#define NODES_SHIFT     CONFIG_NODES_SHIFT
-#endif
+#else
-#ifndef NODES_SHIFT
 #define NODES_SHIFT     0
 #endif
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 9ea629c02a4b..d276a4e2f825 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -48,8 +48,20 @@
 /*
 * Don't use the *_dontuse flags.  Use the macros.  Otherwise you'll break
- * locked- and dirty-page accounting.  The top eight bits of page->flags are
+ * locked- and dirty-page accounting.
- * used for page->zone, so putting flag bits there doesn't work.
+ *
+ * The page flags field is split into two parts, the main flags area
+ * which extends from the low bits upwards, and the fields area which
+ * extends from the high bits downwards.
+ *
+ *  | FIELD | ... | FLAGS |
+ *  N-1     ^             0
+ *          (N-FLAGS_RESERVED)
+ *
+ * The fields area is reserved for fields mapping zone, node and SPARSEMEM
+ * section.  The boundry between these two areas is defined by
+ * FLAGS_RESERVED which defines the width of the fields section
+ * (see linux/mmzone.h).  New flags must _not_ overlap with this area.
 */
 #define PG_locked                0      /* Page is locked. Don't touch. */
 #define PG_error                 1
@@ -74,7 +86,9 @@
 #define PG_mappedtodisk         16      /* Has blocks allocated on-disk */
 #define PG_reclaim              17      /* To be reclaimed asap */
 #define PG_nosave_free          18      /* Free, should not be written */
-#define PG_uncached             19      /* Page has been mapped as uncached */
+#define PG_buddy                19      /* Page is free, on buddy lists */
+#define PG_uncached             20      /* Page has been mapped as uncached */
 /*
 * Global page accounting.  One instance per CPU.  Only unsigned longs are
@@ -317,6 +331,10 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
 #define SetPageNosaveFree(page) set_bit(PG_nosave_free, &(page)->flags)
 #define ClearPageNosaveFree(page)               clear_bit(PG_nosave_free, &(page)->flags)
+#define PageBuddy(page)         test_bit(PG_buddy, &(page)->flags)
+#define __SetPageBuddy(page)    __set_bit(PG_buddy, &(page)->flags)
+#define __ClearPageBuddy(page)  __clear_bit(PG_buddy, &(page)->flags)
 #define PageMappedToDisk(page)  test_bit(PG_mappedtodisk, &(page)->flags)
 #define SetPageMappedToDisk(page) set_bit(PG_mappedtodisk, &(page)->flags)
 #define ClearPageMappedToDisk(page) clear_bit(PG_mappedtodisk, &(page)->flags)
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ec384958d509..123a7c24bc72 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -36,27 +36,19 @@ struct pipe_inode_info {
        unsigned int w_counter;
        struct fasync_struct *fasync_readers;
        struct fasync_struct *fasync_writers;
+        struct inode *inode;
 };
 /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
   memory allocation, whereas PIPE_BUF makes atomicity guarantees.  */
 #define PIPE_SIZE               PAGE_SIZE
-#define PIPE_MUTEX(inode)       (&(inode).i_mutex)
-#define PIPE_WAIT(inode)        (&(inode).i_pipe->wait)
-#define PIPE_READERS(inode)     ((inode).i_pipe->readers)
-#define PIPE_WRITERS(inode)     ((inode).i_pipe->writers)
-#define PIPE_WAITING_WRITERS(inode)     ((inode).i_pipe->waiting_writers)
-#define PIPE_RCOUNTER(inode)    ((inode).i_pipe->r_counter)
-#define PIPE_WCOUNTER(inode)    ((inode).i_pipe->w_counter)
-#define PIPE_FASYNC_READERS(inode)     (&((inode).i_pipe->fasync_readers))
-#define PIPE_FASYNC_WRITERS(inode)     (&((inode).i_pipe->fasync_writers))
 /* Drop the inode semaphore and wait for a pipe event, atomically */
-void pipe_wait(struct inode * inode);
+void pipe_wait(struct pipe_inode_info *pipe);
-struct inode* pipe_new(struct inode* inode);
+struct pipe_inode_info * alloc_pipe_info(struct inode * inode);
-void free_pipe_info(struct inode* inode);
+void free_pipe_info(struct inode * inode);
+void __free_pipe_info(struct pipe_inode_info *);
 /*
 * splice is tied to pipes as a transport (at least for now), so we'll just
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 135871df9911..4b47a0253425 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -79,7 +79,7 @@ struct kcore_list {
 struct vmcore {
        struct list_head list;
        unsigned long long paddr;
-        unsigned long size;
+        unsigned long long size;
        loff_t offset;
 };
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 774e1acfb8c4..f1fbae7e390e 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -227,8 +227,8 @@ struct mdp_superblock_1 {
                                 */
        /* These are only valid with feature bit '4' */
-        __u64   reshape_position;       /* next address in array-space for reshape */
        __u32   new_level;      /* new level we are reshaping to                */
+        __u64   reshape_position;       /* next address in array-space for reshape */
        __u32   delta_disks;    /* change in number of raid_disks               */
        __u32   new_layout;     /* new layout                                   */
        __u32   new_chunk;      /* new chunk size (bytes)                       */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 541f4828f5e7..e3539c14e47e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -684,6 +684,7 @@ static inline void prefetch_stack(struct task_struct *t) { }
 struct audit_context;           /* See audit.c */
 struct mempolicy;
+struct pipe_inode_info;
 enum sleep_type {
        SLEEP_NORMAL,
@@ -882,6 +883,11 @@ struct task_struct {
        atomic_t fs_excl;       /* holding fs exclusive resources */
        struct rcu_head rcu;
+        /*
+         * cache last used pipe for splice
+         */
+        struct pipe_inode_info *splice_pipe;
 };
 static inline pid_t process_group(struct task_struct *tsk)
@@ -1203,9 +1209,10 @@ extern void wait_task_inactive(task_t * p);
 #define while_each_thread(g, t) \
        while ((t = next_thread(t)) != g)
-#define thread_group_leader(p)  (p->pid == p->tgid)
+/* de_thread depends on thread_group_leader not being a pid based check */
+#define thread_group_leader(p)  (p == p->group_leader)
-static inline task_t *next_thread(task_t *p)
+static inline task_t *next_thread(const task_t *p)
 {
        return list_entry(rcu_dereference(p->thread_group.next),
                                task_t, thread_group);
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 6336987dae62..2925e66a6732 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -41,7 +41,8 @@ struct screen_info {
        u16 vesapm_off;         /* 0x30 */
        u16 pages;              /* 0x32 */
        u16 vesa_attributes;    /* 0x34 */
-                                /* 0x36 -- 0x3f reserved for future expansion */
+        u32 capabilities;       /* 0x36 */
+                                /* 0x3a -- 0x3f reserved for future expansion */
 };
 extern struct screen_info screen_info;
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index fca9b0fb5b4e..5a095572881d 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -73,7 +73,7 @@ static inline int write_tryseqlock(seqlock_t *sl)
 }
 /* Start of read calculation -- fetch last complete writer token */
-static inline unsigned read_seqbegin(const seqlock_t *sl)
+static __always_inline unsigned read_seqbegin(const seqlock_t *sl)
 {
        unsigned ret = sl->sequence;
        smp_rmb();
@@ -88,7 +88,7 @@ static inline unsigned read_seqbegin(const seqlock_t *sl)
 *    
 * Using xor saves one conditional branch.
 */
-static inline int read_seqretry(const seqlock_t *sl, unsigned iv)
+static __always_inline int read_seqretry(const seqlock_t *sl, unsigned iv)
 {
        smp_rmb();
        return (iv & 1) | (sl->sequence ^ iv);
diff --git a/include/linux/string.h b/include/linux/string.h
index dee221429ad0..c61306da8c52 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -13,11 +13,6 @@
 extern "C" {
 #endif
-extern char * strpbrk(const char *,const char *);
-extern char * strsep(char **,const char *);
-extern __kernel_size_t strspn(const char *,const char *);
-extern __kernel_size_t strcspn(const char *,const char *);
 extern char *strndup_user(const char __user *, long);
 /*
@@ -70,6 +65,18 @@ extern __kernel_size_t strlen(const char *);
 #ifndef __HAVE_ARCH_STRNLEN
 extern __kernel_size_t strnlen(const char *,__kernel_size_t);
 #endif
+#ifndef __HAVE_ARCH_STRPBRK
+extern char * strpbrk(const char *,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRSEP
+extern char * strsep(char **,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRSPN
+extern __kernel_size_t strspn(const char *,const char *);
+#endif
+#ifndef __HAVE_ARCH_STRCSPN
+extern __kernel_size_t strcspn(const char *,const char *);
+#endif
 #ifndef __HAVE_ARCH_MEMSET
 extern void * memset(void *,int,__kernel_size_t);
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 50cab2a09f28..503564384545 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -197,15 +197,16 @@ svc_take_res_page(struct svc_rqst *rqstp)
        return rqstp->rq_respages[rqstp->rq_resused++];
 }
-static inline int svc_take_page(struct svc_rqst *rqstp)
+static inline void svc_take_page(struct svc_rqst *rqstp)
 {
-        if (rqstp->rq_arghi <= rqstp->rq_argused)
+        if (rqstp->rq_arghi <= rqstp->rq_argused) {
-                return -ENOMEM;
+                WARN_ON(1);
+                return;
+        }
        rqstp->rq_arghi--;
        rqstp->rq_respages[rqstp->rq_resused] =
                rqstp->rq_argpages[rqstp->rq_arghi];
        rqstp->rq_resused++;
-        return 0;
 }
 static inline void svc_pushback_allpages(struct svc_rqst *rqstp)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 54eac8a39a4c..5b1fdf1cff4f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -155,6 +155,7 @@ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *
 /* linux/mm/page_alloc.c */
 extern unsigned long totalram_pages;
 extern unsigned long totalhigh_pages;
+extern unsigned long totalreserve_pages;
 extern long nr_swap_pages;
 extern unsigned int nr_free_pages(void);
 extern unsigned int nr_free_pages_pgdat(pg_data_t *pgdat);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 5717147596b6..f001bad28d9a 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -569,9 +569,12 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
 asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
                                   int flags, int mode);
 asmlinkage long sys_unshare(unsigned long unshare_flags);
-asmlinkage long sys_splice(int fdin, int fdout, size_t len,
-                                unsigned int flags);
+asmlinkage long sys_splice(int fd_in, loff_t __user *off_in,
+                           int fd_out, loff_t __user *off_out,
+                           size_t len, unsigned int flags);
 asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
-                                        int flags);
+                                        unsigned int flags);
 #endif
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 0976a163b459..31548303ee37 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -6,9 +6,10 @@ extern int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *c
 extern int tty_insert_flip_string_flags(struct tty_struct *tty, const unsigned char *chars, const char *flags, size_t size);
 extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size);
 extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size);
+void tty_schedule_flip(struct tty_struct *tty);
 static inline int tty_insert_flip_char(struct tty_struct *tty,
-                                       unsigned char ch, char flag)
+                                        unsigned char ch, char flag)
 {
        struct tty_buffer *tb = tty->buf.tail;
        if (tb && tb->active && tb->used < tb->size) {
@@ -19,26 +20,4 @@ static inline int tty_insert_flip_char(struct tty_struct *tty,
        return tty_insert_flip_string_flags(tty, &ch, &flag, 1);
 }
-static inline void tty_schedule_flip(struct tty_struct *tty)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&tty->buf.lock, flags);
-        if (tty->buf.tail != NULL) {
-                tty->buf.tail->active = 0;
-                tty->buf.tail->commit = tty->buf.tail->used;
-        }
-        spin_unlock_irqrestore(&tty->buf.lock, flags);
-        schedule_delayed_work(&tty->buf.work, 1);
-}
-#undef _INLINE_
 #endif /* _LINUX_TTY_FLIP_H */
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index fadc535e2925..dc7c621e4647 100644
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@ -12,6 +12,11 @@
 #else
 #define MODULE_VERMAGIC_PREEMPT ""
 #endif
+#ifdef CONFIG_MODULE_UNLOAD
+#define MODULE_VERMAGIC_MODULE_UNLOAD "mod_unload "
+#else
+#define MODULE_VERMAGIC_MODULE_UNLOAD ""
+#endif
 #ifndef MODULE_ARCH_VERMAGIC
 #define MODULE_ARCH_VERMAGIC ""
 #endif
@@ -19,5 +24,5 @@
 #define VERMAGIC_STRING                                                 \
        UTS_RELEASE " "                                                 \
        MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT                     \
-        MODULE_ARCH_VERMAGIC                                            \
+        MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC              \
        "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 25f708ff020e..59f0c83d55a2 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -48,31 +48,7 @@ static inline int inet6_sk_ehashfn(const struct sock *sk)
        return inet6_ehashfn(laddr, lport, faddr, fport);
 }
-static inline void __inet6_hash(struct inet_hashinfo *hashinfo,
+extern void __inet6_hash(struct inet_hashinfo *hashinfo, struct sock *sk);
-                                struct sock *sk)
-{
-        struct hlist_head *list;
-        rwlock_t *lock;
-        BUG_TRAP(sk_unhashed(sk));
-        if (sk->sk_state == TCP_LISTEN) {
-                list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
-                lock = &hashinfo->lhash_lock;
-                inet_listen_wlock(hashinfo);
-        } else {
-                unsigned int hash;
-                sk->sk_hash = hash = inet6_sk_ehashfn(sk);
-                hash &= (hashinfo->ehash_size - 1);
-                list = &hashinfo->ehash[hash].chain;
-                lock = &hashinfo->ehash[hash].lock;
-                write_lock(lock);
-        }
-        __sk_add_node(sk, list);
-        sock_prot_inc_use(sk->sk_prot);
-        write_unlock(lock);
-}
 /*
 * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
@@ -80,52 +56,12 @@ static inline void __inet6_hash(struct inet_hashinfo *hashinfo,
 *
 * The sockhash lock must be held as a reader here.
 */
-static inline struct sock *
+extern struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo,
-                __inet6_lookup_established(struct inet_hashinfo *hashinfo,
                                           const struct in6_addr *saddr,
                                           const u16 sport,
                                           const struct in6_addr *daddr,
                                           const u16 hnum,
-                                           const int dif)
+                                           const int dif);
-{
-        struct sock *sk;
-        const struct hlist_node *node;
-        const __u32 ports = INET_COMBINED_PORTS(sport, hnum);
-        /* Optimize here for direct hit, only listening connections can
-         * have wildcards anyways.
-         */
-        unsigned int hash = inet6_ehashfn(daddr, hnum, saddr, sport);
-        struct inet_ehash_bucket *head = inet_ehash_bucket(hashinfo, hash);
-        prefetch(head->chain.first);
-        read_lock(&head->lock);
-        sk_for_each(sk, node, &head->chain) {
-                /* For IPV6 do the cheaper port and family tests first. */
-                if (INET6_MATCH(sk, hash, saddr, daddr, ports, dif))
-                        goto hit; /* You sunk my battleship! */
-        }
-        /* Must check for a TIME_WAIT'er before going to listener hash. */
-        sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
-                const struct inet_timewait_sock *tw = inet_twsk(sk);
-                if(*((__u32 *)&(tw->tw_dport))  == ports        &&
-                   sk->sk_family                == PF_INET6) {
-                        const struct inet6_timewait_sock *tw6 = inet6_twsk(sk);
-                        if (ipv6_addr_equal(&tw6->tw_v6_daddr, saddr)   &&
-                            ipv6_addr_equal(&tw6->tw_v6_rcv_saddr, daddr)       &&
-                            (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dif))
-                                goto hit;
-                }
-        }
-        read_unlock(&head->lock);
-        return NULL;
-hit:
-        sock_hold(sk);
-        read_unlock(&head->lock);
-        return sk;
-}
 extern struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
                                          const struct in6_addr *daddr,
diff --git a/include/net/ip.h b/include/net/ip.h
index 8fe6156ca9b0..3d2e5ca62a5a 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -95,6 +95,7 @@ extern int		ip_local_deliver(struct sk_buff *skb);
 extern int              ip_mr_input(struct sk_buff *skb);
 extern int              ip_output(struct sk_buff *skb);
 extern int              ip_mc_output(struct sk_buff *skb);
+extern int              ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
 extern int              ip_do_nat(struct sk_buff *skb);
 extern void             ip_send_check(struct iphdr *ip);
 extern int              ip_queue_xmit(struct sk_buff *skb, int ipfragok);
diff --git a/include/net/x25device.h b/include/net/x25device.h
index 1a318374faef..1d10c879f7e2 100644
--- a/include/net/x25device.h
+++ b/include/net/x25device.h
@@ -8,6 +8,7 @@
 static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        skb->mac.raw = skb->data;
+        skb->dev = dev;
        skb->pkt_type = PACKET_HOST;
        
        return htons(ETH_P_X25);
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index dc6862d09e53..de6ce541a046 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -140,7 +140,6 @@ struct scsi_host_template {
         *
         * Status: REQUIRED     (at least one of them)
         */
-        int (* eh_strategy_handler)(struct Scsi_Host *);
        int (* eh_abort_handler)(struct scsi_cmnd *);
        int (* eh_device_reset_handler)(struct scsi_cmnd *);
        int (* eh_bus_reset_handler)(struct scsi_cmnd *);
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index b3657f111937..cca1d4926d2a 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -50,6 +50,11 @@ struct scsi_transport_template {
        unsigned int create_work_queue : 1;
        /*
+         * Allows a transport to override the default error handler.
+         */
+        void (* eh_strategy_handler)(struct Scsi_Host *);
+        /*
         * This is an optional routine that allows the transport to become
         * involved when a scsi io timer fires. The return value tells the
         * timer routine how to finish the io timeout handling:
author	Jeff Garzik <jeff@garzik.org>	2006-04-11 12:51:40 -0400
committer	Jeff Garzik <jeff@garzik.org>	2006-04-11 12:51:40 -0400
commit	10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch)
tree	eddf856286234f28cac747d20eb59d918e1bc8b5 /include
parent	c2a6585296009379e0f4eff39cdcb108b457ebf2 (diff)
parent	a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff)