193 files changed, 3579 insertions, 3944 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/unistd.h b/include/asm-arm/unistd.h
index 65ac305c2d45..ee8dfea549bc 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -360,6 +360,24 @@
 #define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
 #define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
+/*
+ * The following syscalls are obsolete and no longer available for EABI.
+ */
+#if defined(__ARM_EABI__)
+#undef __NR_time
+#undef __NR_umount
+#undef __NR_stime
+#undef __NR_alarm
+#undef __NR_utime
+#undef __NR_getrlimit
+#undef __NR_select
+#undef __NR_readdir
+#undef __NR_mmap
+#undef __NR_socketcall
+#undef __NR_syscall
+#undef __NR_ipc
+#endif
 #define __sys2(x) #x
 #define __sys1(x) __sys2(x)
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/atomic.h b/include/asm-i386/atomic.h
index 22d80ece95cb..4ddce5296a78 100644
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -183,6 +183,7 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
 {
        int __i;
 #ifdef CONFIG_M386
+        unsigned long flags;
        if(unlikely(boot_cpu_data.x86==3))
                goto no_xadd;
 #endif
@@ -196,10 +197,10 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
 #ifdef CONFIG_M386
 no_xadd: /* Legacy 386 processor */
-        local_irq_disable();
+        local_irq_save(flags);
        __i = atomic_read(v);
        atomic_set(v, i + __i);
-        local_irq_enable();
+        local_irq_restore(flags);
        return i + __i;
 #endif
 }
diff --git a/include/asm-i386/cpufeature.h b/include/asm-i386/cpufeature.h
index 5c0b5876b931..b44bfc6239cb 100644
--- a/include/asm-i386/cpufeature.h
+++ b/include/asm-i386/cpufeature.h
@@ -71,6 +71,7 @@
 #define X86_FEATURE_P4          (3*32+ 7) /* P4 */
 #define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */
 #define X86_FEATURE_UP          (3*32+ 9) /* smp kernel running on up */
+#define X86_FEATURE_FXSAVE_LEAK (3*32+10) /* FXSAVE leaks FOP/FIP/FOP */
 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_XMM3        (4*32+ 0) /* Streaming SIMD Extensions-3 */
diff --git a/include/asm-i386/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/i387.h b/include/asm-i386/i387.h
index 152d0baa576a..7b1f01191e70 100644
--- a/include/asm-i386/i387.h
+++ b/include/asm-i386/i387.h
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/kernel_stat.h>
 #include <asm/processor.h>
 #include <asm/sigcontext.h>
 #include <asm/user.h>
@@ -38,17 +39,38 @@ extern void init_fpu(struct task_struct *);
 extern void kernel_fpu_begin(void);
 #define kernel_fpu_end() do { stts(); preempt_enable(); } while(0)
+/* We need a safe address that is cheap to find and that is already
+   in L1 during context switch. The best choices are unfortunately
+   different for UP and SMP */
+#ifdef CONFIG_SMP
+#define safe_address (__per_cpu_offset[0])
+#else
+#define safe_address (kstat_cpu(0).cpustat.user)
+#endif
 /*
 * These must be called with preempt disabled
 */
 static inline void __save_init_fpu( struct task_struct *tsk )
 {
+        /* Use more nops than strictly needed in case the compiler
+           varies code */
        alternative_input(
-                "fnsave %1 ; fwait ;" GENERIC_NOP2,
+                "fnsave %[fx] ;fwait;" GENERIC_NOP8 GENERIC_NOP4,
-                "fxsave %1 ; fnclex",
+                "fxsave %[fx]\n"
+                "bt $7,%[fsw] ; jc 1f ; fnclex\n1:",
                X86_FEATURE_FXSR,
-                "m" (tsk->thread.i387.fxsave)
+                [fx] "m" (tsk->thread.i387.fxsave),
-                :"memory");
+                [fsw] "m" (tsk->thread.i387.fxsave.swd) : "memory");
+        /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+           is pending.  Clear the x87 state here by setting it to fixed
+           values. __per_cpu_offset[0] is a random variable that should be in L1 */
+        alternative_input(
+                GENERIC_NOP8 GENERIC_NOP2,
+                "emms\n\t"              /* clear stack tags */
+                "fildl %[addr]",        /* set F?P to defined value */
+                X86_FEATURE_FXSAVE_LEAK,
+                [addr] "m" (safe_address));
        task_thread_info(tsk)->status &= ~TS_USEDFPU;
 }
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..d81d6cfc1bb4 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,10 +318,11 @@
 #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_tee                315
-#define NR_syscalls 315
+#define NR_syscalls 316
 /*
 * user-visible error numbers are in the range -1 - -128: see
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..a40ebec6aeeb 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -286,12 +286,16 @@
 /* 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
+#define __NR_tee                        1301
 #ifdef __KERNEL__
 #include <linux/config.h>
-#define NR_syscalls                     274 /* length of syscall table */
+#define NR_syscalls                     278 /* 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/assembler.h b/include/asm-m32r/assembler.h
index b7f4d8aaeb46..1a1aa17edd33 100644
--- a/include/asm-m32r/assembler.h
+++ b/include/asm-m32r/assembler.h
@@ -109,6 +109,9 @@
        push    r13
        mvfachi r13
        push    r13
+        ldi     r13, #0
+        push    r13             ; dummy push acc1h
+        push    r13             ; dummy push acc1l
 #else
 #error unknown isa configuration
 #endif
@@ -156,6 +159,8 @@
        pop     r13
        mvtaclo r13, a1
 #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
+        pop     r13             ; dummy pop acc1h
+        pop     r13             ; dummy pop acc1l
        pop     r13
        mvtachi r13
        pop     r13
diff --git a/include/asm-m32r/mappi3/mappi3_pld.h b/include/asm-m32r/mappi3/mappi3_pld.h
index 1d3c25d61bcb..031369a7afc8 100644
--- a/include/asm-m32r/mappi3/mappi3_pld.h
+++ b/include/asm-m32r/mappi3/mappi3_pld.h
@@ -53,16 +53,14 @@
 /* Power Control of MMC and CF */
 #define PLD_CPCR                __reg16(PLD_BASE + 0x14000)
+/* ICU */
-/*==== ICU ====*/
+#define M32R_IRQ_PC104          (5)     /* INT4(PC/104) */
-#define  M32R_IRQ_PC104        (5)   /* INT4(PC/104) */
+#define M32R_IRQ_I2C            (28)    /* I2C-BUS */
-#define  M32R_IRQ_I2C          (28)  /* I2C-BUS     */
+#define PLD_IRQ_CFIREQ          (6)     /* INT5 CFC Card Interrupt */
-#define  PLD_IRQ_CFIREQ       (6)  /* INT5 CFC Card Interrupt */
+#define PLD_IRQ_CFC_INSERT      (7)     /* INT6 CFC Card Insert & Eject */
-#define  PLD_IRQ_CFC_INSERT   (7)  /* INT6 CFC Card Insert */
+#define PLD_IRQ_IDEIREQ         (8)     /* INT7 IDE Interrupt */
-#define  PLD_IRQ_IDEIREQ      (8)  /* INT7 IDE Interrupt   */
+#define PLD_IRQ_MMCCARD         (43)    /* MMC Card Insert */
-#define  PLD_IRQ_MMCCARD      (43)  /* MMC Card Insert */
+#define PLD_IRQ_MMCIRQ          (44)    /* MMC Transfer Done */
-#define  PLD_IRQ_MMCIRQ       (44)  /* MMC Transfer Done */
 #if 0
 /* LED Control
@@ -97,7 +95,6 @@
 #define PLD_CRC16ADATA          __reg16(PLD_BASE + 0x18008)
 #define PLD_CRC16AINDATA        __reg16(PLD_BASE + 0x1800a)
 #if 0
 /* RTC */
 #define PLD_RTCCR               __reg16(PLD_BASE + 0x1c000)
@@ -140,4 +137,7 @@
 #endif
+/* Reset Control */
+#define PLD_REBOOT              __reg16(PLD_BASE + 0x38000)
 #endif  /* _MAPPI3_PLD.H */
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/ptrace.h b/include/asm-m32r/ptrace.h
index 0d058b2d844e..53c792452dfc 100644
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
@@ -43,6 +43,14 @@
 #define PT_ACC1L        18
 #define PT_ACCH         PT_ACC0H
 #define PT_ACCL         PT_ACC0L
+#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
+#define PT_ACCH         15
+#define PT_ACCL         16
+#define PT_DUMMY_ACC1H  17
+#define PT_DUMMY_ACC1L  18
+#else
+#error unknown isa conifiguration
+#endif
 #define PT_PSW          19
 #define PT_BPC          20
 #define PT_BBPSW        21
@@ -52,21 +60,6 @@
 #define PT_LR           25
 #define PT_SPI          26
 #define PT_ORIGR0       27
-#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
-#define PT_ACCH         15
-#define PT_ACCL         16
-#define PT_PSW          17
-#define PT_BPC          18
-#define PT_BBPSW        19
-#define PT_BBPC         20
-#define PT_SPU          21
-#define PT_FP           22
-#define PT_LR           23
-#define PT_SPI          24
-#define PT_ORIGR0       25
-#else
-#error unknown isa conifiguration
-#endif
 /* virtual pt_reg entry for gdb */
 #define PT_PC           30
@@ -121,6 +114,8 @@ struct pt_regs {
 #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
        unsigned long acch;
        unsigned long accl;
+        unsigned long dummy_acc1h;
+        unsigned long dummy_acc1l;
 #else
 #error unknown isa configuration
 #endif
diff --git a/include/asm-m32r/semaphore.h b/include/asm-m32r/semaphore.h
index bf447c52a0a1..81750edc8916 100644
--- a/include/asm-m32r/semaphore.h
+++ b/include/asm-m32r/semaphore.h
@@ -9,7 +9,7 @@
 * SMP- and interrupt-safe semaphores..
 *
 * Copyright (C) 1996  Linus Torvalds
- * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ * Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
 */
 #include <linux/config.h>
@@ -77,27 +77,8 @@ asmlinkage void __up(struct semaphore * sem);
 */
 static inline void down(struct semaphore * sem)
 {
-        unsigned long flags;
-        long count;
        might_sleep();
-        local_irq_save(flags);
+        if (unlikely(atomic_dec_return(&sem->count) < 0))
-        __asm__ __volatile__ (
-                "# down                         \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "addi   %0, #-1;                \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (count)
-                : "r" (&sem->count)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-        if (unlikely(count < 0))
                __down(sem);
 }
@@ -107,28 +88,10 @@ static inline void down(struct semaphore * sem)
 */
 static inline int down_interruptible(struct semaphore * sem)
 {
-        unsigned long flags;
-        long count;
        int result = 0;
        might_sleep();
-        local_irq_save(flags);
+        if (unlikely(atomic_dec_return(&sem->count) < 0))
-        __asm__ __volatile__ (
-                "# down_interruptible           \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "addi   %0, #-1;                \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (count)
-                : "r" (&sem->count)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-        if (unlikely(count < 0))
                result = __down_interruptible(sem);
        return result;
@@ -174,26 +137,7 @@ static inline int down_trylock(struct semaphore * sem)
 */
 static inline void up(struct semaphore * sem)
 {
-        unsigned long flags;
+        if (unlikely(atomic_inc_return(&sem->count) <= 0))
-        long count;
-        local_irq_save(flags);
-        __asm__ __volatile__ (
-                "# up                           \n\t"
-                DCACHE_CLEAR("%0", "r4", "%1")
-                M32R_LOCK" %0, @%1;             \n\t"
-                "addi   %0, #1;                 \n\t"
-                M32R_UNLOCK" %0, @%1;           \n\t"
-                : "=&r" (count)
-                : "r" (&sem->count)
-                : "memory"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r4"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
-        );
-        local_irq_restore(flags);
-        if (unlikely(count <= 0))
                __up(sem);
 }
diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h
index c233e2def2a3..942b8a30937d 100644
--- a/include/asm-m32r/sigcontext.h
+++ b/include/asm-m32r/sigcontext.h
@@ -32,6 +32,8 @@ struct sigcontext {
 #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)
        unsigned long sc_acch;
        unsigned long sc_accl;
+        unsigned long sc_dummy_acc1h;
+        unsigned long sc_dummy_acc1l;
 #else
 #error unknown isa configuration
 #endif
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..e55013f378e5 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -6,8 +6,8 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 2001  by Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
+ * Copyright (C) 2001  Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
- * Copyright (C) 2004  Hirokazu Takata <takata at linux-m32r.org>
+ * Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
 */
 #include <linux/config.h>
@@ -19,53 +19,28 @@
 * switch_to(prev, next) should switch from task `prev' to `next'
 * `prev' will never be the same as `next'.
 *
- * `next' and `prev' should be struct task_struct, but it isn't always defined
+ * `next' and `prev' should be task_t, 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; \
-        register unsigned long  *oldsp __asm__ ("r2") = &(prev->thread.sp); \
-        register unsigned long  *newsp __asm__ ("r3") = &(next->thread.sp); \
-        register unsigned long  *oldlr __asm__ ("r4") = &(prev->thread.lr); \
-        register unsigned long  *newlr __asm__ ("r5") = &(next->thread.lr); \
-        register struct task_struct  *__last __asm__ ("r6"); \
        __asm__ __volatile__ ( \
-                "st     r8, @-r15                                 \n\t" \
+                "       seth    lr, #high(1f)                           \n" \
-                "st     r9, @-r15                                 \n\t" \
+                "       or3     lr, lr, #low(1f)                        \n" \
-                "st    r10, @-r15                                 \n\t" \
+                "       st      lr, @%4  ; store old LR                 \n" \
-                "st    r11, @-r15                                 \n\t" \
+                "       ld      lr, @%5  ; load new LR                  \n" \
-                "st    r12, @-r15                                 \n\t" \
+                "       st      sp, @%2  ; store old SP                 \n" \
-                "st    r13, @-r15                                 \n\t" \
+                "       ld      sp, @%3  ; load new SP                  \n" \
-                "st    r14, @-r15                                 \n\t" \
+                "       push    %1  ; store `prev' on new stack         \n" \
-                "seth  r14, #high(1f)                             \n\t" \
+                "       jmp     lr                                      \n" \
-                "or3   r14, r14, #low(1f)                         \n\t" \
+                "       .fillinsn                                       \n" \
-                "st    r14, @r4    ; store old LR                 \n\t" \
+                "1:                                                     \n" \
-                "st    r15, @r2    ; store old SP                 \n\t" \
+                "       pop     %0  ; restore `__last' from new stack   \n" \
-                "ld    r15, @r3    ; load new SP                  \n\t" \
+                : "=r" (last) \
-                "st     r0, @-r15  ; store 'prev' onto new stack  \n\t" \
+                : "0" (prev), \
-                "ld    r14, @r5    ; load new LR                  \n\t" \
+                  "r" (&(prev->thread.sp)), "r" (&(next->thread.sp)), \
-                "jmp   r14                                        \n\t" \
+                  "r" (&(prev->thread.lr)), "r" (&(next->thread.lr)) \
-                ".fillinsn                                        \n  " \
+                : "memory", "lr" \
-                "1:                                               \n\t" \
-                "ld     r6, @r15+  ; load 'prev' from new stack   \n\t" \
-                "ld    r14, @r15+                                 \n\t" \
-                "ld    r13, @r15+                                 \n\t" \
-                "ld    r12, @r15+                                 \n\t" \
-                "ld    r11, @r15+                                 \n\t" \
-                "ld    r10, @r15+                                 \n\t" \
-                "ld     r9, @r15+                                 \n\t" \
-                "ld     r8, @r15+                                 \n\t" \
-                : "=&r" (__last) \
-                : "r" (arg0), "r" (arg1), "r" (oldsp), "r" (newsp), \
-                  "r" (oldlr), "r" (newlr) \
-                : "memory" \
        ); \
-        last = __last; \
 } while(0)
 /*
@@ -171,8 +146,8 @@ extern void  __xchg_called_with_bad_pointer(void);
 #define DCACHE_CLEAR(reg0, reg1, addr)
 #endif  /* CONFIG_CHIP_M32700_TS1 */
-static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr,
+static inline unsigned long
-        int size)
+__xchg(unsigned long x, volatile void * ptr, int size)
 {
        unsigned long flags;
        unsigned long tmp = 0;
@@ -224,7 +199,7 @@ static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr,
 #define __HAVE_ARCH_CMPXCHG     1
-static __inline__ unsigned long
+static inline unsigned long
 __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
 {
        unsigned long flags;
@@ -258,7 +233,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new)
   if something tries to do an invalid cmpxchg().  */
 extern void __cmpxchg_called_with_bad_pointer(void);
-static __inline__ unsigned long
+static inline unsigned long
 __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 {
        switch (size) {
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/asmmacro.h b/include/asm-mips/asmmacro.h
index 30b18ea6cb11..f54aa147ec19 100644
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
@@ -17,7 +17,26 @@
 #ifdef CONFIG_64BIT
 #include <asm/asmmacro-64.h>
 #endif
+#ifdef CONFIG_MIPS_MT_SMTC
+#include <asm/mipsmtregs.h>
+#endif
+#ifdef CONFIG_MIPS_MT_SMTC
+        .macro  local_irq_enable reg=t0
+        mfc0    \reg, CP0_TCSTATUS
+        ori     \reg, \reg, TCSTATUS_IXMT
+        xori    \reg, \reg, TCSTATUS_IXMT
+        mtc0    \reg, CP0_TCSTATUS
+        ehb
+        .endm
+        .macro  local_irq_disable reg=t0
+        mfc0    \reg, CP0_TCSTATUS
+        ori     \reg, \reg, TCSTATUS_IXMT
+        mtc0    \reg, CP0_TCSTATUS
+        ehb
+        .endm
+#else
        .macro  local_irq_enable reg=t0
        mfc0    \reg, CP0_STATUS
        ori     \reg, \reg, 1
@@ -32,6 +51,7 @@
        mtc0    \reg, CP0_STATUS
        irq_disable_hazard
        .endm
+#endif /* CONFIG_MIPS_MT_SMTC */
 #ifdef CONFIG_CPU_SB1
        .macro  fpu_enable_hazard
@@ -48,4 +68,31 @@
        .endm
 #endif
+/*
+ * Temporary until all gas have MT ASE support
+ */
+        .macro  DMT     reg=0
+        .word   (0x41600bc1 | (\reg << 16))
+        .endm
+        .macro  EMT     reg=0
+        .word   (0x41600be1 | (\reg << 16))
+        .endm
+        .macro  DVPE    reg=0
+        .word   (0x41600001 | (\reg << 16))
+        .endm
+        .macro  EVPE    reg=0
+        .word   (0x41600021 | (\reg << 16))
+        .endm
+        .macro  MFTR    rt=0, rd=0, u=0, sel=0
+         .word  (0x41000000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel))
+        .endm
+        .macro  MTTR    rt=0, rd=0, u=0, sel=0
+         .word  (0x41800000 | (\rt << 16) | (\rd << 11) | (\u << 5) | (\sel))
+        .endm
 #endif /* _ASM_ASMMACRO_H */
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index aeae9fabf4a9..47bc8f6c20d2 100644
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -74,6 +74,7 @@ static inline void copy_from_user_page(struct vm_area_struct *vma,
 extern void (*flush_cache_sigtramp)(unsigned long addr);
 extern void (*flush_icache_all)(void);
+extern void (*local_flush_data_cache_page)(void * addr);
 extern void (*flush_data_cache_page)(unsigned long addr);
 /*
diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h
index 3f2b6d9ac45e..254e11ed247b 100644
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
@@ -40,7 +40,7 @@
 #define cpu_has_sb1_cache       (cpu_data[0].options & MIPS_CPU_SB1_CACHE)
 #endif
 #ifndef cpu_has_fpu
-#define cpu_has_fpu             (cpu_data[0].options & MIPS_CPU_FPU)
+#define cpu_has_fpu             (current_cpu_data.options & MIPS_CPU_FPU)
 #endif
 #ifndef cpu_has_32fpr
 #define cpu_has_32fpr           (cpu_data[0].options & MIPS_CPU_32FPR)
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h
index 140be1c67da7..6572ac703662 100644
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
@@ -73,6 +73,16 @@ struct cpuinfo_mips {
        struct cache_desc       dcache; /* Primary D or combined I/D cache */
        struct cache_desc       scache; /* Secondary cache */
        struct cache_desc       tcache; /* Tertiary/split secondary cache */
+#if defined(CONFIG_MIPS_MT_SMTC)
+        /*
+         * In the MIPS MT "SMTC" model, each TC is considered
+         * to be a "CPU" for the purposes of scheduling, but
+         * exception resources, ASID spaces, etc, are common
+         * to all TCs within the same VPE.
+         */
+        int                     vpe_id;  /* Virtual Processor number */
+        int                     tc_id;   /* Thread Context number */
+#endif /* CONFIG_MIPS_MT */
        void                    *data;  /* Additional data */
 } __attribute__((aligned(SMP_CACHE_BYTES)));
diff --git a/include/asm-mips/ds1742.h b/include/asm-mips/ds1742.h
new file mode 100644
index 000000000000..c2f2c32da637
--- /dev/null
+++ b/include/asm-mips/ds1742.h
@@ -0,0 +1,13 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2006 by Ralf Baechle (ralf@linux-mips.org)
+ */
+#ifndef _ASM_DS1742_H
+#define _ASM_DS1742_H
+#include <ds1742.h>
+#endif /* _ASM_DS1742_H */
diff --git a/include/asm-mips/elf.h b/include/asm-mips/elf.h
index 851f013adad3..bdc9de2df1ef 100644
--- a/include/asm-mips/elf.h
+++ b/include/asm-mips/elf.h
@@ -119,8 +119,49 @@
 #define SHT_MIPS_CONFLICT       0x70000002
 #define SHT_MIPS_GPTAB          0x70000003
 #define SHT_MIPS_UCODE          0x70000004
+#define SHT_MIPS_DEBUG          0x70000005
-#define SHF_MIPS_GPREL  0x10000000
+#define SHT_MIPS_REGINFO        0x70000006
+#define SHT_MIPS_PACKAGE        0x70000007
+#define SHT_MIPS_PACKSYM        0x70000008
+#define SHT_MIPS_RELD           0x70000009
+#define SHT_MIPS_IFACE          0x7000000b
+#define SHT_MIPS_CONTENT        0x7000000c
+#define SHT_MIPS_OPTIONS        0x7000000d
+#define SHT_MIPS_SHDR           0x70000010
+#define SHT_MIPS_FDESC          0x70000011
+#define SHT_MIPS_EXTSYM         0x70000012
+#define SHT_MIPS_DENSE          0x70000013
+#define SHT_MIPS_PDESC          0x70000014
+#define SHT_MIPS_LOCSYM         0x70000015
+#define SHT_MIPS_AUXSYM         0x70000016
+#define SHT_MIPS_OPTSYM         0x70000017
+#define SHT_MIPS_LOCSTR         0x70000018
+#define SHT_MIPS_LINE           0x70000019
+#define SHT_MIPS_RFDESC         0x7000001a
+#define SHT_MIPS_DELTASYM       0x7000001b
+#define SHT_MIPS_DELTAINST      0x7000001c
+#define SHT_MIPS_DELTACLASS     0x7000001d
+#define SHT_MIPS_DWARF          0x7000001e
+#define SHT_MIPS_DELTADECL      0x7000001f
+#define SHT_MIPS_SYMBOL_LIB     0x70000020
+#define SHT_MIPS_EVENTS         0x70000021
+#define SHT_MIPS_TRANSLATE      0x70000022
+#define SHT_MIPS_PIXIE          0x70000023
+#define SHT_MIPS_XLATE          0x70000024
+#define SHT_MIPS_XLATE_DEBUG    0x70000025
+#define SHT_MIPS_WHIRL          0x70000026
+#define SHT_MIPS_EH_REGION      0x70000027
+#define SHT_MIPS_XLATE_OLD      0x70000028
+#define SHT_MIPS_PDR_EXCEPTION  0x70000029
+#define SHF_MIPS_GPREL          0x10000000
+#define SHF_MIPS_MERGE          0x20000000
+#define SHF_MIPS_ADDR           0x40000000
+#define SHF_MIPS_STRING         0x80000000
+#define SHF_MIPS_NOSTRIP        0x08000000
+#define SHF_MIPS_LOCAL          0x04000000
+#define SHF_MIPS_NAMES          0x02000000
+#define SHF_MIPS_NODUPES        0x01000000
 #ifndef ELF_ARCH
 /* ELF register definitions */
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h
index 9c828b1f8218..b0f50015e252 100644
--- a/include/asm-mips/fpu.h
+++ b/include/asm-mips/fpu.h
@@ -21,6 +21,10 @@
 #include <asm/processor.h>
 #include <asm/current.h>
+#ifdef CONFIG_MIPS_MT_FPAFF
+#include <asm/mips_mt.h>
+#endif
 struct sigcontext;
 struct sigcontext32;
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index feb29a793888..dadc05188db7 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -284,6 +284,8 @@ do {									\
 #define instruction_hazard() do { } while (0)
 #endif
+extern void mips_ihb(void);
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_HAZARDS_H */
diff --git a/include/asm-mips/interrupt.h b/include/asm-mips/interrupt.h
index 774348734fa0..4bb9c06f4410 100644
--- a/include/asm-mips/interrupt.h
+++ b/include/asm-mips/interrupt.h
@@ -19,7 +19,12 @@ __asm__ (
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
        "       .set    noat                                            \n"
-#ifdef CONFIG_CPU_MIPSR2
+#ifdef CONFIG_MIPS_MT_SMTC
+        "       mfc0    $1, $2, 1       # SMTC - clear TCStatus.IXMT    \n"
+        "       ori     $1, 0x400                                       \n"
+        "       xori    $1, 0x400                                       \n"
+        "       mtc0    $1, $2, 1                                       \n"
+#elif defined(CONFIG_CPU_MIPSR2)
        "       ei                                                      \n"
 #else
        "       mfc0    $1,$12                                          \n"
@@ -62,7 +67,12 @@ __asm__ (
        "       .macro  local_irq_disable\n"
        "       .set    push                                            \n"
        "       .set    noat                                            \n"
-#ifdef CONFIG_CPU_MIPSR2
+#ifdef CONFIG_MIPS_MT_SMTC
+        "       mfc0    $1, $2, 1                                       \n"
+        "       ori     $1, 0x400                                       \n"
+        "       .set    noreorder                                       \n"
+        "       mtc0    $1, $2, 1                                       \n"
+#elif defined(CONFIG_CPU_MIPSR2)
        "       di                                                      \n"
 #else
        "       mfc0    $1,$12                                          \n"
@@ -88,7 +98,11 @@ __asm__ (
        "       .macro  local_save_flags flags                          \n"
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
+#ifdef CONFIG_MIPS_MT_SMTC
+        "       mfc0    \\flags, $2, 1                                  \n"
+#else
        "       mfc0    \\flags, $12                                    \n"
+#endif
        "       .set    pop                                             \n"
        "       .endm                                                   \n");
@@ -102,7 +116,13 @@ __asm__ (
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
        "       .set    noat                                            \n"
-#ifdef CONFIG_CPU_MIPSR2
+#ifdef CONFIG_MIPS_MT_SMTC
+        "       mfc0    \\result, $2, 1                                 \n"
+        "       ori     $1, \\result, 0x400                             \n"
+        "       .set    noreorder                                       \n"
+        "       mtc0    $1, $2, 1                                       \n"
+        "       andi    \\result, \\result, 0x400                       \n"
+#elif defined(CONFIG_CPU_MIPSR2)
        "       di      \\result                                        \n"
        "       andi    \\result, 1                                     \n"
 #else
@@ -128,7 +148,14 @@ __asm__ (
        "       .set    push                                            \n"
        "       .set    noreorder                                       \n"
        "       .set    noat                                            \n"
-#if defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU)
+#ifdef CONFIG_MIPS_MT_SMTC
+        "mfc0   $1, $2, 1                                               \n"
+        "andi   \\flags, 0x400                                          \n"
+        "ori    $1, 0x400                                               \n"
+        "xori   $1, 0x400                                               \n"
+        "or     \\flags, $1                                             \n"
+        "mtc0   \\flags, $2, 1                                          \n"
+#elif defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU)
        /*
         * Slow, but doesn't suffer from a relativly unlikely race
         * condition we're having since days 1.
@@ -167,11 +194,29 @@ do {									\
                : "memory");                                            \
 } while(0)
-#define irqs_disabled()                                                 \
+static inline int irqs_disabled(void)
-({                                                                      \
+{
-        unsigned long flags;                                            \
+#ifdef CONFIG_MIPS_MT_SMTC
-        local_save_flags(flags);                                        \
+        /*
-        !(flags & 1);                                                   \
+         * SMTC model uses TCStatus.IXMT to disable interrupts for a thread/CPU
-})
+         */
+        unsigned long __result;
+        __asm__ __volatile__(
+        "       .set    noreorder                                       \n"
+        "       mfc0    %0, $2, 1                                       \n"
+        "       andi    %0, 0x400                                       \n"
+        "       slt     %0, $0, %0                                      \n"
+        "       .set    reorder                                         \n"
+        : "=r" (__result));
+        return __result;
+#else
+        unsigned long flags;
+        local_save_flags(flags);
+        return !(flags & 1);
+#endif
+}
 #endif /* _ASM_INTERRUPT_H */
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h
index 8a342ccb34a8..dde677f02bc0 100644
--- a/include/asm-mips/irq.h
+++ b/include/asm-mips/irq.h
@@ -11,6 +11,9 @@
 #include <linux/config.h>
 #include <linux/linkage.h>
+#include <asm/mipsmtregs.h>
 #include <irq.h>
 #ifdef CONFIG_I8259
@@ -26,6 +29,23 @@ struct pt_regs;
 extern asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs);
+#ifdef CONFIG_MIPS_MT_SMTC
+/*
+ * Clear interrupt mask handling "backstop" if irq_hwmask
+ * entry so indicates. This implies that the ack() or end()
+ * functions will take over re-enabling the low-level mask.
+ * Otherwise it will be done on return from exception.
+ */
+#define __DO_IRQ_SMTC_HOOK()                                            \
+do {                                                                    \
+        if (irq_hwmask[irq] & 0x0000ff00)                               \
+                write_c0_tccontext(read_c0_tccontext() &                \
+                                   ~(irq_hwmask[irq] & 0x0000ff00));    \
+} while (0)
+#else
+#define __DO_IRQ_SMTC_HOOK() do { } while (0)
+#endif
 #ifdef CONFIG_PREEMPT
 /*
@@ -39,6 +59,7 @@ extern asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs);
 #define do_IRQ(irq, regs)                                               \
 do {                                                                    \
        irq_enter();                                                    \
+        __DO_IRQ_SMTC_HOOK();                                           \
        __do_IRQ((irq), (regs));                                        \
        irq_exit();                                                     \
 } while (0)
@@ -46,5 +67,14 @@ do {									\
 #endif
 extern void arch_init_irq(void);
+extern void spurious_interrupt(struct pt_regs *regs);
+#ifdef CONFIG_MIPS_MT_SMTC
+struct irqaction;
+extern unsigned long irq_hwmask[];
+extern int setup_irq_smtc(unsigned int irq, struct irqaction * new,
+                          unsigned long hwmask);
+#endif /* CONFIG_MIPS_MT_SMTC */
 #endif /* _ASM_IRQ_H */
diff --git a/include/asm-mips/kspd.h b/include/asm-mips/kspd.h
new file mode 100644
index 000000000000..4e9e724c8935
--- /dev/null
+++ b/include/asm-mips/kspd.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ */
+#ifndef _ASM_KSPD_H
+#define _ASM_KSPD_H
+struct kspd_notifications {
+        void (*kspd_sp_exit)(int sp_id);
+        struct list_head list;
+};
+#ifdef CONFIG_MIPS_APSP_KSPD
+extern void kspd_notify(struct kspd_notifications *notify);
+#else
+static inline void kspd_notify(struct kspd_notifications *notify)
+{
+}
+#endif
+#endif
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 550979a9ea9d..e3315359500a 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -104,65 +104,107 @@ static __inline__ unsigned long ide_default_io_base(int index)
 #endif
 /* MIPS port and memory-mapped I/O string operations.  */
+static inline void __ide_flush_prologue(void)
+{
+#ifdef CONFIG_SMP
+        if (cpu_has_dc_aliases)
+                preempt_disable();
+#endif
+}
+static inline void __ide_flush_epilogue(void)
+{
+#ifdef CONFIG_SMP
+        if (cpu_has_dc_aliases)
+                preempt_enable();
+#endif
+}
 static inline void __ide_flush_dcache_range(unsigned long addr, unsigned long size)
 {
        if (cpu_has_dc_aliases) {
                unsigned long end = addr + size;
-                for (; addr < end; addr += PAGE_SIZE)
-                        flush_dcache_page(virt_to_page(addr));
+                while (addr < end) {
+                        local_flush_data_cache_page((void *)addr);
+                        addr += PAGE_SIZE;
+                }
        }
 }
+/*
+ * insw() and gang might be called with interrupts disabled, so we can't
+ * send IPIs for flushing due to the potencial of deadlocks, see the comment
+ * above smp_call_function() in arch/mips/kernel/smp.c.  We work around the
+ * problem by disabling preemption so we know we actually perform the flush
+ * on the processor that actually has the lines to be flushed which hopefully
+ * is even better for performance anyway.
+ */
 static inline void __ide_insw(unsigned long port, void *addr,
        unsigned int count)
 {
+        __ide_flush_prologue();
        insw(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 2);
+        __ide_flush_epilogue();
 }
 static inline void __ide_insl(unsigned long port, void *addr, unsigned int count)
 {
+        __ide_flush_prologue();
        insl(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 4);
+        __ide_flush_epilogue();
 }
 static inline void __ide_outsw(unsigned long port, const void *addr,
        unsigned long count)
 {
+        __ide_flush_prologue();
        outsw(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 2);
+        __ide_flush_epilogue();
 }
 static inline void __ide_outsl(unsigned long port, const void *addr,
        unsigned long count)
 {
+        __ide_flush_prologue();
        outsl(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 4);
+        __ide_flush_epilogue();
 }
 static inline void __ide_mm_insw(void __iomem *port, void *addr, u32 count)
 {
+        __ide_flush_prologue();
        readsw(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 2);
+        __ide_flush_epilogue();
 }
 static inline void __ide_mm_insl(void __iomem *port, void *addr, u32 count)
 {
+        __ide_flush_prologue();
        readsl(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 4);
+        __ide_flush_epilogue();
 }
 static inline void __ide_mm_outsw(void __iomem *port, void *addr, u32 count)
 {
+        __ide_flush_prologue();
        writesw(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 2);
+        __ide_flush_epilogue();
 }
 static inline void __ide_mm_outsl(void __iomem * port, void *addr, u32 count)
 {
+        __ide_flush_prologue();
        writesl(port, addr, count);
        __ide_flush_dcache_range((unsigned long)addr, count * 4);
+        __ide_flush_epilogue();
 }
 /* ide_insw calls insw, not __ide_insw.  Why? */
diff --git a/include/asm-mips/mach-jmr3927/ds1742.h b/include/asm-mips/mach-jmr3927/ds1742.h
index cff6192d4bdb..8a8fef6d07fa 100644
--- a/include/asm-mips/mach-jmr3927/ds1742.h
+++ b/include/asm-mips/mach-jmr3927/ds1742.h
@@ -3,14 +3,14 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 2003 by Ralf Baechle
+ * Copyright (C) 2003, 06 by Ralf Baechle
 */
 #ifndef __ASM_MACH_JMR3927_DS1742_H
 #define __ASM_MACH_JMR3927_DS1742_H
 #include <asm/jmr3927/jmr3927.h>
-#define rtc_read(reg)           (jmr3927_nvram_in(addr))
+#define rtc_read(reg)           (jmr3927_nvram_in(reg))
 #define rtc_write(data, reg)    (jmr3927_nvram_out((data),(reg)))
 #endif /* __ASM_MACH_JMR3927_DS1742_H */
diff --git a/include/asm-mips/mach-mips/param.h b/include/asm-mips/mach-mips/param.h
new file mode 100644
index 000000000000..805ef6d27d3c
--- /dev/null
+++ b/include/asm-mips/mach-mips/param.h
@@ -0,0 +1,13 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003 by Ralf Baechle
+ */
+#ifndef __ASM_MACH_MIPS_PARAM_H
+#define __ASM_MACH_MIPS_PARAM_H
+#define HZ              100             /* Internal kernel timer frequency */
+#endif /* __ASM_MACH_MIPS_PARAM_H */
diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
index 9225b3397a4f..6bb2125bb053 100644
--- a/include/asm-mips/marvell.h
+++ b/include/asm-mips/marvell.h
@@ -53,4 +53,6 @@ struct mv_pci_controller {
        unsigned long   config_vreg;
 };
+extern void ll_mv64340_irq(struct pt_regs *regs);
 #endif  /* __ASM_MIPS_MARVELL_H */
diff --git a/include/asm-mips/mips-boards/atlas.h b/include/asm-mips/mips-boards/atlas.h
index 0998151fb3a1..a8ae12d120ee 100644
--- a/include/asm-mips/mips-boards/atlas.h
+++ b/include/asm-mips/mips-boards/atlas.h
@@ -33,13 +33,29 @@
 #define ATLAS_RTC_ADR_REG       0x1f000800
 #define ATLAS_RTC_DAT_REG       0x1f000808
 /*
 * Atlas interrupt controller register base.
 */
 #define ATLAS_ICTRL_REGS_BASE   0x1f000000
 /*
+ * Atlas registers are memory mapped on 64-bit aligned boundaries and
+ * only word access are allowed.
+ */
+struct atlas_ictrl_regs {
+        volatile unsigned int intraw;
+        int dummy1;
+        volatile unsigned int intseten;
+        int dummy2;
+        volatile unsigned int intrsten;
+        int dummy3;
+        volatile unsigned int intenable;
+        int dummy4;
+        volatile unsigned int intstatus;
+        int dummy5;
+};
+/*
 * Atlas UART register base.
 */
 #define ATLAS_UART_REGS_BASE    0x1f000900
diff --git a/include/asm-mips/mips-boards/atlasint.h b/include/asm-mips/mips-boards/atlasint.h
index bba35c183d08..fd7ebc54fa90 100644
--- a/include/asm-mips/mips-boards/atlasint.h
+++ b/include/asm-mips/mips-boards/atlasint.h
@@ -62,23 +62,4 @@
 #define ATLASINT_RES31          (ATLASINT_BASE+31)
 #define ATLASINT_END            (ATLASINT_BASE+31)
-/*
- * Atlas registers are memory mapped on 64-bit aligned boundaries and
- * only word access are allowed.
- */
-struct atlas_ictrl_regs {
-        volatile unsigned int intraw;
-        int dummy1;
-        volatile unsigned int intseten;
-        int dummy2;
-        volatile unsigned int intrsten;
-        int dummy3;
-        volatile unsigned int intenable;
-        int dummy4;
-        volatile unsigned int intstatus;
-        int dummy5;
-};
-extern void atlasint_init(void);
 #endif /* !(_MIPS_ATLASINT_H) */
diff --git a/include/asm-mips/mips_mt.h b/include/asm-mips/mips_mt.h
new file mode 100644
index 000000000000..c31a312b9783
--- /dev/null
+++ b/include/asm-mips/mips_mt.h
@@ -0,0 +1,15 @@
+/*
+ * Definitions and decalrations for MIPS MT support
+ * that are common between SMTC, VSMP, and/or AP/SP
+ * kernel models.
+ */
+#ifndef __ASM_MIPS_MT_H
+#define __ASM_MIPS_MT_H
+extern cpumask_t mt_fpu_cpumask;
+extern unsigned long mt_fpemul_threshold;
+extern void mips_mt_regdump(unsigned long previous_mvpcontrol_value);
+extern void mips_mt_set_cpuoptions(void);
+#endif /* __ASM_MIPS_MT_H */
diff --git a/include/asm-mips/mipsmtregs.h b/include/asm-mips/mipsmtregs.h
index a669c0702c66..f637ce70758f 100644
--- a/include/asm-mips/mipsmtregs.h
+++ b/include/asm-mips/mipsmtregs.h
@@ -165,7 +165,7 @@
 #ifndef __ASSEMBLY__
-extern void mips_mt_regdump(void);
+extern void mips_mt_regdump(unsigned long previous_mvpcontrol_value);
 static inline unsigned int dvpe(void)
 {
@@ -234,7 +234,7 @@ static inline void __raw_emt(void)
        __asm__ __volatile__(
        "       .set    noreorder                                       \n"
        "       .set    mips32r2                                        \n"
-        "       emt                                                     \n"
+        "       .word   0x41600be1                      # emt           \n"
        "       ehb                                                     \n"
        "       .set    mips0                                           \n"
        "       .set    reorder");
@@ -282,8 +282,11 @@ static inline void ehb(void)
                                                                        \
        __asm__ __volatile__(                                           \
        "       .set    push                                    \n"     \
+        "       .set    noat                                    \n"     \
        "       .set    mips32r2                                \n"     \
-        "       mftgpr  %0," #rt "                              \n"     \
+        "       # mftgpr $1," #rt "                             \n"     \
+        "       .word   0x41000820 | (" #rt " << 16)            \n"     \
+        "       move    %0, $1                                  \n"     \
        "       .set    pop                                     \n"     \
        : "=r" (__res));                                                \
                                                                        \
@@ -295,9 +298,7 @@ static inline void ehb(void)
        unsigned long __res;                                            \
                                                                        \
        __asm__ __volatile__(                                           \
-        ".set noat\n\t"                                                 \
+        "       mftr    %0, " #rt ", " #u ", " #sel "           \n"     \
-        "mftr\t%0, " #rt ", " #u ", " #sel "\n\t"                       \
-        ".set at\n\t"                                                   \
        : "=r" (__res));                                                \
                                                                        \
        __res;                                                          \
@@ -364,6 +365,9 @@ do {									\
 #define read_vpe_c0_ebase()             mftc0(15,1)
 #define write_vpe_c0_ebase(val)         mttc0(15, 1, val)
 #define write_vpe_c0_compare(val)       mttc0(11, 0, val)
+#define read_vpe_c0_badvaddr()          mftc0(8, 0)
+#define read_vpe_c0_epc()               mftc0(14, 0)
+#define write_vpe_c0_epc(val)           mttc0(14, 0, val)
 /* TC */
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h
index 035ba0a9b0df..a2ef579f6b1a 100644
--- a/include/asm-mips/mipsregs.h
+++ b/include/asm-mips/mipsregs.h
@@ -836,6 +836,9 @@ do {									\
 #define read_c0_cache()         __read_32bit_c0_register($7, 0) /* TX39xx */
 #define write_c0_cache(val)     __write_32bit_c0_register($7, 0, val)
+#define read_c0_badvaddr()      __read_ulong_c0_register($8, 0)
+#define write_c0_badvaddr(val)  __write_ulong_c0_register($8, 0, val)
 #define read_c0_count()         __read_32bit_c0_register($9, 0)
 #define write_c0_count(val)     __write_32bit_c0_register($9, 0, val)
@@ -858,7 +861,19 @@ do {									\
 #define write_c0_compare3(val)  __write_32bit_c0_register($11, 7, val)
 #define read_c0_status()        __read_32bit_c0_register($12, 0)
+#ifdef CONFIG_MIPS_MT_SMTC
+#define write_c0_status(val)                                            \
+do {                                                                    \
+        __write_32bit_c0_register($12, 0, val);                         \
+        __ehb();                                                        \
+} while (0)
+#else
+/*
+ * Legacy non-SMTC code, which may be hazardous
+ * but which might not support EHB
+ */
 #define write_c0_status(val)    __write_32bit_c0_register($12, 0, val)
+#endif /* CONFIG_MIPS_MT_SMTC */
 #define read_c0_cause()         __read_32bit_c0_register($13, 0)
 #define write_c0_cause(val)     __write_32bit_c0_register($13, 0, val)
@@ -1001,6 +1016,9 @@ do {									\
 #define read_c0_taglo()         __read_32bit_c0_register($28, 0)
 #define write_c0_taglo(val)     __write_32bit_c0_register($28, 0, val)
+#define read_c0_dtaglo()        __read_32bit_c0_register($28, 2)
+#define write_c0_dtaglo(val)    __write_32bit_c0_register($28, 2, val)
 #define read_c0_taghi()         __read_32bit_c0_register($29, 0)
 #define write_c0_taghi(val)     __write_32bit_c0_register($29, 0, val)
@@ -1354,15 +1372,119 @@ static inline void tlb_write_random(void)
 /*
 * Manipulate bits in a c0 register.
 */
+#ifndef CONFIG_MIPS_MT_SMTC
+/*
+ * SMTC Linux requires shutting-down microthread scheduling
+ * during CP0 register read-modify-write sequences.
+ */
+#define __BUILD_SET_C0(name)                                    \
+static inline unsigned int                                      \
+set_c0_##name(unsigned int set)                                 \
+{                                                               \
+        unsigned int res;                                       \
+                                                                \
+        res = read_c0_##name();                                 \
+        res |= set;                                             \
+        write_c0_##name(res);                                   \
+                                                                \
+        return res;                                             \
+}                                                               \
+                                                                \
+static inline unsigned int                                      \
+clear_c0_##name(unsigned int clear)                             \
+{                                                               \
+        unsigned int res;                                       \
+                                                                \
+        res = read_c0_##name();                                 \
+        res &= ~clear;                                          \
+        write_c0_##name(res);                                   \
+                                                                \
+        return res;                                             \
+}                                                               \
+                                                                \
+static inline unsigned int                                      \
+change_c0_##name(unsigned int change, unsigned int new)         \
+{                                                               \
+        unsigned int res;                                       \
+                                                                \
+        res = read_c0_##name();                                 \
+        res &= ~change;                                         \
+        res |= (new & change);                                  \
+        write_c0_##name(res);                                   \
+                                                                \
+        return res;                                             \
+}
+#else /* SMTC versions that manage MT scheduling */
+#include <asm/interrupt.h>
+/*
+ * This is a duplicate of dmt() in mipsmtregs.h to avoid problems with
+ * header file recursion.
+ */
+static inline unsigned int __dmt(void)
+{
+        int res;
+        __asm__ __volatile__(
+        "       .set    push                                            \n"
+        "       .set    mips32r2                                        \n"
+        "       .set    noat                                            \n"
+        "       .word   0x41610BC1                      # dmt $1        \n"
+        "       ehb                                                     \n"
+        "       move    %0, $1                                          \n"
+        "       .set    pop                                             \n"
+        : "=r" (res));
+        instruction_hazard();
+        return res;
+}
+#define __VPECONTROL_TE_SHIFT   15
+#define __VPECONTROL_TE         (1UL << __VPECONTROL_TE_SHIFT)
+#define __EMT_ENABLE            __VPECONTROL_TE
+static inline void __emt(unsigned int previous)
+{
+        if ((previous & __EMT_ENABLE))
+                __asm__ __volatile__(
+                "       .set    noreorder                               \n"
+                "       .set    mips32r2                                \n"
+                "       .word   0x41600be1              # emt           \n"
+                "       ehb                                             \n"
+                "       .set    mips0                                   \n"
+                "       .set    reorder                                 \n");
+}
+static inline void __ehb(void)
+{
+        __asm__ __volatile__(
+        "       ehb                                                     \n");
+}
+/*
+ * Note that local_irq_save/restore affect TC-specific IXMT state,
+ * not Status.IE as in non-SMTC kernel.
+ */
 #define __BUILD_SET_C0(name)                                    \
 static inline unsigned int                                      \
 set_c0_##name(unsigned int set)                                 \
 {                                                               \
        unsigned int res;                                       \
+        unsigned int omt;                                       \
+        unsigned int flags;                                     \
                                                                \
+        local_irq_save(flags);                                  \
+        omt = __dmt();                                          \
        res = read_c0_##name();                                 \
        res |= set;                                             \
        write_c0_##name(res);                                   \
+        __emt(omt);                                             \
+        local_irq_restore(flags);                               \
                                                                \
        return res;                                             \
 }                                                               \
@@ -1371,10 +1493,16 @@ static inline unsigned int					\
 clear_c0_##name(unsigned int clear)                             \
 {                                                               \
        unsigned int res;                                       \
+        unsigned int omt;                                       \
+        unsigned int flags;                                     \
                                                                \
+        local_irq_save(flags);                                  \
+        omt = __dmt();                                          \
        res = read_c0_##name();                                 \
        res &= ~clear;                                          \
        write_c0_##name(res);                                   \
+        __emt(omt);                                             \
+        local_irq_restore(flags);                               \
                                                                \
        return res;                                             \
 }                                                               \
@@ -1383,14 +1511,22 @@ static inline unsigned int					\
 change_c0_##name(unsigned int change, unsigned int new)         \
 {                                                               \
        unsigned int res;                                       \
+        unsigned int omt;                                       \
+        unsigned int flags;                                     \
                                                                \
+        local_irq_save(flags);                                  \
+                                                                \
+        omt = __dmt();                                          \
        res = read_c0_##name();                                 \
        res &= ~change;                                         \
        res |= (new & change);                                  \
        write_c0_##name(res);                                   \
+        __emt(omt);                                             \
+        local_irq_restore(flags);                               \
                                                                \
        return res;                                             \
 }
+#endif
 __BUILD_SET_C0(status)
 __BUILD_SET_C0(cause)
diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h
index 61cf22588137..6e09f4c87211 100644
--- a/include/asm-mips/mmu_context.h
+++ b/include/asm-mips/mmu_context.h
@@ -17,6 +17,10 @@
 #include <linux/slab.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#ifdef CONFIG_MIPS_MT_SMTC
+#include <asm/mipsmtregs.h>
+#include <asm/smtc.h>
+#endif /* SMTC */
 /*
 * For the fast tlb miss handlers, we keep a per cpu array of pointers
@@ -54,6 +58,14 @@ extern unsigned long pgd_current[];
 #define ASID_INC        0x1
 #define ASID_MASK       0xfff
+/* SMTC/34K debug hack - but maybe we'll keep it */
+#elif defined(CONFIG_MIPS_MT_SMTC)
+#define ASID_INC        0x1
+extern unsigned long smtc_asid_mask;
+#define ASID_MASK       (smtc_asid_mask)
+#define HW_ASID_MASK    0xff
+/* End SMTC/34K debug hack */
 #else /* FIXME: not correct for R6000 */
 #define ASID_INC        0x1
@@ -76,6 +88,8 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 #define ASID_VERSION_MASK  ((unsigned long)~(ASID_MASK|(ASID_MASK-1)))
 #define ASID_FIRST_VERSION ((unsigned long)(~ASID_VERSION_MASK) + 1)
+#ifndef CONFIG_MIPS_MT_SMTC
+/* Normal, classic MIPS get_new_mmu_context */
 static inline void
 get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
 {
@@ -91,6 +105,12 @@ get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
        cpu_context(cpu, mm) = asid_cache(cpu) = asid;
 }
+#else /* CONFIG_MIPS_MT_SMTC */
+#define get_new_mmu_context(mm,cpu) smtc_get_new_mmu_context((mm),(cpu))
+#endif /* CONFIG_MIPS_MT_SMTC */
 /*
 * Initialize the context related info for a new mm_struct
 * instance.
@@ -111,14 +131,46 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
 {
        unsigned int cpu = smp_processor_id();
        unsigned long flags;
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long oldasid;
+        unsigned long mtflags;
+        int mytlb = (smtc_status & SMTC_TLB_SHARED) ? 0 : cpu_data[cpu].vpe_id;
        local_irq_save(flags);
+        mtflags = dvpe();
+#else /* Not SMTC */
+        local_irq_save(flags);
+#endif /* CONFIG_MIPS_MT_SMTC */
        /* Check if our ASID is of an older version and thus invalid */
        if ((cpu_context(cpu, next) ^ asid_cache(cpu)) & ASID_VERSION_MASK)
                get_new_mmu_context(next, cpu);
+#ifdef CONFIG_MIPS_MT_SMTC
+        /*
+         * If the EntryHi ASID being replaced happens to be
+         * the value flagged at ASID recycling time as having
+         * an extended life, clear the bit showing it being
+         * in use by this "CPU", and if that's the last bit,
+         * free up the ASID value for use and flush any old
+         * instances of it from the TLB.
+         */
+        oldasid = (read_c0_entryhi() & ASID_MASK);
+        if(smtc_live_asid[mytlb][oldasid]) {
+                smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
+                if(smtc_live_asid[mytlb][oldasid] == 0)
+                        smtc_flush_tlb_asid(oldasid);
+        }
+        /*
+         * Tread softly on EntryHi, and so long as we support
+         * having ASID_MASK smaller than the hardware maximum,
+         * make sure no "soft" bits become "hard"...
+         */
+        write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK)
+                        | (cpu_context(cpu, next) & ASID_MASK));
+        ehb(); /* Make sure it propagates to TCStatus */
+        evpe(mtflags);
+#else
        write_c0_entryhi(cpu_context(cpu, next));
+#endif /* CONFIG_MIPS_MT_SMTC */
        TLBMISS_HANDLER_SETUP_PGD(next->pgd);
        /*
@@ -151,12 +203,34 @@ activate_mm(struct mm_struct *prev, struct mm_struct *next)
        unsigned long flags;
        unsigned int cpu = smp_processor_id();
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long oldasid;
+        unsigned long mtflags;
+        int mytlb = (smtc_status & SMTC_TLB_SHARED) ? 0 : cpu_data[cpu].vpe_id;
+#endif /* CONFIG_MIPS_MT_SMTC */
        local_irq_save(flags);
        /* Unconditionally get a new ASID.  */
        get_new_mmu_context(next, cpu);
+#ifdef CONFIG_MIPS_MT_SMTC
+        /* See comments for similar code above */
+        mtflags = dvpe();
+        oldasid = read_c0_entryhi() & ASID_MASK;
+        if(smtc_live_asid[mytlb][oldasid]) {
+                smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
+                if(smtc_live_asid[mytlb][oldasid] == 0)
+                         smtc_flush_tlb_asid(oldasid);
+        }
+        /* See comments for similar code above */
+        write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK) |
+                         (cpu_context(cpu, next) & ASID_MASK));
+        ehb(); /* Make sure it propagates to TCStatus */
+        evpe(mtflags);
+#else
        write_c0_entryhi(cpu_context(cpu, next));
+#endif /* CONFIG_MIPS_MT_SMTC */
        TLBMISS_HANDLER_SETUP_PGD(next->pgd);
        /* mark mmu ownership change */
@@ -174,17 +248,49 @@ static inline void
 drop_mmu_context(struct mm_struct *mm, unsigned cpu)
 {
        unsigned long flags;
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long oldasid;
+        /* Can't use spinlock because called from TLB flush within DVPE */
+        unsigned int prevvpe;
+        int mytlb = (smtc_status & SMTC_TLB_SHARED) ? 0 : cpu_data[cpu].vpe_id;
+#endif /* CONFIG_MIPS_MT_SMTC */
        local_irq_save(flags);
        if (cpu_isset(cpu, mm->cpu_vm_mask))  {
                get_new_mmu_context(mm, cpu);
+#ifdef CONFIG_MIPS_MT_SMTC
+                /* See comments for similar code above */
+                prevvpe = dvpe();
+                oldasid = (read_c0_entryhi() & ASID_MASK);
+                if(smtc_live_asid[mytlb][oldasid]) {
+                  smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
+                  if(smtc_live_asid[mytlb][oldasid] == 0)
+                        smtc_flush_tlb_asid(oldasid);
+                }
+                /* See comments for similar code above */
+                write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK)
+                                | cpu_asid(cpu, mm));
+                ehb(); /* Make sure it propagates to TCStatus */
+                evpe(prevvpe);
+#else /* not CONFIG_MIPS_MT_SMTC */
                write_c0_entryhi(cpu_asid(cpu, mm));
+#endif /* CONFIG_MIPS_MT_SMTC */
        } else {
                /* will get a new context next time */
+#ifndef CONFIG_MIPS_MT_SMTC
                cpu_context(cpu, mm) = 0;
+#else /* SMTC */
+                int i;
+                /* SMTC shares the TLB (and ASIDs) across VPEs */
+                for (i = 0; i < num_online_cpus(); i++) {
+                    if((smtc_status & SMTC_TLB_SHARED)
+                    || (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id))
+                        cpu_context(i, mm) = 0;
+                }
+#endif /* CONFIG_MIPS_MT_SMTC */
        }
        local_irq_restore(flags);
 }
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-mips/processor.h b/include/asm-mips/processor.h
index 39d2bd50fece..0fb75f0762e0 100644
--- a/include/asm-mips/processor.h
+++ b/include/asm-mips/processor.h
@@ -12,6 +12,7 @@
 #define _ASM_PROCESSOR_H
 #include <linux/config.h>
+#include <linux/cpumask.h>
 #include <linux/threads.h>
 #include <asm/cachectl.h>
@@ -107,6 +108,10 @@ struct mips_dsp_state {
 #define INIT_DSP {{0,},}
+#define INIT_CPUMASK { \
+        {0,} \
+}
 typedef struct {
        unsigned long seg;
 } mm_segment_t;
@@ -129,6 +134,12 @@ struct thread_struct {
        /* Saved fpu/fpu emulator stuff. */
        union mips_fpu_union fpu;
+#ifdef CONFIG_MIPS_MT_FPAFF
+        /* Emulated instruction count */
+        unsigned long emulated_fp;
+        /* Saved per-thread scheduler affinity mask */
+        cpumask_t user_cpus_allowed;
+#endif /* CONFIG_MIPS_MT_FPAFF */
        /* Saved state of the DSP ASE, if available. */
        struct mips_dsp_state dsp;
@@ -142,6 +153,7 @@ struct thread_struct {
 #define MF_LOGADE       2               /* Log address errors to syslog */
 #define MF_32BIT_REGS   4               /* also implies 16/32 fprs */
 #define MF_32BIT_ADDR   8               /* 32-bit address space (o32/n32) */
+#define MF_FPUBOUND     0x10            /* thread bound to FPU-full CPU set */
        unsigned long mflags;
        unsigned long irix_trampoline;  /* Wheee... */
        unsigned long irix_oldctx;
@@ -153,6 +165,12 @@ struct thread_struct {
 #define MF_N32          MF_32BIT_ADDR
 #define MF_N64          0
+#ifdef CONFIG_MIPS_MT_FPAFF
+#define FPAFF_INIT 0, INIT_CPUMASK,
+#else
+#define FPAFF_INIT
+#endif /* CONFIG_MIPS_MT_FPAFF */
 #define INIT_THREAD  { \
        /* \
         * saved main processor registers \
@@ -168,6 +186,10 @@ struct thread_struct {
         */ \
        INIT_FPU, \
        /* \
+         * fpu affinity state (null if not FPAFF) \
+         */ \
+        FPAFF_INIT \
+        /* \
         * saved dsp/dsp emulator stuff \
         */ \
        INIT_DSP, \
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h
index 95c5839ac465..fa9d8713c12a 100644
--- a/include/asm-mips/ptrace.h
+++ b/include/asm-mips/ptrace.h
@@ -45,6 +45,10 @@ struct pt_regs {
        unsigned long cp0_badvaddr;
        unsigned long cp0_cause;
        unsigned long cp0_epc;
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long cp0_tcstatus;
+        unsigned long smtc_pad;
+#endif /* CONFIG_MIPS_MT_SMTC */
 };
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
diff --git a/include/asm-mips/r4kcache.h b/include/asm-mips/r4kcache.h
index 90c374700977..3c8e3c8d1a9a 100644
--- a/include/asm-mips/r4kcache.h
+++ b/include/asm-mips/r4kcache.h
@@ -15,6 +15,7 @@
 #include <asm/asm.h>
 #include <asm/cacheops.h>
 #include <asm/cpu-features.h>
+#include <asm/mipsmtregs.h>
 /*
 * This macro return a properly sign-extended address suitable as base address
@@ -37,16 +38,120 @@
        "       cache   %0, %1                                  \n"     \
        "       .set    pop                                     \n"     \
        :                                                               \
-        : "i" (op), "m" (*(unsigned char *)(addr)))
+        : "i" (op), "R" (*(unsigned char *)(addr)))
+#ifdef CONFIG_MIPS_MT
+/*
+ * Temporary hacks for SMTC debug. Optionally force single-threaded
+ * execution during I-cache flushes.
+ */
+#define PROTECT_CACHE_FLUSHES 1
+#ifdef PROTECT_CACHE_FLUSHES
+extern int mt_protiflush;
+extern int mt_protdflush;
+extern void mt_cflush_lockdown(void);
+extern void mt_cflush_release(void);
+#define BEGIN_MT_IPROT \
+        unsigned long flags = 0;                        \
+        unsigned long mtflags = 0;                      \
+        if(mt_protiflush) {                             \
+                local_irq_save(flags);                  \
+                ehb();                                  \
+                mtflags = dvpe();                       \
+                mt_cflush_lockdown();                   \
+        }
+#define END_MT_IPROT \
+        if(mt_protiflush) {                             \
+                mt_cflush_release();                    \
+                evpe(mtflags);                          \
+                local_irq_restore(flags);               \
+        }
+#define BEGIN_MT_DPROT \
+        unsigned long flags = 0;                        \
+        unsigned long mtflags = 0;                      \
+        if(mt_protdflush) {                             \
+                local_irq_save(flags);                  \
+                ehb();                                  \
+                mtflags = dvpe();                       \
+                mt_cflush_lockdown();                   \
+        }
+#define END_MT_DPROT \
+        if(mt_protdflush) {                             \
+                mt_cflush_release();                    \
+                evpe(mtflags);                          \
+                local_irq_restore(flags);               \
+        }
+#else
+#define BEGIN_MT_IPROT
+#define BEGIN_MT_DPROT
+#define END_MT_IPROT
+#define END_MT_DPROT
+#endif /* PROTECT_CACHE_FLUSHES */
+#define __iflush_prologue                                               \
+        unsigned long redundance;                                       \
+        extern int mt_n_iflushes;                                       \
+        BEGIN_MT_IPROT                                                  \
+        for (redundance = 0; redundance < mt_n_iflushes; redundance++) {
+#define __iflush_epilogue                                               \
+        END_MT_IPROT                                                    \
+        }
+#define __dflush_prologue                                               \
+        unsigned long redundance;                                       \
+        extern int mt_n_dflushes;                                       \
+        BEGIN_MT_DPROT                                                  \
+        for (redundance = 0; redundance < mt_n_dflushes; redundance++) {
+#define __dflush_epilogue \
+        END_MT_DPROT     \
+        }
+#define __inv_dflush_prologue __dflush_prologue
+#define __inv_dflush_epilogue __dflush_epilogue
+#define __sflush_prologue {
+#define __sflush_epilogue }
+#define __inv_sflush_prologue __sflush_prologue
+#define __inv_sflush_epilogue __sflush_epilogue
+#else /* CONFIG_MIPS_MT */
+#define __iflush_prologue {
+#define __iflush_epilogue }
+#define __dflush_prologue {
+#define __dflush_epilogue }
+#define __inv_dflush_prologue {
+#define __inv_dflush_epilogue }
+#define __sflush_prologue {
+#define __sflush_epilogue }
+#define __inv_sflush_prologue {
+#define __inv_sflush_epilogue }
+#endif /* CONFIG_MIPS_MT */
 static inline void flush_icache_line_indexed(unsigned long addr)
 {
+        __iflush_prologue
        cache_op(Index_Invalidate_I, addr);
+        __iflush_epilogue
 }
 static inline void flush_dcache_line_indexed(unsigned long addr)
 {
+        __dflush_prologue
        cache_op(Index_Writeback_Inv_D, addr);
+        __dflush_epilogue
 }
 static inline void flush_scache_line_indexed(unsigned long addr)
@@ -56,17 +161,23 @@ static inline void flush_scache_line_indexed(unsigned long addr)
 static inline void flush_icache_line(unsigned long addr)
 {
+        __iflush_prologue
        cache_op(Hit_Invalidate_I, addr);
+        __iflush_epilogue
 }
 static inline void flush_dcache_line(unsigned long addr)
 {
+        __dflush_prologue
        cache_op(Hit_Writeback_Inv_D, addr);
+        __dflush_epilogue
 }
 static inline void invalidate_dcache_line(unsigned long addr)
 {
+        __dflush_prologue
        cache_op(Hit_Invalidate_D, addr);
+        __dflush_epilogue
 }
 static inline void invalidate_scache_line(unsigned long addr)
@@ -239,9 +350,13 @@ static inline void blast_##pfx##cache##lsize(void)			\
                               current_cpu_data.desc.waybit;            \
        unsigned long ws, addr;                                         \
                                                                        \
+        __##pfx##flush_prologue                                         \
+                                                                        \
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \
                for (addr = start; addr < end; addr += lsize * 32)      \
                        cache##lsize##_unroll32(addr|ws,indexop);       \
+                                                                        \
+        __##pfx##flush_epilogue                                         \
 }                                                                       \
                                                                        \
 static inline void blast_##pfx##cache##lsize##_page(unsigned long page) \
@@ -249,10 +364,14 @@ static inline void blast_##pfx##cache##lsize##_page(unsigned long page)	\
        unsigned long start = page;                                     \
        unsigned long end = page + PAGE_SIZE;                           \
                                                                        \
+        __##pfx##flush_prologue                                         \
+                                                                        \
        do {                                                            \
                cache##lsize##_unroll32(start,hitop);                   \
                start += lsize * 32;                                    \
        } while (start < end);                                          \
+                                                                        \
+        __##pfx##flush_epilogue                                         \
 }                                                                       \
                                                                        \
 static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page) \
@@ -265,9 +384,13 @@ static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page)
                               current_cpu_data.desc.waybit;            \
        unsigned long ws, addr;                                         \
                                                                        \
+        __##pfx##flush_prologue                                         \
+                                                                        \
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \
                for (addr = start; addr < end; addr += lsize * 32)      \
                        cache##lsize##_unroll32(addr|ws,indexop);       \
+                                                                        \
+        __##pfx##flush_epilogue                                         \
 }
 __BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16)
@@ -288,12 +411,17 @@ static inline void prot##blast_##pfx##cache##_range(unsigned long start, \
        unsigned long lsize = cpu_##desc##_line_size();                 \
        unsigned long addr = start & ~(lsize - 1);                      \
        unsigned long aend = (end - 1) & ~(lsize - 1);                  \
+                                                                        \
+        __##pfx##flush_prologue                                         \
+                                                                        \
        while (1) {                                                     \
                prot##cache_op(hitop, addr);                            \
                if (addr == aend)                                       \
                        break;                                          \
                addr += lsize;                                          \
        }                                                               \
+                                                                        \
+        __##pfx##flush_epilogue                                         \
 }
 __BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_)
diff --git a/include/asm-mips/rtc.h b/include/asm-mips/rtc.h
index a2abc4572b63..82ad401c7dca 100644
--- a/include/asm-mips/rtc.h
+++ b/include/asm-mips/rtc.h
@@ -32,7 +32,7 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
 {
        unsigned long nowtime;
-        nowtime = rtc_get_time();
+        nowtime = rtc_mips_get_time();
        to_tm(nowtime, time);
        time->tm_year -= 1900;
@@ -47,7 +47,7 @@ static inline int set_rtc_time(struct rtc_time *time)
        nowtime = mktime(time->tm_year+1900, time->tm_mon+1,
                        time->tm_mday, time->tm_hour, time->tm_min,
                        time->tm_sec);
-        ret = rtc_set_time(nowtime);
+        ret = rtc_mips_set_time(nowtime);
        return ret;
 }
diff --git a/include/asm-mips/rtlx.h b/include/asm-mips/rtlx.h
index 1298c3fdf6c9..76cd51c6be39 100644
--- a/include/asm-mips/rtlx.h
+++ b/include/asm-mips/rtlx.h
@@ -3,32 +3,46 @@
 *
 */
-#ifndef _RTLX_H
+#ifndef __ASM_RTLX_H
-#define _RTLX_H_
+#define __ASM_RTLX_H_
 #define LX_NODE_BASE 10
 #define MIPSCPU_INT_BASE       16
 #define MIPS_CPU_RTLX_IRQ 0
-#define RTLX_VERSION 1
+#define RTLX_VERSION 2
 #define RTLX_xID 0x12345600
 #define RTLX_ID (RTLX_xID | RTLX_VERSION)
 #define RTLX_CHANNELS 8
-#define RTLX_BUFFER_SIZE 1024
+#define RTLX_CHANNEL_STDIO      0
+#define RTLX_CHANNEL_DBG        1
+#define RTLX_CHANNEL_SYSIO      2
-/*
+extern int rtlx_open(int index, int can_sleep);
- * lx_state bits
+extern int rtlx_release(int index);
- */
+extern ssize_t rtlx_read(int index, void *buff, size_t count, int user);
-#define RTLX_STATE_OPENED 1UL
+extern ssize_t rtlx_write(int index, void *buffer, size_t count, int user);
+extern unsigned int rtlx_read_poll(int index, int can_sleep);
+extern unsigned int rtlx_write_poll(int index);
+enum rtlx_state {
+        RTLX_STATE_UNUSED,
+        RTLX_STATE_INITIALISED,
+        RTLX_STATE_REMOTE_READY,
+        RTLX_STATE_OPENED
+};
+#define RTLX_BUFFER_SIZE 1024
 /* each channel supports read and write.
   linux (vpe0) reads lx_buffer  and writes rt_buffer
   SP (vpe1) reads rt_buffer and writes lx_buffer
 */
 struct rtlx_channel {
-        unsigned long lx_state;
+        enum rtlx_state rt_state;
+        enum rtlx_state lx_state;
        int buffer_size;
@@ -38,15 +52,13 @@ struct rtlx_channel {
        int lx_write, lx_read;
        char *lx_buffer;
-        void *queues;
 };
 struct rtlx_info {
        unsigned long id;
+        enum rtlx_state state;
        struct rtlx_channel channel[RTLX_CHANNELS];
 };
-#endif /* _RTLX_H_ */
+#endif /* __ASM_RTLX_H_ */
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index 7b2366412203..7196ceb0e948 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -77,15 +77,15 @@
 #include <asm/it8712.h>
 #define ITE_SERIAL_PORT_DEFNS                                  \
    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_UART_BASE), \
-      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 }, \
+      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .port = PORT_16550 }, \
    { .baud_base = (24000000/(16*13)), .port = (IT8172_PCI_IO_BASE + IT8712_UART1_PORT), \
-      .irq = IT8172_SERIRQ_4, .flags = STD_COM_FLAGS, .type = 0x3 }, \
+      .irq = IT8172_SERIRQ_4, .flags = STD_COM_FLAGS, .port = PORT_16550 }, \
    /* Smart Card Reader 0 */ \
    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR0_BASE), \
-      .irq = IT8172_SCR0_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 }, \
+      .irq = IT8172_SCR0_IRQ, .flags = STD_COM_FLAGS, .port = PORT_16550 }, \
    /* Smart Card Reader 1 */ \
    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
-      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },
+      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .port = PORT_16550 },
 #else
 #define ITE_SERIAL_PORT_DEFNS
 #endif
@@ -95,10 +95,10 @@
 #include <asm/it8172/it8172_int.h>
 #define IVR_SERIAL_PORT_DEFNS                                  \
    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_UART_BASE), \
-      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },         \
+      .irq = IT8172_UART_IRQ, .flags = STD_COM_FLAGS, .port = PORT_16550 },         \
    /* Smart Card Reader 1 */ \
    { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \
-      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .type = 0x3 },
+      .irq = IT8172_SCR1_IRQ, .flags = STD_COM_FLAGS, .port = PORT_16550 },
 #else
 #define IVR_SERIAL_PORT_DEFNS
 #endif
diff --git a/include/asm-mips/smtc.h b/include/asm-mips/smtc.h
new file mode 100644
index 000000000000..e1941d1b8726
--- /dev/null
+++ b/include/asm-mips/smtc.h
@@ -0,0 +1,55 @@
+#ifndef _ASM_SMTC_MT_H
+#define _ASM_SMTC_MT_H
+/*
+ * Definitions for SMTC multitasking on MIPS MT cores
+ */
+#include <asm/mips_mt.h>
+/*
+ * System-wide SMTC status information
+ */
+extern unsigned int smtc_status;
+#define SMTC_TLB_SHARED 0x00000001
+#define SMTC_MTC_ACTIVE 0x00000002
+/*
+ * TLB/ASID Management information
+ */
+#define MAX_SMTC_TLBS 2
+#define MAX_SMTC_ASIDS 256
+#if NR_CPUS <= 8
+typedef char asiduse;
+#else
+#if NR_CPUS <= 16
+typedef short asiduse;
+#else
+typedef long asiduse;
+#endif
+#endif
+extern asiduse smtc_live_asid[MAX_SMTC_TLBS][MAX_SMTC_ASIDS];
+void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu);
+void smtc_flush_tlb_asid(unsigned long asid);
+extern int mipsmt_build_cpu_map(int startslot);
+extern void mipsmt_prepare_cpus(void);
+extern void smtc_smp_finish(void);
+extern void smtc_boot_secondary(int cpu, struct task_struct *t);
+/*
+ * Sharing the TLB between multiple VPEs means that the
+ * "random" index selection function is not allowed to
+ * select the current value of the Index register. To
+ * avoid additional TLB pressure, the Index registers
+ * are "parked" with an non-Valid value.
+ */
+#define PARKED_INDEX    ((unsigned int)0x80000000)
+#endif /*  _ASM_SMTC_MT_H */
diff --git a/include/asm-mips/smtc_ipi.h b/include/asm-mips/smtc_ipi.h
new file mode 100644
index 000000000000..f22c3e2f993a
--- /dev/null
+++ b/include/asm-mips/smtc_ipi.h
@@ -0,0 +1,118 @@
+/*
+ * Definitions used in MIPS MT SMTC "Interprocessor Interrupt" code.
+ */
+#ifndef __ASM_SMTC_IPI_H
+#define __ASM_SMTC_IPI_H
+//#define SMTC_IPI_DEBUG
+#ifdef SMTC_IPI_DEBUG
+#include <asm/mipsregs.h>
+#include <asm/mipsmtregs.h>
+#endif /* SMTC_IPI_DEBUG */
+/*
+ * An IPI "message"
+ */
+struct smtc_ipi {
+        struct smtc_ipi *flink;
+        int type;
+        void *arg;
+        int dest;
+#ifdef  SMTC_IPI_DEBUG
+        int sender;
+        long stamp;
+#endif /* SMTC_IPI_DEBUG */
+};
+/*
+ * Defined IPI Types
+ */
+#define LINUX_SMP_IPI 1
+#define SMTC_CLOCK_TICK 2
+/*
+ * A queue of IPI messages
+ */
+struct smtc_ipi_q {
+        struct smtc_ipi *head;
+        spinlock_t lock;
+        struct smtc_ipi *tail;
+        int depth;
+};
+extern struct smtc_ipi_q IPIQ[NR_CPUS];
+extern struct smtc_ipi_q freeIPIq;
+static inline void smtc_ipi_nq(struct smtc_ipi_q *q, struct smtc_ipi *p)
+{
+        long flags;
+        spin_lock_irqsave(&q->lock, flags);
+        if (q->head == NULL)
+                q->head = q->tail = p;
+        else
+                q->tail->flink = p;
+        p->flink = NULL;
+        q->tail = p;
+        q->depth++;
+#ifdef  SMTC_IPI_DEBUG
+        p->sender = read_c0_tcbind();
+        p->stamp = read_c0_count();
+#endif /* SMTC_IPI_DEBUG */
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+static inline struct smtc_ipi *smtc_ipi_dq(struct smtc_ipi_q *q)
+{
+        struct smtc_ipi *p;
+        long flags;
+        spin_lock_irqsave(&q->lock, flags);
+        if (q->head == NULL)
+                p = NULL;
+        else {
+                p = q->head;
+                q->head = q->head->flink;
+                q->depth--;
+                /* Arguably unnecessary, but leaves queue cleaner */
+                if (q->head == NULL)
+                        q->tail = NULL;
+        }
+        spin_unlock_irqrestore(&q->lock, flags);
+        return p;
+}
+static inline void smtc_ipi_req(struct smtc_ipi_q *q, struct smtc_ipi *p)
+{
+        long flags;
+        spin_lock_irqsave(&q->lock, flags);
+        if (q->head == NULL) {
+                q->head = q->tail = p;
+                p->flink = NULL;
+        } else {
+                p->flink = q->head;
+                q->head = p;
+        }
+        q->depth++;
+        spin_unlock_irqrestore(&q->lock, flags);
+}
+static inline int smtc_ipi_qdepth(struct smtc_ipi_q *q)
+{
+        long flags;
+        int retval;
+        spin_lock_irqsave(&q->lock, flags);
+        retval = q->depth;
+        spin_unlock_irqrestore(&q->lock, flags);
+        return retval;
+}
+extern void smtc_send_ipi(int cpu, int type, unsigned int action);
+#endif /* __ASM_SMTC_IPI_H */
diff --git a/include/asm-mips/smtc_proc.h b/include/asm-mips/smtc_proc.h
new file mode 100644
index 000000000000..25da651f1f5f
--- /dev/null
+++ b/include/asm-mips/smtc_proc.h
@@ -0,0 +1,23 @@
+/*
+ * Definitions for SMTC /proc entries
+ * Copyright(C) 2005 MIPS Technologies Inc.
+ */
+#ifndef __ASM_SMTC_PROC_H
+#define __ASM_SMTC_PROC_H
+/*
+ * per-"CPU" statistics
+ */
+struct smtc_cpu_proc {
+        unsigned long timerints;
+        unsigned long selfipis;
+};
+extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
+/* Count of number of recoveries of "stolen" FPU access rights on 34K */
+extern atomic_t smtc_fpu_recoveries;
+#endif /* __ASM_SMTC_PROC_H */
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index 2acf3e844f00..c4856a874965 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -14,9 +14,14 @@
 #include <linux/threads.h>
 #include <asm/asm.h>
+#include <asm/asmmacro.h>
 #include <asm/mipsregs.h>
 #include <asm/asm-offsets.h>
+#ifdef CONFIG_MIPS_MT_SMTC
+#include <asm/mipsmtregs.h>
+#endif /* CONFIG_MIPS_MT_SMTC */
                .macro  SAVE_AT
                .set    push
                .set    noat
@@ -57,13 +62,30 @@
 #ifdef CONFIG_SMP
                .macro  get_saved_sp    /* SMP variation */
 #ifdef CONFIG_32BIT
+#ifdef CONFIG_MIPS_MT_SMTC
+                .set    mips32
+                mfc0    k0, CP0_TCBIND;
+                .set    mips0
+                lui     k1, %hi(kernelsp)
+                srl     k0, k0, 19
+                /* No need to shift down and up to clear bits 0-1 */
+#else
                mfc0    k0, CP0_CONTEXT
                lui     k1, %hi(kernelsp)
                srl     k0, k0, 23
+#endif
                addu    k1, k0
                LONG_L  k1, %lo(kernelsp)(k1)
 #endif
 #ifdef CONFIG_64BIT
+#ifdef CONFIG_MIPS_MT_SMTC
+                .set    mips64
+                mfc0    k0, CP0_TCBIND;
+                .set    mips0
+                lui     k0, %highest(kernelsp)
+                dsrl    k1, 19
+                /* No need to shift down and up to clear bits 0-2 */
+#else
                MFC0    k1, CP0_CONTEXT
                lui     k0, %highest(kernelsp)
                dsrl    k1, 23
@@ -71,20 +93,31 @@
                dsll    k0, k0, 16
                daddiu  k0, %hi(kernelsp)
                dsll    k0, k0, 16
+#endif /* CONFIG_MIPS_MT_SMTC */
                daddu   k1, k1, k0
                LONG_L  k1, %lo(kernelsp)(k1)
-#endif
+#endif /* CONFIG_64BIT */
                .endm
                .macro  set_saved_sp stackp temp temp2
 #ifdef CONFIG_32BIT
+#ifdef CONFIG_MIPS_MT_SMTC
+                mfc0    \temp, CP0_TCBIND
+                srl     \temp, 19
+#else
                mfc0    \temp, CP0_CONTEXT
                srl     \temp, 23
 #endif
+#endif
 #ifdef CONFIG_64BIT
+#ifdef CONFIG_MIPS_MT_SMTC
+                mfc0    \temp, CP0_TCBIND
+                dsrl    \temp, 19
+#else
                MFC0    \temp, CP0_CONTEXT
                dsrl    \temp, 23
 #endif
+#endif
                LONG_S  \stackp, kernelsp(\temp)
                .endm
 #else
@@ -122,10 +155,25 @@
                PTR_SUBU sp, k1, PT_SIZE
                LONG_S  k0, PT_R29(sp)
                LONG_S  $3, PT_R3(sp)
+                /*
+                 * You might think that you don't need to save $0,
+                 * but the FPU emulator and gdb remote debug stub
+                 * need it to operate correctly
+                 */
                LONG_S  $0, PT_R0(sp)
                mfc0    v1, CP0_STATUS
                LONG_S  $2, PT_R2(sp)
                LONG_S  v1, PT_STATUS(sp)
+#ifdef CONFIG_MIPS_MT_SMTC
+                /*
+                 * Ideally, these instructions would be shuffled in
+                 * to cover the pipeline delay.
+                 */
+                .set    mips32
+                mfc0    v1, CP0_TCSTATUS
+                .set    mips0
+                LONG_S  v1, PT_TCSTATUS(sp)
+#endif /* CONFIG_MIPS_MT_SMTC */
                LONG_S  $4, PT_R4(sp)
                mfc0    v1, CP0_CAUSE
                LONG_S  $5, PT_R5(sp)
@@ -234,14 +282,36 @@
                .endm
 #else
+/*
+ * For SMTC kernel, global IE should be left set, and interrupts
+ * controlled exclusively via IXMT.
+ */
+#ifdef CONFIG_MIPS_MT_SMTC
+#define STATMASK 0x1e
+#else
+#define STATMASK 0x1f
+#endif
                .macro  RESTORE_SOME
                .set    push
                .set    reorder
                .set    noat
+#ifdef CONFIG_MIPS_MT_SMTC
+                .set    mips32r2
+                /*
+                 * This may not really be necessary if ints are already
+                 * inhibited here.
+                 */
+                mfc0    v0, CP0_TCSTATUS
+                ori     v0, TCSTATUS_IXMT
+                mtc0    v0, CP0_TCSTATUS
+                ehb
+                DMT     5                               # dmt a1
+                jal     mips_ihb
+#endif /* CONFIG_MIPS_MT_SMTC */
                mfc0    a0, CP0_STATUS
-                ori     a0, 0x1f
+                ori     a0, STATMASK
-                xori    a0, 0x1f
+                xori    a0, STATMASK
                mtc0    a0, CP0_STATUS
                li      v1, 0xff00
                and     a0, v1
@@ -250,6 +320,26 @@
                and     v0, v1
                or      v0, a0
                mtc0    v0, CP0_STATUS
+#ifdef CONFIG_MIPS_MT_SMTC
+/*
+ * Only after EXL/ERL have been restored to status can we
+ * restore TCStatus.IXMT.
+ */
+                LONG_L  v1, PT_TCSTATUS(sp)
+                ehb
+                mfc0    v0, CP0_TCSTATUS
+                andi    v1, TCSTATUS_IXMT
+                /* We know that TCStatua.IXMT should be set from above */
+                xori    v0, v0, TCSTATUS_IXMT
+                or      v0, v0, v1
+                mtc0    v0, CP0_TCSTATUS
+                ehb
+                andi    a1, a1, VPECONTROL_TE
+                beqz    a1, 1f
+                emt
+1:
+                .set    mips0
+#endif /* CONFIG_MIPS_MT_SMTC */
                LONG_L  v1, PT_EPC(sp)
                MTC0    v1, CP0_EPC
                LONG_L  $31, PT_R31(sp)
@@ -302,11 +392,33 @@
 * Set cp0 enable bit as sign that we're running on the kernel stack
 */
                .macro  CLI
+#if !defined(CONFIG_MIPS_MT_SMTC)
                mfc0    t0, CP0_STATUS
                li      t1, ST0_CU0 | 0x1f
                or      t0, t1
                xori    t0, 0x1f
                mtc0    t0, CP0_STATUS
+#else /* CONFIG_MIPS_MT_SMTC */
+                /*
+                 * For SMTC, we need to set privilege
+                 * and disable interrupts only for the
+                 * current TC, using the TCStatus register.
+                 */
+                mfc0    t0,CP0_TCSTATUS
+                /* Fortunately CU 0 is in the same place in both registers */
+                /* Set TCU0, TMX, TKSU (for later inversion) and IXMT */
+                li      t1, ST0_CU0 | 0x08001c00
+                or      t0,t1
+                /* Clear TKSU, leave IXMT */
+                xori    t0, 0x00001800
+                mtc0    t0, CP0_TCSTATUS
+                ehb
+                /* We need to leave the global IE bit set, but clear EXL...*/
+                mfc0    t0, CP0_STATUS
+                ori     t0, ST0_EXL | ST0_ERL
+                xori    t0, ST0_EXL | ST0_ERL
+                mtc0    t0, CP0_STATUS
+#endif /* CONFIG_MIPS_MT_SMTC */
                irq_disable_hazard
                .endm
@@ -315,11 +427,35 @@
 * Set cp0 enable bit as sign that we're running on the kernel stack
 */
                .macro  STI
+#if !defined(CONFIG_MIPS_MT_SMTC)
                mfc0    t0, CP0_STATUS
                li      t1, ST0_CU0 | 0x1f
                or      t0, t1
                xori    t0, 0x1e
                mtc0    t0, CP0_STATUS
+#else /* CONFIG_MIPS_MT_SMTC */
+                /*
+                 * For SMTC, we need to set privilege
+                 * and enable interrupts only for the
+                 * current TC, using the TCStatus register.
+                 */
+                ehb
+                mfc0    t0,CP0_TCSTATUS
+                /* Fortunately CU 0 is in the same place in both registers */
+                /* Set TCU0, TKSU (for later inversion) and IXMT */
+                li      t1, ST0_CU0 | 0x08001c00
+                or      t0,t1
+                /* Clear TKSU *and* IXMT */
+                xori    t0, 0x00001c00
+                mtc0    t0, CP0_TCSTATUS
+                ehb
+                /* We need to leave the global IE bit set, but clear EXL...*/
+                mfc0    t0, CP0_STATUS
+                ori     t0, ST0_EXL
+                xori    t0, ST0_EXL
+                mtc0    t0, CP0_STATUS
+                /* irq_enable_hazard below should expand to EHB for 24K/34K cpus */
+#endif /* CONFIG_MIPS_MT_SMTC */
                irq_enable_hazard
                .endm
@@ -328,11 +464,56 @@
 * Set cp0 enable bit as sign that we're running on the kernel stack
 */
                .macro  KMODE
+#ifdef CONFIG_MIPS_MT_SMTC
+                /*
+                 * This gets baroque in SMTC.  We want to
+                 * protect the non-atomic clearing of EXL
+                 * with DMT/EMT, but we don't want to take
+                 * an interrupt while DMT is still in effect.
+                 */
+                /* KMODE gets invoked from both reorder and noreorder code */
+                .set    push
+                .set    mips32r2
+                .set    noreorder
+                mfc0    v0, CP0_TCSTATUS
+                andi    v1, v0, TCSTATUS_IXMT
+                ori     v0, TCSTATUS_IXMT
+                mtc0    v0, CP0_TCSTATUS
+                ehb
+                DMT     2                               # dmt   v0
+                /*
+                 * We don't know a priori if ra is "live"
+                 */
+                move    t0, ra
+                jal     mips_ihb
+                nop     /* delay slot */
+                move    ra, t0
+#endif /* CONFIG_MIPS_MT_SMTC */
                mfc0    t0, CP0_STATUS
                li      t1, ST0_CU0 | 0x1e
                or      t0, t1
                xori    t0, 0x1e
                mtc0    t0, CP0_STATUS
+#ifdef CONFIG_MIPS_MT_SMTC
+                ehb
+                andi    v0, v0, VPECONTROL_TE
+                beqz    v0, 2f
+                nop     /* delay slot */
+                emt
+2:
+                mfc0    v0, CP0_TCSTATUS
+                /* Clear IXMT, then OR in previous value */
+                ori     v0, TCSTATUS_IXMT
+                xori    v0, TCSTATUS_IXMT
+                or      v0, v1, v0
+                mtc0    v0, CP0_TCSTATUS
+                /*
+                 * irq_disable_hazard below should expand to EHB
+                 * on 24K/34K CPUS
+                 */
+                .set pop
+#endif /* CONFIG_MIPS_MT_SMTC */
                irq_disable_hazard
                .endm
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 4097fac5ac3c..261f71d16a07 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -155,6 +155,37 @@ extern asmlinkage void *resume(void *last, void *next, void *next_ti);
 struct task_struct;
+#ifdef CONFIG_MIPS_MT_FPAFF
+/*
+ * Handle the scheduler resume end of FPU affinity management.  We do this
+ * inline to try to keep the overhead down. If we have been forced to run on
+ * a "CPU" with an FPU because of a previous high level of FP computation,
+ * but did not actually use the FPU during the most recent time-slice (CU1
+ * isn't set), we undo the restriction on cpus_allowed.
+ *
+ * We're not calling set_cpus_allowed() here, because we have no need to
+ * force prompt migration - we're already switching the current CPU to a
+ * different thread.
+ */
+#define switch_to(prev,next,last)                                       \
+do {                                                                    \
+        if (cpu_has_fpu &&                                              \
+            (prev->thread.mflags & MF_FPUBOUND) &&                      \
+             (!(KSTK_STATUS(prev) & ST0_CU1))) {                        \
+                prev->thread.mflags &= ~MF_FPUBOUND;                    \
+                prev->cpus_allowed = prev->thread.user_cpus_allowed;    \
+        }                                                               \
+        if (cpu_has_dsp)                                                \
+                __save_dsp(prev);                                       \
+        next->thread.emulated_fp = 0;                                   \
+        (last) = resume(prev, next, next->thread_info);                 \
+        if (cpu_has_dsp)                                                \
+                __restore_dsp(current);                                 \
+} while(0)
+#else
 #define switch_to(prev,next,last)                                       \
 do {                                                                    \
        if (cpu_has_dsp)                                                \
@@ -163,6 +194,7 @@ do {									\
        if (cpu_has_dsp)                                                \
                __restore_dsp(current);                                 \
 } while(0)
+#endif
 /*
 * On SMP systems, when the scheduler does migration-cost autodetection,
@@ -440,8 +472,8 @@ static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
 extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned long len);
 extern void *set_vi_handler (int n, void *addr);
-extern void *set_vi_srs_handler (int n, void *addr, int regset);
 extern void *set_except_vector(int n, void *addr);
+extern unsigned long ebase;
 extern void per_cpu_trap_init(void);
 extern NORET_TYPE void die(const char *, struct pt_regs *);
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index b5c78a4a0192..1068fe9a0a58 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -324,16 +324,18 @@
 #define __NR_pselect6                   (__NR_Linux + 301)
 #define __NR_ppoll                      (__NR_Linux + 302)
 #define __NR_unshare                    (__NR_Linux + 303)
+#define __NR_splice                     (__NR_Linux + 304)
+#define __NR_sync_file_range            (__NR_Linux + 305)
 /*
 * Offset of the last Linux o32 flavoured syscall
 */
-#define __NR_Linux_syscalls             303
+#define __NR_Linux_syscalls             305
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         303
+#define __NR_O32_Linux_syscalls         305
 #if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -604,16 +606,18 @@
 #define __NR_pselect6                   (__NR_Linux + 260)
 #define __NR_ppoll                      (__NR_Linux + 261)
 #define __NR_unshare                    (__NR_Linux + 262)
+#define __NR_splice                     (__NR_Linux + 263)
+#define __NR_sync_file_range            (__NR_Linux + 264)
 /*
 * Offset of the last Linux 64-bit flavoured syscall
 */
-#define __NR_Linux_syscalls             262
+#define __NR_Linux_syscalls             264
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          262
+#define __NR_64_Linux_syscalls          264
 #if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -888,16 +892,18 @@
 #define __NR_pselect6                   (__NR_Linux + 264)
 #define __NR_ppoll                      (__NR_Linux + 265)
 #define __NR_unshare                    (__NR_Linux + 266)
+#define __NR_splice                     (__NR_Linux + 267)
+#define __NR_sync_file_range            (__NR_Linux + 268)
 /*
 * Offset of the last N32 flavoured syscall
 */
-#define __NR_Linux_syscalls             266
+#define __NR_Linux_syscalls             268
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         266
+#define __NR_N32_Linux_syscalls         268
 #ifndef __ASSEMBLY__
diff --git a/include/asm-mips/vpe.h b/include/asm-mips/vpe.h
new file mode 100644
index 000000000000..c6e1b961537d
--- /dev/null
+++ b/include/asm-mips/vpe.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
+ *
+ *  This program is free software; you can distribute it and/or modify it
+ *  under the terms of the GNU General Public License (Version 2) as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ *
+ */
+#ifndef _ASM_VPE_H
+#define _ASM_VPE_H
+struct vpe_notifications {
+        void (*start)(int vpe);
+        void (*stop)(int vpe);
+        struct list_head list;
+};
+extern int vpe_notify(int index, struct vpe_notifications *notify);
+extern void *vpe_get_shared(int index);
+extern int vpe_getuid(int index);
+extern int vpe_getgid(int index);
+extern char *vpe_getcwd(int index);
+#endif /* _ASM_VPE_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/irq.h b/include/asm-powerpc/irq.h
index 51f87d9993b6..7bc6d73b2823 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -54,6 +54,13 @@
 */
 extern unsigned int virt_irq_to_real_map[NR_IRQS];
+/* The maximum virtual IRQ number that we support.  This
+ * can be set by the platform and will be reduced by the
+ * value of __irq_offset_value.  It defaults to and is
+ * capped by (NR_IRQS - 1).
+ */
+extern unsigned int virt_irq_max;
 /* Create a mapping for a real_irq if it doesn't already exist.
 * Return the virtual irq as a convenience.
 */
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-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h
index ffc7462d77ba..88b553c6b26c 100644
--- a/include/asm-powerpc/thread_info.h
+++ b/include/asm-powerpc/thread_info.h
@@ -37,6 +37,8 @@ struct thread_info {
        int             preempt_count;          /* 0 => preemptable,
                                                   <0 => BUG */
        struct restart_block restart_block;
+        unsigned long   local_flags;            /* private flags for thread */
        /* low level flags - has atomic operations done on it */
        unsigned long   flags ____cacheline_aligned_in_smp;
 };
@@ -143,6 +145,12 @@ static inline struct thread_info *current_thread_info(void)
                                 _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK)
 #define _TIF_PERSYSCALL_MASK    (_TIF_RESTOREALL|_TIF_NOERROR)
+/* Bits in local_flags */
+/* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
+#define TLF_NAPPING             0       /* idle thread enabled NAP mode */
+#define _TLF_NAPPING            (1 << TLF_NAPPING)
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_THREAD_INFO_H */
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index 536ba0873052..c612f1a62772 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -302,8 +302,9 @@
 #define __NR_ppoll              281
 #define __NR_unshare            282
 #define __NR_splice             283
+#define __NR_tee                284
-#define __NR_syscalls           284
+#define __NR_syscalls           285
 #ifdef __KERNEL__
 #define __NR__exit __NR_exit
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/unistd.h b/include/asm-sparc/unistd.h
index 264f0ebeaedc..45feff893b8e 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -248,7 +248,7 @@
 #define __NR_setfsgid           229 /* Linux Specific                              */
 #define __NR__newselect         230 /* Linux Specific                              */
 #define __NR_time               231 /* Linux Specific                              */
-#define __NR_sys_splice         232 /* Linux Specific                              */
+#define __NR_splice             232 /* Linux Specific                              */
 #define __NR_stime              233 /* Linux Specific                              */
 #define __NR_statfs64           234 /* Linux Specific                              */
 #define __NR_fstatfs64          235 /* Linux Specific                              */
@@ -296,7 +296,7 @@
 #define __NR_mq_notify          277
 #define __NR_mq_getsetattr      278
 #define __NR_waitid             279
-#define __NR_sys_setaltroot     280
+#define __NR_tee                280
 #define __NR_add_key            281
 #define __NR_request_key        282
 #define __NR_keyctl             283
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-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index d0544b4f47b7..597f6923a46e 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -250,7 +250,7 @@
 #ifdef __KERNEL__
 #define __NR_time               231 /* Linux sparc32                               */
 #endif
-#define __NR_sys_splice         232 /* Linux Specific                              */
+#define __NR_splice             232 /* Linux Specific                              */
 #define __NR_stime              233 /* Linux Specific                              */
 #define __NR_statfs64           234 /* Linux Specific                              */
 #define __NR_fstatfs64          235 /* Linux Specific                              */
@@ -298,7 +298,7 @@
 #define __NR_mq_notify          277
 #define __NR_mq_getsetattr      278
 #define __NR_waitid             279
-/*#define __NR_sys_setaltroot   280 available (was setaltroot) */
+#define __NR_tee                280
 #define __NR_add_key            281
 #define __NR_request_key        282
 #define __NR_keyctl             283
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/cache.h b/include/asm-x86_64/cache.h
index c8043a16152e..f8dff1c67538 100644
--- a/include/asm-x86_64/cache.h
+++ b/include/asm-x86_64/cache.h
@@ -20,8 +20,8 @@
       __attribute__((__section__(".data.page_aligned")))
 #endif
-#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #endif
diff --git a/include/asm-x86_64/cpufeature.h b/include/asm-x86_64/cpufeature.h
index 76bb6193ae91..662964b74e34 100644
--- a/include/asm-x86_64/cpufeature.h
+++ b/include/asm-x86_64/cpufeature.h
@@ -64,6 +64,7 @@
 #define X86_FEATURE_REP_GOOD    (3*32+ 4) /* rep microcode works well on this CPU */
 #define X86_FEATURE_CONSTANT_TSC (3*32+5) /* TSC runs at constant rate */
 #define X86_FEATURE_SYNC_RDTSC  (3*32+6)  /* RDTSC syncs CPU core */
+#define X86_FEATURE_FXSAVE_LEAK (3*32+7)  /* FIP/FOP/FDP leaks through FXSAVE */
 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_XMM3        (4*32+ 0) /* Streaming SIMD Extensions-3 */
diff --git a/include/asm-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/i387.h b/include/asm-x86_64/i387.h
index 876eb9a2fe78..cba8a3b0cded 100644
--- a/include/asm-x86_64/i387.h
+++ b/include/asm-x86_64/i387.h
@@ -72,6 +72,23 @@ extern int set_fpregs(struct task_struct *tsk,
 #define set_fpu_swd(t,val) ((t)->thread.i387.fxsave.swd = (val))
 #define set_fpu_fxsr_twd(t,val) ((t)->thread.i387.fxsave.twd = (val))
+#define X87_FSW_ES (1 << 7)     /* Exception Summary */
+/* AMD CPUs don't save/restore FDP/FIP/FOP unless an exception
+   is pending. Clear the x87 state here by setting it to fixed
+   values. The kernel data segment can be sometimes 0 and sometimes
+   new user value. Both should be ok.
+   Use the PDA as safe address because it should be already in L1. */
+static inline void clear_fpu_state(struct i387_fxsave_struct *fx)
+{
+        if (unlikely(fx->swd & X87_FSW_ES))
+                 asm volatile("fnclex");
+        alternative_input(ASM_NOP8 ASM_NOP2,
+                     "    emms\n"               /* clear stack tags */
+                     "    fildl %%gs:0",        /* load to clear state */
+                     X86_FEATURE_FXSAVE_LEAK);
+}
 static inline int restore_fpu_checking(struct i387_fxsave_struct *fx) 
 { 
        int err;
@@ -119,6 +136,7 @@ static inline int save_i387_checking(struct i387_fxsave_struct __user *fx)
 #endif
        if (unlikely(err))
                __clear_user(fx, sizeof(struct i387_fxsave_struct));
+        /* No need to clear here because the caller clears USED_MATH */
        return err;
 } 
@@ -149,7 +167,7 @@ static inline void __fxsave_clear(struct task_struct *tsk)
                                "i" (offsetof(__typeof__(*tsk),
                                              thread.i387.fxsave)));
 #endif
-        __asm__ __volatile__("fnclex");
+        clear_fpu_state(&tsk->thread.i387.fxsave);
 }
 static inline void kernel_fpu_begin(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/mmzone.h b/include/asm-x86_64/mmzone.h
index 6b18cd8f293d..6944e7122df5 100644
--- a/include/asm-x86_64/mmzone.h
+++ b/include/asm-x86_64/mmzone.h
@@ -12,7 +12,8 @@
 #include <asm/smp.h>
-#define NODEMAPSIZE 0xfff
+/* Should really switch to dynamic allocation at some point */
+#define NODEMAPSIZE 0x4fff
 /* Simple perfect hash to map physical addresses to node numbers */
 struct memnode {
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/percpu.h b/include/asm-x86_64/percpu.h
index 4405b4adeaba..7f33aaf9f7b1 100644
--- a/include/asm-x86_64/percpu.h
+++ b/include/asm-x86_64/percpu.h
@@ -26,7 +26,7 @@
 #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-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-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index f21ff2c1e960..98c36eae567c 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -611,8 +611,12 @@ __SYSCALL(__NR_set_robust_list, sys_set_robust_list)
 __SYSCALL(__NR_get_robust_list, sys_get_robust_list)
 #define __NR_splice             275
 __SYSCALL(__NR_splice, sys_splice)
+#define __NR_tee                276
+__SYSCALL(__NR_tee, sys_tee)
+#define __NR_sync_file_range    277
+__SYSCALL(__NR_sync_file_range, sys_sync_file_range)
-#define __NR_syscall_max __NR_splice
+#define __NR_syscall_max __NR_sync_file_range
 #ifndef __NO_STUBS
diff --git a/include/asm-xtensa/ioctls.h b/include/asm-xtensa/ioctls.h
index 10c443435c11..3b89a772d0a0 100644
--- a/include/asm-xtensa/ioctls.h
+++ b/include/asm-xtensa/ioctls.h
@@ -107,6 +107,6 @@
 #define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* Set multiport config */
 #define TIOCMIWAIT      _IO('T', 92) /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     _IOR('T', 93, struct async_icount) /* read serial port inline interrupt counts */
+#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
 #endif /* _XTENSA_IOCTLS_H */
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/blkdev.h b/include/linux/blkdev.h
index d0cac8b58de7..59e1259b1c40 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -17,6 +17,8 @@
 #include <asm/scatterlist.h>
+struct scsi_ioctl_command;
 struct request_queue;
 typedef struct request_queue request_queue_t;
 struct elevator_queue;
@@ -611,6 +613,8 @@ extern void blk_plug_device(request_queue_t *);
 extern int blk_remove_plug(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
 extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *);
+extern int sg_scsi_ioctl(struct file *, struct request_queue *,
+                struct gendisk *, struct scsi_ioctl_command __user *);
 extern void blk_start_queue(request_queue_t *q);
 extern void blk_stop_queue(request_queue_t *q);
 extern void blk_sync_queue(struct request_queue *q);
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 16be62041bfe..ff56c0bec43c 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 *, loff_t *, size_t, unsigned int);
-        ssize_t (*splice_read)(struct file *, struct inode *, size_t, unsigned int);
+        ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
 };
 struct inode_operations {
@@ -1614,8 +1614,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 *, loff_t *,
+                struct pipe_inode_info *, size_t, unsigned int);
+extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
+                struct file *, loff_t *, size_t, unsigned int);
+extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+                struct file *out, loff_t *, size_t len, unsigned int flags);
+extern long do_splice_direct(struct file *in, loff_t *ppos, 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/genhd.h b/include/linux/genhd.h
index 10a27f29d692..2ef845b35175 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -105,6 +105,7 @@ struct gendisk {
                                         * disks that can't be partitioned. */
        char disk_name[32];             /* name of major driver */
        struct hd_struct **part;        /* [indexed by minor] */
+        int part_uevent_suppress;
        struct block_device_operations *fops;
        struct request_queue *queue;
        void *private_data;
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/ide.h b/include/linux/ide.h
index 8d2db412ba9c..a8bef1d1371c 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1220,7 +1220,6 @@ typedef struct ide_pci_enablebit_s {
 enum {
        /* Uses ISA control ports not PCI ones. */
        IDEPCI_FLAG_ISA_PORTS           = (1 << 0),
-        IDEPCI_FLAG_FORCE_PDC           = (1 << 1),
 };
 typedef struct ide_pci_device_s {
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 c73ed0b05591..2ae50277f581 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -177,7 +177,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/kobject.h b/include/linux/kobject.h
index 4cb1214ec290..dcd0623be892 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -24,6 +24,7 @@
 #include <linux/rwsem.h>
 #include <linux/kref.h>
 #include <linux/kernel.h>
+#include <linux/wait.h>
 #include <asm/atomic.h>
 #define KOBJ_NAME_LEN                   20
@@ -56,6 +57,7 @@ struct kobject {
        struct kset             * kset;
        struct kobj_type        * ktype;
        struct dentry           * dentry;
+        wait_queue_head_t       poll;
 };
 extern int kobject_set_name(struct kobject *, const char *, ...)
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 0d61357604d5..b80d2e7fa6d2 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -523,7 +523,6 @@ 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 int ata_scsi_error(struct Scsi_Host *host);
 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);
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 968b1aa3732c..911206386171 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,8 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
        dump_stack();
        return -ENOSYS;
 }
+extern int add_memory(u64 start, u64 size);
+extern int remove_memory(u64 start, u64 size);
 #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/mv643xx.h b/include/linux/mv643xx.h
index 955d3069d727..edfa012fad3a 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_MV643XX_H
 #define __ASM_MV643XX_H
-#ifdef __MIPS__
+#ifdef __mips__
 #include <asm/addrspace.h>
 #include <asm/marvell.h>
 #endif
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/pci.h b/include/linux/pci.h
index 0aad5a378e95..3a6a4e37a482 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -97,7 +97,13 @@ enum pci_channel_state {
 typedef unsigned short __bitwise pci_bus_flags_t;
 enum pci_bus_flags {
-        PCI_BUS_FLAGS_NO_MSI = (pci_bus_flags_t) 1,
+        PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
+};
+struct pci_cap_saved_state {
+        struct hlist_node next;
+        char cap_nr;
+        u32 data[0];
 };
 /*
@@ -159,6 +165,7 @@ struct pci_dev {
        unsigned int    block_ucfg_access:1;    /* userspace config space access is blocked */
        u32             saved_config_space[16]; /* config space saved at suspend time */
+        struct hlist_head saved_cap_space;
        struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
        int rom_attr_enabled;           /* has display of the rom attribute been enabled? */
        struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
@@ -169,6 +176,30 @@ struct pci_dev {
 #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
 #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
+static inline struct pci_cap_saved_state *pci_find_saved_cap(
+        struct pci_dev *pci_dev,char cap)
+{
+        struct pci_cap_saved_state *tmp;
+        struct hlist_node *pos;
+        hlist_for_each_entry(tmp, pos, &pci_dev->saved_cap_space, next) {
+                if (tmp->cap_nr == cap)
+                        return tmp;
+        }
+        return NULL;
+}
+static inline void pci_add_saved_cap(struct pci_dev *pci_dev,
+        struct pci_cap_saved_state *new_cap)
+{
+        hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space);
+}
+static inline void pci_remove_saved_cap(struct pci_cap_saved_state *cap)
+{
+        hlist_del(&cap->next);
+}
 /*
 *  For PCI devices, the region numbers are assigned this way:
 *
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 870fe38378b1..d6fe048376ab 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -356,6 +356,10 @@
 #define PCI_DEVICE_ID_ATI_IXP300_SATA   0x436e
 #define PCI_DEVICE_ID_ATI_IXP400_IDE    0x4376
 #define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
+#define PCI_DEVICE_ID_ATI_IXP400_SATA2  0x437a
+#define PCI_DEVICE_ID_ATI_IXP600_SATA   0x4380
+#define PCI_DEVICE_ID_ATI_IXP600_SRAID  0x4381
+#define PCI_DEVICE_ID_ATI_IXP600_IDE    0x438c
 #define PCI_VENDOR_ID_VLSI              0x1004
 #define PCI_DEVICE_ID_VLSI_82C592       0x0005
@@ -497,7 +501,8 @@
 #define PCI_DEVICE_ID_AMD_8111_SMBUS    0x746b
 #define PCI_DEVICE_ID_AMD_8111_AUDIO    0x746d
 #define PCI_DEVICE_ID_AMD_8151_0        0x7454
-#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
+#define PCI_DEVICE_ID_AMD_8131_BRIDGE   0x7450
+#define PCI_DEVICE_ID_AMD_8131_APIC     0x7451
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
 #define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ec384958d509..ef7f33c0be19 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -21,6 +21,7 @@ struct pipe_buf_operations {
        void (*unmap)(struct pipe_inode_info *, struct pipe_buffer *);
        void (*release)(struct pipe_inode_info *, struct pipe_buffer *);
        int (*steal)(struct pipe_inode_info *, struct pipe_buffer *);
+        void (*get)(struct pipe_inode_info *, struct pipe_buffer *);
 };
 struct pipe_inode_info {
@@ -36,27 +37,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/pm.h b/include/linux/pm.h
index 6df2585c0169..66be58902b17 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -199,6 +199,12 @@ extern int device_suspend(pm_message_t state);
 extern int dpm_runtime_suspend(struct device *, pm_message_t);
 extern void dpm_runtime_resume(struct device *);
+extern void __suspend_report_result(const char *function, void *fn, int ret);
+#define suspend_report_result(fn, ret)                                  \
+        do {                                                            \
+                __suspend_report_result(__FUNCTION__, fn, ret);         \
+        } while (0)
 #else /* !CONFIG_PM */
@@ -219,6 +225,8 @@ static inline void dpm_runtime_resume(struct device * dev)
 {
 }
+#define suspend_report_result(fn, ret) do { } while (0)
 #endif
 /* changes to device_may_wakeup take effect on the next pm state change.
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
index 1252b45face1..008932d73c35 100644
--- a/include/linux/pm_legacy.h
+++ b/include/linux/pm_legacy.h
@@ -16,11 +16,6 @@ struct pm_dev __deprecated *
 pm_register(pm_dev_t type, unsigned long id, pm_callback callback);
 /*
- * Unregister a device with power management
- */
-void __deprecated pm_unregister(struct pm_dev *dev);
-/*
 * Unregister all devices with matching callback
 */
 void __deprecated pm_unregister_all(pm_callback callback);
@@ -41,8 +36,6 @@ static inline struct pm_dev *pm_register(pm_dev_t type,
        return NULL;
 }
-static inline void pm_unregister(struct pm_dev *dev) {}
 static inline void pm_unregister_all(pm_callback callback) {}
 static inline int pm_send_all(pm_request_t rqst, void *data)
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..29b7d4f87d20 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)
@@ -905,7 +911,6 @@ static inline int pid_alive(struct task_struct *p)
 extern void free_task(struct task_struct *tsk);
 #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
-extern void __put_task_struct_cb(struct rcu_head *rhp);
 extern void __put_task_struct(struct task_struct *t);
 static inline void put_task_struct(struct task_struct *t)
@@ -1187,8 +1192,7 @@ extern void wait_task_inactive(task_t * p);
 #define remove_parent(p)        list_del_init(&(p)->sibling)
 #define add_parent(p)           list_add_tail(&(p)->sibling,&(p)->parent->children)
-#define next_task(p)    list_entry((p)->tasks.next, struct task_struct, tasks)
+#define next_task(p)    list_entry(rcu_dereference((p)->tasks.next), struct task_struct, tasks)
-#define prev_task(p)    list_entry((p)->tasks.prev, struct task_struct, tasks)
 #define for_each_process(p) \
        for (p = &init_task ; (p = next_task(p)) != &init_task ; )
@@ -1203,9 +1207,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/sdla_asy.h b/include/linux/sdla_asy.h
deleted file mode 100644
index f62242537c86..000000000000
--- a/include/linux/sdla_asy.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*****************************************************************************
-* sdla_asy.h    Header file for the Sangoma S508/S514 asynchronous code API     
-*
-* Author:       Gideon Hack     
-*
-* Copyright:    (c) 2000 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-*
-* Jan 28, 2000  Gideon Hack     Initial Version
-*
-*****************************************************************************/
-#ifndef _WANPIPE_ASYNC_H
-#define _WANPIPE_ASYNC_H
-/* ----------------------------------------------------------------------------
- *                        Interface commands
- * --------------------------------------------------------------------------*/
-#define SET_ASY_CONFIGURATION           0xE2    /* set the asychronous operational configuration */
-#define READ_ASY_CONFIGURATION          0xE3    /* read the current asychronous operational configuration */
-#define ENABLE_ASY_COMMUNICATIONS       0xE4    /* enable asychronous communications */
-#define DISABLE_ASY_COMMUNICATIONS      0xE5    /* disable asychronous communications */
-#define READ_ASY_OPERATIONAL_STATS      0xE7    /* retrieve the asychronous operational statistics */
-#define FLUSH_ASY_OPERATIONAL_STATS     0xE8    /* flush the asychronous operational statistics */
-#define TRANSMIT_ASY_BREAK_SIGNAL       0xEC    /* transmit an asychronous break signal */
-/* ----------------------------------------------------------------------------
- *                     Return codes from interface commands
- * --------------------------------------------------------------------------*/
-#define COMMAND_INVALID_FOR_PORT        0x50    /* the command is invalid for the selected port */
-#define DISABLE_ASY_COMMS_BEFORE_CFG    0xE1    /* communications must be disabled before setting the configuration */
-#define ASY_COMMS_ENABLED               0xE1    /* communications are currently enabled */
-#define ASY_COMMS_DISABLED              0xE1    /* communications are currently disabled */
-#define ASY_CFG_BEFORE_COMMS_ENABLED    0xE2    /* perform a SET_ASY_CONFIGURATION before enabling comms */
-#define LGTH_ASY_CFG_DATA_INVALID       0xE2    /* the length of the passed configuration data is invalid */
-#define INVALID_ASY_CFG_DATA            0xE3    /* the passed configuration data is invalid */
-#define ASY_BREAK_SIGNAL_BUSY           0xEC    /* a break signal is being transmitted */
-/* ----------------------------------------------------------------------------
- *   Constants for the SET_ASY_CONFIGURATION/READ_ASY_CONFIGURATION command
- * --------------------------------------------------------------------------*/
-/* the asynchronous configuration structure */
-typedef struct {
-        unsigned long baud_rate                 PACKED;                                                 /* the baud rate */     
-        unsigned short line_config_options      PACKED; /* line configuration options */
-        unsigned short modem_config_options     PACKED; /* modem configuration options */
-        unsigned short asy_API_options          PACKED; /* asynchronous API options */
-        unsigned short asy_protocol_options     PACKED; /* asynchronous protocol options */
-        unsigned short Tx_bits_per_char         PACKED; /* number of bits per tx character */
-        unsigned short Rx_bits_per_char         PACKED; /* number of bits per received character */
-        unsigned short stop_bits                PACKED; /* number of stop bits per character */
-        unsigned short parity                   PACKED; /* parity definition */
-        unsigned short break_timer              PACKED; /* the break signal timer */
-        unsigned short asy_Rx_inter_char_timer  PACKED; /* the receive inter-character timer */
-        unsigned short asy_Rx_complete_length   PACKED; /* the receive 'buffer complete' length */
-        unsigned short XON_char                 PACKED; /* the XON character */
-        unsigned short XOFF_char                PACKED; /* the XOFF character */
-        unsigned short asy_statistics_options   PACKED; /* async operational stat options */
-        unsigned long ptr_shared_mem_info_struct    PACKED;/* ptr to the shared memory area information structure */
-        unsigned long ptr_asy_Tx_stat_el_cfg_struct PACKED;/* ptr to the transmit status element configuration structure */
-        unsigned long ptr_asy_Rx_stat_el_cfg_struct PACKED;/* ptr to the receive status element configuration structure */
-} ASY_CONFIGURATION_STRUCT;
-/* permitted minimum and maximum values for setting the asynchronous configuration */
-#define MIN_ASY_BAUD_RATE               50      /* maximum baud rate */
-#define MAX_ASY_BAUD_RATE               250000  /* minimum baud rate */
-#define MIN_ASY_BITS_PER_CHAR           5       /* minimum number of bits per character */
-#define MAX_ASY_BITS_PER_CHAR           8       /* maximum number of bits per character */
-#define MIN_BREAK_TMR_VAL               0       /* minimum break signal timer */
-#define MAX_BREAK_TMR_VAL               5000    /* maximum break signal timer */
-#define MIN_ASY_RX_INTER_CHAR_TMR       0       /* minimum receive inter-character timer */
-#define MAX_ASY_RX_INTER_CHAR_TMR       30000   /* maximum receive inter-character timer */
-#define MIN_ASY_RX_CPLT_LENGTH          0       /* minimum receive 'length complete' value */
-#define MAX_ASY_RX_CPLT_LENGTH          2000    /* maximum receive 'length complete' value */
-/* bit settings for the 'asy_API_options' */
-#define ASY_RX_DATA_TRANSPARENT         0x0001  /* do not strip parity and unused bits from received characters */
-/* bit settings for the 'asy_protocol_options' */
-#define ASY_RTS_HS_FOR_RX               0x0001  /* RTS handshaking is used for reception control */
-#define ASY_XON_XOFF_HS_FOR_RX          0x0002  /* XON/XOFF handshaking is used for reception control */
-#define ASY_XON_XOFF_HS_FOR_TX          0x0004  /* XON/XOFF handshaking is used for transmission control */
-#define ASY_DCD_HS_FOR_TX               0x0008  /* DCD handshaking is used for transmission control */
-#define ASY_CTS_HS_FOR_TX               0x0020  /* CTS handshaking is used for transmission control */
-/* bit settings for the 'stop_bits' definition */
-#define ONE_STOP_BIT                    1                       /* representation for 1 stop bit */
-#define TWO_STOP_BITS                   2                       /* representation for 2 stop bits */
-#define ONE_AND_A_HALF_STOP_BITS        3                       /* representation for 1.5 stop bits */
-/* bit settings for the 'parity' definition */
-#define NO_PARITY                       0                       /* representation for no parity */
-#define ODD_PARITY                      1                       /* representation for odd parity */
-#define EVEN_PARITY                     2                       /* representation for even parity */
-/* ----------------------------------------------------------------------------
- *    Constants for the READ_COMMS_ERROR_STATS command (asynchronous mode)
- * --------------------------------------------------------------------------*/
-/* the communications error statistics structure */
-typedef struct {
-        unsigned short Rx_overrun_err_count     PACKED; /* receiver overrun error count */
-        unsigned short Rx_parity_err_count      PACKED; /* parity errors received count */
-        unsigned short Rx_framing_err_count     PACKED; /* framing errors received count */
-        unsigned short comms_err_stat_reserved_1 PACKED;/* reserved for later use */
-        unsigned short comms_err_stat_reserved_2 PACKED;/* reserved for later use */
-        unsigned short comms_err_stat_reserved_3 PACKED;/* reserved for later use */
-        unsigned short comms_err_stat_reserved_4 PACKED;/* reserved for later use */
-        unsigned short comms_err_stat_reserved_5 PACKED;/* reserved for later use */
-        unsigned short DCD_state_change_count   PACKED; /* DCD state change count */
-        unsigned short CTS_state_change_count   PACKED; /* CTS state change count */
-} ASY_COMMS_ERROR_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *         Constants for the READ_ASY_OPERATIONAL_STATS command
- * --------------------------------------------------------------------------*/
-/* the asynchronous operational statistics structure */
-typedef struct {
-        /* Data transmission statistics */
-        unsigned long Data_blocks_Tx_count PACKED;/* number of blocks transmitted */
-        unsigned long Data_bytes_Tx_count  PACKED;/* number of bytes transmitted */
-        unsigned long Data_Tx_throughput   PACKED;/* transmit throughput */
-        unsigned long no_ms_for_Data_Tx_thruput_comp PACKED;/* millisecond time used for the Tx throughput computation */
-        unsigned long Tx_Data_discard_lgth_err_count PACKED;/* number of Data blocks discarded (length error) */
-        unsigned long reserved_Data_frm_Tx_stat1 PACKED;/* reserved for later use */
-        unsigned long reserved_Data_frm_Tx_stat2 PACKED;/* reserved for later use */
-        unsigned long reserved_Data_frm_Tx_stat3 PACKED;/* reserved for later use */
-        /* Data reception statistics */
-        unsigned long Data_blocks_Rx_count PACKED;/* number of blocks received */
-        unsigned long Data_bytes_Rx_count  PACKED;/* number of bytes received */
-        unsigned long Data_Rx_throughput   PACKED;/* receive throughput */
-        unsigned long no_ms_for_Data_Rx_thruput_comp PACKED;/* millisecond time used for the Rx throughput computation */
-        unsigned long Rx_Data_bytes_discard_count    PACKED;/* received Data bytes discarded */
-        unsigned long reserved_Data_frm_Rx_stat1     PACKED;/* reserved for later use */
-        /* handshaking protocol statistics */
-        unsigned short XON_chars_Tx_count       PACKED; /* number of XON characters transmitted */
-        unsigned short XOFF_chars_Tx_count      PACKED; /* number of XOFF characters transmitted */
-        unsigned short XON_chars_Rx_count       PACKED; /* number of XON characters received */
-        unsigned short XOFF_chars_Rx_count      PACKED; /* number of XOFF characters received */
-        unsigned short Tx_halt_modem_low_count  PACKED; /* number of times Tx halted (modem line low) */
-        unsigned short Rx_halt_RTS_low_count    PACKED; /* number of times Rx halted by setting RTS low */
-        unsigned long reserved_handshaking_stat1 PACKED;/* reserved for later use */
-        /* break statistics */
-        unsigned short break_Tx_count   PACKED; /* number of break sequences transmitted */
-        unsigned short break_Rx_count   PACKED; /* number of break sequences received */
-        unsigned long reserved_break_stat1 PACKED;/* reserved for later use */
-        /* miscellaneous statistics */
-        unsigned long reserved_misc_stat1       PACKED; /* reserved for later use */
-        unsigned long reserved_misc_stat2       PACKED; /* reserved for later use */
-} ASY_OPERATIONAL_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *                      Constants for Data transmission
- * --------------------------------------------------------------------------*/
-/* the Data block transmit status element configuration structure */
-typedef struct {
-        unsigned short number_Tx_status_elements PACKED;                /* number of transmit status elements */
-        unsigned long base_addr_Tx_status_elements PACKED;      /* base address of the transmit element list */
-        unsigned long next_Tx_status_element_to_use PACKED;     /* pointer to the next transmit element to be used */
-} ASY_TX_STATUS_EL_CFG_STRUCT;
-/* the Data block transmit status element structure */
-typedef struct {
-        unsigned char opp_flag PACKED;                                                          /* opp flag */
-        unsigned short data_length PACKED;                                              /* length of the block to be transmitted */
-        unsigned char reserved_1 PACKED;                                                        /* reserved for internal use */
-        unsigned long reserved_2 PACKED;                                                        /* reserved for internal use */
-        unsigned long reserved_3 PACKED;                                                        /* reserved for internal use */
-        unsigned long ptr_data_bfr PACKED;                                              /* pointer to the data area */
-} ASY_DATA_TX_STATUS_EL_STRUCT;
-/* ----------------------------------------------------------------------------
- *                      Constants for Data reception
- * --------------------------------------------------------------------------*/
-/* the Data block receive status element configuration structure */
-typedef struct {
-        unsigned short number_Rx_status_elements    PACKED;/* number of receive status elements */
-        unsigned long base_addr_Rx_status_elements  PACKED;/* base address of the receive element list */
-        unsigned long next_Rx_status_element_to_use PACKED;/* pointer to the next receive element to be used */
-        unsigned long base_addr_Rx_buffer       PACKED;/* base address of the receive data buffer */
-        unsigned long end_addr_Rx_buffer        PACKED;/* end address of the receive data buffer */
-} ASY_RX_STATUS_EL_CFG_STRUCT;
-/* the Data block receive status element structure */
-typedef struct {
-        unsigned char opp_flag          PACKED; /* opp flag */
-        unsigned short data_length      PACKED; /* length of the received data block */
-        unsigned char reserved_1        PACKED; /* reserved for internal use */
-        unsigned short time_stamp       PACKED; /* receive time stamp (HDLC_STREAMING_MODE) */
-        unsigned short data_buffered    PACKED; /* the number of data bytes still buffered */
-        unsigned long reserved_2        PACKED; /* reserved for internal use */
-        unsigned long ptr_data_bfr      PACKED; /* pointer to the data area */
-} ASY_DATA_RX_STATUS_EL_STRUCT;
-#endif
diff --git a/include/linux/sdla_chdlc.h b/include/linux/sdla_chdlc.h
deleted file mode 100644
index d2e35a299034..000000000000
--- a/include/linux/sdla_chdlc.h
+++ /dev/null
@@ -1,813 +0,0 @@
-/*************************************************************************
- sdla_chdlc.h   Sangoma Cisco HDLC firmware API definitions
- Author:        Gideon Hack
-                Nenad Corbic <ncorbic@sangoma.com>      
- Copyright:     (c) 1995-2000 Sangoma Technologies Inc.
-                This program is free software; you can redistribute it and/or
-                modify it under the term of the GNU General Public License
-                as published by the Free Software Foundation; either version
-                2 of the License, or (at your option) any later version.
-===========================================================================
-  Oct 04, 1999  Nenad Corbic    Updated API support
-  Jun 02, 1999  Gideon Hack     Changes for S514 usage.
-  Oct 28, 1998  Jaspreet Singh  Made changes for Dual Port CHDLC.
-  Jun 11, 1998  David Fong      Initial version.
-===========================================================================
- Organization
-        - Compatibility notes
-        - Constants defining the shared memory control block (mailbox)
-        - Interface commands
-        - Return code from interface commands
-        - Constants for the commands (structures for casting data)
-        - UDP Management constants and structures
-*************************************************************************/
-#ifndef _SDLA_CHDLC_H
-#  define _SDLC_CHDLC_H
-/*------------------------------------------------------------------------
-   Notes:
-        All structres defined in this file are byte-aligned.  
-        Compiler        Platform
-        ------------------------
-        GNU C           Linux
------------------------------------------------------------------------*/
-#ifndef PACKED
-#define PACKED __attribute__((packed))
-#endif  /* PACKED */
-/* ----------------------------------------------------------------------------
- *        Constants defining the shared memory control block (mailbox)
- * --------------------------------------------------------------------------*/
-#define PRI_BASE_ADDR_MB_STRUCT         0xE000  /* the base address of the mailbox structure on the adapter */
-#define SEC_BASE_ADDR_MB_STRUCT         0xE800  /* the base address of the mailbox structure on the adapter */
-#define SIZEOF_MB_DATA_BFR              2032    /* the size of the actual mailbox data area */
-#define NUMBER_MB_RESERVED_BYTES        0x0B    /* the number of reserved bytes in the mailbox header area */
-#define MIN_LGTH_CHDLC_DATA_CFG         300     /* min length of the CHDLC data field (for configuration purposes) */
-#define PRI_MAX_NO_DATA_BYTES_IN_FRAME  15354 /* PRIMARY - max length of the CHDLC data field */
-typedef struct {
-        unsigned char opp_flag PACKED;                  /* the opp flag */
-        unsigned char command PACKED;                   /* the user command */
-        unsigned short buffer_length PACKED;            /* the data length */
-        unsigned char return_code PACKED;               /* the return code */
-        unsigned char MB_reserved[NUMBER_MB_RESERVED_BYTES] PACKED;     /* reserved for later */
-        unsigned char data[SIZEOF_MB_DATA_BFR] PACKED;  /* the data area */
-} CHDLC_MAILBOX_STRUCT;
-typedef struct {
-        pid_t                   pid_num PACKED;
-        CHDLC_MAILBOX_STRUCT     cmdarea PACKED;
-} CMDBLOCK_STRUCT;
-/* ----------------------------------------------------------------------------
- *                        Interface commands
- * --------------------------------------------------------------------------*/
-/* global interface commands */
-#define READ_GLOBAL_EXCEPTION_CONDITION 0x01
-#define SET_GLOBAL_CONFIGURATION        0x02
-#define READ_GLOBAL_CONFIGURATION       0x03
-#define READ_GLOBAL_STATISTICS          0x04
-#define FLUSH_GLOBAL_STATISTICS         0x05
-#define SET_MODEM_STATUS                0x06    /* set status of DTR or RTS */
-#define READ_MODEM_STATUS               0x07    /* read status of CTS and DCD */
-#define READ_COMMS_ERROR_STATS          0x08    
-#define FLUSH_COMMS_ERROR_STATS         0x09
-#define SET_TRACE_CONFIGURATION         0x0A    /* set the line trace config */
-#define READ_TRACE_CONFIGURATION        0x0B    /* read the line trace config */
-#define READ_TRACE_STATISTICS           0x0C    /* read the trace statistics */
-#define FLUSH_TRACE_STATISTICS          0x0D    /* flush the trace statistics */
-#define FT1_MONITOR_STATUS_CTRL         0x1C    /* set the status of the S508/FT1 monitoring */
-#define SET_FT1_CONFIGURATION           0x18    /* set the FT1 configuration */
-#define READ_FT1_CONFIGURATION          0x19    /* read the FT1 configuration */
-#define TRANSMIT_ASYNC_DATA_TO_FT1      0x1A    /* output asynchronous data to the FT1 */
-#define RECEIVE_ASYNC_DATA_FROM_FT1     0x1B    /* receive asynchronous data from the FT1 */
-#define FT1_MONITOR_STATUS_CTRL         0x1C    /* set the status of the FT1 monitoring */
-#define READ_FT1_OPERATIONAL_STATS      0x1D    /* read the S508/FT1 operational statistics */
-#define SET_FT1_MODE                    0x1E    /* set the operational mode of the S508/FT1 module */
-/* CHDLC-level interface commands */
-#define READ_CHDLC_CODE_VERSION         0x20    
-#define READ_CHDLC_EXCEPTION_CONDITION  0x21    /* read exception condition from the adapter */
-#define SET_CHDLC_CONFIGURATION         0x22
-#define READ_CHDLC_CONFIGURATION        0x23
-#define ENABLE_CHDLC_COMMUNICATIONS     0x24
-#define DISABLE_CHDLC_COMMUNICATIONS    0x25
-#define READ_CHDLC_LINK_STATUS          0x26
-#define READ_CHDLC_OPERATIONAL_STATS    0x27
-#define FLUSH_CHDLC_OPERATIONAL_STATS   0x28
-#define SET_CHDLC_INTERRUPT_TRIGGERS    0x30    /* set application interrupt triggers */
-#define READ_CHDLC_INTERRUPT_TRIGGERS   0x31    /* read application interrupt trigger configuration */
-/* Special UDP drivers management commands */
-#define CPIPE_ENABLE_TRACING                            0x50
-#define CPIPE_DISABLE_TRACING                           0x51
-#define CPIPE_GET_TRACE_INFO                            0x52
-#define CPIPE_GET_IBA_DATA                              0x53
-#define CPIPE_FT1_READ_STATUS                           0x54
-#define CPIPE_DRIVER_STAT_IFSEND                        0x55
-#define CPIPE_DRIVER_STAT_INTR                          0x56
-#define CPIPE_DRIVER_STAT_GEN                           0x57
-#define CPIPE_FLUSH_DRIVER_STATS                        0x58
-#define CPIPE_ROUTER_UP_TIME                            0x59
-/* Driver specific commands for API */
-#define CHDLC_READ_TRACE_DATA           0xE4    /* read trace data */
-#define TRACE_ALL                       0x00
-#define TRACE_PROT                      0x01
-#define TRACE_DATA                      0x02
-#define DISCARD_RX_ERROR_FRAMES 0x0001
-/* ----------------------------------------------------------------------------
- *                     Return codes from interface commands
- * --------------------------------------------------------------------------*/
-#define COMMAND_OK                              0x00
-/* return codes from global interface commands */
-#define NO_GLOBAL_EXCEP_COND_TO_REPORT          0x01    /* there is no CHDLC exception condition to report */
-#define LGTH_GLOBAL_CFG_DATA_INVALID            0x01    /* the length of the passed global configuration data is invalid */
-#define LGTH_TRACE_CFG_DATA_INVALID             0x01    /* the length of the passed trace configuration data is invalid */
-#define IRQ_TIMEOUT_VALUE_INVALID               0x02    /* an invalid application IRQ timeout value was selected */
-#define TRACE_CONFIG_INVALID                    0x02    /* the passed line trace configuration is invalid */
-#define ADAPTER_OPERATING_FREQ_INVALID          0x03    /* an invalid adapter operating frequency was selected */
-#define TRC_DEAC_TMR_INVALID                    0x03    /* the trace deactivation timer is invalid */
-#define S508_FT1_ADPTR_NOT_PRESENT              0x0C    /* the S508/FT1 adapter is not present */
-#define INVALID_FT1_STATUS_SELECTION            0x0D    /* the S508/FT1 status selection is invalid */
-#define FT1_OP_STATS_NOT_ENABLED                0x0D    /* the FT1 operational statistics have not been enabled */
-#define FT1_OP_STATS_NOT_AVAILABLE              0x0E    /* the FT1 operational statistics are not currently available */
-#define S508_FT1_MODE_SELECTION_BUSY            0x0E    /* the S508/FT1 adapter is busy selecting the operational mode */
-/* return codes from command READ_GLOBAL_EXCEPTION_CONDITION */
-#define EXCEP_MODEM_STATUS_CHANGE               0x10            /* a modem status change occurred */
-#define EXCEP_TRC_DISABLED                      0x11            /* the trace has been disabled */
-#define EXCEP_IRQ_TIMEOUT                       0x12            /* IRQ timeout */
-/* return codes from CHDLC-level interface commands */
-#define NO_CHDLC_EXCEP_COND_TO_REPORT           0x21    /* there is no CHDLC exception condition to report */
-#define CHDLC_COMMS_DISABLED                    0x21    /* communications are not currently enabled */
-#define CHDLC_COMMS_ENABLED                     0x21    /* communications are currently enabled */
-#define DISABLE_CHDLC_COMMS_BEFORE_CFG          0x21    /* CHDLC communications must be disabled before setting the configuration */
-#define ENABLE_CHDLC_COMMS_BEFORE_CONN          0x21    /* communications must be enabled before using the CHDLC_CONNECT conmmand */
-#define CHDLC_CFG_BEFORE_COMMS_ENABLED          0x22    /* perform a SET_CHDLC_CONFIGURATION before enabling comms */
-#define LGTH_CHDLC_CFG_DATA_INVALID             0x22    /* the length of the passed CHDLC configuration data is invalid */
-#define LGTH_INT_TRIGGERS_DATA_INVALID          0x22    /* the length of the passed interrupt trigger data is invalid */
-#define INVALID_IRQ_SELECTED                    0x23    /* in invalid IRQ was selected in the SET_CHDLC_INTERRUPT_TRIGGERS */
-#define INVALID_CHDLC_CFG_DATA                  0x23    /* the passed CHDLC configuration data is invalid */
-#define IRQ_TMR_VALUE_INVALID                   0x24    /* an invalid application IRQ timer value was selected */
-#define LARGER_PERCENT_TX_BFR_REQUIRED          0x24    /* a larger Tx buffer percentage is required */
-#define LARGER_PERCENT_RX_BFR_REQUIRED          0x25    /* a larger Rx buffer percentage is required */
-#define S514_BOTH_PORTS_SAME_CLK_MODE           0x26    /* S514 - both ports must have same clock mode */
-#define INVALID_CMND_HDLC_STREAM_MODE           0x4E    /* the CHDLC interface command is invalid for HDLC streaming mode */
-#define INVALID_CHDLC_COMMAND                   0x4F    /* the defined CHDLC interface command is invalid */
-/* return codes from command READ_CHDLC_EXCEPTION_CONDITION */
-#define EXCEP_LINK_ACTIVE                       0x30    /* the CHDLC link has become active */
-#define EXCEP_LINK_INACTIVE_MODEM               0x31    /* the CHDLC link has become inactive (modem status) */
-#define EXCEP_LINK_INACTIVE_KPALV               0x32    /* the CHDLC link has become inactive (keepalive status) */
-#define EXCEP_IP_ADDRESS_DISCOVERED             0x33    /* the IP address has been discovered */
-#define EXCEP_LOOPBACK_CONDITION                0x34    /* a loopback condition has occurred */
-/* return code from command CHDLC_SEND_WAIT and CHDLC_SEND_NO_WAIT */
-#define LINK_DISCONNECTED                       0x21
-#define NO_TX_BFRS_AVAIL                        0x24
-/* ----------------------------------------------------------------------------
- * Constants for the SET_GLOBAL_CONFIGURATION/READ_GLOBAL_CONFIGURATION commands
- * --------------------------------------------------------------------------*/
-/* the global configuration structure */
-typedef struct {
-        unsigned short adapter_config_options PACKED;   /* adapter config options */
-        unsigned short app_IRQ_timeout PACKED;          /* application IRQ timeout */
-        unsigned long adapter_operating_frequency PACKED;       /* adapter operating frequency */
-} GLOBAL_CONFIGURATION_STRUCT;
-/* settings for the 'app_IRQ_timeout' */
-#define MAX_APP_IRQ_TIMEOUT_VALUE       5000    /* the maximum permitted IRQ timeout */
-/* ----------------------------------------------------------------------------
- *             Constants for the READ_GLOBAL_STATISTICS command
- * --------------------------------------------------------------------------*/
-/* the global statistics structure */
-typedef struct {
-        unsigned short app_IRQ_timeout_count PACKED;
-} GLOBAL_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *             Constants for the READ_COMMS_ERROR_STATS command
- * --------------------------------------------------------------------------*/
-/* the communications error statistics structure */
-typedef struct {
-        unsigned short Rx_overrun_err_count PACKED;
-        unsigned short CRC_err_count PACKED;    /* receiver CRC error count */
-        unsigned short Rx_abort_count PACKED;   /* abort frames recvd count */
-        unsigned short Rx_dis_pri_bfrs_full_count PACKED;/* receiver disabled */
-        unsigned short comms_err_stat_reserved_1 PACKED;/* reserved for later */
-        unsigned short sec_Tx_abort_msd_Tx_int_count PACKED; /* secondary - abort frames transmitted count (missed Tx interrupt) */
-        unsigned short missed_Tx_und_int_count PACKED;  /* missed tx underrun interrupt count */
-        unsigned short sec_Tx_abort_count PACKED;   /*secondary-abort frames tx count */
-        unsigned short DCD_state_change_count PACKED; /* DCD state change */
-        unsigned short CTS_state_change_count PACKED; /* CTS state change */
-} COMMS_ERROR_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *                  Constants used for line tracing
- * --------------------------------------------------------------------------*/
-/* the trace configuration structure (SET_TRACE_CONFIGURATION/READ_TRACE_CONFIGURATION commands) */
-typedef struct {
-        unsigned char trace_config PACKED;              /* trace configuration */
-        unsigned short trace_deactivation_timer PACKED; /* trace deactivation timer */
-        unsigned long ptr_trace_stat_el_cfg_struct PACKED;      /* a pointer to the line trace element configuration structure */
-} LINE_TRACE_CONFIG_STRUCT;
-/* 'trace_config' bit settings */
-#define TRACE_INACTIVE          0x00    /* trace is inactive */
-#define TRACE_ACTIVE            0x01    /* trace is active */
-#define TRACE_DELAY_MODE        0x04    /* operate the trace in delay mode */
-#define TRACE_DATA_FRAMES       0x08    /* trace Data frames */
-#define TRACE_SLARP_FRAMES      0x10    /* trace SLARP frames */
-#define TRACE_CDP_FRAMES        0x20    /* trace CDP frames */
-/* the line trace status element configuration structure */
-typedef struct {
-        unsigned short number_trace_status_elements PACKED;     /* number of line trace elements */
-        unsigned long base_addr_trace_status_elements PACKED;   /* base address of the trace element list */
-        unsigned long next_trace_element_to_use PACKED; /* pointer to the next trace element to be used */
-        unsigned long base_addr_trace_buffer PACKED;            /* base address of the trace data buffer */
-        unsigned long end_addr_trace_buffer PACKED;             /* end address of the trace data buffer */
-} TRACE_STATUS_EL_CFG_STRUCT;
-/* the line trace status element structure */
-typedef struct {
-        unsigned char opp_flag PACKED;                  /* opp flag */
-        unsigned short trace_length PACKED;             /* trace length */
-        unsigned char trace_type PACKED;                /* trace type */
-        unsigned short trace_time_stamp PACKED; /* time stamp */
-        unsigned short trace_reserved_1 PACKED; /* reserved for later use */
-        unsigned long trace_reserved_2 PACKED;          /* reserved for later use */
-        unsigned long ptr_data_bfr PACKED;              /* ptr to the trace data buffer */
-} TRACE_STATUS_ELEMENT_STRUCT;
-/* "trace_type" bit settings */
-#define TRACE_INCOMING                  0x00
-#define TRACE_OUTGOINGING               0x01
-#define TRACE_INCOMING_ABORTED          0x10
-#define TRACE_INCOMING_CRC_ERROR        0x20
-#define TRACE_INCOMING_OVERRUN_ERROR    0x40
-/* the line trace statistics structure */
-typedef struct {
-        unsigned long frames_traced_count PACKED;       /* number of frames traced */
-        unsigned long trc_frms_not_recorded_count PACKED;       /* number of trace frames discarded */
-} LINE_TRACE_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *               Constants for the FT1_MONITOR_STATUS_CTRL command
- * --------------------------------------------------------------------------*/
-#define DISABLE_FT1_STATUS_STATISTICS   0x00    /* disable the FT1 status and statistics monitoring */
-#define ENABLE_READ_FT1_STATUS          0x01    /* read the FT1 operational status */
-#define ENABLE_READ_FT1_OP_STATS        0x02    /* read the FT1 operational statistics */
-#define FLUSH_FT1_OP_STATS              0x04    /* flush the FT1 operational statistics */
-/* ----------------------------------------------------------------------------
- *               Constants for the SET_CHDLC_CONFIGURATION command
- * --------------------------------------------------------------------------*/
-/* the CHDLC configuration structure */
-typedef struct {
-        unsigned long baud_rate PACKED;         /* the baud rate */     
-        unsigned short line_config_options PACKED;      /* line configuration options */
-        unsigned short modem_config_options PACKED;     /* modem configration options */
-        unsigned short modem_status_timer PACKED;       /* timer for monitoring modem status changes */
-        unsigned short CHDLC_API_options PACKED;        /* CHDLC API options */
-        unsigned short CHDLC_protocol_options PACKED;   /* CHDLC protocol options */
-        unsigned short percent_data_buffer_for_Tx PACKED;       /* percentage data buffering used for Tx */
-        unsigned short CHDLC_statistics_options PACKED; /* CHDLC operational statistics options */
-        unsigned short max_CHDLC_data_field_length PACKED;      /* the maximum length of the CHDLC Data field */
-        unsigned short transmit_keepalive_timer PACKED;         /* the transmit keepalive timer */
-        unsigned short receive_keepalive_timer PACKED;          /* the receive keepalive timer */
-        unsigned short keepalive_error_tolerance PACKED;        /* the receive keepalive error tolerance */
-        unsigned short SLARP_request_timer PACKED;              /* the SLARP request timer */
-        unsigned long IP_address PACKED;                        /* the IP address */
-        unsigned long IP_netmask PACKED;                        /* the IP netmask */
-        unsigned long ptr_shared_mem_info_struct PACKED;        /* a pointer to the shared memory area information structure */
-        unsigned long ptr_CHDLC_Tx_stat_el_cfg_struct PACKED;   /* a pointer to the transmit status element configuration structure */
-        unsigned long ptr_CHDLC_Rx_stat_el_cfg_struct PACKED;   /* a pointer to the receive status element configuration structure */
-} CHDLC_CONFIGURATION_STRUCT;
-/* settings for the 'line_config_options' */
-#define INTERFACE_LEVEL_V35                                     0x0000 /* V.35 interface level */
-#define INTERFACE_LEVEL_RS232                                   0x0001 /* RS-232 interface level */
-/* settings for the 'modem_config_options' */
-#define DONT_RAISE_DTR_RTS_ON_EN_COMMS          0x0001
-/* don't automatically raise DTR and RTS when performing an
-   ENABLE_CHDLC_COMMUNICATIONS command */
-#define DONT_REPORT_CHG_IN_MODEM_STAT           0x0002
-/* don't report changes in modem status to the application */
-/* bit settings for the 'CHDLC_protocol_options' byte */
-#define IGNORE_DCD_FOR_LINK_STAT                0x0001
-/* ignore DCD in determining the CHDLC link status */
-#define IGNORE_CTS_FOR_LINK_STAT                0x0002
-/* ignore CTS in determining the CHDLC link status */
-#define IGNORE_KPALV_FOR_LINK_STAT              0x0004
-/* ignore keepalive frames in determining the CHDLC link status */ 
-#define SINGLE_TX_BUFFER                        0x4000 
-/* configure a single transmit buffer */
-#define HDLC_STREAMING_MODE                     0x8000
-/*   settings for the 'CHDLC_statistics_options' */
-#define CHDLC_TX_DATA_BYTE_COUNT_STAT           0x0001
-/* record the number of Data bytes transmitted */
-#define CHDLC_RX_DATA_BYTE_COUNT_STAT           0x0002
-/* record the number of Data bytes received */
-#define CHDLC_TX_THROUGHPUT_STAT                0x0004
-/* compute the Data frame transmit throughput */
-#define CHDLC_RX_THROUGHPUT_STAT                0x0008
-/* compute the Data frame receive throughput */
-/* permitted minimum and maximum values for setting the CHDLC configuration */
-#define PRI_MAX_BAUD_RATE_S508  2666666 /* PRIMARY   - maximum baud rate (S508) */
-#define SEC_MAX_BAUD_RATE_S508  258064  /* SECONDARY - maximum baud rate (S508) */
-#define PRI_MAX_BAUD_RATE_S514  2750000 /* PRIMARY   - maximum baud rate (S508) */
-#define SEC_MAX_BAUD_RATE_S514  515625  /* SECONDARY - maximum baud rate (S508) */
- 
-#define MIN_MODEM_TIMER 0                       /* minimum modem status timer */
-#define MAX_MODEM_TIMER 5000                    /* maximum modem status timer */
-#define SEC_MAX_NO_DATA_BYTES_IN_FRAME  2048 /* SECONDARY - max length of the CHDLC data field */
-#define MIN_Tx_KPALV_TIMER      0         /* minimum transmit keepalive timer */
-#define MAX_Tx_KPALV_TIMER      60000     /* maximum transmit keepalive timer */
-#define DEFAULT_Tx_KPALV_TIMER  10000     /* default transmit keepalive timer */
-#define MIN_Rx_KPALV_TIMER      10        /* minimum receive keepalive timer */
-#define MAX_Rx_KPALV_TIMER      60000     /* maximum receive keepalive timer */
-#define DEFAULT_Rx_KPALV_TIMER  10000     /* default receive keepalive timer */
-#define MIN_KPALV_ERR_TOL       1         /* min kpalv error tolerance count */
-#define MAX_KPALV_ERR_TOL       20        /* max kpalv error tolerance count */
-#define DEFAULT_KPALV_ERR_TOL   3         /* default value */
-#define MIN_SLARP_REQ_TIMER     0         /* min transmit SLARP Request timer */
-#define MAX_SLARP_REQ_TIMER     60000     /* max transmit SLARP Request timer */
-#define DEFAULT_SLARP_REQ_TIMER 0         /* default value -- no SLARP */
-/* ----------------------------------------------------------------------------
- *             Constants for the READ_CHDLC_LINK_STATUS command
- * --------------------------------------------------------------------------*/
-/* the CHDLC status structure */
-typedef struct {
-        unsigned char CHDLC_link_status PACKED; /* CHDLC link status */
-        unsigned char no_Data_frms_for_app PACKED;      /* number of Data frames available for the application */
-        unsigned char receiver_status PACKED;   /* enabled/disabled */
-        unsigned char SLARP_state PACKED;       /* internal SLARP state */
-} CHDLC_LINK_STATUS_STRUCT;
-/* settings for the 'CHDLC_link_status' variable */
-#define CHDLC_LINK_INACTIVE             0x00    /* the CHDLC link is inactive */
-#define CHDLC_LINK_ACTIVE               0x01    /* the CHDLC link is active */
-/* ----------------------------------------------------------------------------
- *           Constants for the READ_CHDLC_OPERATIONAL_STATS command
- * --------------------------------------------------------------------------*/
-/* the CHDLC operational statistics structure */
-typedef struct {
-        /* Data frame transmission statistics */
-        unsigned long Data_frames_Tx_count PACKED;      /* # of frames transmitted */
-        unsigned long Data_bytes_Tx_count PACKED;       /* # of bytes transmitted */
-        unsigned long Data_Tx_throughput PACKED;        /* transmit throughput */
-        unsigned long no_ms_for_Data_Tx_thruput_comp PACKED;    /* millisecond time used for the Tx throughput computation */
-        unsigned long Tx_Data_discard_lgth_err_count PACKED;    /* number of Data frames discarded (length error) */
-        unsigned long reserved_Data_frm_Tx_stat1 PACKED;        /* reserved for later */
-        unsigned long reserved_Data_frm_Tx_stat2 PACKED;        /* reserved for later */
-        unsigned long reserved_Data_frm_Tx_stat3 PACKED;        /* reserved for later */
-        /* Data frame reception statistics */
-        unsigned long Data_frames_Rx_count PACKED;      /* number of frames received */
-        unsigned long Data_bytes_Rx_count PACKED;       /* number of bytes received */
-        unsigned long Data_Rx_throughput PACKED;        /* receive throughput */
-        unsigned long no_ms_for_Data_Rx_thruput_comp PACKED;    /* millisecond time used for the Rx throughput computation */
-        unsigned long Rx_Data_discard_short_count PACKED;       /* received Data frames discarded (too short) */
-        unsigned long Rx_Data_discard_long_count PACKED;        /* received Data frames discarded (too long) */
-        unsigned long Rx_Data_discard_inactive_count PACKED;    /* received Data frames discarded (link inactive) */
-        unsigned long reserved_Data_frm_Rx_stat1 PACKED;        /* reserved for later */
-        /* SLARP frame transmission/reception statistics */
-        unsigned long CHDLC_SLARP_REQ_Tx_count PACKED;          /* number of SLARP Request frames transmitted */
-        unsigned long CHDLC_SLARP_REQ_Rx_count PACKED;          /* number of SLARP Request frames received */
-        unsigned long CHDLC_SLARP_REPLY_Tx_count PACKED;        /* number of SLARP Reply frames transmitted */
-        unsigned long CHDLC_SLARP_REPLY_Rx_count PACKED;        /* number of SLARP Reply frames received */
-        unsigned long CHDLC_SLARP_KPALV_Tx_count PACKED;        /* number of SLARP keepalive frames transmitted */
-        unsigned long CHDLC_SLARP_KPALV_Rx_count PACKED;        /* number of SLARP keepalive frames received */
-        unsigned long reserved_SLARP_stat1 PACKED;              /* reserved for later */
-        unsigned long reserved_SLARP_stat2 PACKED;              /* reserved for later */
-        /* CDP frame transmission/reception statistics */
-        unsigned long CHDLC_CDP_Tx_count PACKED;                /* number of CDP frames transmitted */
-        unsigned long CHDLC_CDP_Rx_count PACKED;                /* number of CDP frames received */
-        unsigned long reserved_CDP_stat1 PACKED;                /* reserved for later */
-        unsigned long reserved_CDP_stat2 PACKED;                /* reserved for later */
-        unsigned long reserved_CDP_stat3 PACKED;                /* reserved for later */
-        unsigned long reserved_CDP_stat4 PACKED;                /* reserved for later */
-        unsigned long reserved_CDP_stat5 PACKED;                /* reserved for later */
-        unsigned long reserved_CDP_stat6 PACKED;                /* reserved for later */
-        /* Incoming frames with a format error statistics */
-        unsigned short Rx_frm_incomp_CHDLC_hdr_count PACKED;    /* frames received of with incomplete Cisco HDLC header */
-        unsigned short Rx_frms_too_long_count PACKED;           /* frames received of excessive length count */
-        unsigned short Rx_invalid_CHDLC_addr_count PACKED;      /* frames received with an invalid CHDLC address count */
-        unsigned short Rx_invalid_CHDLC_ctrl_count PACKED;      /* frames received with an invalid CHDLC control field count */
-        unsigned short Rx_invalid_CHDLC_type_count PACKED;      /* frames received of an invalid CHDLC frame type count */
-        unsigned short Rx_SLARP_invalid_code_count PACKED;      /* SLARP frame received with an invalid packet code */
-        unsigned short Rx_SLARP_Reply_bad_IP_addr PACKED;       /* SLARP Reply received - bad IP address */
-        unsigned short Rx_SLARP_Reply_bad_netmask PACKED;       /* SLARP Reply received - bad netmask */
-        unsigned long reserved_frm_format_err1 PACKED;          /* reserved for later */
-        unsigned long reserved_frm_format_err2 PACKED;          /* reserved for later */
-        unsigned long reserved_frm_format_err3 PACKED;          /* reserved for later */
-        unsigned long reserved_frm_format_err4 PACKED;          /* reserved for later */
-        /* CHDLC timeout/retry statistics */
-        unsigned short SLARP_Rx_keepalive_TO_count PACKED;      /* timeout count for incoming SLARP frames */
-        unsigned short SLARP_Request_TO_count PACKED;           /* timeout count for SLARP Request frames */
-        unsigned long To_retry_reserved_stat1 PACKED;           /* reserved for later */
-        unsigned long To_retry_reserved_stat2 PACKED;           /* reserved for later */
-        unsigned long To_retry_reserved_stat3 PACKED;           /* reserved for later */
-        /* CHDLC link active/inactive and loopback statistics */
-        unsigned short link_active_count PACKED;                /* number of times that the link went active */
-        unsigned short link_inactive_modem_count PACKED;        /* number of times that the link went inactive (modem failure) */
-        unsigned short link_inactive_keepalive_count PACKED;    /* number of times that the link went inactive (keepalive failure) */
-        unsigned short link_looped_count PACKED;                /* link looped count */
-        unsigned long link_status_reserved_stat1 PACKED;        /* reserved for later use */
-        unsigned long link_status_reserved_stat2 PACKED;        /* reserved for later use */
-        /* miscellaneous statistics */
-        unsigned long reserved_misc_stat1 PACKED;               /* reserved for later */
-        unsigned long reserved_misc_stat2 PACKED;               /* reserved for later */
-        unsigned long reserved_misc_stat3 PACKED;               /* reserved for later */
-        unsigned long reserved_misc_stat4 PACKED;               /* reserved for later */
-} CHDLC_OPERATIONAL_STATS_STRUCT;
-/* ----------------------------------------------------------------------------
- *                 Constants for using application interrupts
- * --------------------------------------------------------------------------*/
-/* the structure used for the SET_CHDLC_INTERRUPT_TRIGGERS/READ_CHDLC_INTERRUPT_TRIGGERS command */
-typedef struct {
-        unsigned char CHDLC_interrupt_triggers PACKED;  /* CHDLC interrupt trigger configuration */
-        unsigned char IRQ PACKED;                       /* IRQ to be used */
-        unsigned short interrupt_timer PACKED;          /* interrupt timer */
-        unsigned short misc_interrupt_bits PACKED;      /* miscellaneous bits */
-} CHDLC_INT_TRIGGERS_STRUCT;
-/* 'CHDLC_interrupt_triggers' bit settings */
-#define APP_INT_ON_RX_FRAME             0x01    /* interrupt on Data frame reception */
-#define APP_INT_ON_TX_FRAME             0x02    /* interrupt when an Data frame may be transmitted */
-#define APP_INT_ON_COMMAND_COMPLETE     0x04    /* interrupt when an interface command is complete */
-#define APP_INT_ON_TIMER                0x08    /* interrupt on a defined millisecond timeout */
-#define APP_INT_ON_GLOBAL_EXCEP_COND    0x10    /* interrupt on a global exception condition */
-#define APP_INT_ON_CHDLC_EXCEP_COND     0x20    /* interrupt on an CHDLC exception condition */
-#define APP_INT_ON_TRACE_DATA_AVAIL     0x80    /* interrupt when trace data is available */
-/* interrupt types indicated at 'interrupt_type' byte of the INTERRUPT_INFORMATION_STRUCT */
-#define NO_APP_INTS_PEND                0x00    /* no interrups are pending */
-#define RX_APP_INT_PEND                 0x01    /* a receive interrupt is pending */
-#define TX_APP_INT_PEND                 0x02    /* a transmit interrupt is pending */
-#define COMMAND_COMPLETE_APP_INT_PEND   0x04    /* a 'command complete' interrupt is pending */
-#define TIMER_APP_INT_PEND              0x08    /* a timer interrupt is pending */
-#define GLOBAL_EXCEP_COND_APP_INT_PEND  0x10    /* a global exception condition interrupt is pending */
-#define CHDLC_EXCEP_COND_APP_INT_PEND   0x20    /* an CHDLC exception condition interrupt is pending */
-#define TRACE_DATA_AVAIL_APP_INT_PEND   0x80    /* a trace data available interrupt is pending */
-/* modem status changes */
-#define DCD_HIGH                        0x08
-#define CTS_HIGH                        0x20
-/* ----------------------------------------------------------------------------
- *                   Constants for Data frame transmission
- * --------------------------------------------------------------------------*/
-/* the Data frame transmit status element configuration structure */
-typedef struct {
-        unsigned short number_Tx_status_elements PACKED;        /* number of transmit status elements */
-        unsigned long base_addr_Tx_status_elements PACKED;      /* base address of the transmit element list */
-        unsigned long next_Tx_status_element_to_use PACKED;     /* pointer to the next transmit element to be used */
-} CHDLC_TX_STATUS_EL_CFG_STRUCT;
-/* the Data frame transmit status element structure */
-typedef struct {
-        unsigned char opp_flag PACKED;          /* opp flag */
-        unsigned short frame_length PACKED;     /* length of the frame to be transmitted */
-        unsigned char reserved_1 PACKED;        /* reserved for internal use */
-        unsigned long reserved_2 PACKED;        /* reserved for internal use */
-        unsigned long reserved_3 PACKED;        /* reserved for internal use */
-        unsigned long ptr_data_bfr PACKED;      /* pointer to the data area */
-} CHDLC_DATA_TX_STATUS_EL_STRUCT;
-/* ----------------------------------------------------------------------------
- *                   Constants for Data frame reception
- * --------------------------------------------------------------------------*/
-/* the Data frame receive status element configuration structure */
-typedef struct {
-        unsigned short number_Rx_status_elements PACKED;        /* number of receive status elements */
-        unsigned long base_addr_Rx_status_elements PACKED;      /* base address of the receive element list */
-        unsigned long next_Rx_status_element_to_use PACKED;     /* pointer to the next receive element to be used */
-        unsigned long base_addr_Rx_buffer PACKED;               /* base address of the receive data buffer */
-        unsigned long end_addr_Rx_buffer PACKED;                /* end address of the receive data buffer */
-} CHDLC_RX_STATUS_EL_CFG_STRUCT;
-/* the Data frame receive status element structure */
-typedef struct {
-        unsigned char opp_flag PACKED;          /* opp flag */
-        unsigned short frame_length PACKED;   /* length of the received frame */
-        unsigned char error_flag PACKED; /* frame errors (HDLC_STREAMING_MODE)*/
-        unsigned short time_stamp PACKED; /* receive time stamp (HDLC_STREAMING_MODE) */
-        unsigned long reserved_1 PACKED;        /* reserved for internal use */
-        unsigned short reserved_2 PACKED;       /* reserved for internal use */
-        unsigned long ptr_data_bfr PACKED;      /* pointer to the data area */
-} CHDLC_DATA_RX_STATUS_EL_STRUCT;
-/* ----------------------------------------------------------------------------
- *         Constants defining the shared memory information area
- * --------------------------------------------------------------------------*/
-/* the global information structure */
-typedef struct {
-        unsigned char global_status PACKED;             /* global status */
-        unsigned char modem_status PACKED;              /* current modem status */
-        unsigned char global_excep_conditions PACKED;   /* global exception conditions */
-        unsigned char glob_info_reserved[5] PACKED;     /* reserved */
-        unsigned char codename[4] PACKED;               /* Firmware name */
-        unsigned char codeversion[4] PACKED;            /* Firmware version */
-} GLOBAL_INFORMATION_STRUCT;
-/* the CHDLC information structure */
-typedef struct {
-        unsigned char CHDLC_status PACKED;              /* CHDLC status */
-        unsigned char CHDLC_excep_conditions PACKED;    /* CHDLC exception conditions */
-        unsigned char CHDLC_info_reserved[14] PACKED;   /* reserved */
-} CHDLC_INFORMATION_STRUCT;
-/* the interrupt information structure */
-typedef struct {
-        unsigned char interrupt_type PACKED;            /* type of interrupt triggered */
-        unsigned char interrupt_permission PACKED;      /* interrupt permission mask */
-        unsigned char int_info_reserved[14] PACKED;     /* reserved */
-} INTERRUPT_INFORMATION_STRUCT;
-/* the S508/FT1 information structure */
-typedef struct {
-        unsigned char parallel_port_A_input PACKED;     /* input - parallel port A */
-        unsigned char parallel_port_B_input PACKED;     /* input - parallel port B */
-        unsigned char FT1_info_reserved[14] PACKED;     /* reserved */
-} FT1_INFORMATION_STRUCT;
-/* the shared memory area information structure */
-typedef struct {
-        GLOBAL_INFORMATION_STRUCT global_info_struct PACKED;            /* the global information structure */
-        CHDLC_INFORMATION_STRUCT CHDLC_info_struct PACKED;              /* the CHDLC information structure */
-        INTERRUPT_INFORMATION_STRUCT interrupt_info_struct PACKED;      /* the interrupt information structure */
-        FT1_INFORMATION_STRUCT FT1_info_struct PACKED;                  /* the S508/FT1 information structure */
-} SHARED_MEMORY_INFO_STRUCT;
-/* ----------------------------------------------------------------------------
- *        UDP Management constants and structures 
- * --------------------------------------------------------------------------*/
-/* The embedded control block for UDP mgmt 
-   This is essentially a mailbox structure, without the large data field */
-typedef struct {
-        unsigned char  opp_flag PACKED;                  /* the opp flag */
-        unsigned char  command PACKED;                   /* the user command */
-        unsigned short buffer_length PACKED;             /* the data length */
-        unsigned char  return_code PACKED;               /* the return code */
-        unsigned char  MB_reserved[NUMBER_MB_RESERVED_BYTES] PACKED;    /* reserved for later */
-} cblock_t;
-/* UDP management packet layout (data area of ip packet) */
-/*
-typedef struct {
-        unsigned char           signature[8]    PACKED;
-        unsigned char           request_reply   PACKED;
-        unsigned char           id              PACKED;
-        unsigned char           reserved[6]     PACKED;
-        cblock_t                cblock          PACKED;
-        unsigned char           num_frames      PACKED;
-        unsigned char           ismoredata      PACKED;
-        unsigned char           data[SIZEOF_MB_DATA_BFR]        PACKED;
-} udp_management_packet_t;
-*/
-typedef struct {
-        unsigned char           num_frames      PACKED;
-        unsigned char           ismoredata      PACKED;
-} trace_info_t;
-typedef struct {
-        ip_pkt_t                ip_pkt          PACKED;
-        udp_pkt_t               udp_pkt         PACKED;
-        wp_mgmt_t               wp_mgmt         PACKED;
-        cblock_t                cblock          PACKED;
-        trace_info_t            trace_info      PACKED;
-        unsigned char           data[SIZEOF_MB_DATA_BFR]      PACKED;
-} chdlc_udp_pkt_t;
-typedef struct ft1_exec_cmd{
-        unsigned char  command PACKED;                   /* the user command */
-        unsigned short buffer_length PACKED;             /* the data length */
-        unsigned char  return_code PACKED;               /* the return code */
-        unsigned char  MB_reserved[NUMBER_MB_RESERVED_BYTES] PACKED;
-} ft1_exec_cmd_t;
-typedef struct {
-        unsigned char  opp_flag                         PACKED;
-        ft1_exec_cmd_t cmd                              PACKED;
-        unsigned char  data[SIZEOF_MB_DATA_BFR]         PACKED;
-} ft1_exec_t;
-#define UDPMGMT_SIGNATURE       "CTPIPEAB"
-/* UDP/IP packet (for UDP management) layout */
-/*
-typedef struct {
-        unsigned char   reserved[2]     PACKED;
-        unsigned short  ip_length       PACKED;
-        unsigned char   reserved2[4]    PACKED;
-        unsigned char   ip_ttl          PACKED;
-        unsigned char   ip_protocol     PACKED;
-        unsigned short  ip_checksum     PACKED;
-        unsigned long   ip_src_address  PACKED;
-        unsigned long   ip_dst_address  PACKED;
-        unsigned short  udp_src_port    PACKED;
-        unsigned short  udp_dst_port    PACKED;
-        unsigned short  udp_length      PACKED;
-        unsigned short  udp_checksum    PACKED;
-        udp_management_packet_t um_packet PACKED;
-} ip_packet_t;
-*/
-/* valid ip_protocol for UDP management */
-#define UDPMGMT_UDP_PROTOCOL 0x11
-typedef struct {
-        unsigned char   status          PACKED;
-        unsigned char   data_avail      PACKED;
-        unsigned short  real_length     PACKED;
-        unsigned short  time_stamp      PACKED;
-        unsigned char   data[1]         PACKED;
-} trace_pkt_t;
-typedef struct {
-        unsigned char   error_flag      PACKED;
-        unsigned short  time_stamp      PACKED;
-        unsigned char   reserved[13]    PACKED;
-} api_rx_hdr_t;
-typedef struct {
-        api_rx_hdr_t    api_rx_hdr      PACKED;
-        void *          data            PACKED;
-} api_rx_element_t;
-typedef struct {
-        unsigned char   attr            PACKED;
-        unsigned char   reserved[15]    PACKED;
-} api_tx_hdr_t;
-typedef struct {
-        api_tx_hdr_t    api_tx_hdr      PACKED;
-        void *          data            PACKED;
-} api_tx_element_t;
-/* ----------------------------------------------------------------------------
- *   Constants for the SET_FT1_CONFIGURATION/READ_FT1_CONFIGURATION command
- * --------------------------------------------------------------------------*/
-/* the FT1 configuration structure */
-typedef struct {
-        unsigned short framing_mode;
-        unsigned short encoding_mode;
-        unsigned short line_build_out;
-        unsigned short channel_base;
-        unsigned short baud_rate_kbps;                                  /* the baud rate (in kbps) */   
-        unsigned short clock_mode;
-} ft1_config_t;
-/* settings for the 'framing_mode' */
-#define ESF_FRAMING     0x00    /* ESF framing */
-#define D4_FRAMING      0x01    /* D4 framing */
-/* settings for the 'encoding_mode' */
-#define B8ZS_ENCODING   0x00    /* B8ZS encoding */
-#define AMI_ENCODING    0x01    /* AMI encoding */
-/* settings for the 'line_build_out' */
-#define LN_BLD_CSU_0dB_DSX1_0_to_133    0x00    /* set build out to CSU (0db) or DSX-1 (0-133ft) */
-#define LN_BLD_DSX1_133_to_266          0x01    /* set build out DSX-1 (133-266ft) */
-#define LN_BLD_DSX1_266_to_399          0x02    /* set build out DSX-1 (266-399ft) */
-#define LN_BLD_DSX1_399_to_533          0x03    /* set build out DSX-1 (399-533ft) */
-#define LN_BLD_DSX1_533_to_655          0x04    /* set build out DSX-1 (533-655ft) */
-#define LN_BLD_CSU_NEG_7dB              0x05    /* set build out to CSU (-7.5db) */
-#define LN_BLD_CSU_NEG_15dB             0x06    /* set build out to CSU (-15db) */
-#define LN_BLD_CSU_NEG_22dB             0x07    /* set build out to CSU (-22.5db) */
-/* settings for the 'channel_base' */
-#define MIN_CHANNEL_BASE_VALUE          1               /* the minimum permitted channel base value */
-#define MAX_CHANNEL_BASE_VALUE          24              /* the maximum permitted channel base value */
-/* settings for the 'baud_rate_kbps' */
-#define MIN_BAUD_RATE_KBPS              0               /* the minimum permitted baud rate (kbps) */
-#define MAX_BAUD_RATE_KBPS              1536    /* the maximum permitted baud rate (kbps) */
-#define BAUD_RATE_FT1_AUTO_CONFIG       0xFFFF /* the baud rate used to trigger an automatic FT1 configuration */
-/* settings for the 'clock_mode' */
-#define CLOCK_MODE_NORMAL               0x00    /* clock mode set to normal (slave) */
-#define CLOCK_MODE_MASTER               0x01    /* clock mode set to master */
-#define BAUD_RATE_FT1_AUTO_CONFIG       0xFFFF
-#define AUTO_FT1_CONFIG_NOT_COMPLETE    0x08
-#define AUTO_FT1_CFG_FAIL_OP_MODE       0x0C
-#define AUTO_FT1_CFG_FAIL_INVALID_LINE  0x0D
- 
-#ifdef          _MSC_
-#  pragma       pack()
-#endif
-#endif  /* _SDLA_CHDLC_H */
diff --git a/include/linux/sdla_ppp.h b/include/linux/sdla_ppp.h
deleted file mode 100644
index 6f3923179c29..000000000000
--- a/include/linux/sdla_ppp.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/*****************************************************************************
-* sdla_ppp.h    Sangoma PPP firmware API definitions.
-*
-* Author:       Nenad Corbic    <ncorbic@sangoma.com>
-*
-* Copyright:    (c) 1995-1997 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* Feb 24, 2000  Nenad Corbic    v2.1.2
-* Jan 06, 1997  Gene Kozin      v2.0
-* Apr 11, 1996  Gene Kozin      Initial version.
-*****************************************************************************/
-#ifndef _SDLA_PPP_H
-#define _SDLA_PPP_H
-/*----------------------------------------------------------------------------
- * Notes:
- * ------
- * 1. All structures defined in this file are byte-alined.  
- *
- *      Compiler        Platform
- *      --------        --------
- *      GNU C           Linux           
- */
-#ifndef PACKED
-#    define     PACKED  __attribute__((packed))
-#endif  /* PACKED */
-/* Adapter memory layout and important constants */
-#define PPP508_MB_VECT  0xE000  /* mailbox window vector */
-#define PPP508_MB_OFFS  0               /* mailbox offset */
-#define PPP508_FLG_OFFS 0x1000  /* status flags offset */
-#define PPP508_BUF_OFFS 0x1100  /* buffer info block offset */
-#define PPP514_MB_OFFS  0xE000  /* mailbox offset */
-#define PPP514_FLG_OFFS 0xF000  /* status flags offset */
-#define PPP514_BUF_OFFS 0xF100  /* buffer info block offset */
-#define PPP_MAX_DATA    1008    /* command block data buffer length */
-/****** Data Structures *****************************************************/
-/*----------------------------------------------------------------------------
- * PPP Command Block.
- */
-typedef struct ppp_cmd{
-        unsigned char  command  PACKED; /* command code */
-        unsigned short length   PACKED; /* length of data buffer */
-        unsigned char  result   PACKED; /* return code */
-        unsigned char  rsrv[11] PACKED; /* reserved for future use */
-} ppp_cmd_t;
-typedef struct cblock{
-        unsigned char  opp_flag PACKED;
-        unsigned char  command  PACKED; /* command code */
-        unsigned short length   PACKED; /* length of data buffer */
-        unsigned char  result   PACKED; /* return code */
-        unsigned char  rsrv[11] PACKED; /* reserved for future use */
-} cblock_t;
-typedef struct ppp_udp_pkt{
-        ip_pkt_t        ip_pkt  PACKED;
-        udp_pkt_t       udp_pkt PACKED;
-        wp_mgmt_t       wp_mgmt PACKED;
-        cblock_t        cblock  PACKED;
-        unsigned char   data[MAX_LGTH_UDP_MGNT_PKT] PACKED;
-} ppp_udp_pkt_t;        
-typedef struct {
-        unsigned char   status          PACKED;
-        unsigned char   data_avail      PACKED;
-        unsigned short  real_length     PACKED;
-        unsigned short  time_stamp      PACKED;
-        unsigned char   data[1]         PACKED;
-} trace_pkt_t;
-typedef struct {
-        unsigned char   opp_flag        PACKED;
-        unsigned char   trace_type      PACKED;
-        unsigned short  trace_length    PACKED;
-        unsigned short  trace_data_ptr  PACKED;
-        unsigned short  trace_time_stamp PACKED;
-} trace_element_t;
-/* 'command' field defines */
-#define PPP_READ_CODE_VERSION   0x10    /* configuration commands */
-#define PPP_SET_CONFIG          0x05
-#define PPP_READ_CONFIG         0x06
-#define PPP_SET_INTR_FLAGS      0x20
-#define PPP_READ_INTR_FLAGS     0x21
-#define PPP_SET_INBOUND_AUTH    0x30
-#define PPP_SET_OUTBOUND_AUTH   0x31
-#define PPP_GET_CONNECTION_INFO 0x32
-#define PPP_COMM_ENABLE         0x03    /* operational commands */
-#define PPP_COMM_DISABLE        0x04
-#define PPP_SEND_SIGN_FRAME     0x23
-#define PPP_READ_SIGN_RESPONSE  0x24
-#define PPP_DATALINE_MONITOR    0x33
-#define PPP_READ_STATISTICS     0x07    /* statistics commands */
-#define PPP_FLUSH_STATISTICS    0x08
-#define PPP_READ_ERROR_STATS    0x09
-#define PPP_FLUSH_ERROR_STATS   0x0A
-#define PPP_READ_PACKET_STATS   0x12
-#define PPP_FLUSH_PACKET_STATS  0x13
-#define PPP_READ_LCP_STATS      0x14
-#define PPP_FLUSH_LCP_STATS     0x15
-#define PPP_READ_LPBK_STATS     0x16
-#define PPP_FLUSH_LPBK_STATS    0x17
-#define PPP_READ_IPCP_STATS     0x18
-#define PPP_FLUSH_IPCP_STATS    0x19
-#define PPP_READ_IPXCP_STATS    0x1A
-#define PPP_FLUSH_IPXCP_STATS   0x1B
-#define PPP_READ_PAP_STATS      0x1C
-#define PPP_FLUSH_PAP_STATS     0x1D
-#define PPP_READ_CHAP_STATS     0x1E
-#define PPP_FLUSH_CHAP_STATS    0x1F
-/* 'result' field defines */
-#define PPPRES_OK               0x00    /* command executed successfully */
-#define PPPRES_INVALID_STATE    0x09    /* invalid command in this context */
-/*----------------------------------------------------------------------------
- * PPP Mailbox.
- *      This structure is located at offset PPP???_MB_OFFS into PPP???_MB_VECT
- */
-typedef struct ppp_mbox
-{
-        unsigned char flag      PACKED; /* 00h: command execution flag */
-        ppp_cmd_t     cmd       PACKED; /* 01h: command block */
-        unsigned char data[1]   PACKED; /* 10h: variable length data buffer */
-} ppp_mbox_t;
-/*----------------------------------------------------------------------------
- * PPP Status Flags.
- *      This structure is located at offset PPP???_FLG_OFFS into
- *      PPP???_MB_VECT.
- */
-typedef struct  ppp_flags
-{
-        unsigned char iflag             PACKED; /* 00: interrupt flag */
-        unsigned char imask             PACKED; /* 01: interrupt mask */
-        unsigned char resrv             PACKED;
-        unsigned char mstatus           PACKED; /* 03: modem status */
-        unsigned char lcp_state         PACKED; /* 04: LCP state */
-        unsigned char ppp_phase         PACKED; /* 05: PPP phase */
-        unsigned char ip_state          PACKED; /* 06: IPCP state */
-        unsigned char ipx_state         PACKED; /* 07: IPXCP state */
-        unsigned char pap_state         PACKED; /* 08: PAP state */
-        unsigned char chap_state        PACKED; /* 09: CHAP state */
-        unsigned short disc_cause       PACKED; /* 0A: disconnection cause */
-} ppp_flags_t;
-/* 'iflag' defines */
-#define PPP_INTR_RXRDY          0x01    /* Rx ready */
-#define PPP_INTR_TXRDY          0x02    /* Tx ready */
-#define PPP_INTR_MODEM          0x04    /* modem status change (DCD, CTS) */
-#define PPP_INTR_CMD            0x08    /* interface command completed */
-#define PPP_INTR_DISC           0x10    /* data link disconnected */
-#define PPP_INTR_OPEN           0x20    /* data link open */
-#define PPP_INTR_DROP_DTR       0x40    /* DTR drop timeout expired */
-#define PPP_INTR_TIMER          0x80    /* timer interrupt */
-/* 'mstatus' defines */
-#define PPP_MDM_DCD             0x08    /* mdm_status: DCD */
-#define PPP_MDM_CTS             0x20    /* mdm_status: CTS */
-/* 'disc_cause' defines */
-#define PPP_LOCAL_TERMINATION   0x0001  /* Local Request by PPP termination phase */
-#define PPP_DCD_CTS_DROP        0x0002  /* DCD and/or CTS dropped. Link down */
-#define PPP_REMOTE_TERMINATION  0x0800  /* Remote Request by PPP termination phase */
-/* 'misc_config_bits' defines */
-#define DONT_RE_TX_ABORTED_I_FRAMES     0x01
-#define TX_FRM_BYTE_COUNT_STATS         0x02
-#define RX_FRM_BYTE_COUNT_STATS         0x04
-#define TIME_STAMP_IN_RX_FRAMES         0x08
-#define NON_STD_ADPTR_FREQ              0x10
-#define INTERFACE_LEVEL_RS232           0x20
-#define AUTO_LINK_RECOVERY              0x100
-#define DONT_TERMINATE_LNK_MAX_CONFIG   0x200                    
-/* 'authentication options' defines */
-#define NO_AUTHENTICATION       0x00
-#define INBOUND_AUTH            0x80
-#define PAP_AUTH                0x01
-#define CHAP_AUTH               0x02            
-/* 'ip options' defines */
-#define L_AND_R_IP_NO_ASSIG     0x00
-#define L_IP_LOCAL_ASSIG        0x01
-#define L_IP_REMOTE_ASSIG       0x02
-#define R_IP_LOCAL_ASSIG        0x04
-#define R_IP_REMOTE_ASSIG       0x08
-#define ENABLE_IP               0x80
-/* 'ipx options' defines */
-#define ROUTING_PROT_DEFAULT    0x20
-#define ENABLE_IPX              0x80
-#define DISABLE_IPX             0x00
-/*----------------------------------------------------------------------------
- * PPP Buffer Info.
- *      This structure is located at offset PPP508_BUF_OFFS into
- *      PPP508_MB_VECT.
- */
-typedef struct  ppp508_buf_info
-{
-        unsigned short txb_num  PACKED; /* 00: number of transmit buffers */
-        unsigned long  txb_ptr  PACKED; /* 02: pointer to the buffer ctl. */
-        unsigned long  txb_nxt  PACKED;
-        unsigned char  rsrv1[22] PACKED;
-        unsigned short rxb_num  PACKED; /* 20: number of receive buffers */
-        unsigned long  rxb_ptr  PACKED; /* 22: pointer to the buffer ctl. */
-        unsigned long  rxb1_ptr PACKED; /* 26: pointer to the first buf.ctl. */
-        unsigned long  rxb_base PACKED; /* 2A: pointer to the buffer base */
-        unsigned char  rsrv2[2] PACKED;
-        unsigned long  rxb_end  PACKED; /* 30: pointer to the buffer end */
-} ppp508_buf_info_t;
-/*----------------------------------------------------------------------------
- * Transmit/Receive Buffer Control Block.
- */
-typedef struct  ppp_buf_ctl
-{
-        unsigned char  flag             PACKED; /* 00: 'buffer ready' flag */
-        unsigned short length           PACKED; /* 01: length of data */
-        unsigned char  reserved1[1]     PACKED; /* 03: */
-        unsigned char  proto            PACKED; /* 04: protocol */
-        unsigned short timestamp        PACKED; /* 05: time stamp (Rx only) */
-        unsigned char  reserved2[5]     PACKED; /* 07: */
-        union
-        {
-                unsigned short o_p[2];  /* 1C: buffer offset & page (S502) */
-                unsigned long  ptr;     /* 1C: buffer pointer (S508) */
-        } buf                           PACKED;
-} ppp_buf_ctl_t;
-/*----------------------------------------------------------------------------
- * S508 Adapter Configuration Block (passed to the PPP_SET_CONFIG command).
- */
-typedef struct  ppp508_conf
-{
-        unsigned long  line_speed       PACKED; /* 00: baud rate, bps */
-        unsigned short txbuf_percent    PACKED; /* 04: % of Tx buffer */
-        unsigned short conf_flags       PACKED; /* 06: configuration bits */
-        unsigned short mtu_local        PACKED; /* 08: local MTU */
-        unsigned short mtu_remote       PACKED; /* 0A: remote MTU */
-        unsigned short restart_tmr      PACKED; /* 0C: restart timer */
-        unsigned short auth_rsrt_tmr    PACKED; /* 0E: authentication timer */
-        unsigned short auth_wait_tmr    PACKED; /* 10: authentication timer */
-        unsigned short mdm_fail_tmr     PACKED; /* 12: modem failure timer */
-        unsigned short dtr_drop_tmr     PACKED; /* 14: DTR drop timer */
-        unsigned short connect_tmout    PACKED; /* 16: connection timeout */
-        unsigned short conf_retry       PACKED; /* 18: max. retry */
-        unsigned short term_retry       PACKED; /* 1A: max. retry */
-        unsigned short fail_retry       PACKED; /* 1C: max. retry */
-        unsigned short auth_retry       PACKED; /* 1E: max. retry */
-        unsigned char  auth_options     PACKED; /* 20: authentication opt. */
-        unsigned char  ip_options       PACKED; /* 21: IP options */
-        unsigned long  ip_local         PACKED; /* 22: local IP address */
-        unsigned long  ip_remote        PACKED; /* 26: remote IP address */
-        unsigned char  ipx_options      PACKED; /* 2A: IPX options */
-        unsigned char  ipx_netno[4]     PACKED; /* 2B: IPX net number */
-        unsigned char  ipx_local[6]     PACKED; /* 2F: local IPX node number*/
-        unsigned char  ipx_remote[6]    PACKED; /* 35: remote IPX node num.*/
-        unsigned char  ipx_router[48]   PACKED; /* 3B: IPX router name*/
-        unsigned long  alt_cpu_clock    PACKED; /* 6B:  */
-} ppp508_conf_t;
-/*----------------------------------------------------------------------------
- * S508 Adapter Read Connection Information Block 
- *    Returned by the PPP_GET_CONNECTION_INFO command
- */
-typedef struct  ppp508_connect_info
-{
-        unsigned short  mru             PACKED; /* 00-01 Remote Max Rec' Unit */
-        unsigned char   ip_options      PACKED; /* 02: Negotiated ip options  */
-        unsigned long   ip_local        PACKED; /* 03-06: local IP address    */
-        unsigned long   ip_remote       PACKED; /* 07-0A: remote IP address   */
-        unsigned char   ipx_options     PACKED; /* 0B: Negotiated ipx options */
-        unsigned char   ipx_netno[4]    PACKED; /* 0C-0F: IPX net number      */
-        unsigned char   ipx_local[6]    PACKED; /* 10-1F: local IPX node #    */
-        unsigned char   ipx_remote[6]   PACKED; /* 16-1B: remote IPX node #   */
-        unsigned char   ipx_router[48]  PACKED; /* 1C-4B: IPX router name     */
-        unsigned char   auth_status     PACKED; /* 4C: Authentication Status  */
-        unsigned char   inbd_auth_peerID[1] PACKED; /* 4D: variable length inbound authenticated peer ID */
-} ppp508_connect_info_t;
-/* 'line_speed' field */
-#define PPP_BITRATE_1200        0x01
-#define PPP_BITRATE_2400        0x02
-#define PPP_BITRATE_4800        0x03
-#define PPP_BITRATE_9600        0x04
-#define PPP_BITRATE_19200       0x05
-#define PPP_BITRATE_38400       0x06
-#define PPP_BITRATE_45000       0x07
-#define PPP_BITRATE_56000       0x08
-#define PPP_BITRATE_64000       0x09
-#define PPP_BITRATE_74000       0x0A
-#define PPP_BITRATE_112000      0x0B
-#define PPP_BITRATE_128000      0x0C
-#define PPP_BITRATE_156000      0x0D
-/* Defines for the 'conf_flags' field */
-#define PPP_IGNORE_TX_ABORT     0x01    /* don't re-transmit aborted frames */
-#define PPP_ENABLE_TX_STATS     0x02    /* enable Tx statistics */
-#define PPP_ENABLE_RX_STATS     0x04    /* enable Rx statistics */
-#define PPP_ENABLE_TIMESTAMP    0x08    /* enable timestamp */
-/* 'ip_options' defines */
-#define PPP_LOCAL_IP_LOCAL      0x01
-#define PPP_LOCAL_IP_REMOTE     0x02
-#define PPP_REMOTE_IP_LOCAL     0x04
-#define PPP_REMOTE_IP_REMOTE    0x08
-/* 'ipx_options' defines */
-#define PPP_REMOTE_IPX_NETNO    0x01
-#define PPP_REMOTE_IPX_LOCAL    0x02
-#define PPP_REMOTE_IPX_REMOTE   0x04
-#define PPP_IPX_ROUTE_RIP_SAP   0x08
-#define PPP_IPX_ROUTE_NLSP      0x10
-#define PPP_IPX_ROUTE_DEFAULT   0x20
-#define PPP_IPX_CONF_COMPLETE   0x40
-#define PPP_IPX_ENABLE          0x80
-/*----------------------------------------------------------------------------
- * S508 Adapter Configuration Block (returned by the PPP_READ_CONFIG command).
- */
-typedef struct  ppp508_get_conf
-{
-        unsigned long  bps      PACKED; /* 00: baud rate, bps */
-        ppp508_conf_t  conf     PACKED; /* 04: requested config. */
-        unsigned short txb_num  PACKED; /* 6F: number of Tx buffers */
-        unsigned short rxb_num  PACKED; /* 71: number of Rx buffers */
-} ppp508_get_conf_t;
-/*----------------------------------------------------------------------------
- * S508 Operational Statistics (returned by the PPP_READ_STATISTIC command).
- */
-typedef struct ppp508_stats
-{
-        unsigned short reserved1        PACKED; /* 00: */
-        unsigned short rx_bad_len       PACKED; /* 02: */
-        unsigned short reserved2        PACKED; /* 04: */
-        unsigned long  tx_frames        PACKED; /* 06: */
-        unsigned long  tx_bytes PACKED; /* 0A: */
-        unsigned long  rx_frames        PACKED; /* 0E: */
-        unsigned long  rx_bytes PACKED; /* 12: */
-} ppp508_stats_t;
-/*----------------------------------------------------------------------------
- * Adapter Error Statistics (returned by the PPP_READ_ERROR_STATS command).
- */
-typedef struct  ppp_err_stats
-{
-        unsigned char    rx_overrun     PACKED; /* 00: Rx overrun errors */
-        unsigned char    rx_bad_crc     PACKED; /* 01: Rx CRC errors */
-        unsigned char    rx_abort       PACKED; /* 02: Rx aborted frames */
-        unsigned char    rx_lost        PACKED; /* 03: Rx frames lost */
-        unsigned char    tx_abort       PACKED; /* 04: Tx aborted frames */
-        unsigned char    tx_underrun    PACKED; /* 05: Tx underrun errors */
-        unsigned char    tx_missed_intr PACKED; /* 06: Tx underruns missed */
-        unsigned char    reserved       PACKED; /* 07: Tx underruns missed */
-        unsigned char    dcd_trans      PACKED; /* 08: DCD transitions */
-        unsigned char    cts_trans      PACKED; /* 09: CTS transitions */
-} ppp_err_stats_t;
-/*----------------------------------------------------------------------------
- * Packet Statistics (returned by the PPP_READ_PACKET_STATS command).
- */
-typedef struct  ppp_pkt_stats
-{
-        unsigned short rx_bad_header    PACKED; /* 00: */
-        unsigned short rx_prot_unknwn   PACKED; /* 02: */
-        unsigned short rx_too_large     PACKED; /* 04: */
-        unsigned short rx_lcp           PACKED; /* 06: */
-        unsigned short tx_lcp           PACKED; /* 08: */
-        unsigned short rx_ipcp          PACKED; /* 0A: */
-        unsigned short tx_ipcp          PACKED; /* 0C: */
-        unsigned short rx_ipxcp         PACKED; /* 0E: */
-        unsigned short tx_ipxcp         PACKED; /* 10: */
-        unsigned short rx_pap           PACKED; /* 12: */
-        unsigned short tx_pap           PACKED; /* 14: */
-        unsigned short rx_chap          PACKED; /* 16: */
-        unsigned short tx_chap          PACKED; /* 18: */
-        unsigned short rx_lqr           PACKED; /* 1A: */
-        unsigned short tx_lqr           PACKED; /* 1C: */
-        unsigned short rx_ip            PACKED; /* 1E: */
-        unsigned short tx_ip            PACKED; /* 20: */
-        unsigned short rx_ipx           PACKED; /* 22: */
-        unsigned short tx_ipx           PACKED; /* 24: */
-} ppp_pkt_stats_t;
-/*----------------------------------------------------------------------------
- * LCP Statistics (returned by the PPP_READ_LCP_STATS command).
- */
-typedef struct  ppp_lcp_stats
-{
-        unsigned short rx_unknown       PACKED; /* 00: unknown LCP type */
-        unsigned short rx_conf_rqst     PACKED; /* 02: Configure-Request */
-        unsigned short rx_conf_ack      PACKED; /* 04: Configure-Ack */
-        unsigned short rx_conf_nak      PACKED; /* 06: Configure-Nak */
-        unsigned short rx_conf_rej      PACKED; /* 08: Configure-Reject */
-        unsigned short rx_term_rqst     PACKED; /* 0A: Terminate-Request */
-        unsigned short rx_term_ack      PACKED; /* 0C: Terminate-Ack */
-        unsigned short rx_code_rej      PACKED; /* 0E: Code-Reject */
-        unsigned short rx_proto_rej     PACKED; /* 10: Protocol-Reject */
-        unsigned short rx_echo_rqst     PACKED; /* 12: Echo-Request */
-        unsigned short rx_echo_reply    PACKED; /* 14: Echo-Reply */
-        unsigned short rx_disc_rqst     PACKED; /* 16: Discard-Request */
-        unsigned short tx_conf_rqst     PACKED; /* 18: Configure-Request */
-        unsigned short tx_conf_ack      PACKED; /* 1A: Configure-Ack */
-        unsigned short tx_conf_nak      PACKED; /* 1C: Configure-Nak */
-        unsigned short tx_conf_rej      PACKED; /* 1E: Configure-Reject */
-        unsigned short tx_term_rqst     PACKED; /* 20: Terminate-Request */
-        unsigned short tx_term_ack      PACKED; /* 22: Terminate-Ack */
-        unsigned short tx_code_rej      PACKED; /* 24: Code-Reject */
-        unsigned short tx_proto_rej     PACKED; /* 26: Protocol-Reject */
-        unsigned short tx_echo_rqst     PACKED; /* 28: Echo-Request */
-        unsigned short tx_echo_reply    PACKED; /* 2A: Echo-Reply */
-        unsigned short tx_disc_rqst     PACKED; /* 2E: Discard-Request */
-        unsigned short rx_too_large     PACKED; /* 30: packets too large */
-        unsigned short rx_ack_inval     PACKED; /* 32: invalid Conf-Ack */
-        unsigned short rx_rej_inval     PACKED; /* 34: invalid Conf-Reject */
-        unsigned short rx_rej_badid     PACKED; /* 36: Conf-Reject w/bad ID */
-} ppp_lcp_stats_t;
-/*----------------------------------------------------------------------------
- * Loopback Error Statistics (returned by the PPP_READ_LPBK_STATS command).
- */
-typedef struct  ppp_lpbk_stats
-{
-        unsigned short conf_magic       PACKED; /* 00:  */
-        unsigned short loc_echo_rqst    PACKED; /* 02:  */
-        unsigned short rem_echo_rqst    PACKED; /* 04:  */
-        unsigned short loc_echo_reply   PACKED; /* 06:  */
-        unsigned short rem_echo_reply   PACKED; /* 08:  */
-        unsigned short loc_disc_rqst    PACKED; /* 0A:  */
-        unsigned short rem_disc_rqst    PACKED; /* 0C:  */
-        unsigned short echo_tx_collsn   PACKED; /* 0E:  */
-        unsigned short echo_rx_collsn   PACKED; /* 10:  */
-} ppp_lpbk_stats_t;
-/*----------------------------------------------------------------------------
- * Protocol Statistics (returned by the PPP_READ_IPCP_STATS and
- * PPP_READ_IPXCP_STATS commands).
- */
-typedef struct  ppp_prot_stats
-{
-        unsigned short rx_unknown       PACKED; /* 00: unknown type */
-        unsigned short rx_conf_rqst     PACKED; /* 02: Configure-Request */
-        unsigned short rx_conf_ack      PACKED; /* 04: Configure-Ack */
-        unsigned short rx_conf_nak      PACKED; /* 06: Configure-Nak */
-        unsigned short rx_conf_rej      PACKED; /* 08: Configure-Reject */
-        unsigned short rx_term_rqst     PACKED; /* 0A: Terminate-Request */
-        unsigned short rx_term_ack      PACKED; /* 0C: Terminate-Ack */
-        unsigned short rx_code_rej      PACKED; /* 0E: Code-Reject */
-        unsigned short reserved         PACKED; /* 10: */
-        unsigned short tx_conf_rqst     PACKED; /* 12: Configure-Request */
-        unsigned short tx_conf_ack      PACKED; /* 14: Configure-Ack */
-        unsigned short tx_conf_nak      PACKED; /* 16: Configure-Nak */
-        unsigned short tx_conf_rej      PACKED; /* 18: Configure-Reject */
-        unsigned short tx_term_rqst     PACKED; /* 1A: Terminate-Request */
-        unsigned short tx_term_ack      PACKED; /* 1C: Terminate-Ack */
-        unsigned short tx_code_rej      PACKED; /* 1E: Code-Reject */
-        unsigned short rx_too_large     PACKED; /* 20: packets too large */
-        unsigned short rx_ack_inval     PACKED; /* 22: invalid Conf-Ack */
-        unsigned short rx_rej_inval     PACKED; /* 24: invalid Conf-Reject */
-        unsigned short rx_rej_badid     PACKED; /* 26: Conf-Reject w/bad ID */
-} ppp_prot_stats_t;
-/*----------------------------------------------------------------------------
- * PAP Statistics (returned by the PPP_READ_PAP_STATS command).
- */
-typedef struct  ppp_pap_stats
-{
-        unsigned short rx_unknown       PACKED; /* 00: unknown type */
-        unsigned short rx_auth_rqst     PACKED; /* 02: Authenticate-Request */
-        unsigned short rx_auth_ack      PACKED; /* 04: Authenticate-Ack */
-        unsigned short rx_auth_nak      PACKED; /* 06: Authenticate-Nak */
-        unsigned short reserved         PACKED; /* 08: */
-        unsigned short tx_auth_rqst     PACKED; /* 0A: Authenticate-Request */
-        unsigned short tx_auth_ack      PACKED; /* 0C: Authenticate-Ack */
-        unsigned short tx_auth_nak      PACKED; /* 0E: Authenticate-Nak */
-        unsigned short rx_too_large     PACKED; /* 10: packets too large */
-        unsigned short rx_bad_peerid    PACKED; /* 12: invalid peer ID */
-        unsigned short rx_bad_passwd    PACKED; /* 14: invalid password */
-} ppp_pap_stats_t;
-/*----------------------------------------------------------------------------
- * CHAP Statistics (returned by the PPP_READ_CHAP_STATS command).
- */
-typedef struct  ppp_chap_stats
-{
-        unsigned short rx_unknown       PACKED; /* 00: unknown type */
-        unsigned short rx_challenge     PACKED; /* 02: Authenticate-Request */
-        unsigned short rx_response      PACKED; /* 04: Authenticate-Ack */
-        unsigned short rx_success       PACKED; /* 06: Authenticate-Nak */
-        unsigned short rx_failure       PACKED; /* 08: Authenticate-Nak */
-        unsigned short reserved         PACKED; /* 0A: */
-        unsigned short tx_challenge     PACKED; /* 0C: Authenticate-Request */
-        unsigned short tx_response      PACKED; /* 0E: Authenticate-Ack */
-        unsigned short tx_success       PACKED; /* 10: Authenticate-Nak */
-        unsigned short tx_failure       PACKED; /* 12: Authenticate-Nak */
-        unsigned short rx_too_large     PACKED; /* 14: packets too large */
-        unsigned short rx_bad_peerid    PACKED; /* 16: invalid peer ID */
-        unsigned short rx_bad_passwd    PACKED; /* 18: invalid password */
-        unsigned short rx_bad_md5       PACKED; /* 1A: invalid MD5 format */
-        unsigned short rx_bad_resp      PACKED; /* 1C: invalid response */
-} ppp_chap_stats_t;
-/*----------------------------------------------------------------------------
- * Connection Information (returned by the PPP_GET_CONNECTION_INFO command).
- */
-typedef struct  ppp_conn_info
-{
-        unsigned short remote_mru       PACKED; /* 00:  */
-        unsigned char  ip_options       PACKED; /* 02:  */
-        unsigned char  ip_local[4]      PACKED; /* 03:  */
-        unsigned char  ip_remote[4]     PACKED; /* 07:  */
-        unsigned char  ipx_options      PACKED; /* 0B:  */
-        unsigned char  ipx_network[4]   PACKED; /* 0C:  */
-        unsigned char  ipx_local[6]     PACKED; /* 10:  */
-        unsigned char  ipx_remote[6]    PACKED; /* 16:  */
-        unsigned char  ipx_router[48]   PACKED; /* 1C:  */
-        unsigned char  auth_status      PACKED; /* 4C:  */
-        unsigned char  peer_id[0]       PACKED; /* 4D:  */
-} ppp_conn_info_t;
-/* Data structure for SET_TRIGGER_INTR command
- */
-typedef struct ppp_intr_info{
-        unsigned char  i_enable         PACKED; /* 0 Interrupt enable bits */
-        unsigned char  irq              PACKED; /* 1 Irq number */
-        unsigned short timer_len        PACKED; /* 2 Timer delay */
-} ppp_intr_info_t;
-#define FT1_MONITOR_STATUS_CTRL                         0x80
-#define SET_FT1_MODE                                    0x81
-/* Special UDP drivers management commands */
-#define PPIPE_ENABLE_TRACING                            0x20
-#define PPIPE_DISABLE_TRACING                           0x21
-#define PPIPE_GET_TRACE_INFO                            0x22
-#define PPIPE_GET_IBA_DATA                              0x23
-#define PPIPE_KILL_BOARD                                0x24
-#define PPIPE_FT1_READ_STATUS                           0x25
-#define PPIPE_DRIVER_STAT_IFSEND                        0x26
-#define PPIPE_DRIVER_STAT_INTR                          0x27
-#define PPIPE_DRIVER_STAT_GEN                           0x28
-#define PPIPE_FLUSH_DRIVER_STATS                        0x29
-#define PPIPE_ROUTER_UP_TIME                            0x30
-#define DISABLE_TRACING                                 0x00
-#define TRACE_SIGNALLING_FRAMES                         0x01
-#define TRACE_DATA_FRAMES                               0x02
-#ifdef          _MSC_
-#  pragma       pack()
-#endif
-#endif  /* _SDLA_PPP_H */
diff --git a/include/linux/sdla_x25.h b/include/linux/sdla_x25.h
deleted file mode 100644
index 57db980e27ad..000000000000
--- a/include/linux/sdla_x25.h
+++ /dev/null
@@ -1,772 +0,0 @@
-/*****************************************************************************
-* sdla_x25.h    Sangoma X.25 firmware API definitions.
-*
-* Author:       Nenad Corbic    <ncorbic@sangoma.com>
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-                2 of the License, or (at your option) any later version.
-* ============================================================================
-* Feb 28, 2000  Nenad Corbic    Updated for socket based x25api
-* Dec 13, 1996  Gene Kozin      Initial version
-*****************************************************************************/
-#ifndef _SDLA_X25_H
-#define _SDLA_X25_H
-/*----------------------------------------------------------------------------
- * Notes:
- * ------
- * 1. All structures defined in this file are byte-alined.  
- *      Compiler        Platform        
- *      --------        --------
- *      GNU C           Linux
- *
- */
-#ifndef PACKED
-#       define  PACKED  __attribute__((packed))
-#endif  /* PACKED */
-/****** CONSTANTS DEFINITIONS ***********************************************/
-#define X25_MAX_CHAN    255     /* max number of open X.25 circuits */
-#define X25_MAX_DATA    1024    /* max length of X.25 data buffer */
-/*
- * X.25 shared memory layout.
- */
-#define X25_MBOX_OFFS   0x16B0  /* general mailbox block */
-#define X25_RXMBOX_OFFS 0x1AD0  /* receive mailbox */
-#define X25_STATUS_OFFS 0x1EF0  /* X.25 status structure */
-#define X25_MB_VECTOR   0xE000  /* S514 mailbox window vecotr */
-#define X25_MISC_HDLC_BITS 0x1F00 /*X.25 miscallaneous HDLC bits */
-/* code levels */
-#define HDLC_LEVEL 0x01
-#define X25_LEVEL  0x02
-#define X25_AND_HDLC_LEVEL 0x03
-#define DO_HDLC_LEVEL_ERROR_CHECKING 0x04
-/****** DATA STRUCTURES *****************************************************/
-/*----------------------------------------------------------------------------
- * X.25 Command Block.
- */
-typedef struct X25Cmd
-{
-        unsigned char command   PACKED; /* command code */
-        unsigned short length   PACKED; /* transfer data length */
-        unsigned char result    PACKED; /* return code */
-        unsigned char pf        PACKED; /* P/F bit */
-        unsigned short lcn      PACKED; /* logical channel */
-        unsigned char qdm       PACKED; /* Q/D/M bits */
-        unsigned char cause     PACKED; /* cause field */
-        unsigned char diagn     PACKED; /* diagnostics */
-        unsigned char pktType   PACKED; /* packet type */
-        unsigned char resrv[4]  PACKED; /* reserved */
-} TX25Cmd;
-/*
- * Defines for the 'command' field.
- */
-/*----- General commands --------------*/
-#define X25_SET_GLOBAL_VARS     0x0B    /* set global variables */ 
-#define X25_READ_MODEM_STATUS   0x0C    /* read modem status */
-#define X25_READ_CODE_VERSION   0x15    /* read firmware version number */
-#define X25_TRACE_CONFIGURE     0x14    /* configure trace facility */
-#define X25_READ_TRACE_DATA     0x16    /* read trace data */
-#define X25_SET_INTERRUPT_MODE  0x17    /* set interrupt generation mode */
-#define X25_READ_INTERRUPT_MODE 0x18    /* read interrupt generation mode */
-/*----- HDLC-level commands -----------*/
-#define X25_HDLC_LINK_CONFIGURE 0x01    /* configure HDLC link level */   
-#define X25_HDLC_LINK_OPEN      0x02    /* open HDLC link */            
-#define X25_HDLC_LINK_CLOSE     0x03    /* close HDLC link */
-#define X25_HDLC_LINK_SETUP     0x04    /* set up HDLC link */ 
-#define X25_HDLC_LINK_DISC      0x05    /* disconnect DHLC link */
-#define X25_HDLC_LINK_STATUS    0x06    /* read DHLC link status */
-#define X25_HDLC_READ_STATS     0x07    /* read operational statistics */
-#define X25_HDLC_FLUSH_STATS    0x08    /* flush operational statistics */
-#define X25_HDLC_READ_COMM_ERR  0x09    /* read error statistics */
-#define X25_HDLC_FLUSH_COMM_ERR 0x0A    /* flush error statistics */
-#define X25_HDLC_FLUSH_BUFFERS  0x0D    /* flush HDLC-level data buffers */
-#define X25_HDLC_SPRVS_CNT_STAT 0x0F    /* read surervisory count status */
-#define X25_HDLC_SEND_UI_FRAME  0x10    /* send unnumbered information frame */
-#define X25_HDLC_WRITE          0x11    /* send HDLC information frame */
-#define X25_HDLC_READ           0x21    /* read HDLC information frame */
-#define X25_HDLC_READ_CONFIG    0x12    /* read HDLC configuration */
-#define X25_HDLC_SET_CONFIG     0x13    /* set HDLC configuration */
-#define SET_PROTOCOL_LEVEL      0x1F    /* set protocol level */
-/*----- X.25-level commands -----------*/
-#define X25_READ                0x22    /* read X.25 packet */
-#define X25_WRITE               0x23    /* send X.25 packet */
-#define X25_PLACE_CALL          0x30    /* place a call on SVC */
-#define X25_ACCEPT_CALL         0x31    /* accept incomming call */
-#define X25_CLEAR_CALL          0x32    /* clear call */
-#define X25_CLEAR_CONFRM        0x33    /* send clear confirmation packet */
-#define X25_RESET               0x34    /* send reset request packet */
-#define X25_RESET_CONFRM        0x35    /* send reset confirmation packet */
-#define X25_RESTART             0x36    /* send restart request packet */
-#define X25_RESTART_CONFRM      0x37    /* send restart confirmation packet */
-#define X25_INTERRUPT           0x38    /* send interrupt request packet */
-#define X25_INTERRUPT_CONFRM    0x39    /* send interrupt confirmation pkt */
-#define X25_REGISTRATION_RQST   0x3A    /* send registration request packet */
-#define X25_REGISTRATION_CONFRM 0x3B    /* send registration confirmation */
-#define X25_IS_DATA_AVAILABLE   0x40    /* querry receive queue */
-#define X25_INCOMMING_CALL_CTL  0x41    /* select incomming call options */
-#define X25_CONFIGURE_PVC       0x42    /* configure PVC */
-#define X25_GET_ACTIVE_CHANNELS 0x43    /* get a list of active circuits */
-#define X25_READ_CHANNEL_CONFIG 0x44    /* read virt. circuit configuration */
-#define X25_FLUSH_DATA_BUFFERS  0x45    /* flush X.25-level data buffers */
-#define X25_READ_HISTORY_TABLE  0x46    /* read asynchronous event log */
-#define X25_HISTORY_TABLE_CTL   0x47    /* control asynchronous event log */
-#define X25_GET_TX_D_BIT_STATUS 0x48    /* is packet with D-bit acknowleged */
-#define X25_READ_STATISTICS     0x49    /* read X.25-level statistics */
-#define X25_FLUSH_STATISTICS    0x4A    /* flush X.25-level statistics */
-#define X25_READ_CONFIGURATION  0x50    /* read HDLC & X.25 configuration */
-#define X25_SET_CONFIGURATION   0x51    /* set HDLC & X.25 configuration */
-/*
- * Defines for the 'result' field.
- */
-/*----- General results ---------------*/
-#define X25RES_OK               0x00
-#define X25RES_ERROR            0x01
-#define X25RES_LINK_NOT_IN_ABM  0x02    /* link is not in ABM mode */
-#define X25RES_LINK_CLOSED      0x03
-#define X25RES_INVAL_LENGTH     0x04
-#define X25RES_INVAL_CMD        0x05
-#define X25RES_UNNUMBERED_FRAME 0x06    /* unnunbered frame received */
-#define X25RES_FRM_REJECT_MODE  0x07    /* link is in Frame Reject mode */
-#define X25RES_MODEM_FAILURE    0x08    /* DCD and/or CTS dropped */
-#define X25RES_N2_RETRY_LIMIT   0x09    /* N2 retry limit has been exceeded */
-#define X25RES_INVAL_LCN        0x30    /* invalid logical channel number */
-#define X25RES_INVAL_STATE      0x31    /* channel is not in data xfer mode */
-#define X25RES_INVAL_DATA_LEN   0x32    /* invalid data length */
-#define X25RES_NOT_READY        0x33    /* no data available / buffers full */
-#define X25RES_NETWORK_DOWN     0x34
-#define X25RES_CHANNEL_IN_USE   0x35    /* there is data queued on this LCN */
-#define X25RES_REGST_NOT_SUPPRT 0x36    /* registration not supported */
-#define X25RES_INVAL_FORMAT     0x37    /* invalid packet format */
-#define X25RES_D_BIT_NOT_SUPPRT 0x38    /* D-bit pragmatics not supported */
-#define X25RES_FACIL_NOT_SUPPRT 0x39    /* Call facility not supported */
-#define X25RES_INVAL_CALL_ARG   0x3A    /* errorneous call arguments */
-#define X25RES_INVAL_CALL_DATA  0x3B    /* errorneous call user data */
-#define X25RES_ASYNC_PACKET     0x40    /* asynchronous packet received */
-#define X25RES_PROTO_VIOLATION  0x41    /* protocol violation occurred */
-#define X25RES_PKT_TIMEOUT      0x42    /* X.25 packet time out */
-#define X25RES_PKT_RETRY_LIMIT  0x43    /* X.25 packet retry limit exceeded */
-/*----- Command-dependent results -----*/
-#define X25RES_LINK_DISC        0x00    /* HDLC_LINK_STATUS */
-#define X25RES_LINK_IN_ABM      0x01    /* HDLC_LINK_STATUS */
-#define X25RES_NO_DATA          0x01    /* HDLC_READ/READ_TRACE_DATA*/
-#define X25RES_TRACE_INACTIVE   0x02    /* READ_TRACE_DATA */
-#define X25RES_LINK_IS_OPEN     0x01    /* HDLC_LINK_OPEN */
-#define X25RES_LINK_IS_DISC     0x02    /* HDLC_LINK_DISC */
-#define X25RES_LINK_IS_CLOSED   0x03    /* HDLC_LINK_CLOSE */
-#define X25RES_INVAL_PARAM      0x31    /* INCOMMING_CALL_CTL */
-#define X25RES_INVAL_CONFIG     0x35    /* REGISTR_RQST/CONFRM */
-/*
- * Defines for the 'qdm_bits' field.
- */
-#define X25CMD_Q_BIT_MASK       0x04
-#define X25CMD_D_BIT_MASK       0x02
-#define X25CMD_M_BIT_MASK       0x01
-/*
- * Defines for the 'pkt_type' field.
- */
-/*----- Asynchronous events ------*/
-#define ASE_CLEAR_RQST          0x02
-#define ASE_RESET_RQST          0x04
-#define ASE_RESTART_RQST        0x08
-#define ASE_INTERRUPT           0x10
-#define ASE_DTE_REGISTR_RQST    0x20
-#define ASE_CALL_RQST           0x30
-#define ASE_CALL_ACCEPTED       0x31
-#define ASE_CLEAR_CONFRM        0x32
-#define ASE_RESET_CONFRM        0x33
-#define ASE_RESTART_CONFRM      0x34
-#define ASE_INTERRUPT_CONFRM    0x35
-#define ASE_DCE_REGISTR_CONFRM  0x36
-#define ASE_DIAGNOSTIC          0x37
-#define ASE_CALL_AUTO_CLEAR     0x38
-#define AUTO_RESPONSE_FLAG      0x80
-/*----- Time-Out events ----------*/
-#define TOE_RESTART_RQST        0x03
-#define TOE_CALL_RQST           0x05
-#define TOE_CLEAR_RQST          0x08
-#define TOE_RESET_RQST          0x0A
-/*----- Protocol Violation events */
-#define PVE_CLEAR_RQST          0x32
-#define PVE_RESET_RQST          0x33
-#define PVE_RESTART_RQST        0x34
-#define PVE_DIAGNOSTIC          0x37
-#define INTR_ON_RX_FRAME            0x01
-#define INTR_ON_TX_FRAME            0x02
-#define INTR_ON_MODEM_STATUS_CHANGE 0x04
-#define INTR_ON_COMMAND_COMPLETE    0x08
-#define INTR_ON_X25_ASY_TRANSACTION 0x10
-#define INTR_ON_TIMER               0x40
-#define DIRECT_RX_INTR_USAGE        0x80
-#define NO_INTR_PENDING                 0x00
-#define RX_INTR_PENDING                 0x01    
-#define TX_INTR_PENDING                 0x02
-#define MODEM_INTR_PENDING              0x04
-#define COMMAND_COMPLETE_INTR_PENDING   0x08
-#define X25_ASY_TRANS_INTR_PENDING      0x10
-#define TIMER_INTR_PENDING              0x40
-/*----------------------------------------------------------------------------
- * X.25 Mailbox.
- *      This structure is located at offsets X25_MBOX_OFFS and X25_RXMBOX_OFFS
- *      into shared memory window.
- */
-typedef struct X25Mbox
-{
-        unsigned char opflag    PACKED; /* 00h: execution flag */
-        TX25Cmd cmd             PACKED; /* 01h: command block */
-        unsigned char data[1]   PACKED; /* 10h: data buffer */
-} TX25Mbox;
-/*----------------------------------------------------------------------------
- * X.25 Time Stamp Structure.
- */
-typedef struct X25TimeStamp
-{
-        unsigned char month     PACKED;
-        unsigned char date      PACKED;
-        unsigned char sec       PACKED;
-        unsigned char min       PACKED;
-        unsigned char hour      PACKED;
-} TX25TimeStamp;
-/*----------------------------------------------------------------------------
- * X.25 Status Block.
- *      This structure is located at offset X25_STATUS_OFF into shared memory
- *      window.
- */
-typedef struct X25Status
-{
-        unsigned short pvc_map  PACKED; /* 00h: PVC map */
-        unsigned short icc_map  PACKED; /* 02h: Incomming Chan. map */
-        unsigned short twc_map  PACKED; /* 04h: Two-way Cnan. map */
-        unsigned short ogc_map  PACKED; /* 06h: Outgoing Chan. map */
-        TX25TimeStamp tstamp    PACKED; /* 08h: timestamp (BCD) */
-        unsigned char iflags    PACKED; /* 0Dh: interrupt flags */
-        unsigned char imask     PACKED; /* 0Eh: interrupt mask  */
-        unsigned char resrv     PACKED; /* 0Eh: */
-        unsigned char gflags    PACKED; /* 10h: misc. HDLC/X25 flags */
-        unsigned char cflags[X25_MAX_CHAN] PACKED; /* channel status bytes */
-} TX25Status;
-/*
- * Bitmasks for the 'iflags' field.
- */
-#define X25_RX_INTR     0x01    /* receive interrupt */
-#define X25_TX_INTR     0x02    /* transmit interrupt */
-#define X25_MODEM_INTR  0x04    /* modem status interrupt (CTS/DCD) */
-#define X25_EVENT_INTR  0x10    /* asyncronous event encountered */
-#define X25_CMD_INTR    0x08    /* interface command complete */
-/*
- * Bitmasks for the 'gflags' field.
- */
-#define X25_HDLC_ABM    0x01    /* HDLC is in ABM mode */
-#define X25_RX_READY    0x02    /* X.25 data available */
-#define X25_TRACE_READY 0x08    /* trace data available */
-#define X25_EVENT_IND   0x20    /* asynchronous event indicator */
-#define X25_TX_READY    0x40    /* space is available in Tx buf.*/
-/*
- * Bitmasks for the 'cflags' field.
- */
-#define X25_XFER_MODE   0x80    /* channel is in data transfer mode */
-#define X25_TXWIN_OPEN  0x40    /* transmit window open */
-#define X25_RXBUF_MASK  0x3F    /* number of data buffers available */
-/*****************************************************************************
- * Following definitions structurize contents of the TX25Mbox.data field for
- * different X.25 interface commands.
- ****************************************************************************/
-/* ---------------------------------------------------------------------------
- * X25_SET_GLOBAL_VARS Command.
- */
-typedef struct X25GlobalVars
-{
-        unsigned char resrv     PACKED; /* 00h: reserved */
-        unsigned char dtrCtl    PACKED; /* 01h: DTR control code */
-        unsigned char resErr    PACKED; /* 01h: '1' - reset modem error */
-} TX25GlobalVars;
-/*
- * Defines for the 'dtrCtl' field.
- */
-#define X25_RAISE_DTR   0x01
-#define X25_DROP_DTR    0x02
-/* ---------------------------------------------------------------------------
- * X25_READ_MODEM_STATUS Command.
- */
-typedef struct X25ModemStatus
-{
-        unsigned char   status  PACKED;         /* 00h: modem status */
-} TX25ModemStatus;
-/*
- * Defines for the 'status' field.
- */
-#define X25_CTS_MASK    0x20
-#define X25_DCD_MASK    0x08
-/* ---------------------------------------------------------------------------
- * X25_HDLC_LINK_STATUS Command.
- */
-typedef struct X25LinkStatus
-{
-        unsigned char txQueued  PACKED; /* 00h: queued Tx I-frames*/
-        unsigned char rxQueued  PACKED; /* 01h: queued Rx I-frames*/
-        unsigned char station   PACKED; /* 02h: DTE/DCE config. */
-        unsigned char reserved  PACKED; /* 03h: reserved */
-        unsigned char sfTally   PACKED; /* 04h: supervisory frame tally */
-} TX25LinkStatus;
-/*
- * Defines for the 'station' field.
- */
-#define X25_STATION_DTE 0x01    /* station configured as DTE */
-#define X25_STATION_DCE 0x02    /* station configured as DCE */
-/* ---------------------------------------------------------------------------
- * X25_HDLC_READ_STATS Command.
- */
-typedef struct HdlcStats
-{                                               /*      a number of ... */
-        unsigned short rxIFrames        PACKED; /* 00h: ready Rx I-frames */
-        unsigned short rxNoseq          PACKED; /* 02h: frms out-of-sequence */
-        unsigned short rxNodata         PACKED; /* 04h: I-frms without data */
-        unsigned short rxDiscarded      PACKED; /* 06h: discarded frames */
-        unsigned short rxTooLong        PACKED; /* 08h: frames too long */
-        unsigned short rxBadAddr        PACKED; /* 0Ah: frms with inval.addr*/
-        unsigned short txAcked          PACKED; /* 0Ch: acknowledged I-frms */
-        unsigned short txRetransm       PACKED; /* 0Eh: re-transmit. I-frms */
-        unsigned short t1Timeout        PACKED; /* 10h: T1 timeouts */
-        unsigned short rxSABM           PACKED; /* 12h: received SABM frames */
-        unsigned short rxDISC           PACKED; /* 14h: received DISC frames */
-        unsigned short rxDM             PACKED; /* 16h: received DM frames */
-        unsigned short rxFRMR           PACKED; /* 18h: FRMR frames received */
-        unsigned short txSABM           PACKED; /* 1Ah: transm. SABM frames*/
-        unsigned short txDISC           PACKED; /* 1Ch: transm. DISC frames*/
-        unsigned short txDM             PACKED; /* 1Eh: transm. DM frames */
-        unsigned short txFRMR           PACKED; /* 20h: transm. FRMR frames*/
-} THdlcStats;
-/* ---------------------------------------------------------------------------
- * X25_HDLC_READ_COMM_ERR Command.
- */
-typedef struct HdlcCommErr
-{                                               /*      a number of ... */
-        unsigned char rxOverrun         PACKED; /* 00h: Rx overrun errors */
-        unsigned char rxBadCrc          PACKED; /* 01h: Rx CRC errors */
-        unsigned char rxAborted         PACKED; /* 02h: Rx aborted frames */
-        unsigned char rxDropped         PACKED; /* 03h: frames lost */
-        unsigned char txAborted         PACKED; /* 04h: Tx aborted frames */
-        unsigned char txUnderrun        PACKED; /* 05h: Tx underrun errors */
-        unsigned char txMissIntr        PACKED; /* 06h: missed underrun ints */
-        unsigned char reserved          PACKED; /* 07h: reserved */
-        unsigned char droppedDCD        PACKED; /* 08h: times DCD dropped */
-        unsigned char droppedCTS        PACKED; /* 09h: times CTS dropped */
-} THdlcCommErr;
-/* ---------------------------------------------------------------------------
- * X25_SET_CONFIGURATION & X25_READ_CONFIGURATION Commands.
- */
-typedef struct X25Config
-{
-unsigned char baudRate          PACKED; /* 00h:  */
-        unsigned char t1                PACKED; /* 01h:  */
-        unsigned char t2                PACKED; /* 02h:  */
-        unsigned char n2                PACKED; /* 03h:  */
-        unsigned short hdlcMTU          PACKED; /* 04h:  */
-        unsigned char hdlcWindow        PACKED; /* 06h:  */
-        unsigned char t4                PACKED; /* 07h:  */
-        unsigned char autoModem         PACKED; /* 08h:  */
-        unsigned char autoHdlc          PACKED; /* 09h:  */
-        unsigned char hdlcOptions       PACKED; /* 0Ah:  */
-        unsigned char station           PACKED; /* 0Bh:  */
-        unsigned char pktWindow         PACKED; /* 0Ch:  */
-        unsigned short defPktSize       PACKED; /* 0Dh:  */
-        unsigned short pktMTU           PACKED; /* 0Fh:  */
-        unsigned short loPVC            PACKED; /* 11h:  */
-        unsigned short hiPVC            PACKED; /* 13h:  */
-        unsigned short loIncommingSVC   PACKED; /* 15h:  */
-        unsigned short hiIncommingSVC   PACKED; /* 17h:  */
-        unsigned short loTwoWaySVC      PACKED; /* 19h:  */
-        unsigned short hiTwoWaySVC      PACKED; /* 1Bh:  */
-        unsigned short loOutgoingSVC    PACKED; /* 1Dh:  */
-        unsigned short hiOutgoingSVC    PACKED; /* 1Fh:  */
-        unsigned short options          PACKED; /* 21h:  */
-        unsigned char responseOpt       PACKED; /* 23h:  */
-        unsigned short facil1           PACKED; /* 24h:  */
-        unsigned short facil2           PACKED; /* 26h:  */
-        unsigned short ccittFacil       PACKED; /* 28h:  */
-        unsigned short otherFacil       PACKED; /* 2Ah:  */
-        unsigned short ccittCompat      PACKED; /* 2Ch:  */
-        unsigned char t10t20            PACKED; /* 2Eh:  */
-        unsigned char t11t21            PACKED; /* 2Fh:  */
-        unsigned char t12t22            PACKED; /* 30h:  */
-        unsigned char t13t23            PACKED; /* 31h:  */
-        unsigned char t16t26            PACKED; /* 32H:  */
-        unsigned char t28               PACKED; /* 33h:  */
-        unsigned char r10r20            PACKED; /* 34h:  */
-        unsigned char r12r22            PACKED; /* 35h:  */
-        unsigned char r13r23            PACKED; /* 36h:  */
-} TX25Config;
-/* ---------------------------------------------------------------------------
- * X25_READ_CHANNEL_CONFIG Command.
- */
-typedef struct X25ChanAlloc                     /*----- Channel allocation -*/
-{
-        unsigned short loPVC            PACKED; /* 00h: lowest PVC number */
-        unsigned short hiPVC            PACKED; /* 02h: highest PVC number */
-        unsigned short loIncommingSVC   PACKED; /* 04h: lowest incoming SVC */
-        unsigned short hiIncommingSVC   PACKED; /* 06h: highest incoming SVC */
-        unsigned short loTwoWaySVC      PACKED; /* 08h: lowest two-way SVC */
-        unsigned short hiTwoWaySVC      PACKED; /* 0Ah: highest two-way SVC */
-        unsigned short loOutgoingSVC    PACKED; /* 0Ch: lowest outgoing SVC */
-        unsigned short hiOutgoingSVC    PACKED; /* 0Eh: highest outgoing SVC */
-} TX25ChanAlloc;
-typedef struct X25ChanCfg               /*------ Channel configuration -----*/
-{
-        unsigned char type      PACKED; /* 00h: channel type */
-        unsigned char txConf    PACKED; /* 01h: Tx packet and window sizes */
-        unsigned char rxConf    PACKED; /* 01h: Rx packet and window sizes */
-} TX25ChanCfg;
-/*
- * Defines for the 'type' field.
- */
-#define X25_PVC         0x01    /* PVC */
-#define X25_SVC_IN      0x03    /* Incoming SVC */
-#define X25_SVC_TWOWAY  0x07    /* Two-way SVC */
-#define X25_SVC_OUT     0x0B    /* Outgoing SVC */
-/*----------------------------------------------------------------------------
- * X25_READ_STATISTICS Command.
- */
-typedef struct X25Stats
-{                                               /* number of packets Tx/Rx'ed */
-        unsigned short txRestartRqst    PACKED; /* 00h: Restart Request */
-        unsigned short rxRestartRqst    PACKED; /* 02h: Restart Request */
-        unsigned short txRestartConf    PACKED; /* 04h: Restart Confirmation */
-        unsigned short rxRestartConf    PACKED; /* 06h: Restart Confirmation */
-        unsigned short txResetRqst      PACKED; /* 08h: Reset Request */
-        unsigned short rxResetRqst      PACKED; /* 0Ah: Reset Request */
-        unsigned short txResetConf      PACKED; /* 0Ch: Reset Confirmation */
-        unsigned short rxResetConf      PACKED; /* 0Eh: Reset Confirmation */
-        unsigned short txCallRequest    PACKED; /* 10h: Call Request */
-        unsigned short rxCallRequest    PACKED; /* 12h: Call Request */
-        unsigned short txCallAccept     PACKED; /* 14h: Call Accept */
-        unsigned short rxCallAccept     PACKED; /* 16h: Call Accept */
-        unsigned short txClearRqst      PACKED; /* 18h: Clear Request */
-        unsigned short rxClearRqst      PACKED; /* 1Ah: Clear Request */
-        unsigned short txClearConf      PACKED; /* 1Ch: Clear Confirmation */
-        unsigned short rxClearConf      PACKED; /* 1Eh: Clear Confirmation */
-        unsigned short txDiagnostic     PACKED; /* 20h: Diagnostic */
-        unsigned short rxDiagnostic     PACKED; /* 22h: Diagnostic */
-        unsigned short txRegRqst        PACKED; /* 24h: Registration Request */
-        unsigned short rxRegRqst        PACKED; /* 26h: Registration Request */
-        unsigned short txRegConf        PACKED; /* 28h: Registration Confirm.*/
-        unsigned short rxRegConf        PACKED; /* 2Ah: Registration Confirm.*/
-        unsigned short txInterrupt      PACKED; /* 2Ch: Interrupt */
-        unsigned short rxInterrupt      PACKED; /* 2Eh: Interrupt */
-        unsigned short txIntrConf       PACKED; /* 30h: Interrupt Confirm. */
-        unsigned short rxIntrConf       PACKED; /* 32h: Interrupt Confirm. */
-        unsigned short txData           PACKED; /* 34h: Data */
-        unsigned short rxData           PACKED; /* 36h: Data */
-        unsigned short txRR             PACKED; /* 38h: RR */
-        unsigned short rxRR             PACKED; /* 3Ah: RR */
-        unsigned short txRNR            PACKED; /* 3Ch: RNR */
-        unsigned short rxRNR            PACKED; /* 3Eh: RNR */
-} TX25Stats;
-/*----------------------------------------------------------------------------
- * X25_READ_HISTORY_TABLE Command.
- */
-typedef struct X25EventLog
-{
-        unsigned char   type    PACKED; /* 00h: transaction type */
-        unsigned short  lcn     PACKED; /* 01h: logical channel num */
-        unsigned char   packet  PACKED; /* 03h: async packet type */
-        unsigned char   cause   PACKED; /* 04h: X.25 cause field */
-        unsigned char   diag    PACKED; /* 05h: X.25 diag field */
-        TX25TimeStamp   ts      PACKED; /* 06h: time stamp */
-} TX25EventLog;
-/*
- * Defines for the 'type' field.
- */
-#define X25LOG_INCOMMING        0x00
-#define X25LOG_APPLICATION      0x01
-#define X25LOG_AUTOMATIC        0x02
-#define X25LOG_ERROR            0x04
-#define X25LOG_TIMEOUT          0x08
-#define X25LOG_RECOVERY         0x10
-/*
- * Defines for the 'packet' field.
- */
-#define X25LOG_CALL_RQST        0x0B
-#define X25LOG_CALL_ACCEPTED    0x0F
-#define X25LOG_CLEAR_RQST       0x13
-#define X25LOG_CLEAR_CONFRM     0x17
-#define X25LOG_RESET_RQST       0x1B
-#define X25LOG_RESET_CONFRM     0x1F
-#define X25LOG_RESTART_RQST     0xFB
-#define X25LOG_RESTART_COMFRM   0xFF
-#define X25LOG_DIAGNOSTIC       0xF1
-#define X25LOG_DTE_REG_RQST     0xF3
-#define X25LOG_DTE_REG_COMFRM   0xF7
-/* ---------------------------------------------------------------------------
- * X25_TRACE_CONFIGURE Command.
- */
-typedef struct X25TraceCfg
-{
-        unsigned char flags     PACKED; /* 00h: trace configuration flags */
-        unsigned char timeout   PACKED; /* 01h: timeout for trace delay mode*/
-} TX25TraceCfg;
-/*
- * Defines for the 'flags' field.
- */
-#define X25_TRC_ENABLE          0x01    /* bit0: '1' - trace enabled */
-#define X25_TRC_TIMESTAMP       0x02    /* bit1: '1' - time stamping enabled*/
-#define X25_TRC_DELAY           0x04    /* bit2: '1' - trace delay enabled */
-#define X25_TRC_DATA            0x08    /* bit3: '1' - trace data packets */
-#define X25_TRC_SUPERVISORY     0x10    /* bit4: '1' - trace suprvisory pkts*/
-#define X25_TRC_ASYNCHRONOUS    0x20    /* bit5: '1' - trace asynch. packets*/
-#define X25_TRC_HDLC            0x40    /* bit6: '1' - trace all packets */
-#define X25_TRC_READ            0x80    /* bit7: '1' - get current config. */
-/* ---------------------------------------------------------------------------
- * X25_READ_TRACE_DATA Command.
- */
-typedef struct X25Trace                 /*----- Trace data structure -------*/
-{
-        unsigned short length   PACKED; /* 00h: trace data length */
-        unsigned char type      PACKED; /* 02h: trace type */
-        unsigned char lost_cnt  PACKED; /* 03h: N of traces lost */
-        TX25TimeStamp tstamp    PACKED; /* 04h: mon/date/sec/min/hour */
-        unsigned short millisec PACKED; /* 09h: ms time stamp */
-        unsigned char data[0]   PACKED; /* 0Bh: traced frame */
-} TX25Trace;
-/*
- * Defines for the 'type' field.
- */
-#define X25_TRC_TYPE_MASK       0x0F    /* bits 0..3: trace type */
-#define X25_TRC_TYPE_RX_FRAME   0x00    /* received frame trace */
-#define X25_TRC_TYPE_TX_FRAME   0x01    /* transmitted frame */
-#define X25_TRC_TYPE_ERR_FRAME  0x02    /* error frame */
-#define X25_TRC_ERROR_MASK      0xF0    /* bits 4..7: error code */
-#define X25_TRCERR_RX_ABORT     0x10    /* receive abort error */
-#define X25_TRCERR_RX_BADCRC    0x20    /* receive CRC error */
-#define X25_TRCERR_RX_OVERRUN   0x30    /* receiver overrun error */
-#define X25_TRCERR_RX_TOO_LONG  0x40    /* excessive frame length error */
-#define X25_TRCERR_TX_ABORT     0x70    /* aborted frame transmittion error */
-#define X25_TRCERR_TX_UNDERRUN  0x80    /* transmit underrun error */
-/*****************************************************************************
- * Following definitions describe HDLC frame and X.25 packet formats.
- ****************************************************************************/
-typedef struct HDLCFrame                /*----- DHLC Frame Format ----------*/
-{
-        unsigned char addr      PACKED; /* address field */
-        unsigned char cntl      PACKED; /* control field */
-        unsigned char data[0]   PACKED;
-} THDLCFrame;
-typedef struct X25Pkt                   /*----- X.25 Paket Format ----------*/
-{
-        unsigned char lcn_hi    PACKED; /* 4 MSB of Logical Channel Number */
-        unsigned char lcn_lo    PACKED; /* 8 LSB of Logical Channel Number */
-        unsigned char type      PACKED;
-        unsigned char data[0]   PACKED;
-} TX25Pkt;
-/*
- * Defines for the 'lcn_hi' field.
- */
-#define X25_Q_BIT_MASK          0x80    /* Data Qualifier Bit mask */
-#define X25_D_BIT_MASK          0x40    /* Delivery Confirmation Bit mask */
-#define X25_M_BITS_MASK         0x30    /* Modulo Bits mask */
-#define X25_LCN_MSB_MASK        0x0F    /* LCN most significant bits mask */
-/*
- * Defines for the 'type' field.
- */
-#define X25PKT_DATA             0x01    /* Data packet mask */
-#define X25PKT_SUPERVISORY      0x02    /* Supervisory packet mask */
-#define X25PKT_CALL_RQST        0x0B    /* Call Request/Incoming */
-#define X25PKT_CALL_ACCEPTED    0x0F    /* Call Accepted/Connected */
-#define X25PKT_CLEAR_RQST       0x13    /* Clear Request/Indication */
-#define X25PKT_CLEAR_CONFRM     0x17    /* Clear Confirmation */
-#define X25PKT_RESET_RQST       0x1B    /* Reset Request/Indication */
-#define X25PKT_RESET_CONFRM     0x1F    /* Reset Confirmation */
-#define X25PKT_RESTART_RQST     0xFB    /* Restart Request/Indication */
-#define X25PKT_RESTART_CONFRM   0xFF    /* Restart Confirmation */
-#define X25PKT_INTERRUPT        0x23    /* Interrupt */
-#define X25PKT_INTERRUPT_CONFRM 0x27    /* Interrupt Confirmation */
-#define X25PKT_DIAGNOSTIC       0xF1    /* Diagnostic */
-#define X25PKT_REGISTR_RQST     0xF3    /* Registration Request */
-#define X25PKT_REGISTR_CONFRM   0xF7    /* Registration Confirmation */
-#define X25PKT_RR_MASKED        0x01    /* Receive Ready packet after masking */
-#define X25PKT_RNR_MASKED       0x05    /* Receive Not Ready after masking  */
-typedef struct {
-        TX25Cmd cmd             PACKED;
-        char data[X25_MAX_DATA] PACKED;
-} mbox_cmd_t;
-typedef struct {
-        unsigned char  qdm      PACKED; /* Q/D/M bits */
-        unsigned char  cause    PACKED; /* cause field */
-        unsigned char  diagn    PACKED; /* diagnostics */
-        unsigned char  pktType  PACKED;
-        unsigned short length   PACKED;
-        unsigned char  result   PACKED;
-        unsigned short lcn      PACKED;
-        char reserved[7]        PACKED;
-}x25api_hdr_t;
-typedef struct {
-        x25api_hdr_t hdr        PACKED;
-        char data[X25_MAX_DATA] PACKED;
-}x25api_t;
-/* 
- * XPIPEMON Definitions
- */
-/* valid ip_protocol for UDP management */
-#define UDPMGMT_UDP_PROTOCOL 0x11
-#define UDPMGMT_XPIPE_SIGNATURE         "XLINK8ND"
-#define UDPMGMT_DRVRSTATS_SIGNATURE     "DRVSTATS"
-/* values for request/reply byte */
-#define UDPMGMT_REQUEST 0x01
-#define UDPMGMT_REPLY   0x02
-#define UDP_OFFSET      12
-typedef struct {
-        unsigned char opp_flag  PACKED; /* the opp flag */
-        unsigned char command   PACKED; /* command code */
-        unsigned short length   PACKED; /* transfer data length */
-        unsigned char result    PACKED; /* return code */
-        unsigned char pf        PACKED; /* P/F bit */
-        unsigned short lcn      PACKED; /* logical channel */
-        unsigned char qdm       PACKED; /* Q/D/M bits */
-        unsigned char cause     PACKED; /* cause field */
-        unsigned char diagn     PACKED; /* diagnostics */
-        unsigned char pktType   PACKED; /* packet type */
-        unsigned char resrv[4]  PACKED; /* reserved */
-} cblock_t;
-typedef struct {
-        ip_pkt_t                ip_pkt          PACKED;
-        udp_pkt_t               udp_pkt         PACKED;
-        wp_mgmt_t               wp_mgmt         PACKED;
-        cblock_t                cblock          PACKED;
-        unsigned char           data[4080]      PACKED;
-} x25_udp_pkt_t;
-typedef struct read_hdlc_stat {
-        unsigned short inf_frames_rx_ok PACKED;
-        unsigned short inf_frames_rx_out_of_seq PACKED;
-        unsigned short inf_frames_rx_no_data PACKED;
-        unsigned short inf_frames_rx_dropped PACKED;
-        unsigned short inf_frames_rx_data_too_long PACKED;
-        unsigned short inf_frames_rx_invalid_addr PACKED;
-        unsigned short inf_frames_tx_ok PACKED;
-        unsigned short inf_frames_tx_retransmit PACKED;
-        unsigned short T1_timeouts PACKED;
-        unsigned short SABM_frames_rx PACKED;
-        unsigned short DISC_frames_rx PACKED;
-        unsigned short DM_frames_rx PACKED;
-        unsigned short FRMR_frames_rx PACKED;
-        unsigned short SABM_frames_tx PACKED;
-        unsigned short DISC_frames_tx PACKED;
-        unsigned short DM_frames_tx PACKED;
-        unsigned short FRMR_frames_tx PACKED;
-} read_hdlc_stat_t;
-typedef struct read_comms_err_stats{
-        unsigned char overrun_err_rx PACKED;
-        unsigned char CRC_err PACKED;
-        unsigned char abort_frames_rx PACKED;
-        unsigned char frames_dropped_buf_full PACKED;
-        unsigned char abort_frames_tx PACKED;
-        unsigned char transmit_underruns PACKED;
-        unsigned char missed_tx_underruns_intr PACKED;
-        unsigned char reserved PACKED;
-        unsigned char DCD_drop PACKED;
-        unsigned char CTS_drop PACKED;
-} read_comms_err_stats_t;
-typedef struct trace_data {
-        unsigned short length PACKED;
-        unsigned char  type PACKED;
-        unsigned char  trace_dropped PACKED;
-        unsigned char  reserved[5] PACKED;
-        unsigned short timestamp PACKED;
-        unsigned char  data PACKED;
-} trace_data_t;
-enum {UDP_XPIPE_TYPE};
-#define XPIPE_ENABLE_TRACING                    0x14
-#define XPIPE_DISABLE_TRACING                   0x14
-#define XPIPE_GET_TRACE_INFO                    0x16
-#define XPIPE_FT1_READ_STATUS                   0x74
-#define XPIPE_DRIVER_STAT_IFSEND                0x75
-#define XPIPE_DRIVER_STAT_INTR                  0x76
-#define XPIPE_DRIVER_STAT_GEN                   0x77
-#define XPIPE_FLUSH_DRIVER_STATS                0x78
-#define XPIPE_ROUTER_UP_TIME                    0x79        
-#define XPIPE_SET_FT1_MODE                      0x81
-#define XPIPE_FT1_STATUS_CTRL                   0x80
-/* error messages */
-#define NO_BUFFS_OR_CLOSED_WIN  0x33
-#define DATA_LENGTH_TOO_BIG     0x32
-#define NO_DATA_AVAILABLE       0x33
-#define Z80_TIMEOUT_ERROR       0x0a   
-#define NO_BUFFS                0x08
-/* Trace options */
-#define TRACE_DEFAULT           0x03
-#define TRACE_SUPERVISOR_FRMS   0x10
-#define TRACE_ASYNC_FRMS        0x20
-#define TRACE_ALL_HDLC_FRMS     0x40
-#define TRACE_DATA_FRMS         0x08
-#endif  /* _SDLA_X25_H */
diff --git a/include/linux/sdladrv.h b/include/linux/sdladrv.h
deleted file mode 100644
index c85e103d5e7b..000000000000
--- a/include/linux/sdladrv.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
-* sdladrv.h     SDLA Support Module.  Kernel API Definitions.
-*
-* Author:       Gideon Hack     
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* Jun 02, 1999  Gideon Hack     Added support for the S514 PCI adapter.
-* Dec 11, 1996  Gene Kozin      Complete overhaul.
-* Oct 17, 1996  Gene Kozin      Minor bug fixes.
-* Jun 12, 1996  Gene Kozin      Added support for S503 card.
-* Dec 06, 1995  Gene Kozin      Initial version.
-*****************************************************************************/
-#ifndef _SDLADRV_H
-#define _SDLADRV_H
-#define SDLA_MAXIORANGE 4       /* maximum I/O port range */
-#define SDLA_WINDOWSIZE 0x2000  /* default dual-port memory window size */
-/****** Data Structures *****************************************************/
-/*----------------------------------------------------------------------------
- * Adapter hardware configuration. Pointer to this structure is passed to all
- * APIs.
- */
-typedef struct sdlahw
-{
-        unsigned type;                  /* adapter type */
-        unsigned fwid;                  /* firmware ID */
-        unsigned port;                  /* adapter I/O port base */
-        int irq;                        /* interrupt request level */
-        char S514_cpu_no[1];            /* PCI CPU Number */
-        unsigned char S514_slot_no;     /* PCI Slot Number */
-        char auto_pci_cfg;              /* Autodetect PCI Slot */
-        struct pci_dev *pci_dev;        /* PCI device */
-        void * dpmbase;                 /* dual-port memory base */
-        unsigned dpmsize;               /* dual-port memory size */
-        unsigned pclk;                  /* CPU clock rate, kHz */
-        unsigned long memory;           /* memory size */
-        unsigned long vector;           /* local offset of the DPM window */
-        unsigned io_range;              /* I/O port range */
-        unsigned char regs[SDLA_MAXIORANGE]; /* was written to registers */
-        unsigned reserved[5];
-} sdlahw_t;
-/****** Function Prototypes *************************************************/
-extern int sdla_setup   (sdlahw_t* hw, void* sfm, unsigned len);
-extern int sdla_down    (sdlahw_t* hw);
-extern void S514_intack  (sdlahw_t* hw, u32 int_status);
-extern void read_S514_int_stat (sdlahw_t* hw, u32* int_status);
-extern int sdla_mapmem  (sdlahw_t* hw, unsigned long addr);
-extern int sdla_peek    (sdlahw_t* hw, unsigned long addr, void* buf,
-                         unsigned len);
-extern int sdla_poke    (sdlahw_t* hw, unsigned long addr, void* buf,
-                         unsigned len);
-extern int sdla_exec    (void* opflag);
-extern unsigned wanpipe_hw_probe(void);
-#endif  /* _SDLADRV_H */
diff --git a/include/linux/sdlapci.h b/include/linux/sdlapci.h
deleted file mode 100644
index 6f7c904f188d..000000000000
--- a/include/linux/sdlapci.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************
-* sdlapci.h     WANPIPE(tm) Multiprotocol WAN Link Driver.
-*               Definitions for the SDLA PCI adapter.
-*
-* Author:       Gideon Hack     <ghack@sangoma.com>
-*
-* Copyright:    (c) 1999-2000 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* Jun 02, 1999  Gideon Hack     Initial version.
-*****************************************************************************/
-#ifndef _SDLAPCI_H
-#define _SDLAPCI_H
-/****** Defines *************************************************************/
-/* Definitions for identifying and finding S514 PCI adapters */
-#define V3_VENDOR_ID            0x11B0          /* V3 vendor ID number */
-#define V3_DEVICE_ID            0x0002          /* V3 device ID number */
-#define SANGOMA_SUBSYS_VENDOR   0x4753          /* ID for Sangoma */
-#define PCI_DEV_SLOT_MASK       0x1F            /* mask for slot numbering */
-#define PCI_IRQ_NOT_ALLOCATED   0xFF            /* interrupt line for no IRQ */
-/* Local PCI register offsets */ 
-#define PCI_VENDOR_ID_WORD      0x00            /* vendor ID */
-#define PCI_IO_BASE_DWORD       0x10            /* IO base */   
-#define PCI_MEM_BASE0_DWORD     0x14            /* memory base - apperture 0 */
-#define PCI_MEM_BASE1_DWORD     0x18            /* memory base - apperture 1 */
-#define PCI_SUBSYS_VENDOR_WORD  0x2C            /* subsystem vendor ID */
-#define PCI_INT_LINE_BYTE       0x3C            /* interrupt line */
-#define PCI_INT_PIN_BYTE        0x3D            /* interrupt pin */
-#define PCI_MAP0_DWORD          0x40            /* PCI to local bus address 0 */
-#define PCI_MAP1_DWORD          0x44            /* PCI to local bus address 1 */
-#define PCI_INT_STATUS          0x48            /* interrupt status */
-#define PCI_INT_CONFIG          0x4C            /* interrupt configuration */
-  
-/* Local PCI register usage */
-#define PCI_MEMORY_ENABLE       0x00000003      /* enable PCI memory */
-#define PCI_CPU_A_MEM_DISABLE   0x00000002      /* disable CPU A memory */
-#define PCI_CPU_B_MEM_DISABLE   0x00100002      /* disable CPU B memory */
-#define PCI_ENABLE_IRQ_CPU_A    0x005A0004      /* enable IRQ for CPU A */
-#define PCI_ENABLE_IRQ_CPU_B    0x005A0008      /* enable IRQ for CPU B */
-#define PCI_DISABLE_IRQ_CPU_A   0x00000004      /* disable IRQ for CPU A */
-#define PCI_DISABLE_IRQ_CPU_B   0x00000008      /* disable IRQ for CPU B */
- 
-/* Setting for the Interrupt Status register */  
-#define IRQ_CPU_A               0x04            /* IRQ for CPU A */
-#define IRQ_CPU_B               0x08            /* IRQ for CPU B */
-/* The maximum size of the S514 memory */
-#define MAX_SIZEOF_S514_MEMORY  (256 * 1024)
-/* S514 control register offsets within the memory address space */
-#define S514_CTRL_REG_BYTE      0x80000
- 
-/* S514 adapter control bytes */
-#define S514_CPU_HALT           0x00
-#define S514_CPU_START          0x01
-/* The maximum number of S514 adapters supported */
-#define MAX_S514_CARDS          20      
-#define PCI_CARD_TYPE           0x2E
-#define S514_DUAL_CPU           0x12
-#define S514_SINGLE_CPU         0x11
-#endif  /* _SDLAPCI_H */
diff --git a/include/linux/sdlasfm.h b/include/linux/sdlasfm.h
deleted file mode 100644
index 94aaa8ada667..000000000000
--- a/include/linux/sdlasfm.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************
-* sdlasfm.h     WANPIPE(tm) Multiprotocol WAN Link Driver.
-*               Definitions for the SDLA Firmware Module (SFM).
-*
-* Author:       Gideon Hack     
-*
-* Copyright:    (c) 1995-1999 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* Jun 02, 1999  Gideon Hack     Added support for the S514 adapter.
-* Dec 11, 1996  Gene Kozin      Cosmetic changes
-* Apr 16, 1996  Gene Kozin      Changed adapter & firmware IDs. Version 2
-* Dec 15, 1995  Gene Kozin      Structures chaned
-* Nov 09, 1995  Gene Kozin      Initial version.
-*****************************************************************************/
-#ifndef _SDLASFM_H
-#define _SDLASFM_H
-/****** Defines *************************************************************/
-#define SFM_VERSION     2
-#define SFM_SIGNATURE   "SFM - Sangoma SDLA Firmware Module"
-/* min/max */
-#define SFM_IMAGE_SIZE  0x8000  /* max size of SDLA code image file */
-#define SFM_DESCR_LEN   256     /* max length of description string */
-#define SFM_MAX_SDLA    16      /* max number of compatible adapters */
-/* Adapter types */
-#define SDLA_S502A      5020
-#define SDLA_S502E      5021
-#define SDLA_S503       5030
-#define SDLA_S508       5080
-#define SDLA_S507       5070
-#define SDLA_S509       5090
-#define SDLA_S514       5140
-/* S514 PCI adapter CPU numbers */
-#define S514_CPU_A      'A'
-#define S514_CPU_B      'B'
-/* Firmware identification numbers:
- *    0  ..  999        Test & Diagnostics
- *  1000 .. 1999        Streaming HDLC
- *  2000 .. 2999        Bisync
- *  3000 .. 3999        SDLC
- *  4000 .. 4999        HDLC
- *  5000 .. 5999        X.25
- *  6000 .. 6999        Frame Relay
- *  7000 .. 7999        PPP
- *  8000 .. 8999        Cisco HDLC
- */
-#define SFID_CALIB502    200
-#define SFID_STRM502    1200
-#define SFID_STRM508    1800
-#define SFID_BSC502     2200
-#define SFID_SDLC502    3200
-#define SFID_HDLC502    4200
-#define SFID_HDLC508    4800
-#define SFID_X25_502    5200
-#define SFID_X25_508    5800
-#define SFID_FR502      6200
-#define SFID_FR508      6800
-#define SFID_PPP502     7200
-#define SFID_PPP508     7800
-#define SFID_PPP514     7140
-#define SFID_CHDLC508   8800
-#define SFID_CHDLC514   8140
-/****** Data Types **********************************************************/
-typedef struct  sfm_info                /* firmware module information */
-{
-        unsigned short  codeid;         /* firmware ID */
-        unsigned short  version;        /* firmaware version number */
-        unsigned short  adapter[SFM_MAX_SDLA]; /* compatible adapter types */
-        unsigned long   memsize;        /* minimum memory size */
-        unsigned short  reserved[2];    /* reserved */
-        unsigned short  startoffs;      /* entry point offset */
-        unsigned short  winoffs;        /* dual-port memory window offset */
-        unsigned short  codeoffs;       /* code load offset */
-        unsigned short  codesize;       /* code size */
-        unsigned short  dataoffs;       /* configuration data load offset */
-        unsigned short  datasize;       /* configuration data size */
-} sfm_info_t;
-typedef struct sfm                      /* SDLA firmware file structire */
-{
-        char            signature[80];  /* SFM file signature */
-        unsigned short  version;        /* file format version */
-        unsigned short  checksum;       /* info + image */
-        unsigned short  reserved[6];    /* reserved */
-        char            descr[SFM_DESCR_LEN]; /* description string */
-        sfm_info_t      info;           /* firmware module info */
-        unsigned char   image[1];       /* code image (variable size) */
-} sfm_t;
-#endif  /* _SDLASFM_H */
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/skbuff.h b/include/linux/skbuff.h
index c4619a428d9b..f8f234708b98 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -344,6 +344,13 @@ extern void	      skb_over_panic(struct sk_buff *skb, int len,
                                     void *here);
 extern void           skb_under_panic(struct sk_buff *skb, int len,
                                      void *here);
+extern void           skb_truesize_bug(struct sk_buff *skb);
+static inline void skb_truesize_check(struct sk_buff *skb)
+{
+        if (unlikely((int)skb->truesize < sizeof(struct sk_buff) + skb->len))
+                skb_truesize_bug(skb);
+}
 extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
                        int getfrag(void *from, char *to, int offset,
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/metrics.h b/include/linux/sunrpc/metrics.h
index 8f96e9dc369a..77f78e56c481 100644
--- a/include/linux/sunrpc/metrics.h
+++ b/include/linux/sunrpc/metrics.h
@@ -69,9 +69,21 @@ struct rpc_clnt;
 /*
 * EXPORTed functions for managing rpc_iostats structures
 */
+#ifdef CONFIG_PROC_FS
 struct rpc_iostats *    rpc_alloc_iostats(struct rpc_clnt *);
 void                    rpc_count_iostats(struct rpc_task *);
 void                    rpc_print_iostats(struct seq_file *, struct rpc_clnt *);
 void                    rpc_free_iostats(struct rpc_iostats *);
+#else  /*  CONFIG_PROC_FS  */
+static inline struct rpc_iostats *rpc_alloc_iostats(struct rpc_clnt *clnt) { return NULL; }
+static inline void rpc_count_iostats(struct rpc_task *task) {}
+static inline void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt) {}
+static inline void rpc_free_iostats(struct rpc_iostats *stats) {}
+#endif  /*  CONFIG_PROC_FS  */
 #endif /* _LINUX_SUNRPC_METRICS_H */
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/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 7eebbab7160b..e8bbe8118de8 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -53,6 +53,7 @@ struct rpc_timeout {
 struct rpc_task;
 struct rpc_xprt;
+struct seq_file;
 /*
 * This describes a complete RPC request
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..d3ebc0e68b2b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -569,9 +569,14 @@ 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_tee(int fdin, int fdout, 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/sysfs.h b/include/linux/sysfs.h
index 392da5a6dacb..1ea5d3cda6ae 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -74,6 +74,7 @@ struct sysfs_dirent {
        umode_t                 s_mode;
        struct dentry           * s_dentry;
        struct iattr            * s_iattr;
+        atomic_t                s_event;
 };
 #define SYSFS_ROOT              0x0001
@@ -117,6 +118,7 @@ int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
 int sysfs_create_group(struct kobject *, const struct attribute_group *);
 void sysfs_remove_group(struct kobject *, const struct attribute_group *);
+void sysfs_notify(struct kobject * k, char *dir, char *attr);
 #else /* CONFIG_SYSFS */
@@ -185,6 +187,10 @@ static inline void sysfs_remove_group(struct kobject * k, const struct attribute
        ;
 }
+static inline void sysfs_notify(struct kobject * k, char *dir, char *attr)
+{
+}
 #endif /* CONFIG_SYSFS */
 #endif /* _SYSFS_H_ */
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/usb/net2280.h b/include/linux/usb/net2280.h
new file mode 100644
index 000000000000..c602f884f182
--- /dev/null
+++ b/include/linux/usb/net2280.h
@@ -0,0 +1,444 @@
+/*
+ * NetChip 2280 high/full speed USB device controller.
+ * Unlike many such controllers, this one talks PCI.
+ */
+#ifndef __LINUX_USB_NET2280_H
+#define __LINUX_USB_NET2280_H
+/*
+ * Copyright (C) 2002 NetChip Technology, Inc. (http://www.netchip.com)
+ * Copyright (C) 2003 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/*-------------------------------------------------------------------------*/
+/* NET2280 MEMORY MAPPED REGISTERS
+ *
+ * The register layout came from the chip documentation, and the bit
+ * number definitions were extracted from chip specification.
+ *
+ * Use the shift operator ('<<') to build bit masks, with readl/writel
+ * to access the registers through PCI.
+ */
+/* main registers, BAR0 + 0x0000 */
+struct net2280_regs {
+        // offset 0x0000
+        u32             devinit;
+#define     LOCAL_CLOCK_FREQUENCY                               8
+#define     FORCE_PCI_RESET                                     7
+#define     PCI_ID                                              6
+#define     PCI_ENABLE                                          5
+#define     FIFO_SOFT_RESET                                     4
+#define     CFG_SOFT_RESET                                      3
+#define     PCI_SOFT_RESET                                      2
+#define     USB_SOFT_RESET                                      1
+#define     M8051_RESET                                         0
+        u32             eectl;
+#define     EEPROM_ADDRESS_WIDTH                                23
+#define     EEPROM_CHIP_SELECT_ACTIVE                           22
+#define     EEPROM_PRESENT                                      21
+#define     EEPROM_VALID                                        20
+#define     EEPROM_BUSY                                         19
+#define     EEPROM_CHIP_SELECT_ENABLE                           18
+#define     EEPROM_BYTE_READ_START                              17
+#define     EEPROM_BYTE_WRITE_START                             16
+#define     EEPROM_READ_DATA                                    8
+#define     EEPROM_WRITE_DATA                                   0
+        u32             eeclkfreq;
+        u32             _unused0;
+        // offset 0x0010
+        u32             pciirqenb0;             /* interrupt PCI master ... */
+#define     SETUP_PACKET_INTERRUPT_ENABLE                       7
+#define     ENDPOINT_F_INTERRUPT_ENABLE                         6
+#define     ENDPOINT_E_INTERRUPT_ENABLE                         5
+#define     ENDPOINT_D_INTERRUPT_ENABLE                         4
+#define     ENDPOINT_C_INTERRUPT_ENABLE                         3
+#define     ENDPOINT_B_INTERRUPT_ENABLE                         2
+#define     ENDPOINT_A_INTERRUPT_ENABLE                         1
+#define     ENDPOINT_0_INTERRUPT_ENABLE                         0
+        u32             pciirqenb1;
+#define     PCI_INTERRUPT_ENABLE                                31
+#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
+#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
+#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
+#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
+#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
+#define     PCI_TARGET_ABORT_ASSERTED_INTERRUPT_ENABLE          18
+#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
+#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
+#define     GPIO_INTERRUPT_ENABLE                               13
+#define     DMA_D_INTERRUPT_ENABLE                              12
+#define     DMA_C_INTERRUPT_ENABLE                              11
+#define     DMA_B_INTERRUPT_ENABLE                              10
+#define     DMA_A_INTERRUPT_ENABLE                              9
+#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
+#define     VBUS_INTERRUPT_ENABLE                               7
+#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
+#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
+#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
+#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
+#define     RESUME_INTERRUPT_ENABLE                             1
+#define     SOF_INTERRUPT_ENABLE                                0
+        u32             cpu_irqenb0;            /* ... or onboard 8051 */
+#define     SETUP_PACKET_INTERRUPT_ENABLE                       7
+#define     ENDPOINT_F_INTERRUPT_ENABLE                         6
+#define     ENDPOINT_E_INTERRUPT_ENABLE                         5
+#define     ENDPOINT_D_INTERRUPT_ENABLE                         4
+#define     ENDPOINT_C_INTERRUPT_ENABLE                         3
+#define     ENDPOINT_B_INTERRUPT_ENABLE                         2
+#define     ENDPOINT_A_INTERRUPT_ENABLE                         1
+#define     ENDPOINT_0_INTERRUPT_ENABLE                         0
+        u32             cpu_irqenb1;
+#define     CPU_INTERRUPT_ENABLE                                31
+#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
+#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
+#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
+#define     PCI_INTA_INTERRUPT_ENABLE                           24
+#define     PCI_PME_INTERRUPT_ENABLE                            23
+#define     PCI_SERR_INTERRUPT_ENABLE                           22
+#define     PCI_PERR_INTERRUPT_ENABLE                           21
+#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
+#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
+#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
+#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
+#define     GPIO_INTERRUPT_ENABLE                               13
+#define     DMA_D_INTERRUPT_ENABLE                              12
+#define     DMA_C_INTERRUPT_ENABLE                              11
+#define     DMA_B_INTERRUPT_ENABLE                              10
+#define     DMA_A_INTERRUPT_ENABLE                              9
+#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
+#define     VBUS_INTERRUPT_ENABLE                               7
+#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
+#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
+#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
+#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
+#define     RESUME_INTERRUPT_ENABLE                             1
+#define     SOF_INTERRUPT_ENABLE                                0
+        // offset 0x0020
+        u32             _unused1;
+        u32             usbirqenb1;
+#define     USB_INTERRUPT_ENABLE                                31
+#define     POWER_STATE_CHANGE_INTERRUPT_ENABLE                 27
+#define     PCI_ARBITER_TIMEOUT_INTERRUPT_ENABLE                26
+#define     PCI_PARITY_ERROR_INTERRUPT_ENABLE                   25
+#define     PCI_INTA_INTERRUPT_ENABLE                           24
+#define     PCI_PME_INTERRUPT_ENABLE                            23
+#define     PCI_SERR_INTERRUPT_ENABLE                           22
+#define     PCI_PERR_INTERRUPT_ENABLE                           21
+#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT_ENABLE          20
+#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT_ENABLE          19
+#define     PCI_RETRY_ABORT_INTERRUPT_ENABLE                    17
+#define     PCI_MASTER_CYCLE_DONE_INTERRUPT_ENABLE              16
+#define     GPIO_INTERRUPT_ENABLE                               13
+#define     DMA_D_INTERRUPT_ENABLE                              12
+#define     DMA_C_INTERRUPT_ENABLE                              11
+#define     DMA_B_INTERRUPT_ENABLE                              10
+#define     DMA_A_INTERRUPT_ENABLE                              9
+#define     EEPROM_DONE_INTERRUPT_ENABLE                        8
+#define     VBUS_INTERRUPT_ENABLE                               7
+#define     CONTROL_STATUS_INTERRUPT_ENABLE                     6
+#define     ROOT_PORT_RESET_INTERRUPT_ENABLE                    4
+#define     SUSPEND_REQUEST_INTERRUPT_ENABLE                    3
+#define     SUSPEND_REQUEST_CHANGE_INTERRUPT_ENABLE             2
+#define     RESUME_INTERRUPT_ENABLE                             1
+#define     SOF_INTERRUPT_ENABLE                                0
+        u32             irqstat0;
+#define     INTA_ASSERTED                                       12
+#define     SETUP_PACKET_INTERRUPT                              7
+#define     ENDPOINT_F_INTERRUPT                                6
+#define     ENDPOINT_E_INTERRUPT                                5
+#define     ENDPOINT_D_INTERRUPT                                4
+#define     ENDPOINT_C_INTERRUPT                                3
+#define     ENDPOINT_B_INTERRUPT                                2
+#define     ENDPOINT_A_INTERRUPT                                1
+#define     ENDPOINT_0_INTERRUPT                                0
+        u32             irqstat1;
+#define     POWER_STATE_CHANGE_INTERRUPT                        27
+#define     PCI_ARBITER_TIMEOUT_INTERRUPT                       26
+#define     PCI_PARITY_ERROR_INTERRUPT                          25
+#define     PCI_INTA_INTERRUPT                                  24
+#define     PCI_PME_INTERRUPT                                   23
+#define     PCI_SERR_INTERRUPT                                  22
+#define     PCI_PERR_INTERRUPT                                  21
+#define     PCI_MASTER_ABORT_RECEIVED_INTERRUPT                 20
+#define     PCI_TARGET_ABORT_RECEIVED_INTERRUPT                 19
+#define     PCI_RETRY_ABORT_INTERRUPT                           17
+#define     PCI_MASTER_CYCLE_DONE_INTERRUPT                     16
+#define     SOF_DOWN_INTERRUPT                                  14
+#define     GPIO_INTERRUPT                                      13
+#define     DMA_D_INTERRUPT                                     12
+#define     DMA_C_INTERRUPT                                     11
+#define     DMA_B_INTERRUPT                                     10
+#define     DMA_A_INTERRUPT                                     9
+#define     EEPROM_DONE_INTERRUPT                               8
+#define     VBUS_INTERRUPT                                      7
+#define     CONTROL_STATUS_INTERRUPT                            6
+#define     ROOT_PORT_RESET_INTERRUPT                           4
+#define     SUSPEND_REQUEST_INTERRUPT                           3
+#define     SUSPEND_REQUEST_CHANGE_INTERRUPT                    2
+#define     RESUME_INTERRUPT                                    1
+#define     SOF_INTERRUPT                                       0
+        // offset 0x0030
+        u32             idxaddr;
+        u32             idxdata;
+        u32             fifoctl;
+#define     PCI_BASE2_RANGE                                     16
+#define     IGNORE_FIFO_AVAILABILITY                            3
+#define     PCI_BASE2_SELECT                                    2
+#define     FIFO_CONFIGURATION_SELECT                           0
+        u32             _unused2;
+        // offset 0x0040
+        u32             memaddr;
+#define     START                                               28
+#define     DIRECTION                                           27
+#define     FIFO_DIAGNOSTIC_SELECT                              24
+#define     MEMORY_ADDRESS                                      0
+        u32             memdata0;
+        u32             memdata1;
+        u32             _unused3;
+        // offset 0x0050
+        u32             gpioctl;
+#define     GPIO3_LED_SELECT                                    12
+#define     GPIO3_INTERRUPT_ENABLE                              11
+#define     GPIO2_INTERRUPT_ENABLE                              10
+#define     GPIO1_INTERRUPT_ENABLE                              9
+#define     GPIO0_INTERRUPT_ENABLE                              8
+#define     GPIO3_OUTPUT_ENABLE                                 7
+#define     GPIO2_OUTPUT_ENABLE                                 6
+#define     GPIO1_OUTPUT_ENABLE                                 5
+#define     GPIO0_OUTPUT_ENABLE                                 4
+#define     GPIO3_DATA                                          3
+#define     GPIO2_DATA                                          2
+#define     GPIO1_DATA                                          1
+#define     GPIO0_DATA                                          0
+        u32             gpiostat;
+#define     GPIO3_INTERRUPT                                     3
+#define     GPIO2_INTERRUPT                                     2
+#define     GPIO1_INTERRUPT                                     1
+#define     GPIO0_INTERRUPT                                     0
+} __attribute__ ((packed));
+/* usb control, BAR0 + 0x0080 */
+struct net2280_usb_regs {
+        // offset 0x0080
+        u32             stdrsp;
+#define     STALL_UNSUPPORTED_REQUESTS                          31
+#define     SET_TEST_MODE                                       16
+#define     GET_OTHER_SPEED_CONFIGURATION                       15
+#define     GET_DEVICE_QUALIFIER                                14
+#define     SET_ADDRESS                                         13
+#define     ENDPOINT_SET_CLEAR_HALT                             12
+#define     DEVICE_SET_CLEAR_DEVICE_REMOTE_WAKEUP               11
+#define     GET_STRING_DESCRIPTOR_2                             10
+#define     GET_STRING_DESCRIPTOR_1                             9
+#define     GET_STRING_DESCRIPTOR_0                             8
+#define     GET_SET_INTERFACE                                   6
+#define     GET_SET_CONFIGURATION                               5
+#define     GET_CONFIGURATION_DESCRIPTOR                        4
+#define     GET_DEVICE_DESCRIPTOR                               3
+#define     GET_ENDPOINT_STATUS                                 2
+#define     GET_INTERFACE_STATUS                                1
+#define     GET_DEVICE_STATUS                                   0
+        u32             prodvendid;
+#define     PRODUCT_ID                                          16
+#define     VENDOR_ID                                           0
+        u32             relnum;
+        u32             usbctl;
+#define     SERIAL_NUMBER_INDEX                                 16
+#define     PRODUCT_ID_STRING_ENABLE                            13
+#define     VENDOR_ID_STRING_ENABLE                             12
+#define     USB_ROOT_PORT_WAKEUP_ENABLE                         11
+#define     VBUS_PIN                                            10
+#define     TIMED_DISCONNECT                                    9
+#define     SUSPEND_IMMEDIATELY                                 7
+#define     SELF_POWERED_USB_DEVICE                             6
+#define     REMOTE_WAKEUP_SUPPORT                               5
+#define     PME_POLARITY                                        4
+#define     USB_DETECT_ENABLE                                   3
+#define     PME_WAKEUP_ENABLE                                   2
+#define     DEVICE_REMOTE_WAKEUP_ENABLE                         1
+#define     SELF_POWERED_STATUS                                 0
+        // offset 0x0090
+        u32             usbstat;
+#define     HIGH_SPEED                                          7
+#define     FULL_SPEED                                          6
+#define     GENERATE_RESUME                                     5
+#define     GENERATE_DEVICE_REMOTE_WAKEUP                       4
+        u32             xcvrdiag;
+#define     FORCE_HIGH_SPEED_MODE                               31
+#define     FORCE_FULL_SPEED_MODE                               30
+#define     USB_TEST_MODE                                       24
+#define     LINE_STATE                                          16
+#define     TRANSCEIVER_OPERATION_MODE                          2
+#define     TRANSCEIVER_SELECT                                  1
+#define     TERMINATION_SELECT                                  0
+        u32             setup0123;
+        u32             setup4567;
+        // offset 0x0090
+        u32             _unused0;
+        u32             ouraddr;
+#define     FORCE_IMMEDIATE                                     7
+#define     OUR_USB_ADDRESS                                     0
+        u32             ourconfig;
+} __attribute__ ((packed));
+/* pci control, BAR0 + 0x0100 */
+struct net2280_pci_regs {
+        // offset 0x0100
+        u32              pcimstctl;
+#define     PCI_ARBITER_PARK_SELECT                             13
+#define     PCI_MULTI LEVEL_ARBITER                             12
+#define     PCI_RETRY_ABORT_ENABLE                              11
+#define     DMA_MEMORY_WRITE_AND_INVALIDATE_ENABLE              10
+#define     DMA_READ_MULTIPLE_ENABLE                            9
+#define     DMA_READ_LINE_ENABLE                                8
+#define     PCI_MASTER_COMMAND_SELECT                           6
+#define         MEM_READ_OR_WRITE                                   0
+#define         IO_READ_OR_WRITE                                    1
+#define         CFG_READ_OR_WRITE                                   2
+#define     PCI_MASTER_START                                    5
+#define     PCI_MASTER_READ_WRITE                               4
+#define         PCI_MASTER_WRITE                                    0
+#define         PCI_MASTER_READ                                     1
+#define     PCI_MASTER_BYTE_WRITE_ENABLES                       0
+        u32              pcimstaddr;
+        u32              pcimstdata;
+        u32              pcimststat;
+#define     PCI_ARBITER_CLEAR                                   2
+#define     PCI_EXTERNAL_ARBITER                                1
+#define     PCI_HOST_MODE                                       0
+} __attribute__ ((packed));
+/* dma control, BAR0 + 0x0180 ... array of four structs like this,
+ * for channels 0..3.  see also struct net2280_dma:  descriptor
+ * that can be loaded into some of these registers.
+ */
+struct net2280_dma_regs {       /* [11.7] */
+        // offset 0x0180, 0x01a0, 0x01c0, 0x01e0,
+        u32             dmactl;
+#define     DMA_SCATTER_GATHER_DONE_INTERRUPT_ENABLE            25
+#define     DMA_CLEAR_COUNT_ENABLE                              21
+#define     DESCRIPTOR_POLLING_RATE                             19
+#define         POLL_CONTINUOUS                                     0
+#define         POLL_1_USEC                                         1
+#define         POLL_100_USEC                                       2
+#define         POLL_1_MSEC                                         3
+#define     DMA_VALID_BIT_POLLING_ENABLE                        18
+#define     DMA_VALID_BIT_ENABLE                                17
+#define     DMA_SCATTER_GATHER_ENABLE                           16
+#define     DMA_OUT_AUTO_START_ENABLE                           4
+#define     DMA_PREEMPT_ENABLE                                  3
+#define     DMA_FIFO_VALIDATE                                   2
+#define     DMA_ENABLE                                          1
+#define     DMA_ADDRESS_HOLD                                    0
+        u32             dmastat;
+#define     DMA_ABORT_DONE_INTERRUPT                            27
+#define     DMA_SCATTER_GATHER_DONE_INTERRUPT                   25
+#define     DMA_TRANSACTION_DONE_INTERRUPT                      24
+#define     DMA_ABORT                                           1
+#define     DMA_START                                           0
+        u32             _unused0 [2];
+        // offset 0x0190, 0x01b0, 0x01d0, 0x01f0,
+        u32             dmacount;
+#define     VALID_BIT                                           31
+#define     DMA_DIRECTION                                       30
+#define     DMA_DONE_INTERRUPT_ENABLE                           29
+#define     END_OF_CHAIN                                        28
+#define         DMA_BYTE_COUNT_MASK                                 ((1<<24)-1)
+#define     DMA_BYTE_COUNT                                      0
+        u32             dmaaddr;
+        u32             dmadesc;
+        u32             _unused1;
+} __attribute__ ((packed));
+/* dedicated endpoint registers, BAR0 + 0x0200 */
+struct net2280_dep_regs {       /* [11.8] */
+        // offset 0x0200, 0x0210, 0x220, 0x230, 0x240
+        u32             dep_cfg;
+        // offset 0x0204, 0x0214, 0x224, 0x234, 0x244
+        u32             dep_rsp;
+        u32             _unused [2];
+} __attribute__ ((packed));
+/* configurable endpoint registers, BAR0 + 0x0300 ... array of seven structs
+ * like this, for ep0 then the configurable endpoints A..F
+ * ep0 reserved for control; E and F have only 64 bytes of fifo
+ */
+struct net2280_ep_regs {        /* [11.9] */
+        // offset 0x0300, 0x0320, 0x0340, 0x0360, 0x0380, 0x03a0, 0x03c0
+        u32             ep_cfg;
+#define     ENDPOINT_BYTE_COUNT                                 16
+#define     ENDPOINT_ENABLE                                     10
+#define     ENDPOINT_TYPE                                       8
+#define     ENDPOINT_DIRECTION                                  7
+#define     ENDPOINT_NUMBER                                     0
+        u32             ep_rsp;
+#define     SET_NAK_OUT_PACKETS                                 15
+#define     SET_EP_HIDE_STATUS_PHASE                            14
+#define     SET_EP_FORCE_CRC_ERROR                              13
+#define     SET_INTERRUPT_MODE                                  12
+#define     SET_CONTROL_STATUS_PHASE_HANDSHAKE                  11
+#define     SET_NAK_OUT_PACKETS_MODE                            10
+#define     SET_ENDPOINT_TOGGLE                                 9
+#define     SET_ENDPOINT_HALT                                   8
+#define     CLEAR_NAK_OUT_PACKETS                               7
+#define     CLEAR_EP_HIDE_STATUS_PHASE                          6
+#define     CLEAR_EP_FORCE_CRC_ERROR                            5
+#define     CLEAR_INTERRUPT_MODE                                4
+#define     CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE                3
+#define     CLEAR_NAK_OUT_PACKETS_MODE                          2
+#define     CLEAR_ENDPOINT_TOGGLE                               1
+#define     CLEAR_ENDPOINT_HALT                                 0
+        u32             ep_irqenb;
+#define     SHORT_PACKET_OUT_DONE_INTERRUPT_ENABLE              6
+#define     SHORT_PACKET_TRANSFERRED_INTERRUPT_ENABLE           5
+#define     DATA_PACKET_RECEIVED_INTERRUPT_ENABLE               3
+#define     DATA_PACKET_TRANSMITTED_INTERRUPT_ENABLE            2
+#define     DATA_OUT_PING_TOKEN_INTERRUPT_ENABLE                1
+#define     DATA_IN_TOKEN_INTERRUPT_ENABLE                      0
+        u32             ep_stat;
+#define     FIFO_VALID_COUNT                                    24
+#define     HIGH_BANDWIDTH_OUT_TRANSACTION_PID                  22
+#define     TIMEOUT                                             21
+#define     USB_STALL_SENT                                      20
+#define     USB_IN_NAK_SENT                                     19
+#define     USB_IN_ACK_RCVD                                     18
+#define     USB_OUT_PING_NAK_SENT                               17
+#define     USB_OUT_ACK_SENT                                    16
+#define     FIFO_OVERFLOW                                       13
+#define     FIFO_UNDERFLOW                                      12
+#define     FIFO_FULL                                           11
+#define     FIFO_EMPTY                                          10
+#define     FIFO_FLUSH                                          9
+#define     SHORT_PACKET_OUT_DONE_INTERRUPT                     6
+#define     SHORT_PACKET_TRANSFERRED_INTERRUPT                  5
+#define     NAK_OUT_PACKETS                                     4
+#define     DATA_PACKET_RECEIVED_INTERRUPT                      3
+#define     DATA_PACKET_TRANSMITTED_INTERRUPT                   2
+#define     DATA_OUT_PING_TOKEN_INTERRUPT                       1
+#define     DATA_IN_TOKEN_INTERRUPT                             0
+        // offset 0x0310, 0x0330, 0x0350, 0x0370, 0x0390, 0x03b0, 0x03d0
+        u32             ep_avail;
+        u32             ep_data;
+        u32             _unused0 [2];
+} __attribute__ ((packed));
+#endif /* __LINUX_USB_NET2280_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/linux/wanpipe.h b/include/linux/wanpipe.h
deleted file mode 100644
index dae9860091dd..000000000000
--- a/include/linux/wanpipe.h
+++ /dev/null
@@ -1,483 +0,0 @@
-/*****************************************************************************
-* wanpipe.h     WANPIPE(tm) Multiprotocol WAN Link Driver.
-*               User-level API definitions.
-*
-* Author:       Nenad Corbic <ncorbic@sangoma.com>
-*               Gideon Hack     
-*
-* Copyright:    (c) 1995-2000 Sangoma Technologies Inc.
-*
-*               This program is free software; you can redistribute it and/or
-*               modify it under the terms of the GNU General Public License
-*               as published by the Free Software Foundation; either version
-*               2 of the License, or (at your option) any later version.
-* ============================================================================
-* Nov 3,  2000  Nenad Corbic    Added config_id to sdla_t structure.
-*                               Used to determine the protocol running.
-* Jul 13, 2000  Nenad Corbic    Added SyncPPP Support
-* Feb 24, 2000  Nenad Corbic    Added support for x25api driver
-* Oct 04, 1999  Nenad Corbic    New CHDLC and FRAME RELAY code, SMP support
-* Jun 02, 1999  Gideon Hack     Added 'update_call_count' for Cisco HDLC 
-*                               support
-* Jun 26, 1998  David Fong      Added 'ip_mode' in sdla_t.u.p for dynamic IP
-*                               routing mode configuration
-* Jun 12, 1998  David Fong      Added Cisco HDLC union member in sdla_t
-* Dec 08, 1997  Jaspreet Singh  Added 'authenticator' in union of 'sdla_t' 
-* Nov 26, 1997  Jaspreet Singh  Added 'load_sharing' structure.  Also added 
-*                               'devs_struct','dev_to_devtint_next' to 'sdla_t' 
-* Nov 24, 1997  Jaspreet Singh  Added 'irq_dis_if_send_count', 
-*                               'irq_dis_poll_count' to 'sdla_t'.
-* Nov 06, 1997  Jaspreet Singh  Added a define called 'INTR_TEST_MODE'
-* Oct 20, 1997  Jaspreet Singh  Added 'buff_intr_mode_unbusy' and 
-*                               'dlci_intr_mode_unbusy' to 'sdla_t'
-* Oct 18, 1997  Jaspreet Singh  Added structure to maintain global driver
-*                               statistics.
-* Jan 15, 1997  Gene Kozin      Version 3.1.0
-*                                o added UDP management stuff
-* Jan 02, 1997  Gene Kozin      Version 3.0.0
-*****************************************************************************/
-#ifndef _WANPIPE_H
-#define _WANPIPE_H
-#include <linux/wanrouter.h>
-/* Defines */
-#ifndef PACKED
-#define PACKED  __attribute__((packed))
-#endif
-#define WANPIPE_MAGIC   0x414C4453L     /* signature: 'SDLA' reversed */
-/* IOCTL numbers (up to 16) */
-#define WANPIPE_DUMP    (ROUTER_USER+0) /* dump adapter's memory */
-#define WANPIPE_EXEC    (ROUTER_USER+1) /* execute firmware command */
-#define TRACE_ALL                       0x00
-#define TRACE_PROT                      0x01
-#define TRACE_DATA                      0x02
-/* values for request/reply byte */
-#define UDPMGMT_REQUEST 0x01
-#define UDPMGMT_REPLY   0x02
-#define UDP_OFFSET      12
-#define MAX_CMD_BUFF    10
-#define MAX_X25_LCN     255     /* Maximum number of x25 channels */
-#define MAX_LCN_NUM     4095    /* Maximum lcn number */
-#define MAX_FT1_RETRY   100
-#ifndef AF_WANPIPE
-        #define AF_WANPIPE 25
-        #ifndef PF_WANPIPE
-                #define PF_WANPIPE AF_WANPIPE
-        #endif
-#endif
-#define TX_TIMEOUT 5*HZ
-/* General Critical Flags */
-#define SEND_CRIT       0x00
-#define PERI_CRIT       0x01
-/* Chdlc and PPP polling critical flag */
-#define POLL_CRIT       0x03
-/* Frame Relay Tx IRQ send critical flag */
-#define SEND_TXIRQ_CRIT 0x02
-/* Frame Relay ARP critical flag */
-#define ARP_CRIT        0x03
-/* Bit maps for dynamic interface configuration
- * DYN_OPT_ON : turns this option on/off 
- * DEV_DOWN   : device was shutdown by the driver not
- *              by user 
- */
-#define DYN_OPT_ON      0x00
-#define DEV_DOWN        0x01
-/*
- * Data structures for IOCTL calls.
- */
-typedef struct sdla_dump        /* WANPIPE_DUMP */
-{
-        unsigned long magic;    /* for verification */
-        unsigned long offset;   /* absolute adapter memory address */
-        unsigned long length;   /* block length */
-        void* ptr;              /* -> buffer */
-} sdla_dump_t;
-typedef struct sdla_exec        /* WANPIPE_EXEC */
-{
-        unsigned long magic;    /* for verification */
-        void* cmd;              /* -> command structure */
-        void* data;             /* -> data buffer */
-} sdla_exec_t;
-/* UDP management stuff */
-typedef struct wum_header
-{
-        unsigned char signature[8];     /* 00h: signature */
-        unsigned char type;             /* 08h: request/reply */
-        unsigned char command;          /* 09h: commnand */
-        unsigned char reserved[6];      /* 0Ah: reserved */
-} wum_header_t;
-/*************************************************************************
- Data Structure for global statistics
-*************************************************************************/
-typedef struct global_stats
-{
-        unsigned long isr_entry;
-        unsigned long isr_already_critical;             
-        unsigned long isr_rx;
-        unsigned long isr_tx;
-        unsigned long isr_intr_test;
-        unsigned long isr_spurious;
-        unsigned long isr_enable_tx_int;
-        unsigned long rx_intr_corrupt_rx_bfr;
-        unsigned long rx_intr_on_orphaned_DLCI;
-        unsigned long rx_intr_dev_not_started;
-        unsigned long tx_intr_dev_not_started;
-        unsigned long poll_entry;
-        unsigned long poll_already_critical;
-        unsigned long poll_processed;
-        unsigned long poll_tbusy_bad_status;
-        unsigned long poll_host_disable_irq;
-        unsigned long poll_host_enable_irq;
-} global_stats_t;
-typedef struct{
-        unsigned short  udp_src_port            PACKED;
-        unsigned short  udp_dst_port            PACKED;
-        unsigned short  udp_length              PACKED;
-        unsigned short  udp_checksum            PACKED;
-} udp_pkt_t;
-typedef struct {
-        unsigned char   ver_inet_hdr_length     PACKED;
-        unsigned char   service_type            PACKED;
-        unsigned short  total_length            PACKED;
-        unsigned short  identifier              PACKED;
-        unsigned short  flags_frag_offset       PACKED;
-        unsigned char   ttl                     PACKED;
-        unsigned char   protocol                PACKED;
-        unsigned short  hdr_checksum            PACKED;
-        unsigned long   ip_src_address          PACKED;
-        unsigned long   ip_dst_address          PACKED;
-} ip_pkt_t;
-typedef struct {
-        unsigned char           signature[8]    PACKED;
-        unsigned char           request_reply   PACKED;
-        unsigned char           id              PACKED;
-        unsigned char           reserved[6]     PACKED;
-} wp_mgmt_t;
-/*************************************************************************
- Data Structure for if_send  statistics
-*************************************************************************/  
-typedef struct if_send_stat{
-        unsigned long if_send_entry;
-        unsigned long if_send_skb_null;
-        unsigned long if_send_broadcast;
-        unsigned long if_send_multicast;
-        unsigned long if_send_critical_ISR;
-        unsigned long if_send_critical_non_ISR;
-        unsigned long if_send_tbusy;
-        unsigned long if_send_tbusy_timeout;
-        unsigned long if_send_PIPE_request;
-        unsigned long if_send_wan_disconnected;
-        unsigned long if_send_dlci_disconnected;
-        unsigned long if_send_no_bfrs;
-        unsigned long if_send_adptr_bfrs_full;
-        unsigned long if_send_bfr_passed_to_adptr;
-        unsigned long if_send_protocol_error;
-        unsigned long if_send_bfr_not_passed_to_adptr;
-        unsigned long if_send_tx_int_enabled;
-        unsigned long if_send_consec_send_fail; 
-} if_send_stat_t;
-typedef struct rx_intr_stat{
-        unsigned long rx_intr_no_socket;
-        unsigned long rx_intr_dev_not_started;
-        unsigned long rx_intr_PIPE_request;
-        unsigned long rx_intr_bfr_not_passed_to_stack;
-        unsigned long rx_intr_bfr_passed_to_stack;
-} rx_intr_stat_t;       
-typedef struct pipe_mgmt_stat{
-        unsigned long UDP_PIPE_mgmt_kmalloc_err;
-        unsigned long UDP_PIPE_mgmt_direction_err;
-        unsigned long UDP_PIPE_mgmt_adptr_type_err;
-        unsigned long UDP_PIPE_mgmt_adptr_cmnd_OK;
-        unsigned long UDP_PIPE_mgmt_adptr_cmnd_timeout;
-        unsigned long UDP_PIPE_mgmt_adptr_send_passed;
-        unsigned long UDP_PIPE_mgmt_adptr_send_failed;
-        unsigned long UDP_PIPE_mgmt_not_passed_to_stack;
-        unsigned long UDP_PIPE_mgmt_passed_to_stack;
-        unsigned long UDP_PIPE_mgmt_no_socket;
-        unsigned long UDP_PIPE_mgmt_passed_to_adptr;
-} pipe_mgmt_stat_t;
-typedef struct {
-        struct sk_buff *skb;
-} bh_data_t, cmd_data_t;
-#define MAX_LGTH_UDP_MGNT_PKT 2000
- 
-/* This is used for interrupt testing */
-#define INTR_TEST_MODE  0x02
-#define WUM_SIGNATURE_L 0x50495046
-#define WUM_SIGNATURE_H 0x444E3845
-#define WUM_KILL        0x50
-#define WUM_EXEC        0x51
-#define WANPIPE         0x00
-#define API             0x01
-#define BRIDGE          0x02
-#define BRIDGE_NODE     0x03
-#ifdef  __KERNEL__
-/****** Kernel Interface ****************************************************/
-#include <linux/sdladrv.h>      /* SDLA support module API definitions */
-#include <linux/sdlasfm.h>      /* SDLA firmware module definitions */
-#include <linux/workqueue.h>
-#include <linux/serial.h>
-#include <linux/serialP.h>
-#include <linux/serial_reg.h>
-#include <asm/serial.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-/****** Data Structures *****************************************************/
-/* Adapter Data Space.
- * This structure is needed because we handle multiple cards, otherwise
- * static data would do it.
- */
-typedef struct sdla
-{
-        char devname[WAN_DRVNAME_SZ+1]; /* card name */
-        sdlahw_t hw;                    /* hardware configuration */
-        struct wan_device wandev;       /* WAN device data space */
-        
-        unsigned open_cnt;              /* number of open interfaces */
-        unsigned long state_tick;       /* link state timestamp */
-        unsigned intr_mode;             /* Type of Interrupt Mode */
-        char in_isr;                    /* interrupt-in-service flag */
-        char buff_int_mode_unbusy;      /* flag for carrying out dev_tint */  
-        char dlci_int_mode_unbusy;      /* flag for carrying out dev_tint */
-        long configured;                /* flag for previous configurations */
-        
-        unsigned short irq_dis_if_send_count; /* Disabling irqs in if_send*/
-        unsigned short irq_dis_poll_count;   /* Disabling irqs in poll routine*/
-        unsigned short force_enable_irq;
-        char TracingEnabled;            /* flag for enabling trace */
-        global_stats_t statistics;      /* global statistics */
-        void* mbox;                     /* -> mailbox */
-        void* rxmb;                     /* -> receive mailbox */
-        void* flags;                    /* -> adapter status flags */
-        void (*isr)(struct sdla* card); /* interrupt service routine */
-        void (*poll)(struct sdla* card); /* polling routine */
-        int (*exec)(struct sdla* card, void* u_cmd, void* u_data);
-                                        /* Used by the listen() system call */          
-        /* Wanpipe Socket Interface */
-        int   (*func) (struct sk_buff *, struct sock *);
-        struct sock *sk;
-        /* Shutdown function */
-        void (*disable_comm) (struct sdla *card);
-        /* Secondary Port Device: Piggibacking */
-        struct sdla *next;
-        /* TTY driver variables */
-        unsigned char tty_opt;
-        struct tty_struct *tty;
-        unsigned int tty_minor;
-        unsigned int tty_open;
-        unsigned char *tty_buf;
-        unsigned char *tty_rx;
-        struct work_struct tty_work;
-        
-        union
-        {
-                struct
-                {                       /****** X.25 specific data **********/
-                        u32 lo_pvc;
-                        u32 hi_pvc;
-                        u32 lo_svc;
-                        u32 hi_svc;
-                        struct net_device *svc_to_dev_map[MAX_X25_LCN];
-                        struct net_device *pvc_to_dev_map[MAX_X25_LCN];
-                        struct net_device *tx_dev;
-                        struct net_device *cmd_dev;
-                        u32 no_dev;
-                        volatile u8 *hdlc_buf_status;
-                        u32 tx_interrupts_pending;
-                        u16 timer_int_enabled;
-                        struct net_device *poll_device;
-                        atomic_t command_busy;
-                        u16 udp_pkt_lgth;
-                        u32 udp_type;
-                        u8  udp_pkt_src;
-                        u32 udp_lcn;
-                        struct net_device *udp_dev;
-                        s8 udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-                        u8 LAPB_hdlc;           /* Option to turn off X25 and run only LAPB */
-                        u8 logging;             /* Option to log call messages */
-                        u8 oob_on_modem;        /* Option to send modem status to the api */
-                        u16 num_of_ch;          /* Number of channels configured by the user */
-                        struct work_struct x25_poll_work;
-                        struct timer_list x25_timer;
-                } x;
-                struct
-                {                       /****** frame relay specific data ***/
-                        void* rxmb_base;        /* -> first Rx buffer */
-                        void* rxmb_last;        /* -> last Rx buffer */
-                        unsigned rx_base;       /* S508 receive buffer base */
-                        unsigned rx_top;        /* S508 receive buffer end */
-                        unsigned short node_dlci[100];
-                        unsigned short dlci_num;
-                        struct net_device *dlci_to_dev_map[991 + 1];
-                        unsigned tx_interrupts_pending;
-                        unsigned short timer_int_enabled;
-                        unsigned short udp_pkt_lgth;
-                        int udp_type;
-                        char udp_pkt_src;
-                        unsigned udp_dlci;
-                        char udp_pkt_data[MAX_LGTH_UDP_MGNT_PKT];
-                        void* trc_el_base;                      /* first trace element */
-                        void* trc_el_last;                      /* last trace element */
-                        void *curr_trc_el;                      /* current trace element */
-                        unsigned short trc_bfr_space;           /* trace buffer space */
-                        unsigned char  update_comms_stats;
-                        struct net_device *arp_dev;
-                        spinlock_t if_send_lock;
-                } f;
-                struct                  /****** PPP-specific data ***********/
-                {
-                        char if_name[WAN_IFNAME_SZ+1];  /* interface name */
-                        void* txbuf;            /* -> current Tx buffer */
-                        void* txbuf_base;       /* -> first Tx buffer */
-                        void* txbuf_last;       /* -> last Tx buffer */
-                        void* rxbuf_base;       /* -> first Rx buffer */
-                        void* rxbuf_last;       /* -> last Rx buffer */
-                        unsigned rx_base;       /* S508 receive buffer base */
-                        unsigned rx_top;        /* S508 receive buffer end */
-                        char ip_mode;           /* STATIC/HOST/PEER IP Mode */
-                        char authenticator;     /* Authenticator for PAP/CHAP */
-                        unsigned char comm_enabled; /* Is comm enabled or not */
-                        unsigned char peer_route;   /* Process Peer Route */    
-                        unsigned long *txbuf_next;  /* Next Tx buffer to use */ 
-                        unsigned long *rxbuf_next;  /* Next Rx buffer to use */
-                } p;
-                struct                  /* Cisco HDLC-specific data */
-                {
-                        char if_name[WAN_IFNAME_SZ+1];  /* interface name */
-                        unsigned char comm_port;/* Communication Port O or 1 */
-                        unsigned char usedby;  /* Used by WANPIPE or API */
-                        void* rxmb;             /* Receive mail box */
-                        void* flags;            /* flags */
-                        void* tx_status;        /* Tx status element */
-                        void* rx_status;        /* Rx status element */
-                        void* txbuf;            /* -> current Tx buffer */
-                        void* txbuf_base;       /* -> first Tx buffer */
-                        void* txbuf_last;       /* -> last Tx buffer */
-                        void* rxbuf_base;       /* -> first Rx buffer */
-                        void* rxbuf_last;       /* -> last Rx buffer */
-                        unsigned rx_base;       /* S508 receive buffer base */
-                        unsigned rx_top;        /* S508 receive buffer end */
-                        unsigned char receive_only; /* high speed receivers */
-                        unsigned short protocol_options;
-                        unsigned short kpalv_tx;        /* Tx kpalv timer */
-                        unsigned short kpalv_rx;        /* Rx kpalv timer */
-                        unsigned short kpalv_err;       /* Error tolerance */
-                        unsigned short slarp_timer;     /* SLARP req timer */
-                        unsigned state;                 /* state of the link */
-                        unsigned char api_status;
-                        unsigned char update_call_count;
-                        unsigned short api_options;     /* for async config */
-                        unsigned char  async_mode;
-                        unsigned short tx_bits_per_char;
-                        unsigned short rx_bits_per_char;
-                        unsigned short stop_bits;
-                        unsigned short parity;
-                        unsigned short break_timer;
-                        unsigned short inter_char_timer;
-                        unsigned short rx_complete_length;
-                        unsigned short xon_char;
-                        unsigned short xoff_char;
-                        unsigned char comm_enabled; /* Is comm enabled or not */
-                        unsigned char backup;
-                } c;
-                struct
-                {
-                        void* tx_status;        /* Tx status element */
-                        void* rx_status;        /* Rx status element */
-                        void* trace_status;     /* Trace status element */
-                        void* txbuf;            /* -> current Tx buffer */
-                        void* txbuf_base;       /* -> first Tx buffer */
-                        void* txbuf_last;       /* -> last Tx buffer */
-                        void* rxbuf_base;       /* -> first Rx buffer */
-                        void* rxbuf_last;       /* -> last Rx buffer */
-                        void* tracebuf;         /* -> current Trace buffer */
-                        void* tracebuf_base;    /* -> current Trace buffer */
-                        void* tracebuf_last;    /* -> current Trace buffer */
-                        unsigned rx_base;       /* receive buffer base */
-                        unsigned rx_end;        /* receive buffer end */
-                        unsigned trace_base;    /* trace buffer base */
-                        unsigned trace_end;     /* trace buffer end */
-                } h;
-        } u;
-} sdla_t;
-/****** Public Functions ****************************************************/
-void wanpipe_open      (sdla_t* card);                  /* wpmain.c */
-void wanpipe_close     (sdla_t* card);                  /* wpmain.c */
-void wanpipe_set_state (sdla_t* card, int state);       /* wpmain.c */
-int wpx_init (sdla_t* card, wandev_conf_t* conf);       /* wpx.c */
-int wpf_init (sdla_t* card, wandev_conf_t* conf);       /* wpf.c */
-int wpp_init (sdla_t* card, wandev_conf_t* conf);       /* wpp.c */
-int wpc_init (sdla_t* card, wandev_conf_t* conf); /* Cisco HDLC */
-int bsc_init (sdla_t* card, wandev_conf_t* conf);       /* BSC streaming */
-int hdlc_init(sdla_t* card, wandev_conf_t* conf);       /* HDLC support */
-int wpft1_init (sdla_t* card, wandev_conf_t* conf);     /* FT1 Config support */
-int wsppp_init (sdla_t* card, wandev_conf_t* conf);     /* Sync PPP on top of RAW CHDLC */
-extern sdla_t * wanpipe_find_card(char *);
-extern sdla_t * wanpipe_find_card_num (int);
-extern void wanpipe_queue_work (struct work_struct *);
-extern void wanpipe_mark_bh (void);
-extern void wakeup_sk_bh(struct net_device *dev);
-extern int change_dev_flags(struct net_device *dev, unsigned flags);
-extern unsigned long get_ip_address(struct net_device *dev, int option);
-extern void add_gateway(sdla_t *card, struct net_device *dev);
-#endif  /* __KERNEL__ */
-#endif  /* _WANPIPE_H */
diff --git a/include/net/arp.h b/include/net/arp.h
index a13e30c35f42..643bded9f557 100644
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -10,8 +10,6 @@
 extern struct neigh_table arp_tbl;
 extern void     arp_init(void);
-extern int      arp_rcv(struct sk_buff *skb, struct net_device *dev,
-                        struct packet_type *pt, struct net_device *orig_dev);
 extern int      arp_find(unsigned char *haddr, struct sk_buff *skb);
 extern int      arp_ioctl(unsigned int cmd, void __user *arg);
 extern void     arp_send(int type, int ptype, u32 dest_ip, 
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index b971d8c82bdd..6b3693f05ca0 100644
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -267,8 +267,9 @@ extern void ieee80211softmac_stop(struct net_device *dev);
 #define IEEE80211SOFTMAC_EVENT_AUTH_FAILED              5
 #define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT             6
 #define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND  7
+#define IEEE80211SOFTMAC_EVENT_DISASSOCIATED            8
 /* keep this updated! */
-#define IEEE80211SOFTMAC_EVENT_LAST                     7
+#define IEEE80211SOFTMAC_EVENT_LAST                     8
 /*
 * If you want to be notified of certain events, you can call
 * ieee80211softmac_notify[_atomic] with
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/ipv6.h b/include/net/ipv6.h
index 6d6f0634ae41..4abedb8eaece 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -230,7 +230,7 @@ extern int 			ip6_ra_control(struct sock *sk, int sel,
                                               void (*destructor)(struct sock *));
-extern int                      ipv6_parse_hopopts(struct sk_buff *skb, int);
+extern int                      ipv6_parse_hopopts(struct sk_buff *skb);
 extern struct ipv6_txoptions *  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt);
 extern struct ipv6_txoptions *  ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
diff --git a/include/net/sock.h b/include/net/sock.h
index af2b0544586e..ff8b0dad7b0f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -454,6 +454,7 @@ static inline void sk_stream_set_owner_r(struct sk_buff *skb, struct sock *sk)
 static inline void sk_stream_free_skb(struct sock *sk, struct sk_buff *skb)
 {
+        skb_truesize_check(skb);
        sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
        sk->sk_wmem_queued   -= skb->truesize;
        sk->sk_forward_alloc += skb->truesize;
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/net/xfrm.h b/include/net/xfrm.h
index 0d5529c382e8..afa508d92c93 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -143,6 +143,11 @@ struct xfrm_state
        /* Replay detection state at the time we sent the last notification */
        struct xfrm_replay_state preplay;
+        /* internal flag that only holds state for delayed aevent at the
+         * moment
+        */
+        u32                     xflags;
        /* Replay detection notification settings */
        u32                     replay_maxage;
        u32                     replay_maxdiff;
@@ -168,6 +173,9 @@ struct xfrm_state
        void                    *data;
 };
+/* xflags - make enum if more show up */
+#define XFRM_TIME_DEFER 1
 enum {
        XFRM_STATE_VOID,
        XFRM_STATE_ACQ,
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index f404fe21cc21..ad63c215efe5 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -91,34 +91,6 @@ enum ib_sa_selector {
        IB_SA_BEST = 3
 };
-enum ib_sa_rate {
-        IB_SA_RATE_2_5_GBPS = 2,
-        IB_SA_RATE_5_GBPS   = 5,
-        IB_SA_RATE_10_GBPS  = 3,
-        IB_SA_RATE_20_GBPS  = 6,
-        IB_SA_RATE_30_GBPS  = 4,
-        IB_SA_RATE_40_GBPS  = 7,
-        IB_SA_RATE_60_GBPS  = 8,
-        IB_SA_RATE_80_GBPS  = 9,
-        IB_SA_RATE_120_GBPS = 10
-};
-static inline int ib_sa_rate_enum_to_int(enum ib_sa_rate rate)
-{
-        switch (rate) {
-        case IB_SA_RATE_2_5_GBPS: return  1;
-        case IB_SA_RATE_5_GBPS:   return  2;
-        case IB_SA_RATE_10_GBPS:  return  4;
-        case IB_SA_RATE_20_GBPS:  return  8;
-        case IB_SA_RATE_30_GBPS:  return 12;
-        case IB_SA_RATE_40_GBPS:  return 16;
-        case IB_SA_RATE_60_GBPS:  return 24;
-        case IB_SA_RATE_80_GBPS:  return 32;
-        case IB_SA_RATE_120_GBPS: return 48;
-        default:                  return -1;
-        }
-}
 /*
 * Structures for SA records are named "struct ib_sa_xxx_rec."  No
 * attempt is made to pack structures to match the physical layout of
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c1ad6273ac6c..6bbf1b364400 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -314,6 +314,34 @@ enum ib_ah_flags {
        IB_AH_GRH       = 1
 };
+enum ib_rate {
+        IB_RATE_PORT_CURRENT = 0,
+        IB_RATE_2_5_GBPS = 2,
+        IB_RATE_5_GBPS   = 5,
+        IB_RATE_10_GBPS  = 3,
+        IB_RATE_20_GBPS  = 6,
+        IB_RATE_30_GBPS  = 4,
+        IB_RATE_40_GBPS  = 7,
+        IB_RATE_60_GBPS  = 8,
+        IB_RATE_80_GBPS  = 9,
+        IB_RATE_120_GBPS = 10
+};
+/**
+ * ib_rate_to_mult - Convert the IB rate enum to a multiple of the
+ * base rate of 2.5 Gbit/sec.  For example, IB_RATE_5_GBPS will be
+ * converted to 2, since 5 Gbit/sec is 2 * 2.5 Gbit/sec.
+ * @rate: rate to convert.
+ */
+int ib_rate_to_mult(enum ib_rate rate) __attribute_const__;
+/**
+ * mult_to_ib_rate - Convert a multiple of 2.5 Gbit/sec to an IB rate
+ * enum.
+ * @mult: multiple to convert.
+ */
+enum ib_rate mult_to_ib_rate(int mult) __attribute_const__;
 struct ib_ah_attr {
        struct ib_global_route  grh;
        u16                     dlid;
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 174101b2069b..d31b16d25a09 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -28,4 +28,5 @@
 #define BLIST_NO_ULD_ATTACH     0x100000 /* device is actually for RAID config */
 #define BLIST_SELECT_NO_ATN     0x200000 /* select without ATN */
 #define BLIST_RETRY_HWERROR     0x400000 /* retry HARDWARE_ERROR */
+#define BLIST_MAX_512           0x800000 /* maximum 512 sector cdb length */
 #endif
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_ioctl.h b/include/scsi/scsi_ioctl.h
index d4be4d92d586..edb9525386da 100644
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -41,8 +41,6 @@ typedef struct scsi_fctargaddress {
 } Scsi_FCTargAddress;
 extern int scsi_ioctl(struct scsi_device *, int, void __user *);
-extern int scsi_ioctl_send_command(struct scsi_device *,
-                                   struct scsi_ioctl_command __user *);
 extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
                                   void __user *arg, struct file *filp);
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:
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index cf3fec8be1e3..5626225bd3ae 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -202,12 +202,19 @@ struct fc_rport {	/* aka fc_starget_attrs */
        /* internal data */
        unsigned int channel;
        u32 number;
+        u8 flags;
        struct list_head peers;
        struct device dev;
        struct work_struct dev_loss_work;
        struct work_struct scan_work;
+        struct work_struct stgt_delete_work;
+        struct work_struct rport_delete_work;
 } __attribute__((aligned(sizeof(unsigned long))));
+/* bit field values for struct fc_rport "flags" field: */
+#define FC_RPORT_DEVLOSS_PENDING        0x01
+#define FC_RPORT_SCAN_PENDING           0x02
 #define dev_to_rport(d)                         \
        container_of(d, struct fc_rport, dev)
 #define transport_class_to_rport(classdev)      \
@@ -327,13 +334,16 @@ struct fc_host_attrs {
        struct list_head rport_bindings;
        u32 next_rport_number;
        u32 next_target_id;
-        u8 flags;
-        struct work_struct rport_del_work;
-};
-/* values for struct fc_host_attrs "flags" field: */
+        /* work queues for rport state manipulation */
-#define FC_SHOST_RPORT_DEL_SCHEDULED    0x01
+        char work_q_name[KOBJ_NAME_LEN];
+        struct workqueue_struct *work_q;
+        char devloss_work_q_name[KOBJ_NAME_LEN];
+        struct workqueue_struct *devloss_work_q;
+};
+#define shost_to_fc_host(x) \
+        ((struct fc_host_attrs *)(x)->shost_data)
 #define fc_host_node_name(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->node_name)
@@ -375,10 +385,14 @@ struct fc_host_attrs {
        (((struct fc_host_attrs *)(x)->shost_data)->next_rport_number)
 #define fc_host_next_target_id(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->next_target_id)
-#define fc_host_flags(x) \
+#define fc_host_work_q_name(x) \
-        (((struct fc_host_attrs *)(x)->shost_data)->flags)
+        (((struct fc_host_attrs *)(x)->shost_data)->work_q_name)
-#define fc_host_rport_del_work(x) \
+#define fc_host_work_q(x) \
-        (((struct fc_host_attrs *)(x)->shost_data)->rport_del_work)
+        (((struct fc_host_attrs *)(x)->shost_data)->work_q)
+#define fc_host_devloss_work_q_name(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q_name)
+#define fc_host_devloss_work_q(x) \
+        (((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
 /* The functions by which the transport class and the driver communicate */
@@ -461,10 +475,15 @@ fc_remote_port_chkready(struct fc_rport *rport)
        switch (rport->port_state) {
        case FC_PORTSTATE_ONLINE:
-                result = 0;
+                if (rport->roles & FC_RPORT_ROLE_FCP_TARGET)
+                        result = 0;
+                else if (rport->flags & FC_RPORT_DEVLOSS_PENDING)
+                        result = DID_IMM_RETRY << 16;
+                else
+                        result = DID_NO_CONNECT << 16;
                break;
        case FC_PORTSTATE_BLOCKED:
-                result = DID_BUS_BUSY << 16;
+                result = DID_IMM_RETRY << 16;
                break;
        default:
                result = DID_NO_CONNECT << 16;
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 66b1f08b42b9..df70e7592ab5 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -367,7 +367,7 @@ struct snd_pcm_substream {
        struct snd_pcm_group self_group;        /* fake group for non linked substream (with substream lock inside) */
        struct snd_pcm_group *group;            /* pointer to current group */
        /* -- assigned files -- */
-        struct snd_pcm_file *file;
+        void *file;
        struct file *ffile;
        void (*pcm_release)(struct snd_pcm_substream *);
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
@@ -898,7 +898,6 @@ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
 const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
 snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian);
-const char *snd_pcm_format_name(snd_pcm_format_t format);
 void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops);
 void snd_pcm_set_sync(struct snd_pcm_substream *substream);